Merge branch 'master' into delimited_text_bug_fixes

qgis · Apr 16, 2013 · d06c308 · d06c308
2 parents 041b9f1 + d06ab3c
commit d06c308
Show file tree

Hide file tree

Showing 914 changed files with 7,462 additions and 6,853 deletions.
diff --git a/i18n/qgis_it.ts b/i18n/qgis_it.ts
@@ -7313,15 +7313,23 @@ Cambiare questa situazione prima, perché il plugin OSM non quale layer è la de
         <translation type="obsolete">Errore di connessione: </translation>
     </message>
     <message>
-        <source>## To access Quantum GIS environment from this console
-## use iface object (instance of QgisInterface class).
+        <source>Click on button to restore all tabs from last session.</source>
+        <translation>Clicca sul bottone per riaprire le schede della sessione precedente.</translation>
+    </message>
+    <message>
+        <source>Restore tabs</source>
+        <translation>Riprisitna schede</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Chiudi</translation>
+    </message>
+    <message>
+        <source>Python %1 on %2
 ## Type help(iface) for more info and list of methods.
-
 </source>
-        <translation type="obsolete">## Per accedere all&apos;ambiente Quantum GIS da questa console
-## usa l&apos;oggetto iface (istanza della classe QgisInterface). 
+        <translation>Python %1 on %2
 ## Digita help(iface) per ottenere più informazioni.
-
 </translation>
     </message>
 </context>

diff --git a/images/images.qrc b/images/images.qrc
diff --git a/images/themes/classic/CMakeLists.txt b/images/themes/classic/CMakeLists.txt
diff --git a/images/themes/default/CMakeLists.txt b/images/themes/default/CMakeLists.txt
@@ -1,8 +1,6 @@
-FILE (GLOB IMAGES *.png)
+ADD_SUBDIRECTORY(plugins)
+
+FILE(GLOB IMAGES *.png *.svg)
 
 INSTALL (FILES ${IMAGES}
          DESTINATION ${QGIS_DATA_DIR}/themes/default)
