[josm] 03/06: Merge tag 'upstream/0.0.svn7778+dfsg1'
Bas Couwenberg
sebastic at xs4all.nl
Wed Dec 10 21:15:52 UTC 2014
This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a commit to branch master
in repository josm.
commit cce78a429c0970c8412ef0c67ad20438eb36b5f3
Merge: 3d00614 94c0380
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Wed Dec 10 20:36:07 2014 +0100
Merge tag 'upstream/0.0.svn7778+dfsg1'
Upstream version 0.0.svn7778+dfsg1
REVISION | 10 +-
data/defaultpresets.xml | 496 +-
data/maps.xsd | 2 +
data/validator/combinations.mapcss | 7 +-
data/validator/deprecated.mapcss | 32 +-
data/validator/geometry.mapcss | 49 +-
geticons.pl | 79 +-
i18n/po/af.po | 567 +-
i18n/po/am.po | 567 +-
i18n/po/ar.po | 573 +-
i18n/po/ast.po | 604 +-
i18n/po/az.po | 567 +-
i18n/po/be.po | 570 +-
i18n/po/bg.po | 658 ++-
i18n/po/bn.po | 567 +-
i18n/po/br.po | 567 +-
i18n/po/bs.po | 567 +-
i18n/po/ca.po | 625 +-
i18n/po/ca at valencia.po | 592 +-
i18n/po/cs.po | 2091 ++++---
i18n/po/cy.po | 567 +-
i18n/po/da.po | 1332 +++--
i18n/po/de.po | 642 +-
i18n/po/de_DE.po | 567 +-
i18n/po/el.po | 617 +-
i18n/po/en_AU.po | 575 +-
i18n/po/en_CA.po | 567 +-
i18n/po/en_GB.po | 594 +-
i18n/po/eo.po | 567 +-
i18n/po/es.po | 677 ++-
i18n/po/et.po | 589 +-
i18n/po/eu.po | 575 +-
i18n/po/fa.po | 571 +-
i18n/po/fi.po | 583 +-
i18n/po/fil.po | 567 +-
i18n/po/fr.po | 693 ++-
i18n/po/gl.po | 581 +-
i18n/po/he.po | 567 +-
i18n/po/hi.po | 567 +-
i18n/po/hr.po | 573 +-
i18n/po/ht.po | 567 +-
i18n/po/hu.po | 5410 ++++++++++-------
i18n/po/hy.po | 567 +-
i18n/po/ia.po | 567 +-
i18n/po/id.po | 584 +-
i18n/po/is.po | 569 +-
i18n/po/it.po | 687 ++-
i18n/po/ja.po | 863 ++-
i18n/po/ka.po | 567 +-
i18n/po/km.po | 1359 +++--
i18n/po/ko.po | 571 +-
i18n/po/ky.po | 567 +-
i18n/po/lo.po | 567 +-
i18n/po/lt.po | 577 +-
i18n/po/lv.po | 567 +-
i18n/po/mk.po | 567 +-
i18n/po/ms.po | 567 +-
i18n/po/nb.po | 575 +-
i18n/po/nds.po | 567 +-
i18n/po/nl.po | 593 +-
i18n/po/nn.po | 567 +-
i18n/po/oc.po | 567 +-
i18n/po/pa.po | 567 +-
i18n/po/pl.po | 1139 ++--
i18n/po/pt.po | 1096 +++-
i18n/po/pt_BR.po | 632 +-
i18n/po/rm.po | 567 +-
i18n/po/ro.po | 567 +-
i18n/po/ru.po | 612 +-
i18n/po/sk.po | 678 ++-
i18n/po/sl.po | 567 +-
i18n/po/sq.po | 567 +-
i18n/po/sr.po | 567 +-
i18n/po/sv.po | 738 ++-
i18n/po/ta.po | 567 +-
i18n/po/te.po | 567 +-
i18n/po/th.po | 567 +-
i18n/po/tr.po | 575 +-
i18n/po/ug.po | 567 +-
i18n/po/uk.po | 676 ++-
i18n/po/ur.po | 567 +-
i18n/po/vi.po | 567 +-
i18n/po/zh_CN.po | 588 +-
i18n/po/zh_TW.po | 589 +-
images/about.png | Bin 1910 -> 0 bytes
images/cursor/modifier/add_node.png | Bin 132 -> 0 bytes
images/data/user.png | Bin 0 -> 663 bytes
images/dialogs/conflict/mergecomplete.png | Bin 242 -> 0 bytes
images/dialogs/mappaint/josm_small.png | Bin 809 -> 808 bytes
images/icons/airport.png | Bin 268 -> 0 bytes
images/icons/bar.png | Bin 312 -> 0 bytes
images/icons/bus_stop.png | Bin 369 -> 0 bytes
images/icons/cafe.png | Bin 371 -> 0 bytes
images/icons/cinema.png | Bin 279 -> 0 bytes
images/icons/convenience.png | Bin 457 -> 0 bytes
images/icons/fast_food.png | Bin 428 -> 0 bytes
images/icons/ferry_terminal.png | Bin 467 -> 0 bytes
images/icons/fire_station.png | Bin 459 -> 0 bytes
images/icons/gate.png | Bin 89 -> 0 bytes
images/icons/hospital.png | Bin 161 -> 0 bytes
images/icons/hotel.png | Bin 214 -> 0 bytes
images/icons/museum.png | Bin 290 -> 0 bytes
images/icons/natural_blank.png | Bin 84 -> 0 bytes
images/icons/pharmacy.png | Bin 171 -> 0 bytes
images/icons/pharmacy_dispensing.png | Bin 165 -> 0 bytes
images/icons/place_of_worship.png | Bin 234 -> 0 bytes
images/icons/police.png | Bin 518 -> 0 bytes
images/icons/post_box.png | Bin 401 -> 0 bytes
images/icons/pub.png | Bin 400 -> 0 bytes
images/icons/recycling.png | Bin 481 -> 0 bytes
images/icons/restaurant.png | Bin 380 -> 0 bytes
images/icons/restriction.png | Bin 228 -> 0 bytes
images/icons/school.png | Bin 290 -> 0 bytes
images/icons/speed_hump_16.png | Bin 124 -> 0 bytes
images/icons/station.png | Bin 412 -> 0 bytes
images/icons/supermarket.png | Bin 484 -> 0 bytes
images/icons/taxi.png | Bin 419 -> 0 bytes
images/icons/theatre.png | Bin 483 -> 0 bytes
images/logo.png | Bin 33600 -> 11323 bytes
images/logo.svg | 1 +
images/logo_16x16x32.png | Bin 1004 -> 998 bytes
images/logo_16x16x8.png | Bin 768 -> 958 bytes
images/logo_32x32x32.png | Bin 3329 -> 2661 bytes
images/logo_32x32x8.png | Bin 1282 -> 1704 bytes
images/logo_48x48x32.png | Bin 6369 -> 4440 bytes
images/logo_48x48x8.png | Bin 2343 -> 2234 bytes
images/misc/grey_check.png | Bin 282 -> 0 bytes
images/misc/red_x.png | Bin 413 -> 0 bytes
images/presets/baseball.png | Bin 373 -> 0 bytes
images/presets/breakwater.png | Bin 0 -> 386 bytes
images/presets/canoe.png | Bin 146 -> 0 bytes
images/presets/chicane.png | Bin 247 -> 0 bytes
images/presets/church.png | Bin 276 -> 0 bytes
images/presets/cricket.png | Bin 336 -> 0 bytes
images/presets/cycling.png | Bin 187 -> 0 bytes
images/presets/drinking_water.png | Bin 141 -> 0 bytes
images/presets/equestrian.png | Bin 185 -> 356 bytes
images/presets/golf.png | Bin 205 -> 0 bytes
images/presets/gymnastics.png | Bin 504 -> 1145 bytes
images/presets/incline.png | Bin 326 -> 0 bytes
images/presets/incline_steep.png | Bin 321 -> 0 bytes
images/presets/pitch.png | Bin 149 -> 0 bytes
images/presets/racquetball.png | Bin 257 -> 0 bytes
images/presets/skiing_downhill.png | Bin 426 -> 0 bytes
images/presets/soccer.png | Bin 271 -> 0 bytes
images/presets/sports_centre.png | Bin 637 -> 0 bytes
images/presets/tennis.png | Bin 323 -> 0 bytes
images/upload-preferences.png | Bin 877 -> 0 bytes
.../usr/share/appdata/josm-latest.appdata.xml | 2 +-
linux/latest/usr/share/pixmaps/josm-latest-16.xpm | 431 +-
linux/latest/usr/share/pixmaps/josm-latest-32.xpm | 1006 +++-
linux/latest/usr/share/pixmaps/josm-latest.png | Bin 33608 -> 19675 bytes
linux/tested/usr/share/appdata/josm.appdata.xml | 2 +-
linux/tested/usr/share/pixmaps/josm-16.xpm | 431 +-
linux/tested/usr/share/pixmaps/josm-32.xpm | 1006 +++-
linux/tested/usr/share/pixmaps/josm.png | Bin 33608 -> 19675 bytes
macosx/JOSM.app/Contents/Resources/JOSM.icns | Bin 62131 -> 312279 bytes
patches/10trim_svgsalamander.patch | 6249 +-------------------
scripts/sync_editor-imagery-index.groovy | 267 +
src/org/openstreetmap/josm/Main.java | 22 +
.../openstreetmap/josm/actions/AboutAction.java | 2 +-
.../josm/actions/AbstractInfoAction.java | 44 -
.../josm/actions/AddImageryLayerAction.java | 18 +-
.../josm/actions/AutoScaleAction.java | 16 +-
.../josm/actions/CreateMultipolygonAction.java | 11 +-
.../josm/actions/DialogsToggleAction.java | 5 +-
.../openstreetmap/josm/actions/DownloadAction.java | 5 +-
.../josm/actions/ExtensionFileFilter.java | 3 +-
src/org/openstreetmap/josm/actions/HelpAction.java | 3 +-
.../josm/actions/HistoryInfoAction.java | 2 +-
.../josm/actions/HistoryInfoWebAction.java | 5 +-
src/org/openstreetmap/josm/actions/InfoAction.java | 2 +-
.../openstreetmap/josm/actions/InfoWebAction.java | 5 +-
.../josm/actions/JoinNodeWayAction.java | 4 +-
src/org/openstreetmap/josm/actions/JosmAction.java | 41 +-
.../openstreetmap/josm/actions/JumpToAction.java | 4 +-
.../josm/actions/LassoModeAction.java | 2 +-
.../josm/actions/OpenLocationAction.java | 7 +-
.../openstreetmap/josm/actions/RestartAction.java | 18 +-
.../openstreetmap/josm/actions/ToggleAction.java | 18 +-
.../josm/actions/UploadNotesAction.java | 58 +
.../downloadtasks/AbstractDownloadTask.java | 25 +-
.../actions/downloadtasks/DownloadGpsTask.java | 5 +
.../actions/downloadtasks/DownloadNotesTask.java | 5 +
.../actions/downloadtasks/DownloadOsmTask.java | 5 +
.../actions/downloadtasks/DownloadSessionTask.java | 12 +
.../josm/actions/downloadtasks/DownloadTask.java | 8 +-
.../josm/actions/mapmode/AddNoteAction.java | 40 +-
.../josm/actions/mapmode/DeleteAction.java | 14 +-
.../josm/actions/mapmode/DrawAction.java | 2 +-
.../josm/actions/mapmode/ExtrudeAction.java | 4 +-
.../actions/mapmode/ImproveWayAccuracyHelper.java | 30 +-
.../josm/actions/mapmode/SelectAction.java | 30 +-
.../actions/relation/AddSelectionToRelations.java | 5 +-
.../josm/actions/upload/UploadNotesTask.java | 144 +
.../openstreetmap/josm/command/DeleteCommand.java | 57 +-
src/org/openstreetmap/josm/data/Preferences.java | 2 +-
.../josm/data/imagery/ImageryInfo.java | 10 +
src/org/openstreetmap/josm/data/osm/Changeset.java | 61 +-
.../josm/data/osm/ChangesetDiscussionComment.java | 65 +
src/org/openstreetmap/josm/data/osm/DataSet.java | 4 +-
src/org/openstreetmap/josm/data/osm/NoteData.java | 75 +-
.../openstreetmap/josm/data/osm/TagCollection.java | 24 +
src/org/openstreetmap/josm/data/osm/Way.java | 7 +-
.../data/osm/visitor/paint/StyledMapRenderer.java | 25 +-
.../visitor/paint/relations/MultipolygonCache.java | 6 +-
.../data/validation/routines/UrlValidator.java | 6 +
.../josm/data/validation/tests/DuplicateWay.java | 63 +-
.../data/validation/tests/MapCSSTagChecker.java | 3 +-
.../josm/data/validation/tests/UnclosedWays.java | 2 +-
.../data/validation/tests/WayConnectedToArea.java | 10 +-
.../openstreetmap/josm/gui/IconToggleButton.java | 5 +-
src/org/openstreetmap/josm/gui/ImageryMenu.java | 9 +-
src/org/openstreetmap/josm/gui/MainMenu.java | 2 +-
src/org/openstreetmap/josm/gui/MapFrame.java | 2 -
src/org/openstreetmap/josm/gui/MapStatus.java | 6 +-
.../openstreetmap/josm/gui/NoteInputDialog.java | 67 +
src/org/openstreetmap/josm/gui/SplashScreen.java | 7 +-
.../josm/gui/conflict/ConflictColors.java | 2 +
.../josm/gui/conflict/pair/ListMerger.java | 22 +-
.../tags/CombinePrimitiveResolverDialog.java | 18 +-
.../gui/conflict/tags/MultiValueCellEditor.java | 26 +-
.../gui/conflict/tags/MultiValueCellRenderer.java | 30 +-
.../gui/conflict/tags/MultiValueDecisionType.java | 5 +-
.../tags/MultiValueResolutionDecision.java | 52 +-
.../tags/RelationMemberConflictResolver.java | 8 +-
.../tags/RelationMemberConflictResolverModel.java | 17 +-
.../conflict/tags/TagConflictResolverModel.java | 3 +
.../conflict/tags/TagConflictResolverTable.java | 2 +-
.../josm/gui/dialogs/ChangesetDialog.java | 4 +-
.../josm/gui/dialogs/FilterDialog.java | 9 +
.../josm/gui/dialogs/HistoryDialog.java | 335 --
.../josm/gui/dialogs/MapPaintDialog.java | 2 +-
.../openstreetmap/josm/gui/dialogs/NoteDialog.java | 68 +-
.../josm/gui/dialogs/SelectionListDialog.java | 69 +-
.../josm/gui/dialogs/ToggleDialog.java | 6 +-
.../josm/gui/dialogs/UserListDialog.java | 4 +-
.../dialogs/changeset/AbstractCellRenderer.java | 76 +
.../dialogs/changeset/ChangesetCacheManager.java | 7 +
.../changeset/ChangesetCacheTableCellRenderer.java | 67 +-
.../changeset/ChangesetCacheTableColumnModel.java | 5 +-
.../changeset/ChangesetContentDownloadTask.java | 2 +-
.../dialogs/changeset/ChangesetContentPanel.java | 2 +-
.../ChangesetContentTableCellRenderer.java | 35 +-
.../ChangesetContentTableColumnModel.java | 3 +
.../changeset/ChangesetContentTableModel.java | 3 +-
.../changeset/ChangesetDiscussionPanel.java | 144 +
.../ChangesetDiscussionTableCellRenderer.java | 41 +
.../ChangesetDiscussionTableColumnModel.java | 48 +
.../changeset/ChangesetDiscussionTableModel.java | 55 +
.../changeset/ChangesetHeaderDownloadTask.java | 25 +-
.../changeset/query/UrlBasedQueryPanel.java | 2 +-
.../gui/dialogs/properties/PropertiesDialog.java | 6 +-
.../josm/gui/dialogs/properties/TagEditHelper.java | 7 +-
.../dialogs/relation/GenericRelationEditor.java | 22 +-
.../gui/dialogs/relation/sort/RelationNodeMap.java | 2 +-
.../josm/gui/download/BoundingBoxSelection.java | 2 +-
.../josm/gui/download/DownloadDialog.java | 29 +-
.../josm/gui/history/VersionInfoPanel.java | 5 +-
.../josm/gui/history/VersionTable.java | 8 +-
.../josm/gui/io/RecentlyOpenedFilesMenu.java | 2 +-
.../josm/gui/io/UploadStrategySelectionPanel.java | 2 +-
.../openstreetmap/josm/gui/layer/NoteLayer.java | 35 +-
.../openstreetmap/josm/gui/layer/OsmDataLayer.java | 7 +-
.../josm/gui/layer/geoimage/GeoImageLayer.java | 7 +-
.../josm/gui/layer/geoimage/ImageViewerDialog.java | 6 +-
.../josm/gui/layer/markerlayer/Marker.java | 3 +
.../josm/gui/mappaint/MapPaintMenu.java | 5 +-
.../gui/mappaint/mapcss/ExpressionFactory.java | 2 +-
.../josm/gui/mappaint/mapcss/MapCSSParser.jj | 2 +-
.../gui/oauth/FullyAutomaticAuthorizationUI.java | 2 +-
.../josm/gui/preferences/ToolbarPreferences.java | 9 +-
.../preferences/advanced/AdvancedPreference.java | 2 +-
.../gui/preferences/audio/AudioPreference.java | 2 +-
.../gui/preferences/display/DisplayPreference.java | 2 +-
.../gui/preferences/imagery/ImageryPreference.java | 12 +-
.../josm/gui/preferences/map/MapPreference.java | 2 +-
.../gui/preferences/plugin/PluginPreference.java | 2 +-
.../projection/CodeProjectionChoice.java | 2 +-
.../projection/CustomProjectionChoice.java | 2 +-
.../projection/GaussKruegerProjectionChoice.java | 2 +-
.../LambertCC9ZonesProjectionChoice.java | 2 +-
.../projection/LambertProjectionChoice.java | 2 +-
.../projection/PuwgProjectionChoice.java | 2 +-
.../projection/SwissGridProjectionChoice.java | 2 +-
.../projection/UTMFranceDOMProjectionChoice.java | 2 +-
.../projection/UTMProjectionChoice.java | 2 +-
.../remotecontrol/RemoteControlPreference.java | 2 +-
.../preferences/server/ServerAccessPreference.java | 2 +-
.../preferences/shortcut/ShortcutPreference.java | 2 +-
.../preferences/validator/ValidatorPreference.java | 2 +-
.../josm/gui/tagging/TaggingPreset.java | 17 +-
.../josm/gui/tagging/TaggingPresetItems.java | 4 +-
.../josm/gui/tagging/TaggingPresetType.java | 5 +-
.../gui/tagging/ac/AutoCompletionItemPriority.java | 34 +-
.../josm/gui/tagging/ac/AutoCompletionList.java | 15 +
.../josm/gui/tagging/ac/AutoCompletionManager.java | 118 +-
.../openstreetmap/josm/io/DiffResultProcessor.java | 26 +-
src/org/openstreetmap/josm/io/MessageNotifier.java | 2 +-
src/org/openstreetmap/josm/io/NoteExporter.java | 48 +
src/org/openstreetmap/josm/io/NoteReader.java | 17 +
src/org/openstreetmap/josm/io/NoteWriter.java | 84 +
src/org/openstreetmap/josm/io/OsmApi.java | 143 +-
.../openstreetmap/josm/io/OsmChangesetParser.java | 82 +-
.../josm/io/OsmServerChangesetReader.java | 40 +-
.../josm/io/OsmServerWritePostprocessor.java | 4 +-
src/org/openstreetmap/josm/io/OsmServerWriter.java | 22 +-
.../openstreetmap/josm/io/imagery/WMSGrabber.java | 1 +
.../josm/io/remotecontrol/AddTagsDialog.java | 68 +-
.../josm/io/remotecontrol/RemoteControl.java | 2 +-
.../io/remotecontrol/handler/ImageryHandler.java | 20 +-
.../io/remotecontrol/handler/ImportHandler.java | 2 +-
.../josm/plugins/PluginInformation.java | 11 +-
.../plugins/ReadLocalPluginInformationTask.java | 24 +-
.../plugins/ReadRemotePluginInformationTask.java | 74 +-
src/org/openstreetmap/josm/tools/Geometry.java | 38 -
.../openstreetmap/josm/tools/ImageProvider.java | 173 +-
.../openstreetmap/josm/tools/ImageResource.java | 31 +-
styles/standard/elemstyles.mapcss | 515 +-
styles/standard/potlatch2.mapcss | 24 +-
320 files changed, 48943 insertions(+), 19726 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