[josm] 02/08: Merge tag 'upstream/0.0.svn13576+dfsg'

Bas Couwenberg sebastic at debian.org
Tue Mar 27 05:43:02 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 a0df7725da14e469de6a7055fde6ccc35d9bfe86
Merge: a2dc679 32fe284
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Mar 27 07:17:35 2018 +0200

    Merge tag 'upstream/0.0.svn13576+dfsg'
    
    Upstream version 0.0.svn13576+dfsg

 .classpath                                         |    6 +-
 REVISION                                           |    8 +-
 build.xml                                          |   21 +-
 data/help-browser.css                              |    4 +
 data/maps.xsd                                      |   15 +-
 data/validator/combinations.mapcss                 |    4 +-
 data/validator/deprecated.mapcss                   |    8 +
 data_nodist/trans/ast.lang                         |  Bin 8482 -> 8488 bytes
 data_nodist/trans/be.lang                          |  Bin 17844 -> 17596 bytes
 data_nodist/trans/bg.lang                          |  Bin 2427 -> 2433 bytes
 data_nodist/trans/ca-valencia.lang                 |  Bin 7523 -> 7529 bytes
 data_nodist/trans/ca.lang                          |  Bin 10187 -> 10105 bytes
 data_nodist/trans/cs.lang                          |  Bin 11281 -> 11320 bytes
 data_nodist/trans/da.lang                          |  Bin 10626 -> 10651 bytes
 data_nodist/trans/de.lang                          |  Bin 12000 -> 12128 bytes
 data_nodist/trans/el.lang                          |  Bin 1167 -> 1173 bytes
 data_nodist/trans/en.lang                          |  Bin 9791 -> 9901 bytes
 data_nodist/trans/en_AU.lang                       |  Bin 1385 -> 1391 bytes
 data_nodist/trans/en_GB.lang                       |  Bin 1977 -> 1983 bytes
 data_nodist/trans/es.lang                          |  Bin 12716 -> 12763 bytes
 data_nodist/trans/et.lang                          |  Bin 1406 -> 1413 bytes
 data_nodist/trans/fi.lang                          |  Bin 3027 -> 3033 bytes
 data_nodist/trans/fr.lang                          |  Bin 12344 -> 12396 bytes
 data_nodist/trans/gl.lang                          |  Bin 2845 -> 2851 bytes
 data_nodist/trans/hu.lang                          |  Bin 13009 -> 12868 bytes
 data_nodist/trans/id.lang                          |  Bin 6513 -> 9212 bytes
 data_nodist/trans/it.lang                          |  Bin 10046 -> 9959 bytes
 data_nodist/trans/ja.lang                          |  Bin 11294 -> 11728 bytes
 data_nodist/trans/km.lang                          |  Bin 16350 -> 16356 bytes
 data_nodist/trans/lt.lang                          |  Bin 1965 -> 1971 bytes
 data_nodist/trans/nb.lang                          |  Bin 1636 -> 1642 bytes
 data_nodist/trans/nl.lang                          |  Bin 12451 -> 12470 bytes
 data_nodist/trans/pl.lang                          |  Bin 5686 -> 5619 bytes
 data_nodist/trans/pt.lang                          |  Bin 13371 -> 13710 bytes
 data_nodist/trans/pt_BR.lang                       |  Bin 9842 -> 9832 bytes
 data_nodist/trans/ru.lang                          |  Bin 18696 -> 18804 bytes
 data_nodist/trans/sk.lang                          |  Bin 10603 -> 10653 bytes
 data_nodist/trans/sv.lang                          |  Bin 1328 -> 1334 bytes
 data_nodist/trans/uk.lang                          |  Bin 19087 -> 19149 bytes
 data_nodist/trans/vi.lang                          |  Bin 10354 -> 10360 bytes
 data_nodist/trans/zh_CN.lang                       |  Bin 8278 -> 8484 bytes
 data_nodist/trans/zh_TW.lang                       |  Bin 5069 -> 5060 bytes
 eclipse/JOSM (Java 8).launch                       |    2 +-
 i18n/po/af.po                                      |  715 +++---
 i18n/po/am.po                                      |  715 +++---
 i18n/po/ar.po                                      |  715 +++---
 i18n/po/ast.po                                     |  722 +++---
 i18n/po/az.po                                      |  715 +++---
 i18n/po/be.po                                      |  727 +++---
 i18n/po/bg.po                                      |  721 +++---
 i18n/po/bn.po                                      |  715 +++---
 i18n/po/br.po                                      |  715 +++---
 i18n/po/bs.po                                      |  715 +++---
 i18n/po/ca.po                                      |  732 +++---
 i18n/po/ca at valencia.po                             |  719 +++---
 i18n/po/cs.po                                      |  771 +++---
 i18n/po/cy.po                                      |  719 +++---
 i18n/po/da.po                                      |  773 +++---
 i18n/po/de.po                                      |  825 ++++---
 i18n/po/de_DE.po                                   |  715 +++---
 i18n/po/el.po                                      |  715 +++---
 i18n/po/en_AU.po                                   |  717 +++---
 i18n/po/en_CA.po                                   |  715 +++---
 i18n/po/en_GB.po                                   |  812 ++++---
 i18n/po/eo.po                                      |  715 +++---
 i18n/po/es.po                                      |  857 +++----
 i18n/po/et.po                                      | 1727 +++++++-------
 i18n/po/eu.po                                      |  715 +++---
 i18n/po/fa.po                                      |  715 +++---
 i18n/po/fi.po                                      |  717 +++---
 i18n/po/fil.po                                     |  715 +++---
 i18n/po/fo.po                                      |  715 +++---
 i18n/po/fr.po                                      |  824 +++----
 i18n/po/ga.po                                      |  715 +++---
 i18n/po/gl.po                                      |  717 +++---
 i18n/po/he.po                                      |  715 +++---
 i18n/po/hi.po                                      |  715 +++---
 i18n/po/hr.po                                      |  715 +++---
 i18n/po/ht.po                                      |  715 +++---
 i18n/po/hu.po                                      |  761 +++---
 i18n/po/hy.po                                      |  715 +++---
 i18n/po/ia.po                                      |  715 +++---
 i18n/po/id.po                                      | 2460 +++++++++++--------
 i18n/po/is.po                                      |  715 +++---
 i18n/po/it.po                                      |  899 +++----
 i18n/po/ja.po                                      |  721 +++---
 i18n/po/ka.po                                      |  715 +++---
 i18n/po/km.po                                      |  719 +++---
 i18n/po/ko.po                                      |  760 +++---
 i18n/po/ku.po                                      |  715 +++---
 i18n/po/ky.po                                      |  715 +++---
 i18n/po/lb.po                                      |  715 +++---
 i18n/po/lo.po                                      |  715 +++---
 i18n/po/lt.po                                      |  723 +++---
 i18n/po/lv.po                                      |  715 +++---
 i18n/po/mk.po                                      |  715 +++---
 i18n/po/mr.po                                      |  715 +++---
 i18n/po/ms.po                                      |  715 +++---
 i18n/po/nb.po                                      |  715 +++---
 i18n/po/nds.po                                     |  715 +++---
 i18n/po/nl.po                                      |  822 ++++---
 i18n/po/nn.po                                      |  715 +++---
 i18n/po/oc.po                                      |  715 +++---
 i18n/po/pa.po                                      |  715 +++---
 i18n/po/pl.po                                      |  733 +++---
 i18n/po/pt.po                                      | 2463 ++++++++++++--------
 i18n/po/pt_BR.po                                   |  777 +++---
 i18n/po/rm.po                                      |  715 +++---
 i18n/po/ro.po                                      |  715 +++---
 i18n/po/ru.po                                      |  814 ++++---
 i18n/po/sk.po                                      |  755 +++---
 i18n/po/sl.po                                      |  715 +++---
 i18n/po/sq.po                                      |  715 +++---
 i18n/po/sr.po                                      |  715 +++---
 i18n/po/sv.po                                      |  715 +++---
 i18n/po/ta.po                                      |  715 +++---
 i18n/po/te.po                                      |  715 +++---
 i18n/po/th.po                                      |  715 +++---
 i18n/po/tr.po                                      |  715 +++---
 i18n/po/ug.po                                      |  715 +++---
 i18n/po/uk.po                                      |  767 +++---
 i18n/po/ur.po                                      |  715 +++---
 i18n/po/vi.po                                      |  723 +++---
 i18n/po/wae.po                                     |  715 +++---
 i18n/po/zh_CN.po                                   |  737 +++---
 i18n/po/zh_TW.po                                   |  727 +++---
 linux/latest/DEBIAN/conffiles                      |    1 +
 linux/tested/DEBIAN/conffiles                      |    1 +
 netbeans/nbproject/project.properties              |   12 +-
 scripts/SyncEditorLayerIndex.groovy                |  188 +-
 scripts/TestHTTPS.pl                               |  103 +
 .../josm/actions/DownloadReferrersAction.java      |    2 +-
 .../josm/actions/ImageryAdjustAction.java          |   20 +-
 .../josm/actions/JoinAreasAction.java              |    2 +-
 .../josm/actions/MergeSelectionAction.java         |    2 +-
 .../openstreetmap/josm/actions/PurgeAction.java    |   11 +-
 .../openstreetmap/josm/actions/SaveActionBase.java |    2 +-
 .../josm/actions/SimplifyWayAction.java            |   16 +-
 .../josm/actions/UpdateModifiedAction.java         |    2 +-
 .../josm/actions/UpdateSelectionAction.java        |    2 +-
 .../openstreetmap/josm/actions/UploadAction.java   |    4 +-
 .../josm/actions/UploadSelectionAction.java        |    2 +-
 .../actions/downloadtasks/DownloadGpsTask.java     |    3 +-
 .../actions/mapmode/ImproveWayAccuracyAction.java  |    9 +-
 .../actions/relation/AbstractRelationAction.java   |    2 +-
 .../josm/actions/search/SearchAction.java          |    3 +
 .../actions/upload/RelationUploadOrderHook.java    |    4 +-
 .../openstreetmap/josm/command/PurgeCommand.java   |   13 +-
 src/org/openstreetmap/josm/data/Preferences.java   |  112 -
 src/org/openstreetmap/josm/data/StructUtils.java   |    5 +-
 .../josm/data/imagery/ImageryInfo.java             |   87 +
 .../josm/data/imagery/ImageryLayerInfo.java        |   13 +-
 .../josm/data/imagery/WMTSTileSource.java          |   36 +-
 .../josm/data/osm/AbstractPrimitive.java           |   28 -
 src/org/openstreetmap/josm/data/osm/DataSet.java   |  105 -
 .../josm/data/osm/DefaultNameFormatter.java        |   52 +-
 .../josm/data/osm/DownloadPolicy.java              |   51 +
 src/org/openstreetmap/josm/data/osm/INode.java     |    5 +
 .../openstreetmap/josm/data/osm/IPrimitive.java    |   18 +
 src/org/openstreetmap/josm/data/osm/IRelation.java |   15 +
 src/org/openstreetmap/josm/data/osm/IWay.java      |   20 +
 .../josm/data/osm/KeyValueVisitor.java             |   23 +
 .../openstreetmap/josm/data/osm/NameFormatter.java |   26 +-
 src/org/openstreetmap/josm/data/osm/Node.java      |    5 -
 .../openstreetmap/josm/data/osm/OsmPrimitive.java  |    8 -
 .../josm/data/osm/OsmPrimitiveComparator.java      |    2 +-
 src/org/openstreetmap/josm/data/osm/Relation.java  |   11 +-
 .../openstreetmap/josm/data/osm/UploadPolicy.java  |   58 +
 src/org/openstreetmap/josm/data/osm/Way.java       |   21 +-
 .../josm/data/preferences/ColorProperty.java       |   94 -
 .../josm/data/preferences/NamedColorProperty.java  |   41 +-
 .../data/validation/tests/MapCSSTagChecker.java    |    3 +
 .../josm/data/validation/tests/UntaggedNode.java   |    9 +-
 .../josm/gui/OsmPrimitivRenderer.java              |    2 +
 ...rimitivRenderer.java => PrimitiveRenderer.java} |   24 +-
 src/org/openstreetmap/josm/gui/SideButton.java     |   28 +-
 .../RelationMemberConflictResolverColumnModel.java |    6 +-
 .../josm/gui/dialogs/ConflictDialog.java           |    4 +-
 .../DeleteFromRelationConfirmationDialog.java      |    6 +-
 .../josm/gui/dialogs/RelationListDialog.java       |    7 +-
 .../josm/gui/dialogs/SelectionListDialog.java      |    6 +-
 .../ChangesetContentTableCellRenderer.java         |    2 +-
 .../ChangesetContentTableColumnModel.java          |    4 +-
 .../gui/dialogs/properties/AbstractCopyAction.java |   65 +
 .../dialogs/properties/CopyAllKeyValueAction.java  |   50 +
 .../gui/dialogs/properties/CopyKeyValueAction.java |   39 +
 .../gui/dialogs/properties/CopyValueAction.java    |   38 +
 .../josm/gui/dialogs/properties/HelpAction.java    |  208 ++
 .../gui/dialogs/properties/PropertiesDialog.java   |  233 +-
 .../josm/gui/dialogs/properties/TaginfoAction.java |   73 +
 .../relation/ReferringRelationsBrowser.java        |    4 +-
 .../relation/ReferringRelationsBrowserModel.java   |    2 +-
 .../actions/AbstractRelationEditorAction.java      |    4 +-
 .../josm/gui/download/OSMDownloadSource.java       |    2 +-
 .../josm/gui/history/TagInfoViewer.java            |   61 +-
 .../josm/gui/history/VersionInfoPanel.java         |    6 +-
 .../io/DownloadPrimitivesWithReferrersTask.java    |    8 +
 .../josm/gui/io/UploadSelectionDialog.java         |    4 +-
 .../josm/gui/io/UploadedObjectsSummaryPanel.java   |    4 +-
 .../openstreetmap/josm/gui/layer/OsmDataLayer.java |   13 +-
 .../gui/mappaint/mapcss/MapCSSStyleSource.java     |    8 +-
 .../gui/preferences/display/ColorPreference.java   |   31 +-
 .../projection/CodeProjectionChoice.java           |  130 +-
 .../preferences/projection/CodeSelectionPanel.java |  180 ++
 .../gui/tagging/ac/AutoCompletingComboBox.java     |    7 +-
 .../presets/TaggingPresetNameTemplateList.java     |    4 +-
 .../gui/tagging/presets/TaggingPresetReader.java   |    2 +
 .../gui/tagging/presets/TaggingPresetType.java     |    4 +-
 .../josm/gui/widgets/TextContextualPopupMenu.java  |    6 +-
 src/org/openstreetmap/josm/io/CachedFile.java      |   45 +-
 src/org/openstreetmap/josm/io/OsmReader.java       |    4 +-
 .../josm/io/OsmServerLocationReader.java           |    1 +
 src/org/openstreetmap/josm/io/OsmWriter.java       |    4 +-
 .../josm/io/imagery/ImageryReader.java             |   13 +
 src/org/openstreetmap/josm/tools/I18n.java         |   41 +-
 src/org/openstreetmap/josm/tools/PlatformHook.java |    1 +
 .../josm/tools/RightAndLefthandTraffic.java        |    4 +-
 src/org/openstreetmap/josm/tools/TextAnalyzer.java |  135 ++
 .../openstreetmap/josm/tools/TextTagParser.java    |  119 -
 src/org/openstreetmap/josm/tools/Utils.java        |    4 +-
 .../actions/downloadtasks/DownloadGpsTaskTest.java |    1 +
 .../josm/actions/mapmode/DrawActionTest.java       |    6 +-
 .../openstreetmap/josm/data/osm/DataSetTest.java   |    2 -
 .../josm/data/osm/DefaultNameFormatterTest.java    |    2 +-
 .../josm/gui/history/HistoryBrowserModelTest.java  |    2 +-
 .../org/openstreetmap/josm/io/OsmWriterTest.java   |    4 +-
 .../josm/tools/TextTagParserTest.java              |   64 +-
 .../org/openstreetmap/josm/tools/UtilsTest.java    |    9 +
 228 files changed, 36678 insertions(+), 31569 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