Rebase failed - merging branch 'master' of github.com:qgis/Quantum-GIS

Author: timlinux

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>

python/console/console.py

@@ -360,7 +360,6 @@ def openHelp(self):
         self.helpDlg.activateWindow()
 
     def openSettings(self):
-        #options = optionsDialog()
         self.options.exec_()
 
     def prefChanged(self):

python/console/console_sci.py

@@ -72,8 +72,6 @@ def __init__(self, parent=None):
         self.setCaretWidth(2)
 
         # Set Python lexer
-        # Set style for Python comments (style number 1) to a fixed-width
-        # courier.
         self.setLexers()
 
         # Indentation
@@ -130,19 +128,16 @@ def commandConsole(self, command):
         self.setSelection(line, 4, line, selCmdLenght)
         self.removeSelectedText()
         if command == "iface":
-            """Import QgisInterface class"""
+            # import QgisInterface class
             self.append('from qgis.utils import iface')
         elif command == "sextante":
-            """Import Sextante class"""
-            self.append('from sextante.core.Sextante import Sextante')
-        elif command == "cLayer":
-            """Retrieve current Layer from map camvas"""
-            self.append('cLayer = iface.mapCanvas().currentLayer()')
+            # import Sextante class
+            self.append('import sextante')
         elif command == "qtCore":
-            """Import QtCore class"""
+            # import QtCore class
             self.append('from PyQt4.QtCore import *')
         elif command == "qtGui":
-            """Import QtGui class"""
+            # import QtGui class
             self.append('from PyQt4.QtGui import *')
         self.entered()
         self.move_cursor_to_end()

python/core/qgspallabeling.sip

@@ -135,6 +135,8 @@ class QgsPalLayerSettings
     bool reverseDirectionSymbol;
     DirectionSymbols placeDirectionSymbol; // whether to place left/right, above or below label
     unsigned int upsidedownLabels; // whether, or how, to show upsidedown labels
+    double maxCurvedCharAngleIn; // maximum angle between inside curved label characters (defaults to 20.0, range 20.0 to 60.0)
+    double maxCurvedCharAngleOut; // maximum angle between outside curved label characters (defaults to -20.0, range -20.0 to -95.0)
     bool fontSizeInMapUnits; //true if font size is in map units (otherwise in points)
     bool fontLimitPixelSize; // true is label should be limited by fontMinPixelSize/fontMaxPixelSize
     int fontMinPixelSize; // minimum pixel size for showing rendered map unit labels (1 - 1000)

python/core/symbology-ng/qgssvgcache.sip

@@ -34,7 +34,7 @@ class QgsSvgCacheEntry
 /**A cache for images / pictures derived from svg files. This class supports parameter replacement in svg files
 according to the svg params specification (http://www.w3.org/TR/2009/WD-SVGParamPrimer-20090616/). Supported are
 the parameters 'fill-color', 'pen-color', 'outline-width', 'stroke-width'. E.g. <circle fill="param(fill-color red)" stroke="param(pen-color black)" stroke-width="param(outline-width 1)"*/
-class QgsSvgCache
+class QgsSvgCache : QObject
 {
 %TypeHeaderCode
 #include <qgssvgcache.h>
@@ -56,7 +56,8 @@ class QgsSvgCache
                          double& defaultOutlineWidth ) const;
 
   protected:
-    QgsSvgCache();
+    //! protected constructor
+    QgsSvgCache( QObject* parent = 0 );
 
     /**Creates new cache entry and returns pointer to it*/
     QgsSvgCacheEntry* insertSVG( const QString& file, int size, const QColor& fill, const QColor& outline, double outlineWidth,

python/gui/qgisinterface.sip

@@ -359,12 +359,16 @@ class QgisInterface : QObject
     virtual QAction *actionAddPgLayer() = 0;
     virtual QAction *actionAddWmsLayer() = 0;
     virtual QAction *actionLayerSeparator1() = 0 /Deprecated/;
+    /** @note added in 1.9 */
+    virtual QAction *actionCopyLayerStyle() = 0;
+    /** @note added in 1.9 */
+    virtual QAction *actionPasteLayerStyle() = 0;
     virtual QAction *actionOpenTable() = 0;
     virtual QAction *actionToggleEditing() = 0;
     virtual QAction *actionLayerSaveAs() = 0;
     virtual QAction *actionLayerSelectionSaveAs() = 0;
     virtual QAction *actionRemoveLayer() = 0;
-    /** @note added in 2.0 */
+    /** @note added in 1.9 */
     virtual QAction *actionDuplicateLayer() = 0;
     virtual QAction *actionLayerProperties() = 0;
     virtual QAction *actionLayerSeparator2() = 0 /Deprecated/;