[DebianGIS-dev] r952 - in packages/qgis/trunk/debian: . patches
frankie at alioth.debian.org
frankie at alioth.debian.org
Fri Jun 29 14:06:35 UTC 2007
Author: frankie
Date: 2007-06-29 14:06:35 +0000 (Fri, 29 Jun 2007)
New Revision: 952
Added:
packages/qgis/trunk/debian/patches/grid_maker.dpatch
Modified:
packages/qgis/trunk/debian/changelog
packages/qgis/trunk/debian/patches/00list
packages/qgis/trunk/debian/patches/cmake.dpatch
packages/qgis/trunk/debian/patches/georef.dpatch
Log:
More fixes
Modified: packages/qgis/trunk/debian/changelog
===================================================================
--- packages/qgis/trunk/debian/changelog 2007-06-28 11:51:40 UTC (rev 951)
+++ packages/qgis/trunk/debian/changelog 2007-06-29 14:06:35 UTC (rev 952)
@@ -2,13 +2,14 @@
* New upstream release.
* Now the building system is based on cmake. Qt4 and SIP are required.
- * Added cmake.dpatch new patch (to build-up consistently)
- * Added georef.dpatch new patch (improvement of georeferencer)
- * Removed obsolete postgresql-dev build-dep
+ * Added cmake.dpatch new patch (to build-up consistently).
+ * Added georef.dpatch new patch (improvement of georeferencer by Martin Dobias).
+ * Removed obsolete postgresql-dev build-dep.
(closes: #429984)
- * Removed obsolete libmysqlclient14-dev build-dep
+ * Removed obsolete libmysqlclient14-dev build-dep.
+ * Added a grid_maker patch to compile standalone binaries.
- -- Francesco Paolo Lovergine <frankie at debian.org> Tue, 19 Jun 2007 18:28:05 +0200
+ -- Francesco Paolo Lovergine <frankie at debian.org> Fri, 29 Jun 2007 16:03:56 +0200
qgis (0.8.0-5) unstable; urgency=low
Modified: packages/qgis/trunk/debian/patches/00list
===================================================================
--- packages/qgis/trunk/debian/patches/00list 2007-06-28 11:51:40 UTC (rev 951)
+++ packages/qgis/trunk/debian/patches/00list 2007-06-29 14:06:35 UTC (rev 952)
@@ -1,5 +1,6 @@
cmake
georef
+grid_maker
#move-doc-dir
#gridmaker_bin
#gcc43-fixes
Modified: packages/qgis/trunk/debian/patches/cmake.dpatch
===================================================================
--- packages/qgis/trunk/debian/patches/cmake.dpatch 2007-06-28 11:51:40 UTC (rev 951)
+++ packages/qgis/trunk/debian/patches/cmake.dpatch 2007-06-29 14:06:35 UTC (rev 952)
@@ -5,9 +5,21 @@
## DP: No description.
@DPATCH@
+diff -urNad qgis~/CMakeLists.txt qgis/CMakeLists.txt
+--- qgis~/CMakeLists.txt 2007-06-28 13:35:49.000000000 +0200
++++ qgis/CMakeLists.txt 2007-06-29 15:26:22.000000000 +0200
+@@ -21,7 +21,7 @@
+ # it's possible to set PLUGINS_ALSO_BINARIES to TRUE
+ # then some plugins that can run as standalone apps will be built
+ # also as standalone apps
+-SET (PLUGINS_ALSO_BINARIES FALSE)
++SET (PLUGINS_ALSO_BINARIES TRUE)
+
+
+ # try to configure and build GRASS plugin by default
diff -urNad qgis~/cmake/FindGDAL.cmake qgis/cmake/FindGDAL.cmake
---- qgis~/cmake/FindGDAL.cmake 2007-06-17 01:12:36.000000000 +0200
-+++ qgis/cmake/FindGDAL.cmake 2007-06-17 01:12:38.000000000 +0200
+--- qgis~/cmake/FindGDAL.cmake 2007-06-28 13:29:53.000000000 +0200
++++ qgis/cmake/FindGDAL.cmake 2007-06-29 15:26:07.000000000 +0200
@@ -37,7 +37,7 @@
EXEC_PROGRAM(${GDAL_CONFIG}
ARGS --prefix
@@ -18,8 +30,8 @@
## extract link dirs for rpath
EXEC_PROGRAM(${GDAL_CONFIG}
diff -urNad qgis~/src/plugins/grid_maker/CMakeLists.txt qgis/src/plugins/grid_maker/CMakeLists.txt
---- qgis~/src/plugins/grid_maker/CMakeLists.txt 2007-06-17 01:12:36.000000000 +0200
-+++ qgis/src/plugins/grid_maker/CMakeLists.txt 2007-06-17 01:14:46.000000000 +0200
+--- qgis~/src/plugins/grid_maker/CMakeLists.txt 2007-06-28 13:31:56.000000000 +0200
++++ qgis/src/plugins/grid_maker/CMakeLists.txt 2007-06-29 15:26:07.000000000 +0200
@@ -1,82 +1,83 @@
-
-########################################################
Modified: packages/qgis/trunk/debian/patches/georef.dpatch
===================================================================
--- packages/qgis/trunk/debian/patches/georef.dpatch 2007-06-28 11:51:40 UTC (rev 951)
+++ packages/qgis/trunk/debian/patches/georef.dpatch 2007-06-29 14:06:35 UTC (rev 952)
@@ -5,9 +5,879 @@
## DP: No description.
@DPATCH@
+diff -urNad qgis~/i18n/qgis_de.ts qgis/i18n/qgis_de.ts
+--- qgis~/i18n/qgis_de.ts 2007-06-28 13:37:36.000000000 +0200
++++ qgis/i18n/qgis_de.ts 2007-06-29 15:39:08.000000000 +0200
+@@ -1,14 +1,14 @@
+ <?xml version="1.0" encoding="utf-8"?>
+-<!DOCTYPE TS><TS version="1.1">
++<!DOCTYPE TS><TS version="1.1" language="de">
+ <context>
+ <name>@default</name>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="1481"/>
++ <location filename="../src/gui/qgisapp.cpp" line="1503"/>
+ <source>OGR Driver Manager</source>
+ <translation>OGR Driver Manager</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="1481"/>
++ <location filename="../src/gui/qgisapp.cpp" line="1503"/>
+ <source>unable to get OGRDriverManager</source>
+ <translation>Kann den OGRDriverManager nicht öffnen.</translation>
+ </message>
+@@ -16,30 +16,40 @@
+ <context>
+ <name>MapCoordsDialogBase</name>
+ <message>
+- <location filename="../src/plugins/georeferencer/mapcoordsdialogbase.ui" line="16"/>
++ <location filename="../src/plugins/georeferencer/mapcoordsdialogbase.ui" line="13"/>
+ <source>Enter map coordinates</source>
+ <translation>Kartenkoordinaten eingeben</translation>
+ </message>
+ <message>
+- <location filename="../src/plugins/georeferencer/mapcoordsdialogbase.ui" line="31"/>
++ <location filename="../src/plugins/georeferencer/mapcoordsdialogbase.ui" line="62"/>
+ <source>X:</source>
+ <translation>X:</translation>
+ </message>
+ <message>
+- <location filename="../src/plugins/georeferencer/mapcoordsdialogbase.ui" line="38"/>
++ <location filename="../src/plugins/georeferencer/mapcoordsdialogbase.ui" line="69"/>
+ <source>Y:</source>
+ <translation>Y:</translation>
+ </message>
+ <message>
+- <location filename="../src/plugins/georeferencer/mapcoordsdialogbase.ui" line="67"/>
++ <location filename="../src/plugins/georeferencer/mapcoordsdialogbase.ui" line="185"/>
+ <source>&OK</source>
+ <translation>&OK</translation>
+ </message>
+ <message>
+- <location filename="../src/plugins/georeferencer/mapcoordsdialogbase.ui" line="83"/>
++ <location filename="../src/plugins/georeferencer/mapcoordsdialogbase.ui" line="172"/>
+ <source>&Cancel</source>
+ <translation>&Abbrechen</translation>
+ </message>
++ <message>
++ <location filename="../src/plugins/georeferencer/mapcoordsdialogbase.ui" line="28"/>
++ <source>Enter X and Y coordinates which correspond with the selected point on the image. Alternatively, click the button with icon of a pencil and then click a corresponding point on map canvas of QGIS to fill in coordinates of that point.</source>
++ <translation>Klicken Sie auf den 'aus Karte' Knopf und wählen Sie dann den korrespondierenden Punkt in der Hauptkarte per Klick aus, um die Koordinaten von dort zu übernehmen. Alternativ, können Sie die Koordinaten auch manuell eingeben.</translation>
++ </message>
++ <message>
++ <location filename="../src/plugins/georeferencer/mapcoordsdialogbase.ui" line="137"/>
++ <source> from map canvas</source>
++ <translation>aus Karte</translation>
++ </message>
+ </context>
+ <context>
+ <name>NavigationGui</name>
+@@ -203,12 +213,12 @@
+ <translation>Keine Datenlieferanten Plugins verfügbar. Es können keine Vektorebenen geladen werden</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="2854"/>
++ <location filename="../src/gui/qgisapp.cpp" line="2876"/>
+ <source>QGis files (*.qgs)</source>
+ <translation>QGIS Dateien (*.qgs)</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="2263"/>
++ <location filename="../src/gui/qgisapp.cpp" line="2285"/>
+ <source>Open an OGR Supported Layer</source>
+ <translation>OGR Vektorebene öffnen</translation>
+ </message>
+@@ -1159,6 +1169,16 @@
+ <source>Cannot read region</source>
+ <translation type="unfinished"></translation>
+ </message>
++ <message>
++ <location filename="../src/gui/qgsproject.cpp" line="1019"/>
++ <source>Unable to open </source>
++ <translation type="unfinished"></translation>
++ </message>
++ <message>
++ <location filename="../src/gui/qgsproject.cpp" line="1140"/>
++ <source>Cannot get extents from </source>
++ <translation type="unfinished"></translation>
++ </message>
+ </context>
+ <context>
+ <name>QgisApp</name>
+@@ -1188,187 +1208,187 @@
+ <translation>Version</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="1336"/>
++ <location filename="../src/gui/qgisapp.cpp" line="1358"/>
+ <source>Available Data Provider Plugins</source>
+ <translation>Verfügbare Datenlieferanten Plugins</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="1898"/>
++ <location filename="../src/gui/qgisapp.cpp" line="1920"/>
+ <source>is not a valid or recognized data source</source>
+ <translation>ist keine zulässige oder erkannte Datenquelle</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="5017"/>
++ <location filename="../src/gui/qgisapp.cpp" line="5049"/>
+ <source>Invalid Data Source</source>
+ <translation>Ungültige Datenquelle</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="3351"/>
++ <location filename="../src/gui/qgisapp.cpp" line="3383"/>
+ <source>No Layer Selected</source>
+ <translation>Keine Ebene gewählt</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="3808"/>
++ <location filename="../src/gui/qgisapp.cpp" line="3840"/>
+ <source>No MapLayer Plugins</source>
+ <translation>Keine Kartenebenen Plugins</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="3808"/>
++ <location filename="../src/gui/qgisapp.cpp" line="3840"/>
+ <source>No MapLayer plugins in ../plugins/maplayer</source>
+ <translation>Keine Kartenebenen Plugins in ../plugins/maplayer</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="3906"/>
++ <location filename="../src/gui/qgisapp.cpp" line="3938"/>
+ <source>No Plugins</source>
+ <translation>Keine Plugins</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="3907"/>
++ <location filename="../src/gui/qgisapp.cpp" line="3939"/>
+ <source>No plugins found in ../plugins. To test plugins, start qgis from the src directory</source>
+ <translation>Keine Plugins in ../plugins gefunden. Um Plugins zu testen, qgis aus dem src Verzeichnis starten</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="3949"/>
++ <location filename="../src/gui/qgisapp.cpp" line="3981"/>
+ <source>Name</source>
+ <translation>Name</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="3949"/>
++ <location filename="../src/gui/qgisapp.cpp" line="3981"/>
+ <source>Plugin %1 is named %2</source>
+ <translation>Plugin %1 heißt %2</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="3972"/>
++ <location filename="../src/gui/qgisapp.cpp" line="4004"/>
+ <source>Plugin Information</source>
+ <translation>Plugin Informationen</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="3973"/>
++ <location filename="../src/gui/qgisapp.cpp" line="4005"/>
+ <source>QGis loaded the following plugin:</source>
+ <translation>QGis hat die follgen Plugins geladen:</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="3973"/>
++ <location filename="../src/gui/qgisapp.cpp" line="4005"/>
+ <source>Name: %1</source>
+ <translation>Name: %1</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="3973"/>
++ <location filename="../src/gui/qgisapp.cpp" line="4005"/>
+ <source>Version: %1</source>
+ <translation>Version: %1</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="3974"/>
++ <location filename="../src/gui/qgisapp.cpp" line="4006"/>
+ <source>Description: %1</source>
+ <translation>Beschreibung: %1</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="3993"/>
++ <location filename="../src/gui/qgisapp.cpp" line="4025"/>
+ <source>Unable to Load Plugin</source>
+ <translation>Laden des Plugin nicht möglich</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="3994"/>
++ <location filename="../src/gui/qgisapp.cpp" line="4026"/>
+ <source>QGIS was unable to load the plugin from: %1</source>
+ <translation>QGIS konnte das Plugin nicht laden von : %1</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="4054"/>
++ <location filename="../src/gui/qgisapp.cpp" line="4086"/>
+ <source>There is a new version of QGIS available</source>
+ <translation>Eine neue Version von QGIS ist verfügbar</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="4060"/>
++ <location filename="../src/gui/qgisapp.cpp" line="4092"/>
+ <source>You are running a development version of QGIS</source>
+ <translation>Sie verwenden eine Entwicklungsversion von QGIS</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="4064"/>
++ <location filename="../src/gui/qgisapp.cpp" line="4096"/>
+ <source>You are running the current version of QGIS</source>
+ <translation>Sie verwenden die aktuelle Version von QGIS</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="4069"/>
++ <location filename="../src/gui/qgisapp.cpp" line="4101"/>
+ <source>Would you like more information?</source>
+ <translation>Wollen Sie mehr Information?</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="4116"/>
++ <location filename="../src/gui/qgisapp.cpp" line="4148"/>
+ <source>QGIS Version Information</source>
+ <translation>QGIS Versionsinformationen</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="4088"/>
++ <location filename="../src/gui/qgisapp.cpp" line="4120"/>
+ <source>Unable to get current version information from server</source>
+ <translation>Kann Informationen zu aktuellen Version nicht vom Server holen</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="4102"/>
++ <location filename="../src/gui/qgisapp.cpp" line="4134"/>
+ <source>Connection refused - server may be down</source>
+ <translation>Verbunging abgelehnt - Server wahrschinlich offline</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="4105"/>
++ <location filename="../src/gui/qgisapp.cpp" line="4137"/>
+ <source>QGIS server was not found</source>
+ <translation>QGIS Server nicht gefunden</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="2005"/>
++ <location filename="../src/gui/qgisapp.cpp" line="2027"/>
+ <source>Invalid Layer</source>
+ <translation>Ungültige Ebene</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="2005"/>
++ <location filename="../src/gui/qgisapp.cpp" line="2027"/>
+ <source>%1 is an invalid layer and cannot be loaded.</source>
+ <translation>%1 ist eine ungültige Ebene und kann nicht geladen werden.</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="3766"/>
++ <location filename="../src/gui/qgisapp.cpp" line="3798"/>
+ <source>Error Loading Plugin</source>
+ <translation>Fehler beim Laden des Plugins</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="3766"/>
++ <location filename="../src/gui/qgisapp.cpp" line="3798"/>
+ <source>There was an error loading %1.</source>
+ <translation>Es trat ein Fehler auf beim Laden von %1.</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="3134"/>
++ <location filename="../src/gui/qgisapp.cpp" line="3166"/>
+ <source>Saved map image to</source>
+ <translation>Speichere Kartenbild nach</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="3089"/>
++ <location filename="../src/gui/qgisapp.cpp" line="3121"/>
+ <source>Choose a filename to save the map image as</source>
+ <translation>Wähle einen Dateinamen zum Speichern des Kartebildes</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="4573"/>
++ <location filename="../src/gui/qgisapp.cpp" line="4605"/>
+ <source>Extents: </source>
+ <translation>Ausmasse:</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="3339"/>
++ <location filename="../src/gui/qgisapp.cpp" line="3371"/>
+ <source>Problem deleting features</source>
+ <translation>Problem beim Löschen der Objekte</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="3340"/>
++ <location filename="../src/gui/qgisapp.cpp" line="3372"/>
+ <source>A problem occured during deletion of features</source>
+ <translation>Beim Löschen der Objekte ist ein Problem aufgetreten</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="3345"/>
++ <location filename="../src/gui/qgisapp.cpp" line="3377"/>
+ <source>No Vector Layer Selected</source>
+ <translation>Es wurde keine Vektorebene selektiert</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="3346"/>
++ <location filename="../src/gui/qgisapp.cpp" line="3378"/>
+ <source>Deleting features only works on vector layers</source>
+ <translation>Löschen von Objekten ist nur in Vektorebenen möglich</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="3352"/>
++ <location filename="../src/gui/qgisapp.cpp" line="3384"/>
+ <source>To delete features, you must select a vector layer in the legend</source>
+ <translation>Um Objekte zu löschen, muss eine Vektorebene in der Legende selektiert werden</translation>
+ </message>
+@@ -1428,17 +1448,17 @@
+ <translation>Wenn angewählt werden die Kartenebenen, abhängig von der Bedienung der Navigationsinstrumente, gezeichnet. Wenn die Checkbox leer ist, werden die Ebenen nicht gezeichnet. Dies erlaubt es, eine grosse Anzahl Ebenen hinzuzufügen und das Aussehen der Ebenen vor dem Zeichnen zu setzen.</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="2776"/>
++ <location filename="../src/gui/qgisapp.cpp" line="2798"/>
+ <source>Choose a QGIS project file</source>
+ <translation>Eine QGIS Projektdatei wählen</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="2906"/>
++ <location filename="../src/gui/qgisapp.cpp" line="2929"/>
+ <source>Unable to save project</source>
+ <translation>Projekt kann nicht gespeichert werden</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="2907"/>
++ <location filename="../src/gui/qgisapp.cpp" line="2930"/>
+ <source>Unable to save project to </source>
+ <translation>Projekt kann nicht gespeichert werden</translation>
+ </message>
+@@ -1463,53 +1483,53 @@
+ <translation type="obsolete">Map Composer um Kartenlayouts zu erstellen</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="1695"/>
++ <location filename="../src/gui/qgisapp.cpp" line="1717"/>
+ <source>Open an OGR Supported Vector Layer</source>
+ <translation>Öffnen einer OGR Vektordatenebene</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="2722"/>
++ <location filename="../src/gui/qgisapp.cpp" line="2744"/>
+ <source>QGIS Project Read Error</source>
+ <translation>Fehler beim Lesen des QGIS Projektes</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="2724"/>
++ <location filename="../src/gui/qgisapp.cpp" line="2746"/>
+ <source>Try to find missing layers?</source>
+ <translation>Versuch, fehlende Ebenen zu finden?</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="4901"/>
++ <location filename="../src/gui/qgisapp.cpp" line="4933"/>
+ <source>Open a GDAL Supported Raster Data Source</source>
+ <translation>Öffnen einer GDAL Rasterdatenquelle</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="2493"/>
++ <location filename="../src/gui/qgisapp.cpp" line="2515"/>
+ <source>Save As</source>
+ <translation>Speichern als</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="2592"/>
++ <location filename="../src/gui/qgisapp.cpp" line="2614"/>
+ <source>Choose a QGIS project file to open</source>
+ <translation>QGIS Projektdatei zum öffnen wählen</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="2899"/>
++ <location filename="../src/gui/qgisapp.cpp" line="2922"/>
+ <source>Saved project to:</source>
+ <translation>Projekt wurde gespeichert in:</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="4190"/>
++ <location filename="../src/gui/qgisapp.cpp" line="4222"/>
+ <source>QGIS Browser Selection</source>
+ <translation>QGIS Browserauswahl</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="4191"/>
++ <location filename="../src/gui/qgisapp.cpp" line="4223"/>
+ <source>Enter the name of a web browser to use (eg. konqueror).
+ </source>
+ <translation>Geben Sie den Namen eines Webbrowsers ein (z.B. Konqueror).</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="4192"/>
++ <location filename="../src/gui/qgisapp.cpp" line="4224"/>
+ <source>Enter the full path if the browser is not in your PATH.
+ </source>
+ <translation>Geben sie den vollen Namen ein, wenn der Browser nicht im PAT ist.</translation>
+@@ -2090,7 +2110,7 @@
+ <translation>Ctrl+B</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="5285"/>
++ <location filename="../src/gui/qgisapp.cpp" line="5317"/>
+ <source>New Bookmark</source>
+ <translation>Neues Lesezeichen</translation>
+ </message>
+@@ -2285,92 +2305,92 @@
+ <translation>Fertig</translation>
+ </message>
+ <message>
+- <location filename="" line="7471221"/>
++ <location filename="../src/gui/qgisapp.cpp" line="1331"/>
+ <source>New features</source>
+- <translation type="obsolete">Neue Objekte</translation>
++ <translation type="unfinished">Neue Objekte</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="2741"/>
++ <location filename="../src/gui/qgisapp.cpp" line="2763"/>
+ <source>Unable to open project</source>
+ <translation>Kann das Projekt nicht öffnen</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="2835"/>
++ <location filename="../src/gui/qgisapp.cpp" line="2936"/>
+ <source>Unable to save project </source>
+ <translation>Kann das Projekt nicht speichern</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="2853"/>
++ <location filename="../src/gui/qgisapp.cpp" line="2875"/>
+ <source>Choose a filename to save the QGIS project file as</source>
+ <translation>Bitte wählen Sie einen Dateinamen, unter dem Sie das Projekt speichern wollen.</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="2966"/>
++ <location filename="../src/gui/qgisapp.cpp" line="2998"/>
+ <source>QGIS: Unable to load project</source>
+ <translation>QGIS: Kann das Projekt nicht laden.</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="2967"/>
++ <location filename="../src/gui/qgisapp.cpp" line="2999"/>
+ <source>Unable to load project </source>
+ <translation>Kann das Projekt nicht laden.</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="4076"/>
++ <location filename="../src/gui/qgisapp.cpp" line="4108"/>
+ <source>QGIS - Changes in SVN Since Last Release</source>
+ <translation>QGIS - Änderungen in SVN seit dem letzten Release</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="4193"/>
++ <location filename="../src/gui/qgisapp.cpp" line="4225"/>
+ <source>You can change this option later by selecting Options from the Settings menu (Help Browser tab).</source>
+ <translation>Sie können diese Option später ändern, indem Sie Optionen aus dem Einstellungen Menü wählen. (Hilfe-Broweser-Reiter).</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="5130"/>
++ <location filename="../src/gui/qgisapp.cpp" line="5162"/>
+ <source>Layer is not valid</source>
+ <translation>Ebene ist ungültig</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="5131"/>
++ <location filename="../src/gui/qgisapp.cpp" line="5163"/>
+ <source>The layer is not a valid layer and can not be added to the map</source>
+ <translation>Die Ebene ist keine gültige Ebene und kann daher nicht zur Karte hinzugefügt werden.</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="4395"/>
++ <location filename="../src/gui/qgisapp.cpp" line="4427"/>
+ <source>Save?</source>
+ <translation>Speichern?</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="4856"/>
++ <location filename="../src/gui/qgisapp.cpp" line="4888"/>
+ <source>Clipboard contents set to: </source>
+ <translation>Inhalt der Zwischenablage setzen auf: </translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="5016"/>
++ <location filename="../src/gui/qgisapp.cpp" line="5048"/>
+ <source> is not a valid or recognized raster data source</source>
+ <translation> ist keine gültige Rasterdatenquelle.</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="5205"/>
++ <location filename="../src/gui/qgisapp.cpp" line="5237"/>
+ <source> is not a supported raster data source</source>
+ <translation> ist kein unterstütztes Rasterdatenformat.</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="5206"/>
++ <location filename="../src/gui/qgisapp.cpp" line="5238"/>
+ <source>Unsupported Data Source</source>
+ <translation>Unbekanntes Datenformat</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="5286"/>
++ <location filename="../src/gui/qgisapp.cpp" line="5318"/>
+ <source>Enter a name for the new bookmark:</source>
+ <translation>Bitte geben Sie einen Namen für das Lesenzeichen ein:</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="5303"/>
++ <location filename="../src/gui/qgisapp.cpp" line="5335"/>
+ <source>Error</source>
+ <translation>Fehler</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="5303"/>
++ <location filename="../src/gui/qgisapp.cpp" line="5335"/>
+ <source>Unable to create the bookmark. Your user database may be missing or corrupted</source>
+ <translation>Kann das Lesezeichen nicht erstellen. Ihre Datenbank scheint zu fehlen oder ist kaputt.</translation>
+ </message>
+@@ -2518,17 +2538,17 @@
+ <translation type="obsolete">Option, die nur in der Tabelle geometry_columns nach PostGIS-Ebenen nachschaut.</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="4108"/>
++ <location filename="../src/gui/qgisapp.cpp" line="4140"/>
+ <source>Network error while communicating with server</source>
+ <translation>Es trat ein Netzwerkfehler während der Kommunikation zum Server auf.</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="4111"/>
++ <location filename="../src/gui/qgisapp.cpp" line="4143"/>
+ <source>Unknown network socket error</source>
+ <translation>Unbekannter Netzwerkfehler (Socketfehler)</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="4116"/>
++ <location filename="../src/gui/qgisapp.cpp" line="4148"/>
+ <source>Unable to communicate with QGIS Version server</source>
+ <translation>Kann nicht mit dem QGIS Server kommunizieren.</translation>
+ </message>
+@@ -2612,25 +2632,80 @@
+ <translation type="unfinished">Ctrl+T</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="3325"/>
++ <location filename="../src/gui/qgisapp.cpp" line="3357"/>
+ <source>To open an attribute table, you must select a layer in the legend</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="4071"/>
++ <location filename="../src/gui/qgisapp.cpp" line="4103"/>
+ <source>Yes</source>
+ <translation type="unfinished">Ja</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="4071"/>
++ <location filename="../src/gui/qgisapp.cpp" line="4103"/>
+ <source>No</source>
+ <translation type="unfinished">Nein</translation>
+ </message>
+ <message>
+- <location filename="../src/gui/qgisapp.cpp" line="4396"/>
++ <location filename="../src/gui/qgisapp.cpp" line="4428"/>
+ <source><p>Do you want to save the current project?</p></source>
+ <translation type="unfinished"></translation>
+ </message>
++ <message>
++ <location filename="../src/gui/qgisapp.cpp" line="1334"/>
++ <source>Numerous bug fixes</source>
++ <translation type="unfinished"></translation>
++ </message>
++ <message>
++ <location filename="../src/gui/qgisapp.cpp" line="1336"/>
++ <source>Improvements in how segment lengths appear in the measure tool. The current segment length is shown/updated in the list of segments</source>
++ <translation type="unfinished"></translation>
++ </message>
++ <message>
++ <location filename="../src/gui/qgisapp.cpp" line="1338"/>
++ <source>Improvement to zoom-in speed for rasters</source>
++ <translation type="unfinished"></translation>
++ </message>
++ <message>
++ <location filename="../src/gui/qgisapp.cpp" line="1340"/>
++ <source>Improve line/area measuring behaviour when the user has been informed that they are probably using the wrong projection for the map canvas</source>
++ <translation type="unfinished"></translation>
++ </message>
++ <message>
++ <location filename="../src/gui/qgisapp.cpp" line="1342"/>
++ <source>Added tooltips to the scale and coordinate position displays in the status bar</source>
++ <translation type="unfinished"></translation>
++ </message>
++ <message>
++ <location filename="../src/gui/qgisapp.cpp" line="1344"/>
++ <source>Removed ugly console on WIN32 when not debugging</source>
++ <translation type="unfinished"></translation>
++ </message>
++ <message>
++ <location filename="../src/gui/qgisapp.cpp" line="1346"/>
++ <source>Added icons to all GRASS tools. All GRASS tools are now on the toolbar</source>
++ <translation type="unfinished"></translation>
++ </message>
++ <message>
++ <location filename="../src/gui/qgisapp.cpp" line="1348"/>
++ <source>New GRASS modules added to the GRASS toolbox</source>
++ <translation type="unfinished"></translation>
++ </message>
++ <message>
++ <location filename="../src/gui/qgisapp.cpp" line="1350"/>
++ <source>The GRASS plugin is now fully internationalized</source>
++ <translation type="unfinished"></translation>
++ </message>
++ <message>
++ <location filename="../src/gui/qgisapp.cpp" line="1352"/>
++ <source>Launcher plugin added to core plugins </source>
++ <translation type="unfinished"></translation>
++ </message>
++ <message>
++ <location filename="../src/gui/qgisapp.cpp" line="2745"/>
++ <source></source>
++ <translation type="unfinished"></translation>
++ </message>
+ </context>
+ <context>
+ <name>QgisAppBase</name>
+@@ -2658,52 +2733,52 @@
+ <translation>Ãœber Quantum GIS</translation>
+ </message>
+ <message>
+- <location filename="../src/ui/qgsabout.ui" line="223"/>
++ <location filename="../src/ui/qgsabout.ui" line="300"/>
+ <source>Ok</source>
+ <translation>OK</translation>
+ </message>
+ <message>
+- <location filename="../src/ui/qgsabout.ui" line="26"/>
++ <location filename="../src/ui/qgsabout.ui" line="32"/>
+ <source>About</source>
+ <translation>Ãœber</translation>
+ </message>
+ <message>
+- <location filename="../src/ui/qgsabout.ui" line="62"/>
++ <location filename="../src/ui/qgsabout.ui" line="86"/>
+ <source>Version</source>
+ <translation>Version</translation>
+ </message>
+ <message>
+- <location filename="../src/ui/qgsabout.ui" line="108"/>
++ <location filename="../src/ui/qgsabout.ui" line="132"/>
+ <source>What's New</source>
+ <translation>Was ist neu</translation>
+ </message>
+ <message>
+- <location filename="../src/ui/qgsabout.ui" line="52"/>
++ <location filename="../src/ui/qgsabout.ui" line="76"/>
+ <source><h2>Quantum GIS (qgis)</h2></source>
+ <translation><h2>Quantum GIS (qgis)</h2></translation>
+ </message>
+ <message>
+- <location filename="../src/ui/qgsabout.ui" line="87"/>
++ <location filename="../src/ui/qgsabout.ui" line="111"/>
+ <source>QGIS Home Page</source>
+ <translation>QGIS Homepage</translation>
+ </message>
+ <message>
+- <location filename="../src/ui/qgsabout.ui" line="97"/>
++ <location filename="../src/ui/qgsabout.ui" line="121"/>
+ <source>Subscribe to the QGIS-User mailing list</source>
+ <translation>Sich für die QGIS-User mailingliste einschreiben</translation>
+ </message>
+ <message>
+- <location filename="../src/ui/qgsabout.ui" line="178"/>
++ <location filename="../src/ui/qgsabout.ui" line="237"/>
+ <source>Providers</source>
+ <translation>Datenprovider</translation>
+ </message>
+ <message>
+- <location filename="../src/ui/qgsabout.ui" line="118"/>
++ <location filename="../src/ui/qgsabout.ui" line="161"/>
+ <source>Developers</source>
+ <translation>Entwickler</translation>
+ </message>
+ <message>
+- <location filename="../src/ui/qgsabout.ui" line="170"/>
++ <location filename="../src/ui/qgsabout.ui" line="229"/>
+ <source><h2>QGIS Developers</h2></source>
+ <translation><h2>QGIS Entwickler</h2></translation>
+ </message>
+@@ -2742,28 +2817,19 @@
+ <translation>Webseite</translation>
+ </message>
+ <message>
+- <location filename="" line="7471221"/>
++ <location filename="../src/ui/qgsabout.ui" line="100"/>
+ <source><html><head><meta name="qrichtext" content="1" /><style type="text/css">
+ p, li { white-space: pre-wrap; }
+ </style></head><body style=" font-family:'Arial'; font-size:12pt; font-weight:400; font-style:normal; text-decoration:none;">
+ <p align="center" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;">Quantum GIS is licensed under the GNU General Public License</p>
+ <p align="center" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;">http://www.gnu.org/licenses</p></body></html></source>
+- <translation type="obsolete"><html><head><meta name="qrichtext" content="1" /><style type="text/css"></style></head><body style=" font-family:'Arial'; font-size:12pt; font-weight:400; font-style:normal; text-decoration:none;"><p align="center" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;">Quantum GIS ist lizensiert unter der GNU General Public License</p><p align="center" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;">http://www.gnu.org/licenses</p></body></html></translation>
++ <translation type="unfinished"><html><head><meta name="qrichtext" content="1" /><style type="text/css"></style></head><body style=" font-family:'Arial'; font-size:12pt; font-weight:400; font-style:normal; text-decoration:none;"><p align="center" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;">Quantum GIS ist lizensiert unter der GNU General Public License</p><p align="center" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;">http://www.gnu.org/licenses</p></body></html></translation>
+ </message>
+ <message>
+- <location filename="../src/ui/qgsabout.ui" line="188"/>
++ <location filename="../src/ui/qgsabout.ui" line="253"/>
+ <source>Sponsors</source>
+ <translation>Sponsoren</translation>
+ </message>
+- <message>
+- <location filename="../src/ui/qgsabout.ui" line="76"/>
+- <source><html><head><meta name="qrichtext" content="1" /><style type="text/css">
+-p, li { white-space: pre-wrap; }
+-</style></head><body style=" font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;">
+-<p align="center" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;">Quantum GIS is licensed under the GNU General Public License</p>
+-<p align="center" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;">http://www.gnu.org/licenses</p></body></html></source>
+- <translation type="unfinished"></translation>
+- </message>
+ </context>
+ <context>
+ <name>QgsAddAttrDialogBase</name>
+@@ -3162,7 +3228,8 @@
+ <location filename="../src/gui/qgsattributetabledisplay.cpp" line="354"/>
+ <source>Found %d matching features.</source>
+ <translation type="unfinished">
+- <numerusform>%d Objekte gefunden.</numerusform>
++ <numerusform></numerusform>
++ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message>
+@@ -6051,7 +6118,7 @@
+ <message>
+ <location filename="../src/plugins/georeferencer/pluginguibase.ui" line="38"/>
+ <source><html><head><meta name="qrichtext" content="1" /></head><body style=" white-space: pre-wrap; font-family:Sans Serif; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;"><p style=" margin-top:16px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:11pt; font-weight:600;">Description</span></p><p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">This plugin can generate world files for rasters. You select points on the raster and give their world coordinates, and the plugin will compute the world file parameters. The more coordinates you can provide the better the result will be.</p></body></html></source>
+- <translation><html><head><meta name="qrichtext" content="1" /></head><body style=" white-space: pre-wrap; font-family:Sans Serif; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;"><p style=" margin-top:16px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:11pt; font-weight:600;">Description</span></p><p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Dieses Plugin erzeugt World-Files für Rasterdateien. Sie wählen Punkte auf der Karte aus, zu denen Sie Weltkoordinaten eingeben. Das Plugin wird dann die World-File-Parameter berechnen. Je mehr Koordinaten Sie eingeben, desto genauer wird das Ergbeniss.</p></body></html></translation>
++ <translation><html><head><meta name="qrichtext" content="1" /></head><body style=" white-space: pre-wrap; font-family:Sans Serif; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;"><p style=" margin-top:16px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:11pt; font-weight:600;">Description</span></p><p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Dieses Plugin erzeugt World-Files für Rasterdateien. Sie wählen Punkte in der Rasterdatei aus, zu denen Sie Weltkoordinaten aus der Hauptkarte übernehmen oder manuell eingeben. Das Plugin berechnet dann die World-File-Parameter. Je mehr Koordinaten Sie eingeben, desto genauer wird das Ergbenis.</p></body></html></translation>
+ </message>
+ <message>
+ <location filename="" line="7471221"/>
+@@ -8661,7 +8728,8 @@
+ <source>Network timed out after %1 seconds of inactivity.
+ This may be a problem in your network connection or at the WMS server.</source>
+ <translation type="unfinished">
+- <numerusform>Netzwerk hatte Timeout nach %1 Sekunden der Inaktivität. Dies könnte auf ein Problem mit Ihrer Netzwerkverbindung oder der des WMS-Servers hindeuten.</numerusform>
++ <numerusform></numerusform>
++ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message>
+@@ -9478,6 +9546,7 @@
+ <comment>Identify results window title</comment>
+ <translation type="unfinished">
+ <numerusform></numerusform>
++ <numerusform></numerusform>
+ </translation>
+ </message>
+ </context>
+@@ -11260,68 +11329,68 @@
+ <translation>Ausgewahl gelöscht.</translation>
+ </message>
+ <message>
+- <location filename="../src/plugins/georeferencer/qgspointdialog.cpp" line="487"/>
++ <location filename="../src/plugins/georeferencer/qgspointdialog.cpp" line="489"/>
+ <source>Linear</source>
+ <translation>Linear</translation>
+ </message>
+ <message>
+- <location filename="../src/plugins/georeferencer/qgspointdialog.cpp" line="314"/>
++ <location filename="../src/plugins/georeferencer/qgspointdialog.cpp" line="316"/>
+ <source>Helmert</source>
+ <translation>Helmert</translation>
+ </message>
+ <message>
+- <location filename="../src/plugins/georeferencer/qgspointdialog.cpp" line="260"/>
++ <location filename="../src/plugins/georeferencer/qgspointdialog.cpp" line="262"/>
+ <source>Choose a name for the world file</source>
+ <translation>Bitte einen Namen für das World-File eingeben.</translation>
+ </message>
+ <message>
+- <location filename="../src/plugins/georeferencer/qgspointdialog.cpp" line="276"/>
++ <location filename="../src/plugins/georeferencer/qgspointdialog.cpp" line="278"/>
+ <source>-modified</source>
+ <comment>Georeferencer:QgsPointDialog.cpp - used to modify a user given filename</comment>
+ <translation>-modifoziert</translation>
+ </message>
+ <message>
+- <location filename="../src/plugins/georeferencer/qgspointdialog.cpp" line="316"/>
++ <location filename="../src/plugins/georeferencer/qgspointdialog.cpp" line="318"/>
+ <source>Warning</source>
+ <translation>Warnung</translation>
+ </message>
+ <message>
+- <location filename="../src/plugins/georeferencer/qgspointdialog.cpp" line="321"/>
++ <location filename="../src/plugins/georeferencer/qgspointdialog.cpp" line="323"/>
+ <source><p>A Helmert transform requires modifications in the raster layer.</p><p>The modifed raster will be saved in a new file and a world file will be generated for this new file instead.</p><p>Are you sure that this is what you want?</p></source>
+ <translation><p>Eine Helmert-Transform wird den Rasterlayer modifizieren.</p><p>Die veränderte Rasterdatei wird in einer neuen Datei mit einem dazu passeneden Worldfile gespeichert.</p><p>Sind Sie sicher, dass sie das wollen?</p></translation>
+ </message>
+ <message>
+- <location filename="../src/plugins/georeferencer/qgspointdialog.cpp" line="329"/>
++ <location filename="../src/plugins/georeferencer/qgspointdialog.cpp" line="331"/>
+ <source>Affine</source>
+ <translation>Affin</translation>
+ </message>
+ <message>
+- <location filename="../src/plugins/georeferencer/qgspointdialog.cpp" line="339"/>
++ <location filename="../src/plugins/georeferencer/qgspointdialog.cpp" line="341"/>
+ <source>Not implemented!</source>
+ <translation>Nicht implementiert!</translation>
+ </message>
+ <message>
+- <location filename="../src/plugins/georeferencer/qgspointdialog.cpp" line="334"/>
++ <location filename="../src/plugins/georeferencer/qgspointdialog.cpp" line="336"/>
+ <source><p>An affine transform requires changing the original raster file. This is not yet supported.</p></source>
+ <translation><p>Eine Affin-Transformation wird die Original-Rasterdatei verändern. Dies ist noch nicht implementiert.</p></translation>
+ </message>
+ <message>
+- <location filename="../src/plugins/georeferencer/qgspointdialog.cpp" line="341"/>
++ <location filename="../src/plugins/georeferencer/qgspointdialog.cpp" line="343"/>
+ <source><p>The </source>
+ <translation><p>Die </translation>
+ </message>
+ <message>
+- <location filename="../src/plugins/georeferencer/qgspointdialog.cpp" line="342"/>
++ <location filename="../src/plugins/georeferencer/qgspointdialog.cpp" line="344"/>
+ <source> transform is not yet supported.</p></source>
+ <translation>Transformation wird noch nicht unterstützt.</p></translation>
+ </message>
+ <message>
+- <location filename="../src/plugins/georeferencer/qgspointdialog.cpp" line="372"/>
++ <location filename="../src/plugins/georeferencer/qgspointdialog.cpp" line="374"/>
+ <source>Error</source>
+ <translation>Fehler</translation>
+ </message>
+ <message>
+- <location filename="../src/plugins/georeferencer/qgspointdialog.cpp" line="373"/>
++ <location filename="../src/plugins/georeferencer/qgspointdialog.cpp" line="375"/>
+ <source>Could not write to </source>
+ <translation>Kann nicht </translation>
+ </message>
+@@ -12905,7 +12974,8 @@
+ <location filename="../src/gui/qgssearchquerybuilder.cpp" line="130"/>
+ <source>Found %d matching features.</source>
+ <translation type="unfinished">
+- <numerusform>%d Objekte gefunden.</numerusform>
++ <numerusform></numerusform>
++ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message>
+@@ -12980,7 +13050,8 @@
+ <location filename="../src/gui/qgsserversourceselect.cpp" line="575"/>
+ <source>Coordinate Reference System (%1 available)</source>
+ <translation type="unfinished">
+- <numerusform>Koordinatensystem (%1 vorhanden).</numerusform>
++ <numerusform></numerusform>
++ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message>
diff -urNad qgis~/src/core/CMakeLists.txt qgis/src/core/CMakeLists.txt
---- qgis~/src/core/CMakeLists.txt 2007-06-22 21:31:12.000000000 +0200
-+++ qgis/src/core/CMakeLists.txt 2007-06-22 21:32:27.000000000 +0200
+--- qgis~/src/core/CMakeLists.txt 2007-06-28 13:34:02.000000000 +0200
++++ qgis/src/core/CMakeLists.txt 2007-06-29 15:27:51.000000000 +0200
@@ -41,6 +41,7 @@
../gui/qgsmaprender.cpp
../gui/qgsmaptoolcapture.cpp
@@ -33,8 +903,8 @@
../gui/qgsmaptoolpan.h
../gui/qgsmaptoolselect.h
diff -urNad qgis~/src/gui/Makefile.am qgis/src/gui/Makefile.am
---- qgis~/src/gui/Makefile.am 2007-06-22 21:31:12.000000000 +0200
-+++ qgis/src/gui/Makefile.am 2007-06-22 21:32:27.000000000 +0200
+--- qgis~/src/gui/Makefile.am 2007-06-28 13:12:00.000000000 +0200
++++ qgis/src/gui/Makefile.am 2007-06-29 15:27:51.000000000 +0200
@@ -109,6 +109,7 @@
qgsmapserverexport.h \
qgsmaptool.h \
@@ -59,27 +929,9 @@
qgsmaptoolidentify.cpp \
qgsmaptoolpan.cpp \
qgsmaptoolselect.cpp \
-diff -urNad qgis~/src/gui/pencil.png qgis/src/gui/pencil.png
---- qgis~/src/gui/pencil.png 1970-01-01 01:00:00.000000000 +0100
-+++ qgis/src/gui/pencil.png 2007-06-22 21:33:47.000000000 +0200
-@@ -0,0 +1,5 @@
-+‰PNG
-+
-+
-IHDR szzô gAMA ¯È7Šé tEXtSoftware Adobe ImageReadyqÉe< ¤IDATxÚbüÿÿ?Ã@€ bb` @î € b1)3IVœAJ‚á ƒÀ_Æ †_Œ ˜Þ2°þ¯b`ú¿¦üÿ™3` €¨Ò r¨b¿˜¢Ø¹þ.’~ÃÇjóN‘ùßb†?ŒµèZˆ…bËÕ€K‰20üü‡ðÏO¦b.¡ß=ù^)01œ}ÉÄðCå#Ë÷uÒM ßX00ÿï†i ÊBÀ@šAFˆáÏ_„ئ.Ùo=!Õwdu¾2ÈÿÿÇÀÇÌÁÀ©ù‡ÃïÐÿÛþ3ÚÀ”y`¦c) åÿ`¢l ?Jh~.
-ºË &÷ƒáÛWVn¦o ö"\ ÜÌ‚ ìÚ?X
->03üfl…i Ò£€ƒ™ÁT’““á7Èrf¨ ÐòåŠfï=¼Òž2pp“À†ßÿ2ˆ³«3‰¥1¸ˆþg˜øtà µï Ï0ZÀŒ Ò À´ ˜Ú™Y –ð?ƒ ÃOÆ5šN¯MÝã^00131üþ ôä¿Ÿ 2œ Ö"© ’ Ú ?Y÷2ü``¸u ˜`ß½†ç€ "ÞB@Ë-Å€Y ü¡¥ç=†¿ ët¼^*;‡¼F/Ðòߌ ÿýbPà¶ZžÌ ¦Äpùç*†Õ'60l™(ÂðõüÛ‰ oŸ”ÂŒ â ÃŒs`bû
-¶þ180üÿ¿J/à…¨…Û¦ @ùÏðïÿ 5^gKáD>Vq†3ßç3¬Ü»‹aÇTq†ßW^Ö0||ÑŠl4@ v€&ƒ 0R‘ꌿŒ¡L¬hû¾æÒ6ÿÊÀÌ™ nÓá÷a0Œg`gáf8úe*ò-ÇöÏûùÿÆã †Ïïæ @ø `
-+LMJ@ü
--)ÿ2ä0sýž¤æó†QAû+Ðr&PIÊÂ`È Ä`"Êj >ô2,^}™áäb‘÷ · $0|ý¼ › „Û@‹AÿÙç Í,¿jä=Þ2ˆ+üûœ˜4ٌؘ" B~1|bØûzâ%÷.¯xÄpç^$à ÇpY@Ø `ÈÎÀ ̵œ¢îÃ4fÑ ©âNï$þ2°ãœì|¬< –Bq Ú|þ _ž0ìxÚÏ°`þk†{[¸/2ܽ Éðë÷u| @˜àæk= ¾Ã}Î ôùbF©ïþ¼Ö ¸ÿ3°¥X€–‹q
-+18ˆ%1¨óº3¼ýwaó= Ïç~ex¶‹u Ãý‡1ÀBê9¡$@¨Znà Mp`ŸK-_Í ÿÍšÕð3'0VØAEÐrn)©`Š·gxö÷$ÃÚkS–ÎþËðî Ã*†OS€9ä31 €f&: åÀ¼ö,¬4d ƒê7Mo ì@iFˆå*|J þ²i@ËM üÞðüÜ,†UsY¾ ý3™áÑÛ" Þ?Ä/ „p€ 0ÁóTüßß *ß5Ô~+/ å@‹™€XWH›!T!A™W›áæÏu ‹Ž-bظ€“á׉ï5 Ï>µ’Z²ÂL ˆýt;Pèÿ__.~6ý_ŠßÀ +3Äçb¦ Ši r<ò —¾/`X°o
-Ãö¥<?ÿŸü’ÃðúÛ rê5€ BÔ†ÌðP–¥ßKj¬|\ÄôÀÉt€³´=CŒr.ƒ$· ÉÓ&o^Á°m>×ûÿG?…“k9 "ØB|ÿï—“´˜„Uª©ƒ£5ñwÅ Þòv ‰j© Ül, »^ö0,Ù~áÊ&ÞG §?F2|ùsŒ’&@ a)þ–Úx3 I + †ÅV6¾9Äðþßk† 1¬Üz’áñN` ?´üÇ¿ë”6¨ ÕLMÿ°º‰3©20ñk>f?á`¾çf(\WÏððî†ï§8ö1œù ¬ìŸQ£9 @¨`þWøÿµ4c~ÿNa 9†/œŸ– ßÈpôÒ¹ßoÀðiï5ág*€ b„õŒ3
-~³bx&ÇÊÀõ ˜&¾ü`xõó<Ã}†Ý ¯vËÙ @e_©e1Ì^€ B„ 3CÃ÷ßÀ”xç ÃM ¥öýyÔ̤eÇ €À.»F…!”‡Á(ÆJ Ì^€ b èÎ)@
-xß €Ü QåpÔŒ„s IEND®B`‚
-\ No newline at end of file
diff -urNad qgis~/src/gui/qgsmaptool.cpp qgis/src/gui/qgsmaptool.cpp
---- qgis~/src/gui/qgsmaptool.cpp 2007-06-22 21:31:12.000000000 +0200
-+++ qgis/src/gui/qgsmaptool.cpp 2007-06-22 21:32:27.000000000 +0200
+--- qgis~/src/gui/qgsmaptool.cpp 2007-06-28 13:12:00.000000000 +0200
++++ qgis/src/gui/qgsmaptool.cpp 2007-06-29 15:27:51.000000000 +0200
@@ -1,5 +1,5 @@
/***************************************************************************
- qgsmaptool.h - base class for map canvas tools
@@ -131,8 +983,8 @@
+}
+
diff -urNad qgis~/src/gui/qgsmaptool.h qgis/src/gui/qgsmaptool.h
---- qgis~/src/gui/qgsmaptool.h 2007-06-22 21:31:12.000000000 +0200
-+++ qgis/src/gui/qgsmaptool.h 2007-06-22 21:32:27.000000000 +0200
+--- qgis~/src/gui/qgsmaptool.h 2007-06-28 13:12:00.000000000 +0200
++++ qgis/src/gui/qgsmaptool.h 2007-06-29 15:27:51.000000000 +0200
@@ -26,7 +26,7 @@
class QgsPoint;
class QPoint;
@@ -182,7 +1034,7 @@
#endif
diff -urNad qgis~/src/gui/qgsmaptoolemitpoint.cpp qgis/src/gui/qgsmaptoolemitpoint.cpp
--- qgis~/src/gui/qgsmaptoolemitpoint.cpp 1970-01-01 01:00:00.000000000 +0100
-+++ qgis/src/gui/qgsmaptoolemitpoint.cpp 2007-06-22 21:32:59.000000000 +0200
++++ qgis/src/gui/qgsmaptoolemitpoint.cpp 2007-06-29 15:32:57.000000000 +0200
@@ -0,0 +1,39 @@
+/***************************************************************************
+ qgsmaptoolemitpoint.cpp - map tool that emits a signal on click
@@ -225,7 +1077,7 @@
+}
diff -urNad qgis~/src/gui/qgsmaptoolemitpoint.h qgis/src/gui/qgsmaptoolemitpoint.h
--- qgis~/src/gui/qgsmaptoolemitpoint.h 1970-01-01 01:00:00.000000000 +0100
-+++ qgis/src/gui/qgsmaptoolemitpoint.h 2007-06-22 21:33:05.000000000 +0200
++++ qgis/src/gui/qgsmaptoolemitpoint.h 2007-06-29 15:32:57.000000000 +0200
@@ -0,0 +1,49 @@
+/***************************************************************************
+ qgsmaptoolemitpoint.h - map tool that emits a signal on click
@@ -277,8 +1129,8 @@
+
+#endif
diff -urNad qgis~/src/plugins/georeferencer/georeferencer.qrc qgis/src/plugins/georeferencer/georeferencer.qrc
---- qgis~/src/plugins/georeferencer/georeferencer.qrc 2007-06-22 21:31:12.000000000 +0200
-+++ qgis/src/plugins/georeferencer/georeferencer.qrc 2007-06-22 21:32:27.000000000 +0200
+--- qgis~/src/plugins/georeferencer/georeferencer.qrc 2007-06-28 13:33:11.000000000 +0200
++++ qgis/src/plugins/georeferencer/georeferencer.qrc 2007-06-29 15:27:51.000000000 +0200
@@ -1,6 +1,7 @@
<RCC>
<qresource prefix="/" >
@@ -289,9 +1141,9 @@
</qresource>
</RCC>
diff -urNad qgis~/src/plugins/georeferencer/mapcoordsdialog.cpp qgis/src/plugins/georeferencer/mapcoordsdialog.cpp
---- qgis~/src/plugins/georeferencer/mapcoordsdialog.cpp 2007-06-22 21:31:12.000000000 +0200
-+++ qgis/src/plugins/georeferencer/mapcoordsdialog.cpp 2007-06-22 21:32:27.000000000 +0200
-@@ -1,24 +1,34 @@
+--- qgis~/src/plugins/georeferencer/mapcoordsdialog.cpp 2007-06-28 13:11:52.000000000 +0200
++++ qgis/src/plugins/georeferencer/mapcoordsdialog.cpp 2007-06-29 15:39:39.000000000 +0200
+@@ -1,26 +1,45 @@
+
#include <QValidator>
#include <mapcoordsdialog.h>
@@ -318,6 +1170,10 @@
+ mToolEmitPoint->setButton(btnPointFromCanvas);
+ connect((QgsMapToolEmitPoint*)mToolEmitPoint, SIGNAL(gotPoint(QgsPoint&,Qt::MouseButton)),
+ this, SLOT(setXY(QgsPoint&)));
++
++ connect(leXCoord, SIGNAL(textChanged(const QString&)), this, SLOT(updateOK()));
++ connect(leYCoord, SIGNAL(textChanged(const QString&)), this, SLOT(updateOK()));
++ updateOK();
}
@@ -326,8 +1182,15 @@
+ delete mToolEmitPoint;
}
++void MapCoordsDialog::updateOK()
++{
++ bool enable = (leXCoord->text().size() != 0 && leYCoord->text().size() != 0);
++ buttonOk->setEnabled(enable);
++}
-@@ -32,3 +42,20 @@
+ void MapCoordsDialog::on_buttonOk_clicked() {
+ QgsPoint mapCoords(leXCoord->text().toDouble(), leYCoord->text().toDouble());
+@@ -32,3 +51,20 @@
{
reject();
}
@@ -349,8 +1212,8 @@
+}
+
diff -urNad qgis~/src/plugins/georeferencer/mapcoordsdialog.h qgis/src/plugins/georeferencer/mapcoordsdialog.h
---- qgis~/src/plugins/georeferencer/mapcoordsdialog.h 2007-06-22 21:31:12.000000000 +0200
-+++ qgis/src/plugins/georeferencer/mapcoordsdialog.h 2007-06-22 21:32:27.000000000 +0200
+--- qgis~/src/plugins/georeferencer/mapcoordsdialog.h 2007-06-28 13:11:52.000000000 +0200
++++ qgis/src/plugins/georeferencer/mapcoordsdialog.h 2007-06-29 15:39:39.000000000 +0200
@@ -14,6 +14,9 @@
#include <qgspoint.h>
@@ -370,13 +1233,14 @@
QWidget* parent = 0, Qt::WFlags fl = 0);
~MapCoordsDialog();
-@@ -30,9 +33,18 @@
+@@ -30,9 +33,19 @@
void on_buttonOk_clicked();
void on_buttonCancel_clicked();
+ void on_btnPointFromCanvas_clicked();
+
+ void setXY(QgsPoint &);
++ void updateOK();
+
private:
@@ -390,8 +1254,8 @@
signals:
diff -urNad qgis~/src/plugins/georeferencer/mapcoordsdialogbase.ui qgis/src/plugins/georeferencer/mapcoordsdialogbase.ui
---- qgis~/src/plugins/georeferencer/mapcoordsdialogbase.ui 2007-06-22 21:31:12.000000000 +0200
-+++ qgis/src/plugins/georeferencer/mapcoordsdialogbase.ui 2007-06-22 21:32:27.000000000 +0200
+--- qgis~/src/plugins/georeferencer/mapcoordsdialogbase.ui 2007-06-28 13:11:52.000000000 +0200
++++ qgis/src/plugins/georeferencer/mapcoordsdialogbase.ui 2007-06-29 15:27:51.000000000 +0200
@@ -1,15 +1,12 @@
<ui version="4.0" >
- <author></author>
@@ -651,9 +1515,27 @@
+ </resources>
<connections/>
</ui>
+diff -urNad qgis~/src/plugins/georeferencer/pencil.png qgis/src/plugins/georeferencer/pencil.png
+--- qgis~/src/plugins/georeferencer/pencil.png 1970-01-01 01:00:00.000000000 +0100
++++ qgis/src/plugins/georeferencer/pencil.png 2007-06-29 15:35:20.000000000 +0200
+@@ -0,0 +1,5 @@
++‰PNG
++
++
+IHDR szzô gAMA ¯È7Šé tEXtSoftware Adobe ImageReadyqÉe< ¤IDATxÚbüÿÿ?Ã@€ bb` @î € b1)3IVœAJ‚á ƒÀ_Æ †_Œ ˜Þ2°þ¯b`ú¿¦üÿ™3` €¨Ò r¨b¿˜¢Ø¹þ.’~ÃÇjóN‘ùßb†?ŒµèZˆ…bËÕ€K‰20üü‡ðÏO¦b.¡ß=ù^)01œ}ÉÄðCå#Ë÷uÒM ßX00ÿï†i ÊBÀ@šAFˆáÏ_„ئ.Ùo=!Õwdu¾2ÈÿÿÇÀÇÌÁÀ©ù‡ÃïÐÿÛþ3ÚÀ”y`¦c) åÿ`¢l ?Jh~.
+ºË &÷ƒáÛWVn¦o ö"\ ÜÌ‚ ìÚ?X
+>03üfl…i Ò£€ƒ™ÁT’““á7Èrf¨ ÐòåŠfï=¼Òž2pp“À†ßÿ2ˆ³«3‰¥1¸ˆþg˜øtà µï Ï0ZÀŒ Ò À´ ˜Ú™Y –ð?ƒ ÃOÆ5šN¯MÝã^00131üþ ôä¿Ÿ 2œ Ö"© ’ Ú ?Y÷2ü``¸u ˜`ß½†ç€ "ÞB@Ë-Å€Y ü¡¥ç=†¿ ët¼^*;‡¼F/Ðòߌ ÿýbPà¶ZžÌ ¦Äpùç*†Õ'60l™(ÂðõüÛ‰ oŸ”ÂŒ â ÃŒs`bû
+¶þ180üÿ¿J/à…¨…Û¦ @ùÏðïÿ 5^gKáD>Vq†3ßç3¬Ü»‹aÇTq†ßW^Ö0||ÑŠl4@ v€&ƒ 0R‘ꌿŒ¡L¬hû¾æÒ6ÿÊÀÌ™ nÓá÷a0Œg`gáf8úe*ò-ÇöÏûùÿÆã †Ïïæ @ø `
++LMJ@ü
+-)ÿ2ä0sýž¤æó†QAû+Ðr&PIÊÂ`È Ä`"Êj >ô2,^}™áäb‘÷ · $0|ý¼ › „Û@‹AÿÙç Í,¿jä=Þ2ˆ+üûœ˜4ٌؘ" B~1|bØûzâ%÷.¯xÄpç^$à ÇpY@Ø `ÈÎÀ ̵œ¢îÃ4fÑ ©âNï$þ2°ãœì|¬< –Bq Ú|þ _ž0ìxÚÏ°`þk†{[¸/2ܽ Éðë÷u| @˜àæk= ¾Ã}Î ôùbF©ïþ¼Ö ¸ÿ3°¥X€–‹q
++18ˆ%1¨óº3¼ýwaó= Ïç~ex¶‹u Ãý‡1ÀBê9¡$@¨Znà Mp`ŸK-_Í ÿÍšÕð3'0VØAEÐrn)©`Š·gxö÷$ÃÚkS–ÎþËðî Ã*†OS€9ä31 €f&: åÀ¼ö,¬4d ƒê7Mo ì@iFˆå*|J þ²i@ËM üÞðüÜ,†UsY¾ ý3™áÑÛ" Þ?Ä/ „p€ 0ÁóTüßß *ß5Ô~+/ å@‹™€XWH›!T!A™W›áæÏu ‹Ž-bظ€“á׉ï5 Ï>µ’Z²ÂL ˆýt;Pèÿ__.~6ý_ŠßÀ +3Äçb¦ Ši r<ò —¾/`X°o
+Ãö¥<?ÿŸü’ÃðúÛ rê5€ BÔ†ÌðP–¥ßKj¬|\ÄôÀÉt€³´=CŒr.ƒ$· ÉÓ&o^Á°m>×ûÿG?…“k9 "ØB|ÿï—“´˜„Uª©ƒ£5ñwÅ Þòv ‰j© Ül, »^ö0,Ù~áÊ&ÞG §?F2|ùsŒ’&@ a)þ–Úx3 I + †ÅV6¾9Äðþßk† 1¬Üz’áñN` ?´üÇ¿ë”6¨ ÕLMÿ°º‰3©20ñk>f?á`¾çf(\WÏððî†ï§8ö1œù ¬ìŸQ£9 @¨`þWøÿµ4c~ÿNa 9†/œŸ– ßÈpôÒ¹ßoÀðiï5ág*€ b„õŒ3
+~³bx&ÇÊÀõ ˜&¾ü`xõó<Ã}†Ý ¯vËÙ @e_©e1Ì^€ B„ 3CÃ÷ßÀ”xç ÃM ¥öýyÔ̤eÇ €À.»F…!”‡Á(ÆJ Ì^€ b èÎ)@
+xß €Ü QåpÔŒ„s IEND®B`‚
+\ No newline at end of file
diff -urNad qgis~/src/plugins/georeferencer/qgspointdialog.cpp qgis/src/plugins/georeferencer/qgspointdialog.cpp
---- qgis~/src/plugins/georeferencer/qgspointdialog.cpp 2007-06-22 21:31:12.000000000 +0200
-+++ qgis/src/plugins/georeferencer/qgspointdialog.cpp 2007-06-22 21:32:27.000000000 +0200
+--- qgis~/src/plugins/georeferencer/qgspointdialog.cpp 2007-06-28 13:33:11.000000000 +0200
++++ qgis/src/plugins/georeferencer/qgspointdialog.cpp 2007-06-29 15:27:51.000000000 +0200
@@ -127,6 +127,7 @@
mToolDeletePoint = new QgsGeorefTool(mCanvas, this, FALSE /* addPoint */);
mToolDeletePoint->setAction(mActionDeletePoint);
@@ -680,8 +1562,8 @@
this, SLOT(addPoint(const QgsPoint&, const QgsPoint&)));
mcd->show();
diff -urNad qgis~/src/plugins/georeferencer/qgspointdialog.h qgis/src/plugins/georeferencer/qgspointdialog.h
---- qgis~/src/plugins/georeferencer/qgspointdialog.h 2007-06-22 21:31:12.000000000 +0200
-+++ qgis/src/plugins/georeferencer/qgspointdialog.h 2007-06-22 21:32:27.000000000 +0200
+--- qgis~/src/plugins/georeferencer/qgspointdialog.h 2007-06-28 13:11:52.000000000 +0200
++++ qgis/src/plugins/georeferencer/qgspointdialog.h 2007-06-29 15:27:51.000000000 +0200
@@ -80,6 +80,7 @@
QgsMapTool* mToolAddPoint;
QgsMapTool* mToolDeletePoint;
Added: packages/qgis/trunk/debian/patches/grid_maker.dpatch
===================================================================
--- packages/qgis/trunk/debian/patches/grid_maker.dpatch (rev 0)
+++ packages/qgis/trunk/debian/patches/grid_maker.dpatch 2007-06-29 14:06:35 UTC (rev 952)
@@ -0,0 +1,30 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## grid_maker.dpatch by Francesco Paolo Lovergine <frankie at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad qgis~/src/plugins/grid_maker/main.cpp qgis/src/plugins/grid_maker/main.cpp
+--- qgis~/src/plugins/grid_maker/main.cpp 2007-06-28 13:11:26.000000000 +0200
++++ qgis/src/plugins/grid_maker/main.cpp 2007-06-29 16:01:48.000000000 +0200
+@@ -9,6 +9,7 @@
+ #include <QApplication>
+ #include <QTranslator>
+ #include <QString>
++#include <QTextCodec>
+
+ int main(int argc, char *argv[])
+ {
+diff -urNad qgis~/src/plugins/grid_maker/plugingui.h qgis/src/plugins/grid_maker/plugingui.h
+--- qgis~/src/plugins/grid_maker/plugingui.h 2007-06-28 13:11:26.000000000 +0200
++++ qgis/src/plugins/grid_maker/plugingui.h 2007-06-29 16:03:09.000000000 +0200
+@@ -23,7 +23,7 @@
+ Q_OBJECT
+ public:
+ QgsGridMakerPluginGui();
+- QgsGridMakerPluginGui(QWidget* parent, Qt::WFlags);
++ QgsGridMakerPluginGui(QWidget* parent = 0, Qt::WFlags = 0);
+ ~QgsGridMakerPluginGui();
+
+ public slots:
Property changes on: packages/qgis/trunk/debian/patches/grid_maker.dpatch
___________________________________________________________________
Name: svn:executable
+ *
More information about the Pkg-grass-devel
mailing list