-
-FILE (GLOB PLUG_IMAGES  plugins/*.png)
-
-INSTALL (FILES ${PLUG_IMAGES} DESTINATION ${QGIS_DATA_DIR}/themes/default/plugins)
diff --git a/images/themes/gis/LICENSE.TXT → images/themes/default/LICENSE.TXT b/images/themes/gis/LICENSE.TXT → images/themes/default/LICENSE.TXT
diff --git a/images/themes/default/console/iconCloseTabEditorConsole.png b/images/themes/default/console/iconCloseTabEditorConsole.png
diff --git a/images/themes/default/console/iconCommentEditorConsole.png b/images/themes/default/console/iconCommentEditorConsole.png
diff --git a/images/themes/default/console/iconCopyEditorConsole.png b/images/themes/default/console/iconCopyEditorConsole.png
diff --git a/images/themes/default/console/iconCutEditorConsole.png b/images/themes/default/console/iconCutEditorConsole.png
diff --git a/images/themes/default/console/iconFileTabsMenuConsole.png b/images/themes/default/console/iconFileTabsMenuConsole.png
diff --git a/images/themes/default/console/iconNewTabEditorConsole.png b/images/themes/default/console/iconNewTabEditorConsole.png
diff --git a/images/themes/default/console/iconPasteEditorConsole.png b/images/themes/default/console/iconPasteEditorConsole.png
diff --git a/images/themes/default/console/iconRestoreTabsConsole.png b/images/themes/default/console/iconRestoreTabsConsole.png
diff --git a/images/themes/default/console/iconRunScriptConsole.png b/images/themes/default/console/iconRunScriptConsole.png
diff --git a/images/themes/default/console/iconSaveAsConsole.png b/images/themes/default/console/iconSaveAsConsole.png
diff --git a/images/themes/default/console/iconShowEditorConsole.png b/images/themes/default/console/iconShowEditorConsole.png
diff --git a/images/themes/default/console/iconTabEditorConsole.png b/images/themes/default/console/iconTabEditorConsole.png
diff --git a/images/themes/default/console/iconUncommentEditorConsole.png b/images/themes/default/console/iconUncommentEditorConsole.png
diff --git a/images/themes/default/locked.png b/images/themes/default/locked.png
diff --git a/images/themes/default/mActionAddArrow.png b/images/themes/default/mActionAddArrow.png
diff --git a/images/themes/default/mActionAddBasicShape.png b/images/themes/default/mActionAddBasicShape.png
diff --git a/images/themes/gis/mActionAddGPSLayer.png → images/themes/default/mActionAddGPSLayer.png b/images/themes/gis/mActionAddGPSLayer.png → images/themes/default/mActionAddGPSLayer.png
diff --git a/images/themes/default/mActionAddHtml.png b/images/themes/default/mActionAddHtml.png
diff --git a/images/themes/default/mActionAddImage.png b/images/themes/default/mActionAddImage.png
diff --git a/images/themes/default/mActionAddLayer.png b/images/themes/default/mActionAddLayer.png
diff --git a/images/themes/default/mActionAddLegend.png b/images/themes/default/mActionAddLegend.png
diff --git a/images/themes/default/mActionAddMap.png b/images/themes/default/mActionAddMap.png
diff --git a/images/themes/default/mActionAddOgrLayer.png b/images/themes/default/mActionAddOgrLayer.png
diff --git a/images/themes/default/mActionAddPart.png b/images/themes/default/mActionAddPart.png
diff --git a/images/themes/default/mActionAddRasterLayer.png b/images/themes/default/mActionAddRasterLayer.png
diff --git a/images/themes/default/mActionAddRing.png b/images/themes/default/mActionAddRing.png
diff --git a/images/themes/default/mActionAddSpatiaLiteLayer.png b/images/themes/default/mActionAddSpatiaLiteLayer.png
diff --git a/images/themes/default/mActionAddVertex.png b/images/themes/default/mActionAddVertex.png
diff --git a/images/themes/default/mActionAddWcsLayer.png b/images/themes/default/mActionAddWcsLayer.png
diff --git a/images/themes/default/mActionAddWfsLayer.png b/images/themes/default/mActionAddWfsLayer.png
diff --git a/images/themes/default/mActionAddWmsLayer.png b/images/themes/default/mActionAddWmsLayer.png
diff --git a/images/themes/default/mActionAlignBottom.png b/images/themes/default/mActionAlignBottom.png
diff --git a/images/themes/default/mActionAlignHCenter.png b/images/themes/default/mActionAlignHCenter.png
diff --git a/images/themes/default/mActionAlignLeft.png b/images/themes/default/mActionAlignLeft.png
diff --git a/images/themes/default/mActionAlignRight.png b/images/themes/default/mActionAlignRight.png
diff --git a/images/themes/default/mActionAlignTop.png b/images/themes/default/mActionAlignTop.png
diff --git a/images/themes/default/mActionAlignVCenter.png b/images/themes/default/mActionAlignVCenter.png
diff --git a/images/themes/default/mActionCalculateField.png b/images/themes/default/mActionCalculateField.png
diff --git a/images/themes/default/mActionCaptureLine.png b/images/themes/default/mActionCaptureLine.png
diff --git a/images/themes/default/mActionCapturePoint.png b/images/themes/default/mActionCapturePoint.png
diff --git a/images/themes/default/mActionCapturePolygon.png b/images/themes/default/mActionCapturePolygon.png
diff --git a/images/themes/default/mActionChangeLabelProperties.png b/images/themes/default/mActionChangeLabelProperties.png
diff --git a/images/themes/default/mActionComposerManager.png b/images/themes/default/mActionComposerManager.png
diff --git a/images/themes/default/mActionCopySelected.png b/images/themes/default/mActionCopySelected.png
diff --git a/images/themes/default/mActionDeleteAttribute.png b/images/themes/default/mActionDeleteAttribute.png
diff --git a/images/themes/default/mActionDeletePart.png b/images/themes/default/mActionDeletePart.png
diff --git a/images/themes/default/mActionDeleteRing.png b/images/themes/default/mActionDeleteRing.png
diff --git a/images/themes/default/mActionDeleteSelected.png b/images/themes/default/mActionDeleteSelected.png
diff --git a/images/themes/default/mActionDeleteVertex.png b/images/themes/default/mActionDeleteVertex.png
diff --git a/images/themes/default/mActionDeselectAll.png b/images/themes/default/mActionDeselectAll.png
diff --git a/images/themes/default/mActionDraw.png b/images/themes/default/mActionDraw.png
diff --git a/images/themes/default/mActionEditCopy.png b/images/themes/default/mActionEditCopy.png
diff --git a/images/themes/default/mActionEditCut.png b/images/themes/default/mActionEditCut.png
diff --git a/images/themes/default/mActionEditPaste.png b/images/themes/default/mActionEditPaste.png
diff --git a/images/themes/default/mActionFileNew.png b/images/themes/default/mActionFileNew.png
diff --git a/images/themes/default/mActionFileOpen.png b/images/themes/default/mActionFileOpen.png
diff --git a/images/themes/default/mActionFilePrint.png b/images/themes/default/mActionFilePrint.png
diff --git a/images/themes/default/mActionFileSave.png b/images/themes/default/mActionFileSave.png
diff --git a/images/themes/default/mActionFileSaveAs.png b/images/themes/default/mActionFileSaveAs.png
diff --git a/images/themes/gis/mActionFilter.svg → images/themes/default/mActionFilter.svg b/images/themes/gis/mActionFilter.svg → images/themes/default/mActionFilter.svg
diff --git a/images/themes/default/mActionFolder.png b/images/themes/default/mActionFolder.png
diff --git a/images/themes/default/mActionGroupItems.png b/images/themes/default/mActionGroupItems.png
diff --git a/images/themes/default/mActionHelpContents.png b/images/themes/default/mActionHelpContents.png
diff --git a/images/themes/default/mActionHideAllLayers.png b/images/themes/default/mActionHideAllLayers.png
diff --git a/images/themes/default/mActionIdentify.png b/images/themes/default/mActionIdentify.png
diff --git a/images/themes/default/mActionInOverview.png b/images/themes/default/mActionInOverview.png
diff --git a/images/themes/default/mActionInvertSelection.png b/images/themes/default/mActionInvertSelection.png
diff --git a/images/themes/default/mActionLabel.png b/images/themes/default/mActionLabel.png
diff --git a/images/themes/default/mActionLabeling.png b/images/themes/default/mActionLabeling.png
diff --git a/images/themes/default/mActionLowerItems.png b/images/themes/default/mActionLowerItems.png
diff --git a/images/themes/default/mActionMapTips.png b/images/themes/default/mActionMapTips.png
diff --git a/images/themes/default/mActionMeasure.png b/images/themes/default/mActionMeasure.png
diff --git a/images/themes/default/mActionMeasureAngle.png b/images/themes/default/mActionMeasureAngle.png
diff --git a/images/themes/default/mActionMeasureArea.png b/images/themes/default/mActionMeasureArea.png
diff --git a/images/themes/default/mActionMergeFeatureAttributes.png b/images/themes/default/mActionMergeFeatureAttributes.png
diff --git a/images/themes/default/mActionMergeFeatures.png b/images/themes/default/mActionMergeFeatures.png
diff --git a/images/themes/default/mActionMoveFeature.png b/images/themes/default/mActionMoveFeature.png
diff --git a/images/themes/default/mActionMoveItemContent.png b/images/themes/default/mActionMoveItemContent.png
diff --git a/images/themes/default/mActionMoveItemsToBottom.png b/images/themes/default/mActionMoveItemsToBottom.png
diff --git a/images/themes/default/mActionMoveItemsToTop.png b/images/themes/default/mActionMoveItemsToTop.png
diff --git a/images/themes/default/mActionMoveLabel.png b/images/themes/default/mActionMoveLabel.png
diff --git a/images/themes/default/mActionMoveVertex.png b/images/themes/default/mActionMoveVertex.png
diff --git a/images/themes/default/mActionNewAttribute.png b/images/themes/default/mActionNewAttribute.png
diff --git a/images/themes/default/mActionNewBookmark.png b/images/themes/default/mActionNewBookmark.png
diff --git a/images/themes/default/mActionNewComposer.png b/images/themes/default/mActionNewComposer.png
diff --git a/images/themes/default/mActionNewVectorLayer.png b/images/themes/default/mActionNewVectorLayer.png
diff --git a/images/themes/default/mActionNodeTool.png b/images/themes/default/mActionNodeTool.png
diff --git a/images/themes/default/mActionOffsetCurve.png b/images/themes/default/mActionOffsetCurve.png
diff --git a/images/themes/default/mActionOpenTable.png b/images/themes/default/mActionOpenTable.png
diff --git a/images/themes/default/mActionPan.png b/images/themes/default/mActionPan.png