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

sebastic pushed a commit to branch master
in repository josm.

commit 6d5fc24506dcd2bb59226c358eaa8ed2896d8074
Merge: 3dd31a1 6b169d1
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date:   Mon Apr 27 20:25:28 2015 +0200

    Merge tag 'upstream/0.0.svn8279+dfsg1'
    
    Upstream version 0.0.svn8279+dfsg1

 .classpath                                         |    4 +-
 REVISION                                           |   10 +-
 build.xml                                          |   26 +-
 data/defaultpresets.xml                            |   32 +-
 data/projection/epsg                               |   20 +
 data/validator/combinations.mapcss                 |    2 +-
 data/validator/deprecated.mapcss                   |   60 +-
 data/validator/opening_hours.js                    | 1910 ++++++--
 i18n/build.xml                                     |    7 +-
 i18n/convpreset.pl                                 |    3 +
 i18n/i18n.pl                                       |   11 +-
 i18n/launchpad.pl                                  |    8 +-
 i18n/po/af.po                                      |  453 +-
 i18n/po/am.po                                      |  453 +-
 i18n/po/ar.po                                      |  455 +-
 i18n/po/ast.po                                     |  507 +-
 i18n/po/az.po                                      |  453 +-
 i18n/po/be.po                                      |  472 +-
 i18n/po/bg.po                                      |  464 +-
 i18n/po/bn.po                                      |  461 +-
 i18n/po/br.po                                      |  453 +-
 i18n/po/bs.po                                      |  453 +-
 i18n/po/ca.po                                      |  515 +-
 i18n/po/c...@valencia.po                             |  525 ++-
 i18n/po/cs.po                                      |  525 ++-
 i18n/po/cy.po                                      |  453 +-
 i18n/po/da.po                                      |  978 ++--
 i18n/po/de.po                                      |  713 +--
 i18n/po/de_DE.po                                   |  453 +-
 i18n/po/el.po                                      |  470 +-
 i18n/po/en_AU.po                                   |  461 +-
 i18n/po/en_CA.po                                   |  453 +-
 i18n/po/en_GB.po                                   |  504 +-
 i18n/po/eo.po                                      |  453 +-
 i18n/po/es.po                                      |  526 ++-
 i18n/po/et.po                                      |  457 +-
 i18n/po/eu.po                                      |  464 +-
 i18n/po/fa.po                                      |  453 +-
 i18n/po/fi.po                                      |  554 +--
 i18n/po/fil.po                                     |  453 +-
 i18n/po/fo.po                                      |  453 +-
 i18n/po/fr.po                                      |  825 ++--
 i18n/po/gl.po                                      |  465 +-
 i18n/po/he.po                                      |  455 +-
 i18n/po/hi.po                                      |  453 +-
 i18n/po/hr.po                                      |  462 +-
 i18n/po/ht.po                                      |  453 +-
 i18n/po/hu.po                                      |  557 +--
 i18n/po/hy.po                                      |  453 +-
 i18n/po/ia.po                                      |  453 +-
 i18n/po/id.po                                      |  506 +-
 i18n/po/is.po                                      |  455 +-
 i18n/po/it.po                                      |  512 +-
 i18n/po/ja.po                                      |  609 +--
 i18n/po/ka.po                                      |  453 +-
 i18n/po/km.po                                      |  499 +-
 i18n/po/ko.po                                      |  455 +-
 i18n/po/ky.po                                      |  453 +-
 i18n/po/lo.po                                      |  453 +-
 i18n/po/lt.po                                      | 4937 +++++++++++---------
 i18n/po/lv.po                                      |  453 +-
 i18n/po/mk.po                                      |  453 +-
 i18n/po/ms.po                                      |  453 +-
 i18n/po/nb.po                                      |  457 +-
 i18n/po/nds.po                                     |  453 +-
 i18n/po/nl.po                                      |  568 +--
 i18n/po/nn.po                                      |  453 +-
 i18n/po/oc.po                                      |  455 +-
 i18n/po/pa.po                                      |  453 +-
 i18n/po/pl.po                                      |  600 +--
 i18n/po/pt.po                                      |  508 +-
 i18n/po/pt_BR.po                                   |  534 ++-
 i18n/po/rm.po                                      |  453 +-
 i18n/po/ro.po                                      |  455 +-
 i18n/po/ru.po                                      |  533 ++-
 i18n/po/sk.po                                      |  525 ++-
 i18n/po/sl.po                                      |  455 +-
 i18n/po/sq.po                                      |  453 +-
 i18n/po/sr.po                                      |  453 +-
 i18n/po/sv.po                                      |  486 +-
 i18n/po/ta.po                                      |  453 +-
 i18n/po/te.po                                      |  453 +-
 i18n/po/th.po                                      |  453 +-
 i18n/po/tr.po                                      |  461 +-
 i18n/po/ug.po                                      |  453 +-
 i18n/po/uk.po                                      |  557 ++-
 i18n/po/ur.po                                      |  453 +-
 i18n/po/vi.po                                      |  454 +-
 i18n/po/zh_CN.po                                   |  479 +-
 i18n/po/zh_TW.po                                   |  598 +--
 netbeans/nbproject/project.properties              |    4 +-
 src/org/openstreetmap/josm/Main.java               |    2 +
 .../josm/actions/AutoScaleAction.java              |   86 +-
 .../josm/actions/CombineWayAction.java             |   34 +-
 src/org/openstreetmap/josm/actions/CopyAction.java |   14 +-
 .../josm/actions/DistributeAction.java             |  191 +-
 .../josm/actions/DownloadNotesInViewAction.java    |   46 +
 .../josm/actions/DownloadPrimitiveAction.java      |    2 +-
 .../openstreetmap/josm/actions/OpenFileAction.java |   25 +-
 .../josm/actions/OpenLocationAction.java           |   64 +-
 .../openstreetmap/josm/actions/SaveActionBase.java |    4 +-
 .../josm/actions/SearchNotesDownloadAction.java    |   14 +
 .../openstreetmap/josm/actions/SplitWayAction.java |   47 +-
 .../downloadtasks/AbstractDownloadTask.java        |    5 +
 .../actions/downloadtasks/DownloadNotesTask.java   |   27 +-
 .../downloadtasks/DownloadNotesUrlBoundsTask.java  |   27 +
 .../downloadtasks/DownloadNotesUrlIdTask.java      |   39 +
 .../downloadtasks/DownloadOsmChangeTask.java       |   17 +-
 .../actions/downloadtasks/DownloadOsmIdTask.java   |   46 +
 .../josm/actions/mapmode/AddNoteAction.java        |   22 +-
 .../josm/actions/search/SearchAction.java          |   66 +-
 .../josm/actions/search/SearchCompiler.java        |   96 +-
 .../josm/actions/upload/FixDataHook.java           |   23 +-
 .../josm/corrector/ReverseWayTagCorrector.java     |    7 +-
 .../josm/data/cache/BufferedImageCacheEntry.java   |   91 +
 .../openstreetmap/josm/data/cache/CacheEntry.java  |   29 +
 .../josm/data/cache/CacheEntryAttributes.java      |   66 +
 .../josm/data/cache/ICachedLoaderJob.java          |   47 +
 .../josm/data/cache/ICachedLoaderListener.java     |   26 +
 .../josm/data/cache/JCSCacheManager.java           |  194 +
 .../josm/data/cache/JCSCachedTileLoaderJob.java    |  422 ++
 .../josm/data/imagery/TMSCachedTileLoader.java     |   91 +
 .../josm/data/imagery/TMSCachedTileLoaderJob.java  |  247 +
 src/org/openstreetmap/josm/data/osm/NoteData.java  |   57 +-
 src/org/openstreetmap/josm/data/osm/OsmUtils.java  |    4 +-
 .../josm/data/osm/SimplePrimitiveId.java           |    2 +-
 .../data/osm/visitor/paint/StyledMapRenderer.java  |    4 +-
 .../osm/visitor/paint/relations/Multipolygon.java  |   41 +-
 .../josm/data/projection/Ellipsoid.java            |    5 +
 .../josm/data/projection/Projections.java          |    1 +
 .../josm/data/validation/tests/CrossingWays.java   |    2 +-
 .../data/validation/tests/MapCSSTagChecker.java    |  168 +-
 .../data/validation/tests/MultipolygonTest.java    |   57 +-
 .../josm/data/validation/tests/NameMismatch.java   |   11 +-
 .../data/validation/tests/OpeningHourTest.java     |    2 +-
 .../openstreetmap/josm/gui/MainApplication.java    |   43 +-
 src/org/openstreetmap/josm/gui/MainMenu.java       |    4 +
 src/org/openstreetmap/josm/gui/MapFrame.java       |    6 +-
 .../openstreetmap/josm/gui/NoteInputDialog.java    |    5 +-
 .../josm/gui/bbox/SlippyMapBBoxChooser.java        |   14 +-
 .../josm/gui/dialogs/ChangesetDialog.java          |   37 +-
 .../josm/gui/dialogs/NotesDialog.java              |   26 +-
 .../dialogs/properties/PropertiesCellRenderer.java |   33 +-
 .../gui/dialogs/properties/PropertiesDialog.java   |    7 +-
 .../josm/gui/dialogs/properties/TagEditHelper.java |   30 +-
 .../gui/dialogs/relation/sort/RelationSorter.java  |   19 +
 .../josm/gui/download/DownloadDialog.java          |   27 +-
 .../josm/gui/history/DiffTableModel.java           |   20 +-
 .../josm/gui/history/HistoryBrowserModel.java      |   31 +-
 .../josm/gui/history/NodeListViewer.java           |   38 +-
 .../josm/gui/history/TwoColumnDiff.java            |   19 +-
 .../josm/gui/history/VersionInfoPanel.java         |   46 +-
 .../josm/gui/io/BasicUploadSettingsPanel.java      |    7 +-
 .../io/DownloadPrimitivesWithReferrersTask.java    |    5 +-
 .../openstreetmap/josm/gui/io/UploadDialog.java    |    8 +-
 .../openstreetmap/josm/gui/layer/NoteLayer.java    |   25 +-
 src/org/openstreetmap/josm/gui/layer/TMSLayer.java |  201 +-
 .../josm/gui/layer/geoimage/GeoImageLayer.java     |    4 +-
 .../josm/gui/mappaint/BoxTextElemStyle.java        |   39 +-
 .../josm/gui/mappaint/Environment.java             |   19 +-
 .../josm/gui/mappaint/NodeElemStyle.java           |   33 +-
 .../openstreetmap/josm/gui/mappaint/StyleKeys.java |    1 +
 .../josm/gui/mappaint/mapcss/Condition.java        |   27 +-
 .../gui/mappaint/mapcss/ExpressionFactory.java     |   68 +
 .../josm/gui/mappaint/mapcss/MapCSSParser.jj       |  240 +-
 .../josm/gui/mappaint/mapcss/Selector.java         |   50 +-
 .../preferences/display/LanguagePreference.java    |   10 +-
 .../gui/preferences/imagery/TMSSettingsPanel.java  |   41 +-
 .../server/AuthenticationPreferencesPanel.java     |   16 +-
 ...ssagesNotifierPanel.java => FeaturesPanel.java} |   19 +-
 .../josm/gui/tagging/TaggingPreset.java            |    2 +
 .../gui/tagging/ac/AutoCompletingComboBox.java     |   10 +
 .../gui/tagging/ac/AutoCompletingTextField.java    |   12 +-
 .../openstreetmap/josm/gui/util/RotationAngle.java |  121 +
 .../josm/io/BoundingBoxDownloader.java             |   68 +-
 src/org/openstreetmap/josm/io/NoteReader.java      |   36 +-
 src/org/openstreetmap/josm/io/NoteWriter.java      |    6 +-
 src/org/openstreetmap/josm/io/OsmServerReader.java |    4 +-
 .../josm/io/remotecontrol/RequestProcessor.java    |    3 +-
 .../io/remotecontrol/handler/ImageryHandler.java   |   30 +-
 .../io/remotecontrol/handler/ImportHandler.java    |   66 +-
 .../remotecontrol/handler/LoadAndZoomHandler.java  |    8 +-
 .../io/remotecontrol/handler/LoadDataHandler.java  |   77 +-
 .../remotecontrol/handler/LoadObjectHandler.java   |    6 +-
 .../io/remotecontrol/handler/RequestHandler.java   |   85 +-
 src/org/openstreetmap/josm/tools/ExifReader.java   |   11 +-
 src/org/openstreetmap/josm/tools/I18n.java         |   12 +-
 src/org/openstreetmap/josm/tools/LanguageInfo.java |   65 +-
 styles/standard/elemstyles.mapcss                  |   19 +-
 taginfoextract.groovy                              |  182 +-
 test/unit/org/openstreetmap/josm/TestUtils.java    |   22 -
 .../openstreetmap/josm/actions/CopyActionTest.java |   35 +
 .../josm/actions/SplitWayActionTest.java           |   96 +
 .../josm/actions/search/SearchCompilerTest.java    |   34 +
 .../josm/corrector/ReverseWayTagCorrectorTest.java |    2 +
 .../openstreetmap/josm/data/osm/OsmUtilsTest.java  |   40 +
 .../josm/data/osm/SimplePrimitiveIdTest.groovy     |    6 +
 .../validation/tests/MapCSSTagCheckerTest.java     |   60 +-
 .../data/validation/tests/NameMismatchTest.java    |   61 +
 .../gui/mappaint/mapcss/KeyConditionTest.groovy    |    4 +-
 .../mappaint/mapcss/KeyValueConditionTest.groovy   |    4 +-
 .../josm/gui/util/RotationAngleTest.java           |   26 +
 .../remotecontrol/handler/ImportHandlerTest.java   |   19 +
 .../remotecontrol/handler/RequestHandlerTest.java  |   85 +
 204 files changed, 29340 insertions(+), 20625 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/josm.git

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to