This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository merkaartor.
commit cb37e9cc2ebf8752ead48cf329500e37115f8d7a
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Fri Sep 18 15:12:26 2015 +0200
Add patch to fix various typos.
---
debian/changelog | 3 +-
debian/patches/series | 1 +
debian/patches/various-typos.patch | 645 +++++++++++++++++++++++++++++++++++++
3 files changed, 648 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index b97116e..268f40d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,7 @@ merkaartor (0.18.2-1) UNRELEASED; urgency=medium
* Disable zbar, is Qt4-only.
* Use dh_auto_* commands in overrides.
* Disable SpatiaLite support, causes FTBFS.
+ * Add patch to fix various typos.
-- Bas Couwenberg <sebas...@debian.org> Fri, 18 Sep 2015 01:17:53 +0200
@@ -528,7 +529,7 @@ merkaartor (0.0.12~svn10441-1) experimental; urgency=low
merkaartor (0.0.11~svn7913-2) unstable; urgency=low
- * Explicitely call qmake-qt4. (Closes: #495807)
+ * Explicitly call qmake-qt4. (Closes: #495807)
-- Christoph Berg <m...@debian.org> Sat, 23 Aug 2008 13:46:25 +0200
diff --git a/debian/patches/series b/debian/patches/series
index 2820a49..9228595 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
0001-Fixed-version-info-in-tarballs.patch
0001-Fixed-compilation-issues-with-GEOIMAGE-1-and-Qt5.patch
quazip-qt5.patch
+various-typos.patch
diff --git a/debian/patches/various-typos.patch
b/debian/patches/various-typos.patch
new file mode 100644
index 0000000..0e879da
--- /dev/null
+++ b/debian/patches/various-typos.patch
@@ -0,0 +1,645 @@
+Description: Fix various typos.
+ * Replace 'succesfully' with 'successfully'.
+ * Replace 'Explicitely' with 'Explicitly'.
+ * Replace 'GNU Public License' with 'GNU General Public License'.
+ * Replace 'allows to <verb>' with 'allows to <verb>ing' or 'allows one to
<verb>'.
+Author: Bas Couwenberg <sebas...@debian.org>
+
+--- a/src/qextserialport/posix_qextserialport.cpp
++++ b/src/qextserialport/posix_qextserialport.cpp
+@@ -823,7 +823,7 @@ bool Posix_QextSerialPort::open(OpenMode
+ Posix_File->setFileName(port);
+ qDebug("Trying to open File");
+ if (Posix_File->open(QIODevice::ReadWrite|QIODevice::Unbuffered)) {
+- qDebug("Opened File succesfully");
++ qDebug("Opened File successfully");
+ /*set open mode*/
+ QIODevice::open(mode);
+
+--- a/CHANGELOG
++++ b/CHANGELOG
+@@ -74,7 +74,7 @@ v0.18
+ * ADD : Self-contained style packages (*.msz)
+ * FIX : mutex deadlock (refs #3319)
+ * FIX : Protect updatemeta (fixes #3317)
+- * ADD : Allow to show/hide the toolbars labels (toolbar context menu)
++ * ADD : Allow showing/hiding the toolbars labels (toolbar context menu)
+ * ADD : "Select parent(s)" & "Download missing children" to the Feature
menu (refs #3314)
+ * FIX : force redrawing the osm map when zooming (fixes #3316)
+ * FIX : Mutex-lock update of the painters (fixes #3315)
+@@ -122,9 +122,9 @@ v0.18
+ * FIX : do not create ~/.merkaartor in portable mode
+ * FIX : Handle UTF8 in GDAL fields
+ * CHG : When doing GDAL imports, always confirm input projection
+- * ADD : Allow to use projection chooser in projection editor
+- * ADD : Allow to enter WKT in projection chooser
+- * ADD : Goto dialog: Allow to show/edit coordinates in projected units
++ * ADD : Allow using projection chooser in projection editor
++ * ADD : Allow entering WKT in projection chooser
++ * ADD : Goto dialog: Allow showing/editing coordinates in projected units
+ * FIX : Only check styles for POI nodes
+ * FIX : Feature dock: Relations not shown in "All' tab
+ * FIX : log2 not available on FreeBSD (fixes #3211)
+@@ -136,17 +136,17 @@ v0.18
+ v0.17
+ * FIX : Problem importing OSM comprising new features
+ * ADD : Move "validation" style rules to a new "Validation.mas" style
+- * ADD : Allow to align background image with <SPACE>+pan
++ * ADD : Allow aligning background image with <SPACE>+pan
+ * CHG : Rename "Create rectangle" to "Create rectangular building" and
automatically add "building=yes"
+ * ADD : Remember "Create polygon" last number of sides
+- * ADD : "Relation->Add to Multipolygon"; allows to create or add to a
multipolygon relation (closes 2889)
++ * ADD : "Relation->Add to Multipolygon"; allows creating or adding to a
multipolygon relation (closes 2889)
+ * ADD : Network timeout preference
+ * CHG : Paste Tags : Allow any<->any pasting but only takes top level
features into account (fixes #3174)
+ * FIX : When loading history from MDC, do not import the command if the
layer is not found + save layers dirty level in MDC (fixes #3176)
+ * FIX : Locked zoom was bugged since passage to real pixel per Meter
(fixes #3175)
+ * FIX : Allow creating a way in non-separate move mode with a virtual
node selected (fixes #3172)
+ * FIX : Revert to custom icon for move interaction on MAC (fixes #3170)
+- * FIX : GeoTIFF + GDAL backgrounds: Allow to specify an automatic
"source" tag via the plugin menu
++ * FIX : GeoTIFF + GDAL backgrounds: Allow specifying an automatic
"source" tag via the plugin menu
+ * ADD : Bing Maps plugin
+ * FIX : GDAL + GeoTIFF : if a ESRI World File (.tfw, *.wld) is present,
override file geotransform
+ * FIX : GDAL + GeoTIFF : if the projection cannot be determined, ask for
it rather than fail
+@@ -154,15 +154,15 @@ v0.17
+ * FIX : Cannot access TMS servers that Min-zoom equals Max-zoom (fixes
#3157)
+ * ADD : GDAL raster background plugin
+ * FIX : WMS Editor - Handle Styles properly
+- * ADD : Explicitely add GML to the list of supported format (via GDAL)
++ * ADD : Explicitly add GML to the list of supported format (via GDAL)
+ * ADD : Bicycle style by Markus Straub
+- * ADD : Styles : allow to texture areas with an icon
+- * CHG : When opening/importing, always fallback to GDAL if available.
Allows to open most GDAL supported geomtery files.
++ * ADD : Styles : allow texturing areas with an icon
++ * CHG : When opening/importing, always fallback to GDAL if available.
Allows opening most GDAL supported geomtery files.
+ * ADD : Vector map layers
+ * ADD : Allow "[*] is xxx" (or "*=xxx") construct in tag selection. Means
a feature match if any of its tags has xxx as a value (fixes #3146)
+- * ADD : Do not allow to delete OSM nodes in non-downloaded areas (refs
#3083)
++ * ADD : Do not allow deleting OSM nodes in non-downloaded areas (refs
#3083)
+ * ADD : Save the downloaded areas in the MDC. Expired after 12h.
+- * ADD : Allow to specify the Nominatim url in preferences
++ * ADD : Allow specifying the Nominatim url in preferences
+ * ADD : French Cadastre plugin
+ * FIX : Infloop on next/previous image when none visible (fixes #3135)
+ * CHG : Do not wait for "CLOSE changeset" response
+@@ -171,7 +171,7 @@ v0.17
+ * ADD : Auto-add "source" tag when drawing over a background map; define
the value in the WMS and TMS editors
+ * FIX : Filter out invalid value for first Tag list column width (fixes
#3129)
+ * FIX : Remove tags from autocomplete suggestions when cleared from
features (fixes #3113)
+- * ADD : Allow to start merkaartor with a document template specified in
preferences
++ * ADD : Allow starting merkaartor with a document template specified in
preferences
+ * CHG : Layers & View settings are now saved in a $HOME/Startup.mdc
document rather than thru QSettings
+ * ADD : New CL options: "--ignore-preferences" && "--reset-preferences"
+ * FIX : Re-enable PgUp/PgDown in Geoimage dock (dock must be focused)
(fixes #3126); coincidentaly, PgUp/PgDown for zooming only works when the map
view is focused.
+@@ -183,7 +183,7 @@ v0.17
+ * FIX : remove dependency on GDAL data files when importing OSGB36
shapefiles + correct projection (closes #3119)
+ * ADD : New preference: "Allow node/way creation in select mode". When
checked, allows double-click to create a node and double-click on a node to
start a way in select mode.
+ * ADD : When drawing ways, double-clicking finishes the current way
(Potlach/JOSM style)
+- * ADD : Way segments: Keeping ALT depressed allows to move way segment
++ * ADD : Way segments: Keeping ALT depressed allows moving a way segment
+ * ADD : In Road creation mode, double-click creates a new node
+ * ADD : Hardcoded PgUp/PgDown for Zoom in/Zoom out (Potlach style)
+ * ADD : Snap to angle functionality when creating way: keeping "o"
pressed snap to 45° angles, "h" snap to 30° angles
+@@ -193,13 +193,13 @@ v0.17
+ * ADD : Cut functionality
+ * ADD : double-clicking a feature selects the feature and its children
+ * CHG : style update
+- * ADD : Style Editor: allow to filter the style list
++ * ADD : Style Editor: allow filtering the style list
+ * FIX : Styles: draw icons for ways, too
+- * FIX : allow to shrink properties dock
++ * FIX : allow shrinking properties dock
+ * ADD : Support for XAPI
+ * ADD : ":dirty" and ":uploaded" pseudo tags for finding/filtering
+ * CHG : Remove builtin "Dirty" and "Uploaded" layers. Those are now
managed at feature level.
+- * ADD : Allow to rename a layer by double-clicking on its name
++ * ADD : Allow renaming a layer by double-clicking on its name
+ * FIX : Initial viewport issue
+ * ADD : View menu item allowing to highlight "dirty" features, i.e.,
features ready for upload
+ * FIX : Do not export incomplete features
+@@ -226,14 +226,14 @@ v0.17
+ * FIX : problem with "Bottom-left standard" TMS
+ * ADD : Printing
+ * ADD : Hungarian translation by Peter Sulyok
+- * CHG : Allow to pan with middle mouse button
++ * CHG : Allow panning with middle mouse button
+ * ADD : Toolbar editor (create/modify tollbars)
+ * FIX : OSX fix
+ * FIX : Draw relations children dashed to avoid multiple parent drawing
+ * FIX : Fix several issues with features dock.
+ * FIX : Fix reappearance of deleted features.
+ * FIX : Fix WayRemoveNodeCommand reversibility.
+- * ADD : Allow to move complete relations
++ * ADD : Allow moving complete relations
+ * FIX : WMS'es in EPSG:4326 not showing
+ * FIX : Don't overzoom on layer zoom (and don't allow if the bbox is
null). fixes #3046
+ * ADD : Add a "portable" mode to merkaartor via command-line ("-p") or
build setting ("PORTABLE=1")
+@@ -257,12 +257,12 @@ v0.16
+ * FIX : Make JOSM happy about our .osm export (fixes #2952)
+ * ADD : Preliminary support for OpenStreetBugs (Refs #983)
+ * ADD : POC of a Gosmore map adapter
+- * FIX : Allow to "Force Upload" relations, too (fixes #2926)
++ * FIX : Allow one to "Force Upload" relations, too (fixes #2926)
+ * FIX : Update Feature dock when document content changes (fixes #2923)
+ * CHG : Change way the virtual nodes are handled
+ * CHG : Allow tag pasting between different classes of features
+ * CHG : Use a different spatial index provider
+- * ADD : Allow to delete features from the context menu of the Features
dock
++ * ADD : Allow deleting features from the context menu of the Features dock
+ * ADD : Accept mlon/mlat URLs as emitted by mkgmap logging
+ * ADD : Walking Papers backgound plugin + load WP scans as geotagged
images
+ * ADD : Import from OSC (osmChange format)
+@@ -272,10 +272,10 @@ v0.16
+ * ADD : CSV POI import
+ * FIX : crash when closing layer with virtual nodes (fixes #2858)
+ * ADD : OSGB36 to the default list of projections
+- * CHG : Allow to add images to a GeoTIFF layer
++ * CHG : Allow adding images to a GeoTIFF layer
+ * ADD : Add SHP feature attributes as not uploadable OSM Feature tags
+- * FIX : Allow to load OS VectorMap District shapefiles
+- * ADD : Allow to save geotagged images
++ * FIX : Allow loading OS VectorMap District shapefiles
++ * ADD : Allow saving geotagged images
+ * CHG : Enhanced support for geotagged images drag&drop
+ * CHG : Geotag support enhancements
+ * FIX : use gpsd api and implement gpsd-ng
+@@ -284,12 +284,12 @@ v0.16
+ * FIX : crash when closing layers containing photos (fixes #2828)
+ * CHG : Allow importing geotagged photos when no track layer is present
(closes #2827)
+ * ADD : Templates xsd (by Jonathan Bennett) (closes #2809; closes #2707)
+- * ADD : allow to re-order relation members (closes #2759)
++ * ADD : allow re-ordering relation members (closes #2759)
+ * FIX : solves a problem when hovering large relations
+ * ADD : add a projection editor
+ * ADD : allow google maps links in goto and download dialogs
+ * FIX : abort tile downloading when zooming
+- * ADD : Allow to tile (and cache) arbitrary WMS'es (only EPSG:4326 and
google projection supported)
++ * ADD : Allow tiling (and caching) arbitrary WMS'es (only EPSG:4326 and
google projection supported)
+ * CHG : rework "Zoom lock" and move it to the view menu
+ * ADD : support for WMS-C servers (see
http://wiki.openstreetmap.org/wiki/Merkaartor/Documentation#WMS-C_Servers)
(closes #2598)
+ * FIX : problem when joining ways
+@@ -304,7 +304,7 @@ v0.16
+ * FIX : OSX Qt system translations location (by Aleksandar)
+ * FIX : Update language of language combo after language change (by
Alaeksandar)
+ * FIX : Only allow virtual node updates after relations resolution (by
Trav)(closes #2782)
+- * ADD : Allow to zoom on the location of a GeoTIFF image
++ * ADD : Allow zooming on the location of a GeoTIFF image
+ * FIX : Do not updateindex() if the feature is deleted
+ * FIX : roads not always refreshed when changing type or properties
(fixes #2773)
+ * FIX : Cannot cleanly copy tags from one relation to another (fixes
#2746)
+@@ -335,7 +335,7 @@ v0.15
+ * ADD : GeoTIFF background plugin (closes #1025)
+ * ADD : Grabbing hand icon in signle mouse mode
+ * FIX : Layers menu entry for background layer is wrong at startup. Patch
by Trav (closes #2641)
+- * ADD : When in "single mouse button" mode, allow to cancel most
operation with a right-click
++ * ADD : When in "single mouse button" mode, allow canceling most
operation with a right-click
+ * ADD : "Zoom lock" mode. Zoom steps are locked to TMS ones and
projection is locked to Mercator
+ * FIX : get sharper Yahoo images (closes #2623)
+ * FIX : tag value "Fast food" should be "fast_food" (closes #2625)
+@@ -345,7 +345,7 @@ v0.15
+ * FIX : URL's in about dialog (fixes #2606)
+ * FIX : Export trackpoints time when exporting GPX (fixes #2594)
+ * ADD : Virtual nodes allow fast creation of intermediary nodes (closes
#821)
+- * ADD : Allow to move node in Node creation mode (closes #1910)
++ * ADD : Allow moving node in Node creation mode (closes #1910)
+ * CHG : Only generate log files on request (--log) on release builds
+ * FIX : speedup epsg:4326 projection
+ * FIX : WMS projection related bugfixes
+@@ -362,7 +362,7 @@ v0.15
+ * ADD : Mac OS X icon (closes #2254)
+ * FIX : Force custom Qt style if Qt runtime version < 4.5.1 (fixes #2204)
+ * ADD : Allow all platforms to connect to a gpsd backend
+- * FIX : Set gpsd output to NMEA; allow to save log
++ * FIX : Set gpsd output to NMEA; allow saving log
+ * FIX : Do not draw background if saved pixmap is null as a copy of a
null pixmap seems to crash on Mac (fixes #2262)
+ * FIX : Fixes MacOSX plugin dir (fixes #2253)
+ * FIX : Handle latlong projection in SHP files (fixes #2183)
+@@ -384,12 +384,12 @@ v0.14
+ * ADD : Add a Features dock displaying the features in the current
viewport
+ * ADD : Add a case-sensitiveness option to the search + search by ID
(closes #1509)
+ * CHG : Remove support for osmarender (fixes #1966)
+- * ADD : Allow multi-selection of layers; allow to show/hide or readonly
several layers at once (closes #1798)
++ * ADD : Allow multi-selection of layers; allow one to show/hide or
readonly several layers at once (closes #1798)
+ * ADD : Also export routes in GPX
+ * ADD : Paste features as a whole (closes #1807)
+ * ADD : Spatial indexing of features for faster display with large
downloaded areas.
+ * ADD : Built-in list of epsg projections (from proj4)
+- * CHG : Replaced "Commit..." command by "Force Upload". Allows to force
update of existing features or to upload imported features (such as SHP, KML,
...)
++ * CHG : Replaced "Commit..." command by "Force Upload". Allows forcing
update of existing features or to upload imported features (such as SHP, KML,
...)
+ * FIX : User preferences thru OSM preferences system works again
+ * FIX : Support projections when importing SHP files
+ * ADD : Drag & drop re-ordering of the layers
+@@ -413,7 +413,7 @@ v0.14
+ * ADD : log file for debugging output
+ * ADD : standard command-line arguments (-h, -v, ...) (fixes #1712)
+ * FIX : Use application-wide proxy (fixes #1763)
+- * ADD : Allow to specify a user/password for the proxy (untested by me)
++ * ADD : Allow specifying a user/password for the proxy (untested by me)
+ * FIX : Photo localization patch from Toby Speight.
+ * FIX : Set version of newly uploaded objects at 1.
+ * FIX : Graphical corruption on Intel chipsets when "Show downloaded
areas" was enabled
+@@ -423,7 +423,7 @@ v0.14
+ * FIX : API 0.6: Error when deleting a road with no nodes (fixes #1732)
+ * FIX : Correctly handle plural forms in MapLayer information
+ * FIX : API 0.6: Do not add "created_by" to changed features (fixes #1728)
+- * FIX : API 0.6: Allow to define a comment on a changeset (fixes #1731)
++ * FIX : API 0.6: Allow defining a comment on a changeset (fixes #1731)
+ * FIX : API 0.6 fixes
+ * FIX : Nodes fetched by relations are incomplete and not completed by
"download more" (fixes #1715)
+ * ADD : Initial support for Symbian S60v5
+@@ -435,9 +435,9 @@ v0.14
+ * FIX : OSM/GPX import optimisations (by Trav)
+ * FIX : <Esc> in Name property inspector causes AV (fixes #1672)
+ * CHG : Move vector background from SHP to OSB
+- * CHG : Preferences are uploaded to OSM in binary, base-64 encoded, 254
char slice. Allow to bypass the 255 char per preference limitation.
++ * CHG : Preferences are uploaded to OSM in binary, base-64 encoded, 254
char slice. Allow bypassing the 255 char per preference limitation.
+ * CHG : Preferences lists (Bookmarks, WMS servers, ...) are now
distributed and saved as XML in ~/.merkaartor. Allow proper merging (fixes
#1401)
+- * ADD : Allow to choose which Qt style to use via a combobox
++ * ADD : Allow choosing which Qt style to use via a combobox
+ * CHG : Implement the custom styles as plugins
+ * FIX : English language warning
+ * ADD : Switch to template-based projection handling; remove dependency
on libproj
+@@ -461,7 +461,7 @@ v0.13
+ * FIX : Crash on layer close
+ * FIX : Hardening upload process
+ * FIX : Remove the deleted road from parent when joining
+- * FIX : allow to split/join roads belonging to not-completely-downloaded
relations
++ * FIX : allow spliting/joining roads belonging to
not-completely-downloaded relations
+ * FIX : Avert crashes by using guarded pointers
+ * FIX : In case of a failed "Download more", do not delete layer if it
was a previously existing one.
+ * FIX : GeoTagged images are drawn to the full size of GeoImageDock
+@@ -477,7 +477,7 @@ v0.13
+ * FIX : Handle Undoes while creating single/double roads (fixes #1621)
+ * FIX : Re-apply custom shortcuts after retranslateUI (fixes #1620)
+ * FIX : Insufficent precision for WMS bbox requests at high zoom (fixes
#1618)
+- * ADD : Allow to force the custom Qt style thru Config.pri
++ * ADD : Allow forcing the custom Qt style thru Config.pri
+ * FIX : Do not remove incomplete downloaded relation; make them readonly
and display them in red (temporary)
+ * FIX : Painting slowdowns (+ memory consumption) when relations are
involved (fixes #1528)
+ * FIX : Split roads not added to Relation (fixes #1586)
+@@ -501,10 +501,10 @@ v0.13
+ * FIX : Add missing tr() calls in render dialogs.
+ * FIX : Messagebox-Cancel after deleting a line did not work (fixes #1392)
+ * ADD : Native SVG renderer
+- * ADD : Allow to break roads (and areas) with a single node (fixes #1505)
++ * ADD : Allow breaking roads (and areas) with a single node (fixes #1505)
+ * ADD : Relation member context menu for center and zoom on the properties
+ dock
+- * ADD : Allow to remove a member from a relation thru the properties dock.
++ * ADD : Allow removing a member from a relation thru the properties dock.
+ * FIX : switch to skulpture 2.2 custom style by default
+ * FIX : Don't allow templates combo to grow depending on content (fixes
#1482)
+ * FIX : Allow disabling "Don't connect GPX nodes separated more than.."
by setting it to 0. (fixes #1488)
+@@ -603,7 +603,7 @@ v0.12
+ * FIX : Upload of a modified single GPX track node was not working
anymore (fixes #1141)
+ * ADD : Support for GeoTagged images. qmake GEOIMAGE=1 to activate.
requires exiv2 (by Timo Schlüßler)
+ * ADD : Move to the next field on enter in properties dock tags (by
Travers Carter) (Refs #1137)
+- * ADD : revised OSB format. Allows to use large map files directly from
disk with low memory footprint.
++ * ADD : revised OSB format. Allows using large map files directly from
disk with low memory footprint.
+ * FIX : Native render doesn't render anything at high lat/long values(by
Travers Carter) (Closes #1135)
+ * FIX : Expand tables in the properties dock to the available width by
default (by Travers Carter) (Closes #1136)
+ * FIX : make download dialog a less cluttered
+--- a/src/Main.cpp
++++ b/src/Main.cpp
+@@ -85,7 +85,7 @@ void showVersion()
+ o = QString("using Qt version %1 (built with
%2)\n").arg(qVersion()).arg(QT_VERSION_STR);
+ fprintf(stdout, "%s", o.toLatin1().data());
+ fprintf(stdout, "Copyright Bart Vanhauwaert, Chris Browet and others,
2006-2010\n");
+- fprintf(stdout, "This program is licensed under the Version 2 of the GNU
Public License or any later version\n");
++ fprintf(stdout, "This program is licensed under the Version 2 of the GNU
General Public License or any later version\n");
+ }
+
+ void showHelp()
+--- a/src/common/AboutDialog.ui
++++ b/src/common/AboutDialog.ui
+@@ -116,7 +116,7 @@ p, li { white-space: pre-wrap; }
+ <item>
+ <widget class="QLabel" name="label_3">
+ <property name="text">
+- <string>This program is licensed under the GNU Public License
v2</string>
++ <string>This program is licensed under the GNU General Public License
v2</string>
+ </property>
+ </widget>
+ </item>
+--- a/translations/merkaartor_ar.ts
++++ b/translations/merkaartor_ar.ts
+@@ -58,7 +58,7 @@ p, li { white-space: pre-wrap; }
+ </message>
+ <message>
+ <location filename="../src/common/AboutDialog.ui" line="130"/>
+- <source>This program is licensed under the GNU Public License
v2</source>
++ <source>This program is licensed under the GNU General Public License
v2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+--- a/translations/merkaartor_cs.ts
++++ b/translations/merkaartor_cs.ts
+@@ -58,8 +58,8 @@ p, li { white-space: pre-wrap; }
+ </message>
+ <message>
+ <location filename="../src/common/AboutDialog.ui" line="130"/>
+- <source>This program is licensed under the GNU Public License
v2</source>
+- <translation>Tento program je šířen pod licencí GNU Public License
v2</translation>
++ <source>This program is licensed under the GNU General Public License
v2</source>
++ <translation>Tento program je šířen pod licencí GNU General Public
License v2</translation>
+ </message>
+ <message>
+ <location filename="../src/common/AboutDialog.ui" line="114"/>
+--- a/translations/merkaartor_de.ts
++++ b/translations/merkaartor_de.ts
+@@ -10,8 +10,8 @@
+ </message>
+ <message>
+ <location filename="../src/common/AboutDialog.ui" line="130"/>
+- <source>This program is licensed under the GNU Public License
v2</source>
+- <translation>Dieses Programm ist unter der GNU Public License v2
lizenziert</translation>
++ <source>This program is licensed under the GNU General Public License
v2</source>
++ <translation>Dieses Programm ist unter der GNU General Public License
v2 lizenziert</translation>
+ </message>
+ <message>
+ <location filename="../src/common/AboutDialog.ui" line="137"/>
+--- a/translations/merkaartor_es.ts
++++ b/translations/merkaartor_es.ts
+@@ -58,7 +58,7 @@ p, li { white-space: pre-wrap; }
+ </message>
+ <message>
+ <location filename="../src/common/AboutDialog.ui" line="130"/>
+- <source>This program is licensed under the GNU Public License
v2</source>
++ <source>This program is licensed under the GNU General Public License
v2</source>
+ <translation>Este programa esta licenciado bajo la Licencia Publica
GNU v2</translation>
+ </message>
+ <message>
+--- a/translations/merkaartor_et.ts
++++ b/translations/merkaartor_et.ts
+@@ -58,7 +58,7 @@ p, li { white-space: pre-wrap; }
+ </message>
+ <message>
+ <location filename="../src/common/AboutDialog.ui" line="130"/>
+- <source>This program is licensed under the GNU Public License
v2</source>
++ <source>This program is licensed under the GNU General Public License
v2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+--- a/translations/merkaartor_fr.ts
++++ b/translations/merkaartor_fr.ts
+@@ -10,7 +10,7 @@
+ </message>
+ <message>
+ <location filename="../src/common/AboutDialog.ui" line="130"/>
+- <source>This program is licensed under the GNU Public License
v2</source>
++ <source>This program is licensed under the GNU General Public License
v2</source>
+ <translation>Ce programme est publié sous Licence Publique GNU
v2</translation>
+ </message>
+ <message>
+--- a/translations/merkaartor_hr.ts
++++ b/translations/merkaartor_hr.ts
+@@ -58,7 +58,7 @@ p, li { white-space: pre-wrap; }
+ </message>
+ <message>
+ <location filename="../src/common/AboutDialog.ui" line="130"/>
+- <source>This program is licensed under the GNU Public License
v2</source>
++ <source>This program is licensed under the GNU General Public License
v2</source>
+ <translation>Ovaj pogram licenciran je pod GNU javnom licencom
v2</translation>
+ </message>
+ <message>
+--- a/translations/merkaartor_hu.ts
++++ b/translations/merkaartor_hu.ts
+@@ -10,7 +10,7 @@
+ </message>
+ <message>
+ <location filename="../src/common/AboutDialog.ui" line="130"/>
+- <source>This program is licensed under the GNU Public License
v2</source>
++ <source>This program is licensed under the GNU General Public License
v2</source>
+ <translation>E program a GNU GPLv2 engedéllyel jár</translation>
+ </message>
+ <message>
+--- a/translations/merkaartor_it.ts
++++ b/translations/merkaartor_it.ts
+@@ -10,8 +10,8 @@
+ </message>
+ <message>
+ <location filename="../src/common/AboutDialog.ui" line="130"/>
+- <source>This program is licensed under the GNU Public License
v2</source>
+- <translation>Questo programma è rilasciato sotto licenza GNU Public
License v2</translation>
++ <source>This program is licensed under the GNU General Public License
v2</source>
++ <translation>Questo programma è rilasciato sotto licenza GNU General
Public License v2</translation>
+ </message>
+ <message>
+ <location filename="../src/common/AboutDialog.ui" line="137"/>
+--- a/translations/merkaartor_ja.ts
++++ b/translations/merkaartor_ja.ts
+@@ -76,7 +76,7 @@ p, li { white-space: pre-wrap; }
+ </message>
+ <message>
+ <location filename="../src/common/AboutDialog.ui" line="130"/>
+- <source>This program is licensed under the GNU Public License
v2</source>
++ <source>This program is licensed under the GNU General Public License
v2</source>
+ <translation>このプログラムは、GNU一般公衆使用許諾バージョン2のもとでライセンスされています。</translation>
+ </message>
+ <message>
+--- a/translations/merkaartor_nl.ts
++++ b/translations/merkaartor_nl.ts
+@@ -58,7 +58,7 @@ p, li { white-space: pre-wrap; }
+ </message>
+ <message>
+ <location filename="../src/common/AboutDialog.ui" line="130"/>
+- <source>This program is licensed under the GNU Public License
v2</source>
++ <source>This program is licensed under the GNU General Public License
v2</source>
+ <translation>Dit programma valt onder de GNU Public Licentie
v2</translation>
+ </message>
+ <message>
+--- a/translations/merkaartor_pl.ts
++++ b/translations/merkaartor_pl.ts
+@@ -76,8 +76,8 @@ p, li { white-space: pre-wrap; }
+ </message>
+ <message>
+ <location filename="../src/common/AboutDialog.ui" line="130"/>
+- <source>This program is licensed under the GNU Public License
v2</source>
+- <translation>Ten program jest objęty licencją GNU Public License
v2</translation>
++ <source>This program is licensed under the GNU General Public License
v2</source>
++ <translation>Ten program jest objęty licencją GNU General Public
License v2</translation>
+ </message>
+ <message>
+ <location filename="../src/common/AboutDialog.ui" line="137"/>
+--- a/translations/merkaartor_pt.ts
++++ b/translations/merkaartor_pt.ts
+@@ -58,7 +58,7 @@ p, li { white-space: pre-wrap; }
+ </message>
+ <message>
+ <location filename="../src/common/AboutDialog.ui" line="130"/>
+- <source>This program is licensed under the GNU Public License
v2</source>
++ <source>This program is licensed under the GNU General Public License
v2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+--- a/translations/merkaartor_pt_BR.ts
++++ b/translations/merkaartor_pt_BR.ts
+@@ -76,7 +76,7 @@ p, li { white-space: pre-wrap; }
+ </message>
+ <message>
+ <location filename="../src/common/AboutDialog.ui" line="130"/>
+- <source>This program is licensed under the GNU Public License
v2</source>
++ <source>This program is licensed under the GNU General Public License
v2</source>
+ <translation>Este programa está licenciado sob os termos da Licença
Pública Geral GNU v2</translation>
+ </message>
+ <message>
+--- a/translations/merkaartor_ru.ts
++++ b/translations/merkaartor_ru.ts
+@@ -10,8 +10,8 @@
+ </message>
+ <message>
+ <location filename="../src/common/AboutDialog.ui" line="130"/>
+- <source>This program is licensed under the GNU Public License
v2</source>
+- <translation>Эта программа распространяется под лицензией GNU Public
License v2</translation>
++ <source>This program is licensed under the GNU General Public License
v2</source>
++ <translation>Эта программа распространяется под лицензией GNU General
Public License v2</translation>
+ </message>
+ <message>
+ <location filename="../src/common/AboutDialog.ui" line="137"/>
+--- a/translations/merkaartor_sk.ts
++++ b/translations/merkaartor_sk.ts
+@@ -58,8 +58,8 @@ p, li { white-space: pre-wrap; }
+ </message>
+ <message>
+ <location filename="../src/common/AboutDialog.ui" line="130"/>
+- <source>This program is licensed under the GNU Public License
v2</source>
+- <translation>Tento program je šírený pod licenciou GNU Public License
v2</translation>
++ <source>This program is licensed under the GNU General Public License
v2</source>
++ <translation>Tento program je šírený pod licenciou GNU General Public
License v2</translation>
+ </message>
+ <message>
+ <location filename="../src/common/AboutDialog.ui" line="137"/>
+--- a/translations/merkaartor_sv.ts
++++ b/translations/merkaartor_sv.ts
+@@ -58,8 +58,8 @@ p, li { white-space: pre-wrap; }
+ </message>
+ <message>
+ <location filename="../src/common/AboutDialog.ui" line="130"/>
+- <source>This program is licensed under the GNU Public License
v2</source>
+- <translation>Detta program är licenserat med GNU Public License
v2</translation>
++ <source>This program is licensed under the GNU General Public License
v2</source>
++ <translation>Detta program är licenserat med GNU General Public
License v2</translation>
+ </message>
+ <message>
+ <location filename="../src/common/AboutDialog.ui" line="137"/>
+--- a/translations/merkaartor_uk.ts
++++ b/translations/merkaartor_uk.ts
+@@ -58,8 +58,8 @@ p, li { white-space: pre-wrap; }
+ </message>
+ <message>
+ <location filename="../src/common/AboutDialog.ui" line="130"/>
+- <source>This program is licensed under the GNU Public License
v2</source>
+- <translation>Ця програма ліцензована на умовах GNU Public License
v2</translation>
++ <source>This program is licensed under the GNU General Public License
v2</source>
++ <translation>Ця програма ліцензована на умовах GNU General Public
License v2</translation>
+ </message>
+ <message>
+ <location filename="../src/common/AboutDialog.ui" line="137"/>
+--- a/3rdparty/quazip-0.7/NEWS.txt
++++ b/3rdparty/quazip-0.7/NEWS.txt
+@@ -12,7 +12,7 @@ QuaZIP changes
+ need more precise dates and times than default ones.
+ * QuaZipNewInfo may now be initialized from QuaZipFileInfo64.
+ * No more crashes when using QSaveFile as QIODevice for ZIP.
+- * The new QuaZip::setAutoClose() method allows to leave the
++ * The new QuaZip::setAutoClose() method allows leaving the
+ QIODevice open when you close the QuaZip instance.
+ * qztest now depends on quazip, no longer breaking the build.
+
+--- a/3rdparty/quazip-0.7/doc/html/classQuaZip.html
++++ b/3rdparty/quazip-0.7/doc/html/classQuaZip.html
+@@ -441,7 +441,7 @@ class </td><td class="memItemRight"
+ <p>If the ZIP file is accessed via explicitly set QIODevice, then this device
is opened in the necessary mode. If the device was already opened by some other
means, then QuaZIP checks if the open mode is compatible to the mode needed for
the requested operation. If necessary, seeking is performed to position the
device properly.</p>
+ <dl class="section return"><dt>Returns</dt><dd><code>true</code> if
successful, <code>false</code> otherwise.</dd></dl>
+ <dl class="section note"><dt>Note</dt><dd>ZIP/UNZIP API open calls do not
return error code - they just return <code>NULL</code> indicating an error. But
to make things easier, <a class="el" href="quazip_8h_source.html">quazip.h</a>
header defines additional error code <code>UNZ_ERROROPEN</code> and <a
class="el" href="classQuaZip.html#a28b91a6282ddd9382c96a069572c6fb4"
title="Returns the error code of the last operation. ">getZipError()</a> will
return it if the open call of the ZIP/UN [...]
+-<p>Argument <em>ioApi</em> specifies IO function set for ZIP/UNZIP package to
use. See unzip.h, zip.h and ioapi.h for details. Note that IO API for <a
class="el" href="classQuaZip.html" title="ZIP archive. ">QuaZip</a> is
different from the original package. The file path argument was changed to be
of type <code>voidpf</code>, and <a class="el" href="classQuaZip.html"
title="ZIP archive. ">QuaZip</a> passes a QIODevice pointer there. This
QIODevice is either set explicitly via <a class= [...]
++<p>Argument <em>ioApi</em> specifies IO function set for ZIP/UNZIP package to
use. See unzip.h, zip.h and ioapi.h for details. Note that IO API for <a
class="el" href="classQuaZip.html" title="ZIP archive. ">QuaZip</a> is
different from the original package. The file path argument was changed to be
of type <code>voidpf</code>, and <a class="el" href="classQuaZip.html"
title="ZIP archive. ">QuaZip</a> passes a QIODevice pointer there. This
QIODevice is either set explicitly via <a class= [...]
+ <dl class="section note"><dt>Note</dt><dd>If the zip64 support is needed, the
ioApi argument <em>must</em> be NULL because due to the backwards compatibility
issues it can be used to provide a 32-bit API only.</dd>
+ <dd>
+ If the <a class="el"
href="classQuaZip.html#a54bfc924762774ccf9f99be075ba7b0e">no-auto-close</a>
feature is used, then the <em>ioApi</em> argument <em>should</em> be NULL
because the old API doesn't support the 'fake close' operation, causing slight
memory leaks and other possible troubles (like closing the output device in
case when an error occurs during opening).</dd></dl>
+--- a/3rdparty/quazip-0.7/doc/html/structQuaZipFileInfo64.html
++++ b/3rdparty/quazip-0.7/doc/html/structQuaZipFileInfo64.html
+@@ -285,7 +285,7 @@ QByteArray </td><td class="memItemR
+ </div><div class="memdoc">
+
+ <p>Last modification date and time. </p>
+-<p>This is the time stored in the standard ZIP header. This format only
allows to store time with 2-second precision, so the seconds will always be
even and the milliseconds will always be zero. If you need more precise date
and time, you can try to call the <a class="el"
href="structQuaZipFileInfo64.html#af4b19399367cf5bf24026344e0631ccb"
title="Returns the NTFS modification time. ">getNTFSmTime()</a> function or its
siblings, provided that the archive itself contains these NTFS times. </p>
++<p>This is the time stored in the standard ZIP header. This format only
allows storing time with 2-second precision, so the seconds will always be even
and the milliseconds will always be zero. If you need more precise date and
time, you can try to call the <a class="el"
href="structQuaZipFileInfo64.html#af4b19399367cf5bf24026344e0631ccb"
title="Returns the NTFS modification time. ">getNTFSmTime()</a> function or its
siblings, provided that the archive itself contains these NTFS times. </p>
+
+ <p>Referenced by <a class="el"
href="classQuaZip.html#a7ba6daf39263c308c683e7f72f74e0ae">QuaZip::getCurrentFileInfo()</a>,
and <a class="el"
href="structQuaZipFileInfo64.html#ada29945c7ee4c9df6fbe95864793aade">toQuaZipFileInfo()</a>.</p>
+
+--- a/3rdparty/quazip-0.7/doc/latex/classQuaZip.tex
++++ b/3rdparty/quazip-0.7/doc/latex/classQuaZip.tex
+@@ -298,7 +298,7 @@ If the Z\-I\-P file is accessed via expl
+ \begin{DoxyNote}{Note}
+ Z\-I\-P/\-U\-N\-Z\-I\-P A\-P\-I open calls do not return error code -\/ they
just return {\ttfamily N\-U\-L\-L} indicating an error. But to make things
easier, \doxyref{quazip.\-h}{p.}{quazip_8h_source} header defines additional
error code {\ttfamily U\-N\-Z\-\_\-\-E\-R\-R\-O\-R\-O\-P\-E\-N} and
\doxyref{get\-Zip\-Error()}{p.}{classQuaZip_a28b91a6282ddd9382c96a069572c6fb4}
will return it if the open call of the Z\-I\-P/\-U\-N\-Z\-I\-P A\-P\-I returns
{\ttfamily N\-U\-L\-L}.
+ \end{DoxyNote}
+-Argument {\itshape io\-Api} specifies I\-O function set for
Z\-I\-P/\-U\-N\-Z\-I\-P package to use. See unzip.\-h, zip.\-h and ioapi.\-h
for details. Note that I\-O A\-P\-I for \doxyref{Qua\-Zip}{p.}{classQuaZip} is
different from the original package. The file path argument was changed to be
of type {\ttfamily voidpf}, and \doxyref{Qua\-Zip}{p.}{classQuaZip} passes a
Q\-I\-O\-Device pointer there. This Q\-I\-O\-Device is either set explicitly
via \doxyref{set\-Io\-Device()}{p.}{classQu [...]
++Argument {\itshape io\-Api} specifies I\-O function set for
Z\-I\-P/\-U\-N\-Z\-I\-P package to use. See unzip.\-h, zip.\-h and ioapi.\-h
for details. Note that I\-O A\-P\-I for \doxyref{Qua\-Zip}{p.}{classQuaZip} is
different from the original package. The file path argument was changed to be
of type {\ttfamily voidpf}, and \doxyref{Qua\-Zip}{p.}{classQuaZip} passes a
Q\-I\-O\-Device pointer there. This Q\-I\-O\-Device is either set explicitly
via \doxyref{set\-Io\-Device()}{p.}{classQu [...]
+
+ \begin{DoxyNote}{Note}
+ If the zip64 support is needed, the io\-Api argument {\itshape must} be
N\-U\-L\-L because due to the backwards compatibility issues it can be used to
provide a 32-\/bit A\-P\-I only.
+--- a/3rdparty/quazip-0.7/doc/latex/structQuaZipFileInfo64.tex
++++ b/3rdparty/quazip-0.7/doc/latex/structQuaZipFileInfo64.tex
+@@ -197,7 +197,7 @@ The N\-T\-F\-S creation time, U\-T\-C
+
+ Last modification date and time.
+
+-This is the time stored in the standard Z\-I\-P header. This format only
allows to store time with 2-\/second precision, so the seconds will always be
even and the milliseconds will always be zero. If you need more precise date
and time, you can try to call the
\doxyref{get\-N\-T\-F\-Sm\-Time()}{p.}{structQuaZipFileInfo64_af4b19399367cf5bf24026344e0631ccb}
function or its siblings, provided that the archive itself contains these
N\-T\-F\-S times.
++This is the time stored in the standard Z\-I\-P header. This format only
allows storing time with 2-\/second precision, so the seconds will always be
even and the milliseconds will always be zero. If you need more precise date
and time, you can try to call the
\doxyref{get\-N\-T\-F\-Sm\-Time()}{p.}{structQuaZipFileInfo64_af4b19399367cf5bf24026344e0631ccb}
function or its siblings, provided that the archive itself contains these
N\-T\-F\-S times.
+
+ Referenced by Qua\-Zip\-::get\-Current\-File\-Info(), and
to\-Qua\-Zip\-File\-Info().
+
+--- a/3rdparty/quazip-0.7/quazip/quazip.h
++++ b/3rdparty/quazip-0.7/quazip/quazip.h
+@@ -173,7 +173,7 @@ class QUAZIP_EXPORT QuaZip {
+ * set explicitly via setIoDevice() or the QuaZip(QIODevice*)
+ * constructor, or it is created internally when opening the archive
+ * by its file name. The default API (qioapi.cpp) just delegates
+- * everything to the QIODevice API. Not only this allows to use a
++ * everything to the QIODevice API. Not only this allows using a
+ * QIODevice instead of file name, but also has a nice side effect
+ * of raising the file size limit from 2G to 4G (in non-zip64 archives).
+ *
+--- a/3rdparty/quazip-0.7/quazip/quazipfile.cpp
++++ b/3rdparty/quazip-0.7/quazip/quazipfile.cpp
+@@ -70,7 +70,7 @@ class QuaZipFilePrivate {
+ /// Sets the zip error.
+ /**
+ This function is marked as const although it changes one field.
+- This allows to call it from const functions that don't change
++ This allows calling it from const functions that don't change
+ anything by themselves.
+ */
+ void setZipError(int zipError) const;
+--- a/src/QMapControl/mapcontrol.h
++++ b/src/QMapControl/mapcontrol.h
+@@ -157,7 +157,7 @@ class MapControl : public QWidget
+ * The MouesMode Dragging draws an rectangular in the map while
the MouseButton is pressed.
+ * When the Button is released a draggedRect() signal is
emitted.
+ *
+- * The second MouseMode (the default) is Panning, which allows
to drag the map around.
++ * The second MouseMode (the default) is Panning, which allows
dragging the map around.
+ * @param mousemode the MouseMode
+ */
+ void setMouseMode(MouseMode mousemode);
+@@ -204,7 +204,7 @@ class MapControl : public QWidget
+
+ //! Emitted AFTER a MouseEvent occured
+ /*!
+- * This signals allows to receive click events within the
MapWidget together with the world coordinate.
++ * This signals allows receiving click events within the
MapWidget together with the world coordinate.
+ * It is emitted on MousePressEvents and MouseReleaseEvents.
+ * The kind of the event can be obtained by checking the events
type.
+ * @param evnt the QMouseEvent that occured
+--- a/translations/README
++++ b/translations/README
+@@ -3,7 +3,7 @@ templates. Translations can be done usin
+ in SVN or using Launchpad (preferred way) at
+ https://translations.launchpad.net/merkaartor/trunk
+
+-The script in this directory allows to convert between the two XML file types
++The script in this directory allows converting between the two XML file types
+ and the standard gettext .po files.
+
+ The templates and the main translations are separated in two different sets
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/merkaartor.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
