Merge remote-tracking branch 'upstream/master'

qgis · Jun 3, 2014 · 9053d46 · 9053d46
2 parents 309f5d5 + 6209b97
commit 9053d46
Show file tree

Hide file tree

Showing 117 changed files with 832 additions and 470 deletions.
diff --git a/i18n/qgis_pl.ts b/i18n/qgis_pl.ts
@@ -64625,30 +64625,30 @@ Odpowiedź:
     <message>
         <location filename="../src/gui/editorwidgets/qgswebviewwidget.cpp" line="52"/>
         <source>...</source>
-        <translation type="unfinished">...</translation>
+        <translation>...</translation>
     </message>
     <message>
         <location filename="../src/gui/editorwidgets/qgswebviewwidget.cpp" line="132"/>
         <source>Select a file</source>
-        <translation type="unfinished">Wybierz plik</translation>
+        <translation>Wybierz plik</translation>
     </message>
 </context>
 <context>
     <name>QgsWebViewWidgetConfigDlgBase</name>
     <message>
         <location filename="../src/ui/editorwidgets/qgswebviewconfigdlgbase.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished">Formularz</translation>
+        <translation>Formularz</translation>
     </message>
     <message>
         <location filename="../src/ui/editorwidgets/qgswebviewconfigdlgbase.ui" line="27"/>
         <source>Width</source>
-        <translation type="unfinished"></translation>
+        <translation>Szerokość</translation>
     </message>
     <message>
         <location filename="../src/ui/editorwidgets/qgswebviewconfigdlgbase.ui" line="41"/>
         <source>Height</source>
-        <translation type="unfinished"></translation>
+        <translation>Wysokość</translation>
     </message>
 </context>
 <context>
@@ -65220,7 +65220,11 @@ Odpowiedź:
 Response was:
 
 %4</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie można pobrać WCS Service Exception: %1, wiersz %2, kolumna %3
+
+Odpowiedź:
+
+%4</translation>
     </message>
     <message>
         <location filename="../src/providers/wms/qgswmsprovider.cpp" line="1674"/>
@@ -65240,12 +65244,12 @@ Response was:
     <message>
         <location filename="../src/providers/wms/qgswmsprovider.cpp" line="1794"/>
         <source>Identifier</source>
-        <translation type="unfinished">Identyfikator</translation>
+        <translation>Identyfikator</translation>
     </message>
     <message>
         <location filename="../src/providers/wms/qgswmsprovider.cpp" line="1796"/>
         <source>Tile mode</source>
-        <translation type="unfinished">Tryb kafli</translation>
+        <translation>Tryb kafli</translation>
     </message>
     <message>
         <location filename="../src/providers/wms/qgswmsprovider.cpp" line="1805"/>
@@ -65260,7 +65264,7 @@ Response was:
     <message>
         <location filename="../src/providers/wms/qgswmsprovider.cpp" line="1813"/>
         <source>Invalid tile mode</source>
-        <translation type="unfinished">Nieprawidłowy tryb kafli</translation>
+        <translation>Nieprawidłowy tryb kafli</translation>
     </message>
     <message>
         <location filename="../src/providers/wms/qgswmsprovider.cpp" line="1836"/>
@@ -65275,7 +65279,7 @@ Response was:
     <message>
         <location filename="../src/providers/wms/qgswmsprovider.cpp" line="1906"/>
         <source>Selected tile matrix set </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Wybierz zakres kafli</translation>
     </message>
     <message>
         <location filename="../src/providers/wms/qgswmsprovider.cpp" line="1907"/>
@@ -65295,83 +65299,87 @@ Response was:
     <message>
         <location filename="../src/providers/wms/qgswmsprovider.cpp" line="1910"/>
         <source>Matrix size</source>
-        <translation type="unfinished">Rozmiar macierzy</translation>
+        <translation>Rozmiar macierzy</translation>
     </message>
     <message>
         <location filename="../src/providers/wms/qgswmsprovider.cpp" line="1911"/>
         <source>Matrix extent [mu]</source>
