Merge branch 'master' of https://github.com/qgis/Quantum-GIS

cmake_templates/qgsconfig.h.in

@@ -29,6 +29,8 @@
 #define CMAKE_SOURCE_DIR "${CMAKE_SOURCE_DIR}"
 
 #define QSCINTILLA_VERSION_STR "${QSCINTILLA_VERSION_STR}"
+//used by Mac to find system Qt plugins when bundle is run from build directory
+#define QTPLUGINSDIR "${QT_PLUGINS_DIR}"
 
 #cmakedefine HAVE_POSTGRESQL
 

doc/msvc.t2t

@@ -2,7 +2,7 @@
 ==Building with Microsoft Visual Studio==
 
 This section describes how to build QGIS using Visual Studio on Windows.  This
-is currently also who the binary QGIS packages are made (earlier versions used
+is currently also how the binary QGIS packages are made (earlier versions used
 MinGW).
 
 This section describes the setup required to allow Visual Studio to be used to
@@ -56,6 +56,7 @@ For the QGIS build you need to install following packages from OSGeo4W (select
 - libspatialindex-devel
 - python-qscintilla
 
+
 This will also select packages the above packages depend on.
 
 Additionally QGIS also needs the include file ``unistd.h``, which normally
@@ -105,8 +106,8 @@ git clone git://github.com/qgis/Quantum-GIS.git
 Create a 'build' directory somewhere. This will be where all the build output
 will be generated.
 
-Now run ``cmake-gui`` and in the //Where is the source code:// box, browse to
-the top level QGIS directory.
+Now run ``cmake-gui`` (still from ``cmd``) and in the //Where is the source code://
+box, browse to the top level QGIS directory.
 
 In the //Where to build the binaries:// box, browse to the 'build' directory you
 created.

i18n/qgis_de.ts

@@ -1007,7 +1007,7 @@ Folgende Feldnamen sind länger als 10 Zeichen:
     <message>
         <location filename="../python/plugins/fTools/tools/frmVectorGrid.ui" line="26"/>
         <source>Grid extent</source>
-        <translation>Rastergrenze</translation>
+        <translation>Gittergrenze von Layer</translation>
     </message>
     <message>
         <location filename="../python/plugins/fTools/tools/frmVectorGrid.ui" line="41"/>
@@ -1017,12 +1017,12 @@ Folgende Feldnamen sind länger als 10 Zeichen:
     <message>
         <location filename="../python/plugins/fTools/tools/frmVectorGrid.ui" line="54"/>
         <source>Update extents from canvas</source>
-        <translation>Layergrenzen aus aktueller Ansicht aktualisieren</translation>
+        <translation>Layergrenzen aus aktueller Ansicht</translation>
     </message>
     <message>
         <location filename="../python/plugins/fTools/tools/frmVectorGrid.ui" line="169"/>
         <source>Align extents and resolution to selected raster layer</source>
-        <translation>Ausmaße und Auflösung am gewählten Rasterlayer ausrichten</translation>
+        <translation>Ausmaße und Auflösung am gewählten Layer ausrichten</translation>
     </message>
     <message>
         <location filename="../python/plugins/fTools/tools/frmVectorGrid.ui" line="179"/>
@@ -1047,12 +1047,12 @@ Folgende Feldnamen sind länger als 10 Zeichen:
     <message>
         <location filename="../python/plugins/fTools/tools/frmVectorGrid.ui" line="286"/>
         <source>Output grid as polygons</source>
-        <translation>Raster als Polygone ausgeben</translation>
+        <translation>Gitter als Polygone ausgeben</translation>
     </message>
     <message>
         <location filename="../python/plugins/fTools/tools/frmVectorGrid.ui" line="296"/>
         <source>Output grid as lines</source>
-        <translation>Raster als Linien ausgeben</translation>
+        <translation>Gitter als Linien ausgeben</translation>
     </message>
     <message>
         <source>Line intersections</source>
@@ -44820,7 +44820,7 @@ Base Path (i.e. keep only filename from attribute)</source>
     </message>
     <message>
         <source>Vector grid</source>
-        <translation>Vektorraster</translation>
+        <translation>Vektorgitter</translation>
     </message>
     <message>
         <source>Select by location</source>

i18n/qgis_fr.ts

@@ -16111,22 +16111,22 @@ Les classes existantes doivent-elles être effacées avant la classification ?</
     <message>
         <location filename="../src/ui/qgscomposerlegendwidgetbase.ui" line="74"/>
         <source>Title Font...</source>
-        <translation>Police du tite...</translation>
+        <translation>Police du titre...</translation>
     </message>
     <message>
         <location filename="../src/ui/qgscomposerlegendwidgetbase.ui" line="81"/>
         <source>Group Font...</source>
-        <translation>Groupe de police...</translation>
+        <translation>Police des groupes...</translation>
     </message>
     <message>
         <location filename="../src/ui/qgscomposerlegendwidgetbase.ui" line="88"/>
         <source>Layer Font...</source>
-        <translation>Police de la couche...</translation>
+        <translation>Police des couches...</translation>
     </message>
     <message>
         <location filename="../src/ui/qgscomposerlegendwidgetbase.ui" line="95"/>
         <source>Item Font...</source>
-        <translation>Police de l&apos;objet...</translation>
+        <translation>Police des objets...</translation>
     </message>
     <message>
         <location filename="../src/ui/qgscomposerlegendwidgetbase.ui" line="102"/>
@@ -16182,7 +16182,7 @@ Les classes existantes doivent-elles être effacées avant la classification ?</
     <message>
         <location filename="../src/ui/qgscomposerlegendwidgetbase.ui" line="205"/>
         <source>Wrap text on</source>
-        <translation>Retour à la ligne activé</translation>
+        <translation>Activer le retour à la ligne après</translation>
     </message>
     <message>
         <location filename="../src/ui/qgscomposerlegendwidgetbase.ui" line="240"/>

i18n/qgis_it.ts

@@ -830,6 +830,11 @@ sono stati ridotti a %2 dopo la semplificazione</translation>
         <source>Press Ctrl+C to copy results to the clipboard</source>
         <translation>Premi Ctrl+C per copiare i risultati negli appunti</translation>
     </message>
+    <message>
+        <location filename="../python/plugins/fTools/tools/frmVisual.ui" line="120"/>
+        <source>Save errors location</source>
+        <translation>Salva posizione errori</translation>
+    </message>
     <message>
         <source>Sum line lengths</source>
         <translation>Somma lunghezza linee</translation>