1,476 changes: 752 additions & 724 deletions i18n/qgis_gl_ES.ts

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion i18n/qgis_it.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34182,7 +34182,7 @@ Sovrascrivere?</translation>
<message>
<location filename="../src/app/qgstextannotationdialog.cpp" line="107"/>
<source>Select font color</source>
<translation>Scegli il colore di riempimento</translation>
<translation>Scegli il colore del carattere</translation>
</message>
<message>
<location filename="../src/app/qgstextannotationdialog.cpp" line="160"/>
Expand Down
178 changes: 125 additions & 53 deletions i18n/qgis_ja.ts

Large diffs are not rendered by default.

1,731 changes: 868 additions & 863 deletions i18n/qgis_nl.ts

Large diffs are not rendered by default.

569 changes: 334 additions & 235 deletions i18n/qgis_pl_PL.ts

Large diffs are not rendered by default.

136 changes: 70 additions & 66 deletions i18n/qgis_pt_BR.ts

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions python/core/qgsmaplayerregistry.sip
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public:
Not emitting signal is useful when you want to use registry for layers
on a different canvas and don't want them added to the main canvas automatically.
*/
QList<QgsMapLayer *> addMapLayers( QList<QgsMapLayer *> theMapLayers,
QList<QgsMapLayer *> addMapLayers( QList<QgsMapLayer *> theMapLayers /Transfer/,
bool theEmitSignal = true );


Expand All @@ -53,7 +53,7 @@ public:
Not emitting signal is useful when you want to use registry also for layers
which won't be used in main map canvas but will be used in a special one
*/
QgsMapLayer * addMapLayer(QgsMapLayer * theMapLayer /Transfer/, bool theEmitSignal = TRUE) /Deprecated/;
QgsMapLayer *addMapLayer(QgsMapLayer * theMapLayer /Transfer/, bool theEmitSignal = TRUE) /Deprecated/;

/** Remove a set of layers from qgis
@note As a side-effect QgsProject is made dirty.
Expand Down
2 changes: 1 addition & 1 deletion scripts/tsstat.pl
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
nl => 'Richard Duivenvoorde, Raymond Nijssen, Carlo van Rijswijk',
mn => 'Bayarmaa Enkhtur',
pl_PL => 'Robert Szczepanek, Milena Nowotarska, Borys Jurgiel, Mateusz Loskot, Tomasz Paul, Andrzej Swiader ',
pt_BR => 'Arthur Nanni, Christian Ferreira, Leandro Kaut',
pt_BR => 'Arthur Nanni',
pt_PT => 'Giovanni Manghi, Joana Simoes, Duarte Carreira, Alexandre Neto, Pedro Pereira',
ro => 'Lonut Losifescu-Enescu',
ru => 'Artem Popov',
Expand Down
4 changes: 2 additions & 2 deletions src/providers/ogr/qgsogrprovider.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1690,9 +1690,9 @@ QString createFilters( QString type )
myFileFilters += createFileFilter_( QObject::tr( "INTERLIS 2" ), "*.itf *.xml *.ili" );
myExtensions << "itf" << "xml" << "ili";
}
else if ( driverName.startsWith( "INGRES" ) )
else if ( driverName.startsWith( "Ingres" ) )
{
myDatabaseDrivers += QObject::tr( "INGRES" ) + ",INGRES;";
myDatabaseDrivers += QObject::tr( "Ingres" ) + ",Ingres;";
}
else if ( driverName.startsWith( "KML" ) )
{
Expand Down