Skip to content

Commit 9053d46

Browse files
author
Marcel Dancak
committed
Merge remote-tracking branch 'upstream/master'
2 parents 309f5d5 + 6209b97 commit 9053d46

File tree

117 files changed

+832
-470
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

117 files changed

+832
-470
lines changed

‎i18n/qgis_pl.ts‎

Lines changed: 35 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -64625,30 +64625,30 @@ Odpowiedź:
6462564625
<message>
6462664626
<location filename="../src/gui/editorwidgets/qgswebviewwidget.cpp" line="52"/>
6462764627
<source>...</source>
64628-
<translation type="unfinished">...</translation>
64628+
<translation>...</translation>
6462964629
</message>
6463064630
<message>
6463164631
<location filename="../src/gui/editorwidgets/qgswebviewwidget.cpp" line="132"/>
6463264632
<source>Select a file</source>
64633-
<translation type="unfinished">Wybierz plik</translation>
64633+
<translation>Wybierz plik</translation>
6463464634
</message>
6463564635
</context>
6463664636
<context>
6463764637
<name>QgsWebViewWidgetConfigDlgBase</name>
6463864638
<message>
6463964639
<location filename="../src/ui/editorwidgets/qgswebviewconfigdlgbase.ui" line="14"/>
6464064640
<source>Form</source>
64641-
<translation type="unfinished">Formularz</translation>
64641+
<translation>Formularz</translation>
6464264642
</message>
6464364643
<message>
6464464644
<location filename="../src/ui/editorwidgets/qgswebviewconfigdlgbase.ui" line="27"/>
6464564645
<source>Width</source>
64646-
<translation type="unfinished"></translation>
64646+
<translation>Szerokość</translation>
6464764647
</message>
6464864648
<message>
6464964649
<location filename="../src/ui/editorwidgets/qgswebviewconfigdlgbase.ui" line="41"/>
6465064650
<source>Height</source>
64651-
<translation type="unfinished"></translation>
64651+
<translation>Wysokość</translation>
6465264652
</message>
6465364653
</context>
6465464654
<context>
@@ -65220,7 +65220,11 @@ Odpowiedź:
6522065220
Response was:
6522165221