-        <translation type="unfinished">Zasięg macierzy [mu]</translation>
+        <translation>Zasięg macierzy [mu]</translation>
     </message>
     <message>
         <location filename="../src/providers/wms/qgswmsprovider.cpp" line="1912"/>
         <source>Bounds</source>
-        <translation type="unfinished"></translation>
+        <translation>Granice</translation>
     </message>
     <message>
         <location filename="../src/providers/wms/qgswmsprovider.cpp" line="1913"/>
         <source>Width</source>
-        <translation type="unfinished"></translation>
+        <translation>Szerokość</translation>
     </message>
     <message>
         <location filename="../src/providers/wms/qgswmsprovider.cpp" line="1913"/>
         <source>Height</source>
-        <translation type="unfinished"></translation>
+        <translation>Wysokość</translation>
     </message>
     <message>
         <location filename="../src/providers/wms/qgswmsprovider.cpp" line="1914"/>
         <source>Top</source>
-        <translation type="unfinished"></translation>
+        <translation>Góra</translation>
     </message>
     <message>
         <location filename="../src/providers/wms/qgswmsprovider.cpp" line="1914"/>
         <source>Left</source>
-        <translation type="unfinished"></translation>
+        <translation>Lewa</translation>
     </message>
     <message>
         <location filename="../src/providers/wms/qgswmsprovider.cpp" line="1915"/>
         <source>Bottom</source>
-        <translation type="unfinished"></translation>
+        <translation>Dół</translation>
     </message>
     <message>
         <location filename="../src/providers/wms/qgswmsprovider.cpp" line="1915"/>
         <source>Right</source>
-        <translation type="unfinished"></translation>
+        <translation>Prawa</translation>
     </message>
     <message numerus="yes">
         <location filename="../src/providers/wms/qgswmsprovider.cpp" line="1945"/>
         <location filename="../src/providers/wms/qgswmsprovider.cpp" line="1971"/>
         <source>%n missing row(s)</source>
