[josm] 02/06: Merge tag 'upstream/0.0.svn7643+dfsg1'
Bas Couwenberg
sebastic at xs4all.nl
Wed Oct 22 20:49:53 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 66b8e4a3b5af3c2b9f35b8fc2a47cc649456141e
Merge: b25bbd8 1c9e7eb
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Tue Oct 21 22:29:29 2014 +0200
Merge tag 'upstream/0.0.svn7643+dfsg1'
Upstream version 0.0.svn7643+dfsg1
.classpath | 2 +-
REVISION | 8 +-
build.xml | 4 +-
data/defaultpresets.xml | 211 ++++---
data/left-right-hand-traffic.osm | 4 +-
data/mappaint-style.xsd | 1 +
data/tagging-preset.xsd | 1 +
data/validator/deprecated.mapcss | 50 +-
i18n/build.xml | 26 +-
i18n/po/af.po | 30 +-
i18n/po/am.po | 30 +-
i18n/po/ar.po | 30 +-
i18n/po/ast.po | 30 +-
i18n/po/az.po | 30 +-
i18n/po/be.po | 30 +-
i18n/po/bg.po | 30 +-
i18n/po/bn.po | 30 +-
i18n/po/br.po | 30 +-
i18n/po/bs.po | 30 +-
i18n/po/ca.po | 51 +-
i18n/po/ca at valencia.po | 30 +-
i18n/po/cs.po | 30 +-
i18n/po/cy.po | 30 +-
i18n/po/da.po | 70 +--
i18n/po/de.po | 120 ++--
i18n/po/de_DE.po | 30 +-
i18n/po/el.po | 30 +-
i18n/po/en_AU.po | 30 +-
i18n/po/en_CA.po | 30 +-
i18n/po/en_GB.po | 30 +-
i18n/po/eo.po | 30 +-
i18n/po/es.po | 30 +-
i18n/po/et.po | 74 +--
i18n/po/eu.po | 30 +-
i18n/po/fa.po | 30 +-
i18n/po/fi.po | 30 +-
i18n/po/fil.po | 30 +-
i18n/po/fr.po | 132 ++--
i18n/po/gl.po | 30 +-
i18n/po/he.po | 30 +-
i18n/po/hi.po | 30 +-
i18n/po/hr.po | 30 +-
i18n/po/ht.po | 30 +-
i18n/po/hu.po | 85 +--
i18n/po/hy.po | 30 +-
i18n/po/ia.po | 30 +-
i18n/po/id.po | 30 +-
i18n/po/is.po | 30 +-
i18n/po/it.po | 677 +++++++++++----------
i18n/po/ja.po | 30 +-
i18n/po/ka.po | 30 +-
i18n/po/km.po | 132 ++--
i18n/po/ko.po | 30 +-
i18n/po/ky.po | 30 +-
i18n/po/lo.po | 30 +-
i18n/po/lt.po | 30 +-
i18n/po/lv.po | 30 +-
i18n/po/mk.po | 30 +-
i18n/po/ms.po | 30 +-
i18n/po/nb.po | 30 +-
i18n/po/nds.po | 30 +-
i18n/po/nl.po | 30 +-
i18n/po/nn.po | 30 +-
i18n/po/oc.po | 30 +-
i18n/po/pa.po | 30 +-
i18n/po/pl.po | 30 +-
i18n/po/pt.po | 30 +-
i18n/po/pt_BR.po | 87 +--
i18n/po/rm.po | 30 +-
i18n/po/ro.po | 30 +-
i18n/po/ru.po | 48 +-
i18n/po/sk.po | 30 +-
i18n/po/sl.po | 30 +-
i18n/po/sq.po | 30 +-
i18n/po/sr.po | 30 +-
i18n/po/sv.po | 30 +-
i18n/po/ta.po | 30 +-
i18n/po/te.po | 30 +-
i18n/po/th.po | 30 +-
i18n/po/tr.po | 30 +-
i18n/po/ug.po | 30 +-
i18n/po/uk.po | 48 +-
i18n/po/ur.po | 30 +-
i18n/po/vi.po | 30 +-
i18n/po/zh_CN.po | 30 +-
i18n/po/zh_TW.po | 30 +-
images/cursor/modifier/create_note.png | Bin 0 -> 148 bytes
.../notes/note_closed.png} | Bin
images/dialogs/notes/note_comment.png | Bin 0 -> 290 bytes
.../notes/note_new.png} | Bin
.../notes/note_open.png} | Bin
images/dialogs/pin.png | Bin 0 -> 623 bytes
.../note_new_24x24.png => mapmode/addnote.png} | Bin
images/notes/note_closed_16x16.png | Bin 601 -> 0 bytes
images/notes/note_new_16x16.png | Bin 604 -> 0 bytes
images/notes/note_open_16x16.png | Bin 597 -> 0 bytes
src/org/openstreetmap/josm/Main.java | 24 +-
.../josm/actions/ReportBugAction.java | 49 ++
.../josm/actions/ShowStatusReportAction.java | 5 +-
.../actions/downloadtasks/DownloadGpsTask.java | 9 +-
.../actions/downloadtasks/DownloadNotesTask.java | 5 +-
.../actions/downloadtasks/DownloadOsmTask.java | 170 ++++--
.../josm/actions/mapmode/AddNoteAction.java | 90 +++
.../josm/actions/mapmode/ExtrudeAction.java | 3 +-
src/org/openstreetmap/josm/data/APIDataSet.java | 8 +-
src/org/openstreetmap/josm/data/osm/NoteData.java | 168 +++++
.../openstreetmap/josm/data/osm/OsmPrimitive.java | 33 +
.../data/osm/visitor/paint/StyledMapRenderer.java | 6 +
.../data/validation/tests/MapCSSTagChecker.java | 13 +-
src/org/openstreetmap/josm/gui/MainMenu.java | 5 +
src/org/openstreetmap/josm/gui/MapFrame.java | 6 +
src/org/openstreetmap/josm/gui/MapMover.java | 21 +-
.../openstreetmap/josm/gui/PleaseWaitRunnable.java | 15 +
.../conflict/tags/TagConflictResolverModel.java | 7 +-
.../josm/gui/dialogs/LayerListDialog.java | 1 -
.../openstreetmap/josm/gui/dialogs/NoteDialog.java | 356 +++++++++++
.../dialogs/relation/GenericRelationEditor.java | 9 +-
.../josm/gui/download/PlaceSelection.java | 33 +-
.../io/DownloadPrimitivesWithReferrersTask.java | 2 +-
.../openstreetmap/josm/gui/layer/NoteLayer.java | 148 ++++-
src/org/openstreetmap/josm/gui/layer/WMSLayer.java | 1 +
.../josm/gui/layer/geoimage/ImageViewerDialog.java | 8 +-
.../josm/gui/mappaint/AreaElemStyle.java | 7 +-
.../josm/gui/mappaint/BoxTextElemStyle.java | 3 +-
.../openstreetmap/josm/gui/mappaint/ElemStyle.java | 4 +-
.../josm/gui/mappaint/ElemStyles.java | 1 -
.../josm/gui/mappaint/LineElemStyle.java | 5 +-
.../josm/gui/mappaint/LineTextElemStyle.java | 3 +-
.../josm/gui/mappaint/MapPaintMenu.java | 2 +-
.../josm/gui/mappaint/NodeElemStyle.java | 3 +-
.../josm/gui/mappaint/RepeatImageElemStyle.java | 3 +-
.../josm/gui/mappaint/StyleSource.java | 3 -
.../gui/mappaint/mapcss/ExpressionFactory.java | 1 -
.../josm/gui/mappaint/xml/XmlStyleSource.java | 1 -
.../josm/gui/tagging/TaggingPreset.java | 2 +-
.../josm/gui/tagging/TaggingPresetItems.java | 18 +-
.../gui/tagging/ac/AutoCompletingComboBox.java | 58 +-
.../josm/gui/util/AdvancedKeyPressDetector.java | 29 +-
.../DisableShortcutsOnFocusGainedTextField.java | 16 +-
.../josm/gui/widgets/JosmPasswordField.java | 25 +-
.../josm/gui/widgets/JosmTextArea.java | 22 +-
.../josm/gui/widgets/JosmTextField.java | 15 +-
src/org/openstreetmap/josm/io/FileImporter.java | 9 +
src/org/openstreetmap/josm/io/NmeaReader.java | 5 +-
src/org/openstreetmap/josm/io/NoteImporter.java | 2 +-
.../josm/io/remotecontrol/DNSName.java | 4 +-
.../josm/io/remotecontrol/RemoteControl.java | 2 +-
.../josm/io/remotecontrol/RequestProcessor.java | 2 +
.../io/remotecontrol/handler/LoadDataHandler.java | 151 +++++
.../josm/plugins/PluginDownloadTask.java | 4 +-
.../plugins/ReadLocalPluginInformationTask.java | 1 -
.../openstreetmap/josm/tools/ExceptionUtil.java | 1 -
src/org/openstreetmap/josm/tools/ExifReader.java | 2 +-
.../openstreetmap/josm/tools/GeoPropertyIndex.java | 4 +-
.../openstreetmap/josm/tools/ImageProvider.java | 5 +-
.../openstreetmap/josm/tools/PlatformHookOsx.java | 48 +-
src/org/openstreetmap/josm/tools/Shortcut.java | 34 +-
styles/standard/elemstyles.mapcss | 86 ++-
taginfoextract.groovy | 57 +-
.../josm/gui/history/HistoryBrowserTest.java | 3 -
.../josm/actions/JoinAreasActionTest.java | 3 +-
.../validation/tests/MultipolygonTestTest.java | 5 +-
162 files changed, 3540 insertions(+), 2115 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