6522265222
%4</source>
65223-
<translation type="unfinished"></translation>
65223+
<translation>Nie można pobrać WCS Service Exception: %1, wiersz %2, kolumna %3
65224+
65225+
Odpowiedź:
65226+
65227+
%4</translation>
6522465228
</message>
6522565229
<message>
6522665230
<location filename="../src/providers/wms/qgswmsprovider.cpp" line="1674"/>
@@ -65240,12 +65244,12 @@ Response was:
6524065244
<message>
6524165245
<location filename="../src/providers/wms/qgswmsprovider.cpp" line="1794"/>
6524265246
<source>Identifier</source>
65243-
<translation type="unfinished">Identyfikator</translation>
65247+
<translation>Identyfikator</translation>
6524465248
</message>
6524565249
<message>
6524665250
<location filename="../src/providers/wms/qgswmsprovider.cpp" line="1796"/>
6524765251
<source>Tile mode</source>
65248-
<translation type="unfinished">Tryb kafli</translation>
65252+
<translation>Tryb kafli</translation>
6524965253
</message>
6525065254
<message>
6525165255
<location filename="../src/providers/wms/qgswmsprovider.cpp" line="1805"/>
@@ -65260,7 +65264,7 @@ Response was:
6526065264
<message>
6526165265
<location filename="../src/providers/wms/qgswmsprovider.cpp" line="1813"/>
6526265266
<source>Invalid tile mode</source>
65263-
<translation type="unfinished">Nieprawidłowy tryb kafli</translation>
65267+
<translation>Nieprawidłowy tryb kafli</translation>
6526465268
</message>
6526565269
<message>
6526665270
<location filename="../src/providers/wms/qgswmsprovider.cpp" line="1836"/>
@@ -65275,7 +65279,7 @@ Response was:
6527565279
<message>
6527665280
<location filename="../src/providers/wms/qgswmsprovider.cpp" line="1906"/>
6527765281
<source>Selected tile matrix set </source>
65278-
<translation type="unfinished"></translation>
65282+
<translation type="unfinished">Wybierz zakres kafli</translation>
6527965283
</message>
6528065284
<message>
6528165285
<location filename="../src/providers/wms/qgswmsprovider.cpp" line="1907"/>
@@ -65295,83 +65299,87 @@ Response was:
6529565299
<message>
6529665300
<location filename="../src/providers/wms/qgswmsprovider.cpp" line="1910"/>
6529765301
<source>Matrix size</source>
65298-
<translation type="unfinished">Rozmiar macierzy</translation>
65302+
<translation>Rozmiar macierzy</translation>
6529965303
</message>
6530065304
<message>
6530165305
<location filename="../src/providers/wms/qgswmsprovider.cpp" line="1911"/>
6530265306
<source>Matrix extent [mu]</source>
65303-
<translation type="unfinished">Zasięg macierzy [mu]</translation>
65307+
<translation>Zasięg macierzy [mu]</translation>
6530465308
</message>
6530565309
<message>
6530665310
<location filename="../src/providers/wms/qgswmsprovider.cpp" line="1912"/>
6530765311
<source>Bounds</source>
65308-
<translation type="unfinished"></translation>
65312+
<translation>Granice</translation>
6530965313
</message>
6531065314
<message>
6531165315
<location filename="../src/providers/wms/qgswmsprovider.cpp" line="1913"/>
6531265316
<source>Width</source>
65313-
<translation type="unfinished"></translation>
65317+
<translation>Szerokość</translation>
6531465318
</message>
6531565319
<message>
6531665320
<location filename="../src/providers/wms/qgswmsprovider.cpp" line="1913"/>
6531765321
<source>Height</source>
65318-
<translation type="unfinished"></translation>
65322+
<translation>Wysokość</translation>
6531965323
</message>
6532065324
<message>
6532165325
<location filename="../src/providers/wms/qgswmsprovider.cpp" line="1914"/>
6532265326
<source>Top</source>
65323-
<translation type="unfinished"></translation>
65327+
<translation>Góra</translation>
6532465328
</message>
6532565329
<message>
6532665330
<location filename="../src/providers/wms/qgswmsprovider.cpp" line="1914"/>
6532765331
<source>Left</source>
65328-
<translation type="unfinished"></translation>
65332+
<translation>Lewa</translation>
6532965333
</message>
6533065334
<message>
6533165335
<location filename="../src/providers/wms/qgswmsprovider.cpp" line="1915"/>
6533265336
<source>Bottom</source>
65333-
<translation type="unfinished"></translation>
65337+
<translation>Dół</translation>
6533465338
</message>
6533565339
<message>
6533665340
<location filename="../src/providers/wms/qgswmsprovider.cpp" line="1915"/>
6533765341
<source>Right</source>
65338-
<translation type="unfinished"></translation>
65342+
<translation>Prawa</translation>
6533965343
</message>
6534065344
<message numerus="yes">
6534165345
<location filename="../src/providers/wms/qgswmsprovider.cpp" line="1945"/>
6534265346
<location filename="../src/providers/wms/qgswmsprovider.cpp" line="1971"/>
6534365347
<source>%n missing row(s)</source>
65344-
<translation type="unfinished">
65348+
<translation>
65349+
<numerusform>%n brakujących wierszy</numerusform>
65350+
<numerusform></numerusform>
6534565351
<numerusform></numerusform>
6534665352
</translation>
6534765353
</message>
6534865354
<message>
6534965355
<location filename="../src/providers/wms/qgswmsprovider.cpp" line="1946"/>
6535065356
<source>Layer&apos;s upper bound: %1</source>
65351-
<translation type="unfinished"></translation>
65357+
<translation>Górna granica warstwy: %1</translation>
6535265358
</message>
6535365359
<message numerus="yes">
6535465360
<location filename="../src/providers/wms/qgswmsprovider.cpp" line="1958"/>
6535565361
<location filename="../src/providers/wms/qgswmsprovider.cpp" line="1984"/>
6535665362
<source>%n missing column(s)</source>
65357-
<translation type="unfinished">
65358-
<numerusform></numerusform>
65363+
<translation>
65364+
<numerusform>brakująca kolumna</numerusform>
65365+
<numerusform>brakujące %n kolumny</numerusform>
65366+
<numerusform>brakujących %n kolumn</numerusform>
6535965367
</translation>
6536065368
</message>
6536165369
<message>
6536265370
<location filename="../src/providers/wms/qgswmsprovider.cpp" line="1959"/>
6536365371
<source>Layer&apos;s left bound: %1</source>
65364-
<translation type="unfinished"></translation>
65372+
<translation>Lewa granica warstwy: %1</translation>
6536565373
</message>
6536665374
<message>
6536765375
<location filename="../src/providers/wms/qgswmsprovider.cpp" line="1972"/>
6536865376
<source>Layer&apos;s lower bound: %1</source>
65369-
<translation type="unfinished"></translation>
65377+
<translation>Dolna granica warstwy: %1</translation>
6537065378
</message>
6537165379
<message>
6537265380
<location filename="../src/providers/wms/qgswmsprovider.cpp" line="1985"/>
6537365381
<source>Layer&apos;s right bound: %1</source>
65374-
<translation type="unfinished"></translation>
65382+
<translation>Prawa granica warstwy: %1</translation>
6537565383
</message>
6537665384
<message>
6537765385
<location filename="../src/providers/wms/qgswmsprovider.cpp" line="2050"/>
@@ -65871,7 +65879,7 @@ Przyczyna: %2</translation>
6587165879
<message>
6587265880
<location filename="../python/plugins/MetaSearch/ui/recorddialog.ui" line="14"/>
6587365881
<source>Record Metadata</source>
65874-
<translation type="unfinished"></translation>
65882+
<translation>Zapisz metadane</translation>
6587565883
</message>
6587665884
</context>
6587765885
<context>

