[josm] 02/09: Merge tag 'upstream/0.0.svn8109+dfsg1'
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Thu Mar 5 19:29:59 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 7c94b13f695eeadef4e69ec3b02018af4f2c6fae
Merge: 03676ba 82c8334
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Wed Mar 4 21:02:58 2015 +0100
Merge tag 'upstream/0.0.svn8109+dfsg1'
Upstream version 0.0.svn8109+dfsg1
REVISION | 6 +-
build.xml | 2 +
data/defaultpresets.xml | 982 +-
data/maps.xsd | 126 +-
data/validator/combinations.mapcss | 74 +-
data/validator/deprecated.mapcss | 13 +
data/validator/geometry.mapcss | 9 +
data/validator/numeric.mapcss | 13 +-
i18n/build.xml | 6 +-
i18n/{convwms.pl => convmaps.pl} | 10 +-
i18n/convplugins.pl | 4 +-
i18n/launchpad.pl | 4 +-
i18n/po/af.po | 6138 ++++-----
i18n/po/am.po | 6138 ++++-----
i18n/po/ar.po | 7404 +++++------
i18n/po/ast.po | 11284 +++++++++--------
i18n/po/az.po | 6138 ++++-----
i18n/po/be.po | 6152 +++++-----
i18n/po/bg.po | 11066 +++++++++--------
i18n/po/bn.po | 6138 ++++-----
i18n/po/br.po | 6138 ++++-----
i18n/po/bs.po | 6138 ++++-----
i18n/po/ca.po | 11316 ++++++++---------
i18n/po/ca at valencia.po | 10063 +++++++--------
i18n/po/cs.po | 11264 +++++++++--------
i18n/po/cy.po | 6138 ++++-----
i18n/po/da.po | 11366 ++++++++---------
i18n/po/de.po | 11732 +++++++++---------
i18n/po/de_DE.po | 6170 +++++-----
i18n/po/el.po | 8306 +++++++------
i18n/po/en_AU.po | 8434 +++++++------
i18n/po/en_CA.po | 6138 ++++-----
i18n/po/en_GB.po | 10122 +++++++--------
i18n/po/eo.po | 6470 +++++-----
i18n/po/es.po | 11679 +++++++++---------
i18n/po/et.po | 8665 ++++++-------
i18n/po/eu.po | 8462 +++++++------
i18n/po/fa.po | 6138 ++++-----
i18n/po/fi.po | 8324 +++++++------
i18n/po/fil.po | 6138 ++++-----
i18n/po/{az.po => fo.po} | 6202 +++++-----
i18n/po/fr.po | 11088 +++++++++--------
i18n/po/gl.po | 9277 +++++++-------
i18n/po/he.po | 7392 +++++------
i18n/po/hi.po | 6138 ++++-----
i18n/po/hr.po | 6554 +++++-----
i18n/po/ht.po | 6138 ++++-----
i18n/po/hu.po | 11405 ++++++++---------
i18n/po/hy.po | 6138 ++++-----
i18n/po/ia.po | 6138 ++++-----
i18n/po/id.po | 9619 ++++++++-------
i18n/po/is.po | 7099 ++++++-----
i18n/po/it.po | 11311 ++++++++---------
i18n/po/ja.po | 11026 +++++++++--------
i18n/po/ka.po | 6138 ++++-----
i18n/po/km.po | 6418 +++++-----
i18n/po/ko.po | 6183 +++++-----
i18n/po/ky.po | 6138 ++++-----
i18n/po/lo.po | 6138 ++++-----
i18n/po/lt.po | 8456 +++++++------
i18n/po/lv.po | 6138 ++++-----
i18n/po/mk.po | 6138 ++++-----
i18n/po/ms.po | 6148 +++++-----
i18n/po/nb.po | 8326 +++++++------
i18n/po/nds.po | 6186 +++++-----
i18n/po/nl.po | 10405 ++++++++--------
i18n/po/nn.po | 6138 ++++-----
i18n/po/oc.po | 6210 +++++-----
i18n/po/pa.po | 6138 ++++-----
i18n/po/pl.po | 10421 ++++++++--------
i18n/po/pt.po | 12283 ++++++++++---------
i18n/po/pt_BR.po | 11190 +++++++++--------
i18n/po/rm.po | 6138 ++++-----
i18n/po/ro.po | 6353 +++++-----
i18n/po/ru.po | 11300 +++++++++--------
i18n/po/sk.po | 11285 +++++++++--------
i18n/po/sl.po | 6814 +++++-----
i18n/po/sq.po | 6146 +++++-----
i18n/po/sr.po | 6162 +++++-----
i18n/po/sv.po | 9502 +++++++-------
i18n/po/ta.po | 6192 +++++-----
i18n/po/te.po | 6138 ++++-----
i18n/po/th.po | 6138 ++++-----
i18n/po/tr.po | 7748 ++++++------
i18n/po/ug.po | 6138 ++++-----
i18n/po/uk.po | 11277 +++++++++--------
i18n/po/ur.po | 6138 ++++-----
i18n/po/vi.po | 6160 +++++-----
i18n/po/zh_CN.po | 9958 +++++++--------
i18n/po/zh_TW.po | 8572 ++++++-------
images/data/changeset.png | Bin 411 -> 0 bytes
images/data/changeset.svg | 90 +
images/dialogs/activate.png | Bin 709 -> 0 bytes
images/dialogs/activate.svg | 132 +
images/dialogs/changeset/changesetmanager.png | Bin 935 -> 0 bytes
images/dialogs/changeset/changesetmanager.svg | 416 +
images/dialogs/changeset/downloadchangeset.png | Bin 723 -> 0 bytes
images/dialogs/changeset/downloadchangeset.svg | 235 +
.../dialogs/changeset/downloadchangesetcontent.png | Bin 810 -> 0 bytes
.../dialogs/changeset/downloadchangesetcontent.svg | 308 +
images/dialogs/changeset/updatechangeset.png | Bin 956 -> 0 bytes
images/dialogs/changeset/updatechangeset.svg | 344 +
.../dialogs/changeset/updatechangesetcontent.png | Bin 955 -> 0 bytes
.../dialogs/changeset/updatechangesetcontent.svg | 372 +
images/dialogs/changesetdialog.png | Bin 830 -> 0 bytes
images/dialogs/changesetdialog.svg | 177 +
images/dialogs/collapse.png | Bin 618 -> 0 bytes
images/dialogs/collapse.svg | 151 +
images/dialogs/conflict/copyaftercurrentleft.png | Bin 447 -> 0 bytes
images/dialogs/conflict/copyaftercurrentleft.svg | 109 +
images/dialogs/conflict/copyaftercurrentright.png | Bin 529 -> 0 bytes
images/dialogs/conflict/copyaftercurrentright.svg | 109 +
images/dialogs/conflict/copybeforecurrentleft.png | Bin 448 -> 0 bytes
images/dialogs/conflict/copybeforecurrentleft.svg | 109 +
images/dialogs/conflict/copybeforecurrentright.png | Bin 539 -> 0 bytes
images/dialogs/conflict/copybeforecurrentright.svg | 109 +
images/dialogs/conflict/copyendleft.png | Bin 573 -> 0 bytes
images/dialogs/conflict/copyendleft.svg | 113 +
images/dialogs/conflict/copyendright.png | Bin 504 -> 0 bytes
images/dialogs/conflict/copyendright.svg | 113 +
images/dialogs/conflict/copystartleft.png | Bin 585 -> 0 bytes
images/dialogs/conflict/copystartleft.svg | 113 +
images/dialogs/conflict/copystartright.png | Bin 543 -> 0 bytes
images/dialogs/conflict/copystartright.svg | 113 +
images/dialogs/conflict/mergeincomplete.png | Bin 142 -> 0 bytes
.../{tagconflictresolved => mergeincomplete.svg} | 56 +-
images/dialogs/conflict/movedown.png | Bin 476 -> 0 bytes
images/dialogs/conflict/movedown.svg | 102 +
images/dialogs/conflict/moveup.png | Bin 362 -> 0 bytes
images/dialogs/conflict/moveup.svg | 102 +
images/dialogs/conflict/remove.png | Bin 402 -> 0 bytes
images/dialogs/conflict/remove.svg | 102 +
images/dialogs/conflict/tagconflictresolved.png | Bin 322 -> 0 bytes
...tagconflictresolved => tagconflictresolved.svg} | 0
images/dialogs/conflict/tagconflictunresolved.png | Bin 373 -> 0 bytes
...onflictunresolved => tagconflictunresolved.svg} | 0
images/dialogs/conflict/tagkeepmine.png | Bin 345 -> 0 bytes
images/dialogs/conflict/tagkeepmine.svg | 76 +
images/dialogs/conflict/tagkeeptheir.png | Bin 329 -> 0 bytes
images/dialogs/conflict/tagkeeptheir.svg | 76 +
images/dialogs/conflict/tagundecide.png | Bin 475 -> 0 bytes
images/dialogs/conflict/tagundecide.svg | 86 +
images/dialogs/mappaint/wireframe_small.png | Bin 264 -> 0 bytes
images/dialogs/mappaint/wireframe_small.svg | 207 +
images/dialogs/mapstyle.png | Bin 1025 -> 0 bytes
images/dialogs/mapstyle.svg | 334 +
images/dialogs/propertiesdialog.png | Bin 961 -> 0 bytes
images/dialogs/propertiesdialog.svg | 160 +
images/dialogs/relation/deletemembers.png | Bin 673 -> 0 bytes
images/dialogs/relation/deletemembers.svg | 113 +
images/dialogs/relation/reverse.png | Bin 375 -> 0 bytes
images/dialogs/relation/reverse.svg | 198 +
images/dialogs/relation/selectmembers.png | Bin 579 -> 0 bytes
images/dialogs/relation/selectmembers.svg | 125 +
images/dialogs/relation/selectprimitives.png | Bin 608 -> 0 bytes
images/dialogs/relation/selectprimitives.svg | 125 +
images/followline.png | Bin 343 -> 0 bytes
images/followline.svg | 173 +
images/mapmode/parallel.png | Bin 228 -> 0 bytes
images/mapmode/parallel.svg | 190 +
images/misc/error.png | Bin 652 -> 0 bytes
images/misc/error.svg | 338 +
images/multipoly_create.png | Bin 695 -> 0 bytes
images/multipoly_create.svg | 206 +
images/note_search.png | Bin 0 -> 1361 bytes
images/presets/dollar.png | Bin 268 -> 0 bytes
images/presets/power_source-geothermal.svg | 173 +
images/session.png | Bin 876 -> 0 bytes
images/session.svg | 660 +
patches/10trim_svgsalamander.patch | 13 +-
src/org/openstreetmap/josm/Main.java | 30 +-
.../josm/actions/CombineWayAction.java | 2 +-
.../josm/actions/FollowLineAction.java | 2 +-
.../josm/actions/HistoryInfoAction.java | 2 +-
.../josm/actions/MapRectifierWMSmenuAction.java | 16 +-
.../josm/actions/OpenLocationAction.java | 2 +-
.../openstreetmap/josm/actions/PasteAction.java | 2 +-
.../josm/actions/ReportBugAction.java | 2 +-
src/org/openstreetmap/josm/actions/SaveAction.java | 2 +-
.../openstreetmap/josm/actions/SaveActionBase.java | 2 +-
.../josm/actions/SearchNotesDownloadAction.java | 95 +
.../josm/actions/ShowStatusReportAction.java | 2 +-
.../actions/downloadtasks/DownloadSessionTask.java | 2 +-
.../josm/actions/mapmode/AddNoteAction.java | 2 +-
.../josm/actions/mapmode/DrawAction.java | 44 +-
.../actions/mapmode/ImproveWayAccuracyAction.java | 2 +-
.../josm/actions/mapmode/SelectAction.java | 2 +-
.../josm/actions/search/SearchAction.java | 2 +-
src/org/openstreetmap/josm/data/Preferences.java | 34 +-
.../josm/data/imagery/ImageryInfo.java | 94 +-
.../data/osm/visitor/paint/StyledMapRenderer.java | 44 +-
.../data/validation/tests/MultipolygonTest.java | 4 +-
.../openstreetmap/josm/gui/MainApplication.java | 11 +-
src/org/openstreetmap/josm/gui/MainMenu.java | 213 +
src/org/openstreetmap/josm/gui/MapFrame.java | 5 +-
src/org/openstreetmap/josm/gui/MapView.java | 18 +-
.../josm/gui/NavigatableComponent.java | 8 +-
.../openstreetmap/josm/gui/bbox/SizeButton.java | 4 +-
.../openstreetmap/josm/gui/bbox/SourceButton.java | 4 +-
.../josm/gui/conflict/pair/ConflictResolver.java | 4 +-
.../josm/gui/conflict/pair/ListMerger.java | 10 +-
.../josm/gui/conflict/pair/tags/TagMerger.java | 6 +-
.../RelationMemberConflictResolverColumnModel.java | 2 +-
.../josm/gui/dialogs/MapPaintDialog.java | 2 +-
.../josm/gui/dialogs/NotesDialog.java | 16 +-
.../gui/dialogs/properties/PropertiesDialog.java | 2 +-
.../gui/dialogs/relation/MemberRoleCellEditor.java | 2 +-
.../josm/gui/download/DownloadDialog.java | 31 +-
.../josm/gui/download/DownloadObjectDialog.java | 2 +-
.../josm/gui/io/CredentialDialog.java | 5 +-
.../josm/gui/io/UploadParameterSummaryPanel.java | 2 +-
.../openstreetmap/josm/gui/layer/NoteLayer.java | 12 +-
.../openstreetmap/josm/gui/layer/OsmDataLayer.java | 4 +-
src/org/openstreetmap/josm/gui/layer/TMSLayer.java | 3 +-
src/org/openstreetmap/josm/gui/layer/WMSLayer.java | 15 +-
.../gui/layer/geoimage/CorrelateGpxWithImages.java | 6 +-
.../josm/gui/layer/geoimage/GeoImageLayer.java | 30 +-
.../josm/gui/layer/geoimage/ImageEntry.java | 30 +-
.../josm/gui/layer/geoimage/ImageViewerDialog.java | 8 +-
.../josm/gui/layer/markerlayer/AudioMarker.java | 2 +-
.../josm/gui/layer/markerlayer/ImageMarker.java | 2 +-
.../josm/gui/layer/markerlayer/WebMarker.java | 2 +-
.../josm/gui/mappaint/AreaElemStyle.java | 7 +-
.../josm/gui/mappaint/BoxTextElemStyle.java | 4 +-
.../openstreetmap/josm/gui/mappaint/ElemStyle.java | 20 +-
.../josm/gui/mappaint/LineElemStyle.java | 11 +-
.../openstreetmap/josm/gui/mappaint/MapImage.java | 50 +-
.../josm/gui/mappaint/MapPaintMenu.java | 2 +-
.../josm/gui/mappaint/MapPaintStyles.java | 41 +-
.../josm/gui/mappaint/NodeElemStyle.java | 27 +-
.../josm/gui/mappaint/RepeatImageElemStyle.java | 2 +-
.../openstreetmap/josm/gui/mappaint/StyleKeys.java | 42 +-
.../josm/gui/mappaint/StyleSource.java | 80 +-
.../josm/gui/mappaint/TextElement.java | 16 +-
.../josm/gui/mappaint/mapcss/MapCSSParser.jj | 122 +-
.../gui/mappaint/mapcss/MapCSSStyleSource.java | 81 +-
.../josm/gui/mappaint/mapcss/Selector.java | 20 +-
.../josm/gui/mappaint/mapcss/Subpart.java | 48 +
.../josm/gui/preferences/PreferenceTabbedPane.java | 106 +-
.../gui/preferences/imagery/ImageryPreference.java | 47 +-
.../gui/preferences/plugin/PluginPreference.java | 26 +-
.../preferences/plugin/PluginPreferencesModel.java | 12 +-
.../projection/CustomProjectionChoice.java | 4 +-
.../josm/gui/tagging/TagCellEditor.java | 2 +-
.../josm/gui/tagging/TaggingPreset.java | 4 +-
.../gui/tagging/ac/AutoCompletingTextField.java | 14 +-
.../josm/gui/util/AdvancedKeyPressDetector.java | 4 +-
.../josm/gui/widgets/JosmComboBox.java | 5 +-
.../josm/gui/widgets/JosmEditorPane.java | 2 +-
.../josm/gui/widgets/JosmTextArea.java | 2 +-
.../josm/gui/widgets/JosmTextField.java | 28 +-
.../josm/gui/widgets/TextContextualPopupMenu.java | 133 +-
src/org/openstreetmap/josm/io/CachedFile.java | 2 +-
src/org/openstreetmap/josm/io/GpxExporter.java | 2 +-
.../josm/io/imagery/ImageryReader.java | 10 +-
.../io/remotecontrol/handler/ImageryHandler.java | 3 +-
.../josm/plugins/PluginDownloadTask.java | 10 +-
.../openstreetmap/josm/plugins/PluginHandler.java | 98 +-
.../josm/plugins/PluginInformation.java | 6 +
.../plugins/ReadLocalPluginInformationTask.java | 1 -
.../plugins/ReadRemotePluginInformationTask.java | 2 +-
.../josm/tools/BugReportExceptionHandler.java | 3 +-
src/org/openstreetmap/josm/tools/ImageOverlay.java | 100 +
.../openstreetmap/josm/tools/ImageProvider.java | 177 +-
.../openstreetmap/josm/tools/ImageResource.java | 76 +-
src/org/openstreetmap/josm/tools/LanguageInfo.java | 29 +
src/org/openstreetmap/josm/tools/PlatformHook.java | 8 +
.../josm/tools/PlatformHookUnixoid.java | 195 +-
.../josm/tools/PlatformHookWindows.java | 85 +
.../openstreetmap/josm/tools/TextTagParser.java | 4 +-
styles/standard/elemstyles.mapcss | 172 +-
271 files changed, 334238 insertions(+), 295069 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