Skip to content

Commit 513f1c3

Browse files
committed
Merge branch 'master' of github.com:qgis/Quantum-GIS
2 parents 2ef1772 + b0112f1 commit 513f1c3

Some content is hidden

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

46 files changed

+12126
-9400
lines changed

i18n/qgis_de.ts

Lines changed: 931 additions & 801 deletions
Large diffs are not rendered by default.

i18n/qgis_hr_HR.ts

Lines changed: 9881 additions & 7725 deletions
Large diffs are not rendered by default.

i18n/qgis_it.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2230,7 +2230,7 @@ Disabilita l'opzione "Usa estensioni di intersezione" per ottener
22302230
</message>
22312231
<message>
22322232
<source>Select directory with GDAL executables</source>
2233-
<translation>Scegli la cartella contenente gli eseguibili GDAL</translation>
2233+
<translation>Scegli la cartella contenente gli eseguibili di GDAL</translation>
22342234
</message>
22352235
<message>
22362236
<source>Select directory with the GDAL documentation</source>
@@ -10247,7 +10247,7 @@ p, li { white-space: pre-wrap; }
1024710247
<message>
1024810248
<location filename="../src/ui/qgsannotationwidgetbase.ui" line="50"/>
1024910249
<source>Frame width</source>
10250-
<translation>Larghezza del riquadro</translation>
10250+
<translation>Spessore del riquadro</translation>
1025110251
</message>
1025210252
<message>
1025310253
<location filename="../src/ui/qgsannotationwidgetbase.ui" line="67"/>
@@ -29412,7 +29412,7 @@ p, li { white-space: pre-wrap; }
2941229412
<message>
2941329413
<location filename="../src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisplugin.cpp" line="107"/>
2941429414
<source>Calculating </source>
29415-
<translation>Calcolo in corso</translation>
29415+
<translation>Calcolo in corso </translation>
2941629416
</message>
2941729417
<message>
2941829418
<location filename="../src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisplugin.cpp" line="107"/>
@@ -30992,7 +30992,7 @@ p, li { white-space: pre-wrap; }
3099230992
<message>
3099330993
<location filename="../src/plugins/spatialquery/qgsspatialquerydialogbase.ui" line="332"/>
3099430994
<source>Zoom to item</source>
30995-
<translation>Zomm all&apos;oggetto</translation>
30995+
<translation>Zoom all&apos;oggetto</translation>
3099630996
</message>
3099730997
<message>
3099830998
<location filename="../src/plugins/spatialquery/qgsspatialquerydialogbase.ui" line="353"/>

images/images.qrc

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -353,6 +353,13 @@
353353
<file>themes/default/plugins/north_arrow.png</file>
354354
<file>themes/default/plugins/scale_bar.png</file>
355355
<file>themes/default/mActionAddWfsLayer.png</file>
356+
<file>themes/gis/mIconWms.png</file>
357+
<file>themes/gis/mIconWfs.png</file>
358+
<file>themes/gis/mIconSpatialite.png</file>
359+
<file>themes/gis/mIconRaster.png</file>
360+
<file>themes/gis/mIconPostgis.png</file>
361+
<file>themes/gis/mIconConnect.png</file>
362+
<file>themes/gis/mIconDbSchema.png</file>
356363
</qresource>
357364
<qresource prefix="/images/tips">
358365
<file alias="symbol_levels.png">qgis_tips/symbol_levels.png</file>

images/themes/gis/mIconConnect.png

536 Bytes
Loading
918 Bytes
Loading

images/themes/gis/mIconPostgis.png

849 Bytes
Loading

images/themes/gis/mIconRaster.png

409 Bytes
Loading
929 Bytes
Loading

images/themes/gis/mIconWfs.png

945 Bytes
Loading

0 commit comments

Comments
 (0)