‎python/analysis/raster/qgsrastercalcnode.sip‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ class QgsRasterCalcNode
77
//! defines possible types of node
88
enum Type
99
{
10-
tOperator = 1,
10+
tOperator,
1111
tNumber,
1212
tRasterRef
1313
};

‎python/analysis/vector/qgsgeometryanalyzer.sip‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ class QgsGeometryAnalyzer
9090
@param memoryProvider memory provider to write output to (can be 0 if output is written to a file)
9191
@param p progress dialog or 0 if no progress dialog should be shown
9292
*/
93-
bool eventLayer( QgsVectorLayer* lineLayer, QgsVectorLayer* eventLayer, int lineField, int eventField, QList<int>& unlocatedFeatureIds /Out/, const QString& outputLayer,
93+
bool eventLayer( QgsVectorLayer* lineLayer, QgsVectorLayer* eventLayer, int lineField, int eventField, QSet<qint64> &unlocatedFeatureIds /Out/, const QString& outputLayer,
9494
const QString& outputFormat, int locationField1, int locationField2 = -1, int offsetField = -1, double offsetScale = 1.0,
9595
bool forceSingleGeometry = false, QgsVectorDataProvider* memoryProvider = 0, QProgressDialog* p = 0 );
9696

‎python/core/composer/qgsaddremoveitemcommand.sip‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ class QgsAddRemoveItemCommand: QObject, QUndoCommand
99

1010
enum State
1111
{
12-
Added = 0,
12+
Added,
1313
Removed
1414
};
1515

‎python/core/composer/qgsaddremovemultiframecommand.sip‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ class QgsAddRemoveMultiFrameCommand : QUndoCommand
88

99
enum State
1010
{
11-
Added = 0,
11+
Added,
1212
Removed
1313
};
1414

‎python/core/composer/qgsatlascomposition.sip‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public:
8888
* @note This method has no effect when exporting to PDF if singleFile() is true
8989
*/
9090
bool setFilenamePattern( const QString& pattern );
91-
91+
9292
/**Returns an error string from parsing the filename expression.
9393
* @returns filename pattern parser error
9494
* @see setFilenamePattern
@@ -135,7 +135,7 @@ public:
135135

136136
QString featureFilter() const;
137137
void setFeatureFilter( const QString& expression );
138-
138+
139139
/**Returns an error string from parsing the feature filter expression.
140140
* @returns filename pattern parser error
141141
* @see setFilenamePattern

‎python/core/composer/qgscomposeritemcommand.sip‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class QgsComposerMergeCommand : QgsComposerItemCommand
4242
public:
4343
enum Context
4444
{
45-
Unknown = 0,
45+
Unknown,
4646
//composer label
4747
ComposerLabelSetText,
4848
ComposerLabelSetId,

‎python/core/composer/qgscomposerlegendstyle.sip‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ class QgsComposerLegendStyle
1616
};
1717
enum Side // margin side
1818
{
19-
Top = 0,
20-
Bottom = 1,
21-
Left = 2,
22-
Right = 3
19+
Top,
20+
Bottom,
21+
Left,
22+
Right,
2323
};
2424
QgsComposerLegendStyle();
2525
~QgsComposerLegendStyle();

‎python/core/composer/qgscomposermap.sip‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,43 +22,43 @@ class QgsComposerMap : QgsComposerItem
2222
/** \brief Preview style */
2323
enum PreviewMode
2424
{
25-
Cache = 0, // Use raster cache
25+
Cache, // Use raster cache
2626
Render, // Render the map
2727
Rectangle // Display only rectangle
2828
};
2929

3030
enum GridStyle
3131
{
32-
Solid = 0, //solid lines
32+
Solid, //solid lines
3333
Cross //only draw line crossings
3434
};
3535

3636
enum GridAnnotationPosition
3737
{
38-
InsideMapFrame = 0,
38+
InsideMapFrame,
3939
OutsideMapFrame,
4040
Disabled
4141
};
4242

4343
enum GridAnnotationDirection
4444
{
45-
Horizontal = 0,
45+
Horizontal,
4646
Vertical,
4747
HorizontalAndVertical,
4848
BoundaryDirection
4949
};
5050

5151
enum GridAnnotationFormat
5252
{
53-
Decimal = 0,
53+
Decimal,
5454
DegreeMinute,
5555
DegreeMinuteSecond
5656
};
5757

5858
enum GridFrameStyle
5959
{
60-
NoGridFrame = 0,
61-
Zebra //black / white pattern
60+
NoGridFrame,
61+
Zebra // black/white pattern
6262
};
6363

6464
/**Enum for different frame borders*/

‎python/core/composer/qgscomposermultiframe.sip‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class QgsComposerMultiFrame: QObject
1010

1111
enum ResizeMode
1212
{
13-
UseExistingFrames = 0,
13+
UseExistingFrames,
1414
ExtendToNextPage, //uses the next page(s) until the content has been printed
1515
RepeatOnEveryPage, //repeats the same frame on every page
1616
RepeatUntilFinished //duplicates last frame to next page to fit the total size

0 commit comments

Comments
 (0)