-        <translation type="unfinished">
+        <translation>
+            <numerusform>%n brakujących wierszy</numerusform>
+            <numerusform></numerusform>
             <numerusform></numerusform>
         </translation>
     </message>
     <message>
         <location filename="../src/providers/wms/qgswmsprovider.cpp" line="1946"/>
         <source>Layer&apos;s upper bound: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Górna granica warstwy: %1</translation>
     </message>
     <message numerus="yes">
         <location filename="../src/providers/wms/qgswmsprovider.cpp" line="1958"/>
         <location filename="../src/providers/wms/qgswmsprovider.cpp" line="1984"/>
         <source>%n missing column(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>brakująca kolumna</numerusform>
+            <numerusform>brakujące %n kolumny</numerusform>
+            <numerusform>brakujących %n kolumn</numerusform>
         </translation>
     </message>
     <message>
         <location filename="../src/providers/wms/qgswmsprovider.cpp" line="1959"/>
         <source>Layer&apos;s left bound: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Lewa granica warstwy: %1</translation>
     </message>
     <message>
         <location filename="../src/providers/wms/qgswmsprovider.cpp" line="1972"/>
         <source>Layer&apos;s lower bound: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Dolna granica warstwy: %1</translation>
     </message>
     <message>
         <location filename="../src/providers/wms/qgswmsprovider.cpp" line="1985"/>
         <source>Layer&apos;s right bound: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Prawa granica warstwy: %1</translation>
     </message>
     <message>
         <location filename="../src/providers/wms/qgswmsprovider.cpp" line="2050"/>
@@ -65871,7 +65879,7 @@ Przyczyna: %2</translation>
     <message>
         <location filename="../python/plugins/MetaSearch/ui/recorddialog.ui" line="14"/>
         <source>Record Metadata</source>
-        <translation type="unfinished"></translation>
+        <translation>Zapisz metadane</translation>
     </message>
 </context>
 <context>

diff --git a/python/analysis/raster/qgsrastercalcnode.sip b/python/analysis/raster/qgsrastercalcnode.sip
@@ -7,7 +7,7 @@ class QgsRasterCalcNode
     //! defines possible types of node
     enum Type
     {
-      tOperator = 1,
+      tOperator,
       tNumber,
       tRasterRef
     };

diff --git a/python/analysis/vector/qgsgeometryanalyzer.sip b/python/analysis/vector/qgsgeometryanalyzer.sip
@@ -90,7 +90,7 @@ class QgsGeometryAnalyzer
       @param memoryProvider memory provider to write output to (can be 0 if output is written to a file)
       @param p progress dialog or 0 if no progress dialog should be shown
     */
-    bool eventLayer( QgsVectorLayer* lineLayer, QgsVectorLayer* eventLayer, int lineField, int eventField, QList<int>& unlocatedFeatureIds /Out/, const QString& outputLayer,
+    bool eventLayer( QgsVectorLayer* lineLayer, QgsVectorLayer* eventLayer, int lineField, int eventField, QSet<qint64> &unlocatedFeatureIds /Out/, const QString& outputLayer,
                      const QString& outputFormat, int locationField1, int locationField2 = -1, int offsetField = -1, double offsetScale = 1.0,
                      bool forceSingleGeometry = false, QgsVectorDataProvider* memoryProvider = 0, QProgressDialog* p = 0 );
 

diff --git a/python/core/composer/qgsaddremoveitemcommand.sip b/python/core/composer/qgsaddremoveitemcommand.sip
@@ -9,7 +9,7 @@ class QgsAddRemoveItemCommand: QObject, QUndoCommand
 
     enum State
     {
-      Added = 0,
+      Added,
       Removed
     };
 

diff --git a/python/core/composer/qgsaddremovemultiframecommand.sip b/python/core/composer/qgsaddremovemultiframecommand.sip
@@ -8,7 +8,7 @@ class QgsAddRemoveMultiFrameCommand : QUndoCommand
 
     enum State
     {
-      Added = 0,
+      Added,
       Removed
     };
 

diff --git a/python/core/composer/qgsatlascomposition.sip b/python/core/composer/qgsatlascomposition.sip
@@ -88,7 +88,7 @@ public:
      * @note This method has no effect when exporting to PDF if singleFile() is true
      */
     bool setFilenamePattern( const QString& pattern );
-    
+
     /**Returns an error string from parsing the filename expression.
      * @returns filename pattern parser error
      * @see setFilenamePattern
@@ -135,7 +135,7 @@ public:
 
     QString featureFilter() const;
     void setFeatureFilter( const QString& expression );
-    
+
     /**Returns an error string from parsing the feature filter expression.
      * @returns filename pattern parser error
      * @see setFilenamePattern

diff --git a/python/core/composer/qgscomposeritemcommand.sip b/python/core/composer/qgscomposeritemcommand.sip
@@ -42,7 +42,7 @@ class QgsComposerMergeCommand : QgsComposerItemCommand
   public:
     enum Context
     {
-      Unknown = 0,
+      Unknown,
       //composer label
       ComposerLabelSetText,
       ComposerLabelSetId,

diff --git a/python/core/composer/qgscomposerlegendstyle.sip b/python/core/composer/qgscomposerlegendstyle.sip
@@ -16,10 +16,10 @@ class QgsComposerLegendStyle
     };
     enum Side // margin side
     {
-      Top = 0,
-      Bottom = 1,
-      Left = 2,
-      Right = 3
+      Top,
+      Bottom,
+      Left,
+      Right,
     };
     QgsComposerLegendStyle();
     ~QgsComposerLegendStyle();

diff --git a/python/core/composer/qgscomposermap.sip b/python/core/composer/qgscomposermap.sip
@@ -22,43 +22,43 @@ class QgsComposerMap : QgsComposerItem
     /** \brief Preview style  */
     enum PreviewMode
     {
-      Cache = 0,   // Use raster cache
+      Cache,       // Use raster cache
       Render,      // Render the map
       Rectangle    // Display only rectangle
     };
 
     enum GridStyle
     {
-      Solid = 0, //solid lines
+      Solid, //solid lines
       Cross //only draw line crossings
     };
 
     enum GridAnnotationPosition
     {
-      InsideMapFrame = 0,
+      InsideMapFrame,
       OutsideMapFrame,
       Disabled
     };
 
     enum GridAnnotationDirection
     {
-      Horizontal = 0,
+      Horizontal,
       Vertical,
       HorizontalAndVertical,
       BoundaryDirection
     };
 
     enum GridAnnotationFormat
     {
-      Decimal = 0,
+      Decimal,
       DegreeMinute,
       DegreeMinuteSecond
     };
 
     enum GridFrameStyle
     {
-      NoGridFrame = 0,
-      Zebra //black / white pattern
+      NoGridFrame,
+      Zebra // black/white pattern
     };
 
     /**Enum for different frame borders*/

diff --git a/python/core/composer/qgscomposermultiframe.sip b/python/core/composer/qgscomposermultiframe.sip
@@ -10,7 +10,7 @@ class QgsComposerMultiFrame: QObject
 
     enum ResizeMode
     {
-      UseExistingFrames = 0,
+      UseExistingFrames,
       ExtendToNextPage, //uses the next page(s) until the content has been printed
       RepeatOnEveryPage, //repeats the same frame on every page
       RepeatUntilFinished //duplicates last frame to next page to fit the total size

diff --git a/python/core/composer/qgscomposerscalebar.sip b/python/core/composer/qgscomposerscalebar.sip
@@ -13,15 +13,15 @@ class QgsComposerScaleBar: QgsComposerItem
     /**Added in version 1.8*/
     enum Alignment
     {
-      Left = 0,
+      Left,
       Middle,
       Right
     };
 
     /**Added in version 1.9*/
     enum ScaleBarUnits
     {
-      MapUnits = 0,
+      MapUnits,
       Meters,
       Feet,
       NauticalMiles

diff --git a/python/core/composer/qgscomposition.sip b/python/core/composer/qgscomposition.sip
@@ -15,7 +15,7 @@ class QgsComposition : QGraphicsScene
     /** \brief Plot type */
     enum PlotStyle
     {
-      Preview = 0, // Use cache etc
+      Preview,     // Use cache etc
       Print,       // Render well
       Postscript   // Fonts need different scaling!
     };

diff --git a/python/core/composer/qgslegendmodel.sip b/python/core/composer/qgslegendmodel.sip
@@ -11,7 +11,7 @@ class QgsLegendModel : QStandardItemModel
 
     enum ItemType
     {
-      GroupItem = 0,
+      GroupItem,
       LayerItem,
       ClassificationItem
     };

diff --git a/python/core/diagram/qgstextdiagram.sip b/python/core/diagram/qgstextdiagram.sip
@@ -7,14 +7,14 @@ class QgsTextDiagram: QgsDiagram
   public:
     enum Shape
     {
-      Circle = 0,
+      Circle,
       Rectangle,
       Triangle
     };
 
     enum Orientation
     {
-      Horizontal = 0,
+      Horizontal,
       Vertical
     };
 

diff --git a/python/core/dxf/qgsdxfexport.sip b/python/core/dxf/qgsdxfexport.sip
@@ -23,7 +23,7 @@ class QgsDxfExport
   public:
     enum SymbologyExport
     {
-      NoSymbology = 0, //export only data
+      NoSymbology, //export only data
       FeatureSymbology, //Keeps the number of features and export symbology per feature (using the first symbol level)
       SymbolLayerSymbology //Exports one feature per symbol layer (considering symbol levels)
     };