[josm] 02/11: Merge tag 'upstream/0.0.svn7906+dfsg1'
Bas Couwenberg
sebastic at xs4all.nl
Mon Dec 29 23:09:08 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 5119e8f9cea64c8f3ff74dff9dc459c11a73ba1b
Merge: 4d9600f 4adb53e
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Mon Dec 29 22:02:09 2014 +0100
Merge tag 'upstream/0.0.svn7906+dfsg1'
Upstream version 0.0.svn7906+dfsg1
.classpath | 4 +-
CONTRIBUTION | 4 +-
README | 34 +-
REVISION | 8 +-
build.xml | 16 +-
data/defaultpresets.xml | 102 +-
data/validator/combinations.mapcss | 22 +-
data/validator/deprecated.mapcss | 19 +-
data/validator/geometry.mapcss | 49 +
data/validator/highway.mapcss | 29 +-
data/validator/multiple.mapcss | 35 +-
data/validator/numeric.mapcss | 15 +-
i18n/launchpad.pl | 6 +-
i18n/po/af.po | 188 +-
i18n/po/am.po | 188 +-
i18n/po/ar.po | 190 +-
i18n/po/ast.po | 2894 +++++++++--------
i18n/po/az.po | 188 +-
i18n/po/be.po | 188 +-
i18n/po/bg.po | 192 +-
i18n/po/bn.po | 188 +-
i18n/po/br.po | 188 +-
i18n/po/bs.po | 188 +-
i18n/po/ca.po | 233 +-
i18n/po/ca at valencia.po | 206 +-
i18n/po/cs.po | 229 +-
i18n/po/cy.po | 188 +-
i18n/po/da.po | 1723 +++++-----
i18n/po/de.po | 242 +-
i18n/po/de_DE.po | 188 +-
i18n/po/el.po | 196 +-
i18n/po/en_AU.po | 196 +-
i18n/po/en_CA.po | 188 +-
i18n/po/en_GB.po | 210 +-
i18n/po/eo.po | 190 +-
i18n/po/es.po | 269 +-
i18n/po/et.po | 190 +-
i18n/po/eu.po | 194 +-
i18n/po/fa.po | 188 +-
i18n/po/fi.po | 204 +-
i18n/po/fil.po | 188 +-
i18n/po/fr.po | 224 +-
i18n/po/gl.po | 198 +-
i18n/po/he.po | 190 +-
i18n/po/hi.po | 188 +-
i18n/po/hr.po | 188 +-
i18n/po/ht.po | 188 +-
i18n/po/hu.po | 208 +-
i18n/po/hy.po | 188 +-
i18n/po/ia.po | 188 +-
i18n/po/id.po | 206 +-
i18n/po/is.po | 190 +-
i18n/po/it.po | 211 +-
i18n/po/ja.po | 212 +-
i18n/po/ka.po | 188 +-
i18n/po/km.po | 3354 ++++++++++++--------
i18n/po/ko.po | 188 +-
i18n/po/ky.po | 188 +-
i18n/po/lo.po | 188 +-
i18n/po/lt.po | 196 +-
i18n/po/lv.po | 188 +-
i18n/po/mk.po | 188 +-
i18n/po/ms.po | 188 +-
i18n/po/nb.po | 192 +-
i18n/po/nds.po | 188 +-
i18n/po/nl.po | 210 +-
i18n/po/nn.po | 188 +-
i18n/po/oc.po | 188 +-
i18n/po/pa.po | 188 +-
i18n/po/pl.po | 362 ++-
i18n/po/pt.po | 206 +-
i18n/po/pt_BR.po | 235 +-
i18n/po/rm.po | 188 +-
i18n/po/ro.po | 188 +-
i18n/po/ru.po | 248 +-
i18n/po/sk.po | 394 ++-
i18n/po/sl.po | 188 +-
i18n/po/sq.po | 188 +-
i18n/po/sr.po | 188 +-
i18n/po/sv.po | 248 +-
i18n/po/ta.po | 190 +-
i18n/po/te.po | 188 +-
i18n/po/th.po | 188 +-
i18n/po/tr.po | 190 +-
i18n/po/ug.po | 188 +-
i18n/po/uk.po | 1938 +++++------
i18n/po/ur.po | 188 +-
i18n/po/vi.po | 188 +-
i18n/po/zh_CN.po | 235 +-
i18n/po/zh_TW.po | 230 +-
images/presets/cattle_grid.png | Bin 459 -> 0 bytes
images/presets/motorway_exit.png | Bin 856 -> 0 bytes
images/presets/stile.png | Bin 291 -> 0 bytes
images/presets/traffic-light.png | Bin 322 -> 0 bytes
linux/latest/usr/share/man/man1/josm-latest.1 | 19 +-
linux/tested/usr/share/man/man1/josm.1 | 19 +-
src/org/openstreetmap/josm/Main.java | 97 +-
.../josm/actions/AlignInLineAction.java | 148 +-
.../josm/actions/AutoScaleAction.java | 4 +-
.../josm/actions/DistributeAction.java | 2 +-
.../josm/actions/ImageryAdjustAction.java | 50 +-
src/org/openstreetmap/josm/actions/InfoAction.java | 10 +-
.../openstreetmap/josm/actions/InfoWebAction.java | 7 +
.../josm/actions/JoinNodeWayAction.java | 22 +-
src/org/openstreetmap/josm/actions/JosmAction.java | 1 -
.../openstreetmap/josm/actions/JumpToAction.java | 2 +
.../josm/actions/LassoModeAction.java | 7 +
.../josm/actions/MapRectifierWMSmenuAction.java | 22 +-
.../josm/actions/MergeLayerAction.java | 2 +-
.../josm/actions/MergeNodesAction.java | 15 +-
.../josm/actions/MergeSelectionAction.java | 33 +-
.../openstreetmap/josm/actions/MirrorAction.java | 3 +-
src/org/openstreetmap/josm/actions/MoveAction.java | 14 +-
.../openstreetmap/josm/actions/MoveNodeAction.java | 3 +
.../openstreetmap/josm/actions/OpenFileAction.java | 12 +-
.../josm/actions/OpenLocationAction.java | 12 +-
.../josm/actions/OrthogonalizeAction.java | 12 +-
.../josm/actions/SelectByInternalPointAction.java | 12 +-
.../actions/downloadtasks/DownloadOsmTask.java | 22 +-
.../josm/actions/mapmode/AddNoteAction.java | 9 +-
.../josm/actions/upload/FixDataHook.java | 4 +-
.../josm/corrector/ReverseWayNoTagCorrector.java | 20 +-
src/org/openstreetmap/josm/data/AutosaveTask.java | 10 +-
.../josm/data/CustomConfigurator.java | 28 +-
src/org/openstreetmap/josm/data/Preferences.java | 181 +-
.../openstreetmap/josm/data/ProjectionBounds.java | 3 +
src/org/openstreetmap/josm/data/ViewportData.java | 36 +-
.../josm/data/osm/AbstractPrimitive.java | 6 +-
src/org/openstreetmap/josm/data/osm/DataSet.java | 14 +
.../josm/data/osm/DatasetConsistencyTest.java | 2 +-
src/org/openstreetmap/josm/data/osm/Node.java | 9 +-
src/org/openstreetmap/josm/data/osm/NoteData.java | 76 +
.../josm/data/osm/OsmPrimitiveType.java | 11 +-
src/org/openstreetmap/josm/data/osm/OsmUtils.java | 3 +-
src/org/openstreetmap/josm/data/osm/Relation.java | 2 +-
.../josm/data/osm/RelationMember.java | 7 +-
src/org/openstreetmap/josm/data/osm/Way.java | 4 +-
.../josm/data/osm/visitor/BoundingXYVisitor.java | 5 +-
.../data/osm/visitor/paint/StyledMapRenderer.java | 7 +-
.../josm/data/validation/OsmValidator.java | 10 +-
.../josm/data/validation/TestError.java | 2 +-
.../data/validation/routines/DomainValidator.java | 565 +++-
.../data/validation/routines/EmailValidator.java | 5 +-
.../validation/routines/InetAddressValidator.java | 1 +
.../data/validation/routines/RegexValidator.java | 1 +
.../data/validation/routines/UrlValidator.java | 8 +-
.../josm/data/validation/tests/Highways.java | 8 +-
.../josm/data/validation/tests/InternetTags.java | 111 +-
.../josm/data/validation/tests/Lanes.java | 10 +-
.../data/validation/tests/MapCSSTagChecker.java | 97 +-
.../data/validation/tests/RelationChecker.java | 259 +-
.../data/validation/tests/SimilarNamedWays.java | 162 +-
src/org/openstreetmap/josm/gui/ExtendedDialog.java | 2 +-
.../openstreetmap/josm/gui/MainApplication.java | 30 +-
src/org/openstreetmap/josm/gui/MapFrame.java | 6 +-
src/org/openstreetmap/josm/gui/MapStatus.java | 6 +-
src/org/openstreetmap/josm/gui/MapView.java | 61 +-
.../josm/gui/NavigatableComponent.java | 74 +-
src/org/openstreetmap/josm/gui/NoteSortDialog.java | 88 +
.../josm/gui/conflict/pair/ListMergeModel.java | 2 +-
.../tags/MultiValueResolutionDecision.java | 6 +-
.../josm/gui/dialogs/ChangesetDialog.java | 2 +-
.../josm/gui/dialogs/DialogsPanel.java | 6 +-
.../josm/gui/dialogs/InspectPrimitiveDialog.java | 6 +-
.../josm/gui/dialogs/MapPaintDialog.java | 5 +-
.../dialogs/{NoteDialog.java => NotesDialog.java} | 65 +-
.../josm/gui/dialogs/OsmIdSelectionDialog.java | 45 +-
.../josm/gui/dialogs/SelectionListDialog.java | 50 +-
.../changeset/query/ChangesetQueryDialog.java | 2 +-
.../gui/dialogs/properties/PropertiesDialog.java | 3 +
.../josm/gui/dialogs/properties/TagEditHelper.java | 1 +
.../dialogs/relation/GenericRelationEditor.java | 25 +-
.../josm/gui/download/DownloadDialog.java | 4 +-
src/org/openstreetmap/josm/gui/help/HelpUtil.java | 8 +-
.../josm/gui/history/TagInfoViewer.java | 2 +
.../josm/gui/history/TagTableColumnModel.java | 11 +-
.../io/DownloadPrimitivesWithReferrersTask.java | 2 +-
.../josm/gui/io/UploadStrategySelectionPanel.java | 2 -
.../openstreetmap/josm/gui/layer/NoteLayer.java | 33 +-
src/org/openstreetmap/josm/gui/layer/TMSLayer.java | 68 +-
.../gui/layer/geoimage/CorrelateGpxWithImages.java | 2 +-
.../josm/gui/layer/geoimage/GeoImageLayer.java | 13 +
.../josm/gui/layer/geoimage/ImageViewerDialog.java | 25 +-
.../josm/gui/layer/geoimage/ThumbsLoader.java | 11 +-
.../openstreetmap/josm/gui/mappaint/Cascade.java | 2 +-
.../josm/gui/mappaint/MapPaintStyles.java | 11 +
.../josm/gui/mappaint/NodeElemStyle.java | 4 +-
src/org/openstreetmap/josm/gui/mappaint/Range.java | 14 +-
.../josm/gui/mappaint/StyleCache.java | 4 +-
.../josm/gui/mappaint/mapcss/Instruction.java | 3 +-
.../josm/gui/mappaint/mapcss/MapCSSRule.java | 10 +
.../josm/gui/mappaint/mapcss/Selector.java | 9 +-
.../josm/gui/mappaint/xml/XmlCondition.java | 5 +-
.../preferences/advanced/AdvancedPreference.java | 2 +-
.../gui/preferences/imagery/ImageryPreference.java | 45 +-
.../projection/AbstractProjectionChoice.java | 2 +-
.../projection/CodeProjectionChoice.java | 2 +-
.../projection/CustomProjectionChoice.java | 2 +-
.../projection/ListProjectionChoice.java | 2 +-
.../projection/UTMProjectionChoice.java | 2 +-
.../josm/gui/preferences/shortcut/PrefJPanel.java | 2 +-
.../josm/gui/tagging/TagEditorModel.java | 6 +-
.../josm/gui/tagging/TaggingPresetItems.java | 6 +-
.../josm/gui/tagging/TaggingPresetReader.java | 38 +-
.../gui/tagging/ac/AutoCompletingComboBox.java | 7 +-
.../josm/gui/tagging/ac/AutoCompletionList.java | 13 +-
.../gui/tagging/ac/AutoCompletionListItem.java | 7 +-
src/org/openstreetmap/josm/gui/util/GuiHelper.java | 45 +
.../josm/gui/widgets/EditableList.java | 20 +-
.../josm/gui/widgets/JosmComboBox.java | 22 +-
.../josm/gui/widgets/JosmEditorPane.java | 7 +-
.../josm/gui/widgets/MultiSplitLayout.java | 13 +-
src/org/openstreetmap/josm/io/CachedFile.java | 18 +-
src/org/openstreetmap/josm/io/Compression.java | 6 +-
src/org/openstreetmap/josm/io/GpxExporter.java | 6 +-
src/org/openstreetmap/josm/io/GpxReader.java | 3 -
src/org/openstreetmap/josm/io/NoteImporter.java | 31 +-
.../josm/io/OsmChangesetContentParser.java | 8 +-
src/org/openstreetmap/josm/io/OsmImporter.java | 17 +-
src/org/openstreetmap/josm/io/OsmReader.java | 15 +-
.../josm/io/remotecontrol/DNSName.java | 2 +
.../josm/io/remotecontrol/RemoteControl.java | 20 +-
.../io/remotecontrol/RemoteControlHttpServer.java | 11 +-
.../io/remotecontrol/RemoteControlHttpsServer.java | 14 +-
.../io/remotecontrol/handler/ImageryHandler.java | 35 +-
.../remotecontrol/handler/LoadAndZoomHandler.java | 2 +-
src/org/openstreetmap/josm/tools/Diff.java | 1 -
src/org/openstreetmap/josm/tools/ExifReader.java | 2 +-
src/org/openstreetmap/josm/tools/Geometry.java | 32 +-
src/org/openstreetmap/josm/tools/I18n.java | 131 +-
.../openstreetmap/josm/tools/ImageProvider.java | 43 +-
.../openstreetmap/josm/tools/ImageResource.java | 4 +-
src/org/openstreetmap/josm/tools/PlatformHook.java | 21 +
.../openstreetmap/josm/tools/PlatformHookOsx.java | 71 +-
.../josm/tools/PlatformHookUnixoid.java | 16 +
.../josm/tools/PlatformHookWindows.java | 15 +
.../openstreetmap/josm/tools/TextTagParser.java | 2 +-
src/org/openstreetmap/josm/tools/Utils.java | 128 +-
.../openstreetmap/josm/tools/XmlObjectParser.java | 14 +
styles/standard/elemstyles.mapcss | 137 +-
.../josm/actions/AlignInLineActionTest.java | 191 ++
.../data/validation/tests/InternetTagsTest.java | 79 +
.../validation/tests/RelationCheckerTest.groovy | 15 +-
.../validation/tests/SimilarNamedWaysTest.groovy | 107 +
.../org/openstreetmap/josm/tools/GeometryTest.java | 52 +
.../josm/tools/TextTagParserTest.java | 4 +-
windows/README.txt | 66 +
windows/josm-nsis-brand.bmp | Bin 0 -> 154542 bytes
windows/josm-setup-unix.sh | 151 +
windows/josm.nsi | 471 +++
windows/langmacros.nsh | 84 +
windows/launch4j.xml | 35 +
windows/locale/english.nsh | 51 +
windows/locale/french.nsh | 51 +
windows/locale/german.nsh | 51 +
windows/logo.ico | Bin 0 -> 370070 bytes
.../plugins/stdutils/Contrib/StdUtils/ComUtils.h | 96 +
.../stdutils/Contrib/StdUtils/DetectOsVersion.cpp | 294 ++
.../stdutils/Contrib/StdUtils/DetectOsVersion.h | 26 +
.../stdutils/Contrib/StdUtils/InvokeShellVerb.cpp | 258 ++
.../stdutils/Contrib/StdUtils/InvokeShellVerb.h | 26 +
.../stdutils/Contrib/StdUtils/ParameterParser.cpp | 152 +
.../stdutils/Contrib/StdUtils/ParameterParser.h | 23 +
.../plugins/stdutils/Contrib/StdUtils/RandUtils.h | 101 +
.../stdutils/Contrib/StdUtils/ShellExecAsUser.cpp | 189 ++
.../stdutils/Contrib/StdUtils/ShellExecAsUser.h | 26 +
.../plugins/stdutils/Contrib/StdUtils/StdUtils.aps | Bin 0 -> 18740 bytes
.../plugins/stdutils/Contrib/StdUtils/StdUtils.cpp | 921 ++++++
.../plugins/stdutils/Contrib/StdUtils/StdUtils.h | 43 +
.../plugins/stdutils/Contrib/StdUtils/StdUtils.rc | Bin 0 -> 4986 bytes
.../plugins/stdutils/Contrib/StdUtils/StdUtils.sln | 22 +
.../stdutils/Contrib/StdUtils/StdUtils.vcxproj | 205 ++
.../Contrib/StdUtils/StdUtils.vcxproj.filters | 63 +
.../Contrib/StdUtils/StdUtils.vcxproj.user | 7 +
.../stdutils/Contrib/StdUtils/UnicodeSupport.cpp | 96 +
.../stdutils/Contrib/StdUtils/UnicodeSupport.h | 47 +
.../Contrib/StdUtils/include/ansi/nsis/api.h | 83 +
.../Contrib/StdUtils/include/ansi/nsis/pluginapi.h | 77 +
.../Contrib/StdUtils/include/common/msvc_utils.h | 55 +
.../Contrib/StdUtils/include/unicode/nsis/api.h | 83 +
.../StdUtils/include/unicode/nsis/nsis_tchar.h | 214 ++
.../StdUtils/include/unicode/nsis/pluginapi.h | 101 +
.../stdutils/Contrib/StdUtils/lib/msvcrt_vc6.lib | Bin 0 -> 235942 bytes
.../Contrib/StdUtils/lib/nsis_pluginapi_ansi.lib | Bin 0 -> 4668 bytes
.../StdUtils/lib/nsis_pluginapi_unicode.lib | Bin 0 -> 6902 bytes
.../plugins/stdutils/Contrib/StdUtils/resource.h | 26 +
.../stdutils/Contrib/StdUtils/utils/Date.exe | Bin 0 -> 39424 bytes
.../stdutils/Contrib/StdUtils/utils/Zip.exe | Bin 0 -> 68096 bytes
.../plugins/stdutils/Docs/StdUtils/StdUtils.html | 752 +++++
.../plugins/stdutils/Examples/StdUtils/!_Make.bat | 29 +
.../stdutils/Examples/StdUtils/GetParameters.nsi | 38 +
.../stdutils/Examples/StdUtils/InvokeShellVerb.nsi | 53 +
.../stdutils/Examples/StdUtils/ShellExecAsUser.nsi | 29 +
.../stdutils/Examples/StdUtils/ShellExecWait.nsi | 44 +
.../stdutils/Examples/StdUtils/StdUtilsTest.nsi | 399 +++
windows/plugins/stdutils/Include/StdUtils.nsh | 301 ++
windows/plugins/stdutils/LGPL.txt | 502 +++
windows/plugins/stdutils/LGPL_EXCEPTION.txt | 4 +
.../stdutils/Plugins/Release_ANSI/StdUtils.dll | Bin 0 -> 22016 bytes
.../stdutils/Plugins/Release_Unicode/StdUtils.dll | Bin 0 -> 23040 bytes
windows/plugins/stdutils/ReadMe.txt | 30 +
windows/plugins/stdutils/make_pack.bat | 54 +
windows/plugins/stdutils/make_pack.lst | 13 +
303 files changed, 27796 insertions(+), 8208 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