- Update to 1.4.0

- Update my mail address to FreeBSD

3 files changed, 210 insertions, 492 deletions

diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile
index 19585792611..e1fd096bb75 100644
--- a/graphics/qgis/Makefile
+++ b/graphics/qgis/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	qgis
-PORTVERSION=	1.3.0
-PORTREVISION=	3
+PORTVERSION=	1.4.0
 CATEGORIES=	graphics geography
 MASTER_SITES=	http://download.osgeo.org/qgis/src/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
-MAINTAINER=	wenheping@gmail.com
+MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Geographical Information System (GIS) data viewer
 
 LIB_DEPENDS=	geos:${PORTSDIR}/graphics/geos \
diff --git a/graphics/qgis/distinfo b/graphics/qgis/distinfo
index 39c91c5f660..b83ec8a299f 100644
--- a/graphics/qgis/distinfo
+++ b/graphics/qgis/distinfo
@@ -1,3 +1,3 @@
-MD5 (qgis_1.3.0.tar.gz) = c75d0912011fe41a4e4a316ea323f73a
-SHA256 (qgis_1.3.0.tar.gz) = 4d94913fa44648980609762c7a72d9e3b9736a2157321acb0402afb03ea8186c
-SIZE (qgis_1.3.0.tar.gz) = 22091843
+MD5 (qgis_1.4.0.tar.gz) = 47710e7aa14c2a672c7f28457b0c956f
+SHA256 (qgis_1.4.0.tar.gz) = bbe07eedec4bda95cca994002941b91fd0e50d5cdee2bf79be0c4f7b930cc7da
+SIZE (qgis_1.4.0.tar.gz) = 17285943
diff --git a/graphics/qgis/pkg-plist b/graphics/qgis/pkg-plist
index 72198a814da..0dfaff73cc9 100644
--- a/graphics/qgis/pkg-plist
+++ b/graphics/qgis/pkg-plist
@@ -16,401 +16,6 @@
 %%DATADIR%%/images/icons/qgis-icon.png
 %%DATADIR%%/images/icons/qgis-mime-icon.png
 %%DATADIR%%/images/icons/qgis-icon-60x60.png
-%%DATADIR%%/images/developers/Jens_Oberender.jpg
-%%DATADIR%%/images/developers/Godofredo_Contreras.jpg
-%%DATADIR%%/images/developers/Radim_Blazek.jpg
-%%DATADIR%%/images/developers/Gavin_Macaulay.jpg
-%%DATADIR%%/images/developers/Steve_Halasz.jpg
-%%DATADIR%%/images/developers/Masaru_Hoshi.jpg
-%%DATADIR%%/images/developers/Tisham_Dhar.jpg
-%%DATADIR%%/images/developers/Denis_Antipov.jpg
-%%DATADIR%%/images/developers/Christoph_Spoerri.jpg
-%%DATADIR%%/images/developers/Gary_E_Sherman.jpg
-%%DATADIR%%/images/developers/Jc3bcrgen_Fischer.jpg
-%%DATADIR%%/images/developers/Carl_Anderson.jpg
-%%DATADIR%%/images/developers/Tom_Elwertowski.jpg
-%%DATADIR%%/images/developers/Tim_Sutton.jpg
-%%DATADIR%%/images/developers/Martin_Dobias.jpg
-%%DATADIR%%/images/developers/Peter_Brewer.jpg
-%%DATADIR%%/images/developers/Lars_Luthman.jpg
-%%DATADIR%%/images/developers/Marco_Hugentobler.jpg
-%%DATADIR%%/images/developers/Mark_Coletti.jpg
-%%DATADIR%%/images/developers/Leonardo_Lami.jpg
-%%DATADIR%%/images/developers/Magnus_Homann.jpg
-%%DATADIR%%/themes/classic/mActionShowPluginManager.png
-%%DATADIR%%/themes/classic/mActionHideAllLayers.png
-%%DATADIR%%/themes/classic/mActionEditPaste.png
-%%DATADIR%%/themes/classic/mActionCopySelected.png
-%%DATADIR%%/themes/classic/mActionShowBookmarks.png
-%%DATADIR%%/themes/classic/mActionInOverview.png
-%%DATADIR%%/themes/classic/mActionRemove.png
-%%DATADIR%%/themes/classic/mIconGeometryLayer.png
-%%DATADIR%%/themes/classic/mActionFileOpen.png
-%%DATADIR%%/themes/classic/mIconPointLayer.png
-%%DATADIR%%/themes/classic/mActionRemoveAllFromOverview.png
-%%DATADIR%%/themes/classic/mIconProjectionEnabled.png
-%%DATADIR%%/themes/classic/mActionCheckQgisVersion.png
-%%DATADIR%%/themes/classic/mActionAddLegend.png
-%%DATADIR%%/themes/classic/mActionQgisHomePage.png
-%%DATADIR%%/themes/classic/mActionCaptureLine.png
-%%DATADIR%%/themes/classic/mActionZoomIn.png
-%%DATADIR%%/themes/classic/mActionCapturePoint.png
-%%DATADIR%%/themes/classic/mActionPan.png
-%%DATADIR%%/themes/classic/mActionNewBookmark.png
-%%DATADIR%%/themes/classic/mActionProjectProperties.png
-%%DATADIR%%/themes/classic/mActionHelpAbout.png
-%%DATADIR%%/themes/classic/mActionAddIsland.png
-%%DATADIR%%/themes/classic/mActionZoomToLayer.png
-%%DATADIR%%/themes/classic/mActionNewFolder.png
-%%DATADIR%%/themes/classic/mActionToggleEditing.png
-%%DATADIR%%/themes/classic/mActionFileNew.png
-%%DATADIR%%/themes/classic/mActionMeasureArea.png
-%%DATADIR%%/themes/classic/mActionAddOgrLayer.png
-%%DATADIR%%/themes/classic/mActionExpandTree.png
-%%DATADIR%%/themes/classic/mActionZoomFullExtent.png
-%%DATADIR%%/themes/classic/mActionDeleteVertex.png
-%%DATADIR%%/themes/classic/mActionNewAttribute.png
-%%DATADIR%%/themes/classic/mActionMeasure.png
-%%DATADIR%%/themes/classic/mActionEditCut.png
-%%DATADIR%%/themes/classic/mIconProperties.png
-%%DATADIR%%/themes/classic/mActionFileSmall.png
-%%DATADIR%%/themes/classic/mActionFolder.png
-%%DATADIR%%/themes/classic/mActionScaleBar.png
-%%DATADIR%%/themes/classic/mActionAddAllToOverview.png
-%%DATADIR%%/themes/classic/mActionFileSaveAs.png
-%%DATADIR%%/themes/classic/mIconNoPyramid.png
-%%DATADIR%%/themes/classic/mAction.png
-%%DATADIR%%/themes/classic/mActionEditCopy.png
-%%DATADIR%%/themes/classic/mActionDeleteAttribute.png
-%%DATADIR%%/themes/classic/mActionCollapseTree.png
-%%DATADIR%%/themes/classic/mActionFileExit.png
-%%DATADIR%%/themes/classic/mActionAddVertex.png
-%%DATADIR%%/themes/classic/mActionZoomToSelected.png
-%%DATADIR%%/themes/classic/mActionZoomNext.png
-%%DATADIR%%/themes/classic/mActionShowAllLayers.png
-%%DATADIR%%/themes/classic/mActionUnselectAttributes.png
-%%DATADIR%%/themes/classic/mActionMoveVertex.png
-%%DATADIR%%/themes/classic/mActionHelpContents.png
-%%DATADIR%%/themes/classic/mActionCustomProjection.png
-%%DATADIR%%/themes/classic/mActionNewVectorLayer.png
-%%DATADIR%%/themes/classic/mIconUnknownLayerType.png
-%%DATADIR%%/themes/classic/mActionDeleteSelected.png
-%%DATADIR%%/themes/classic/mActionAddWmsLayer.png
-%%DATADIR%%/themes/classic/mActionZoomOut.png
-%%DATADIR%%/themes/classic/mActionSelect.png
-%%DATADIR%%/themes/classic/mIconPyramid.png
-%%DATADIR%%/themes/classic/mActionSaveMapAsImage.png
-%%DATADIR%%/themes/classic/mIconWaitingForLayerType.png
-%%DATADIR%%/themes/classic/mIconEditable.png
-%%DATADIR%%/themes/classic/mActionAddLayer.png
-%%DATADIR%%/themes/classic/mIconLayer.png
-%%DATADIR%%/themes/classic/mActionRemoveLayer.png
-%%DATADIR%%/themes/classic/mActionOptions.png
-%%DATADIR%%/themes/classic/mActionFilePrint.png
-%%DATADIR%%/themes/classic/mActionContextHelp.png
-%%DATADIR%%/themes/classic/mActionDraw.png
-%%DATADIR%%/themes/classic/mActionFileSave.png
-%%DATADIR%%/themes/classic/mIconLineLayer.png
-%%DATADIR%%/themes/classic/mIconPolygonLayer.png
-%%DATADIR%%/themes/classic/mIconSymbology.png
-%%DATADIR%%/themes/classic/mActionSaveAsSVG.png
-%%DATADIR%%/themes/classic/mActionPropertyItem.png
-%%DATADIR%%/themes/classic/mActionAddRasterLayer.png
-%%DATADIR%%/themes/classic/mActionAddRing.png
-%%DATADIR%%/themes/classic/mActionExportMapServer.png
-%%DATADIR%%/themes/classic/mActionZoomLast.png
-%%DATADIR%%/themes/classic/mIconProjectionProblem.png
-%%DATADIR%%/themes/classic/mMapserverExport.png
-%%DATADIR%%/themes/classic/mActionOpenTable.png
-%%DATADIR%%/themes/classic/mActionIdentify.png
-%%DATADIR%%/themes/classic/mActionCapturePolygon.png
-%%DATADIR%%/themes/classic/mActionInvertSelection.png
-%%DATADIR%%/themes/classic/mActionSelectedToTop.png
-%%DATADIR%%/themes/classic/mActionLabel.png
-%%DATADIR%%/themes/classic/mIconProjectionDisabled.png
-%%DATADIR%%/themes/default/mIconSymbology.png
-%%DATADIR%%/themes/default/mActionZoomLast.png
-%%DATADIR%%/themes/default/mActionMeasure.png
-%%DATADIR%%/themes/default/mActionRemoveLayer.png
-%%DATADIR%%/themes/default/mIconPointLayer.png
-%%DATADIR%%/themes/default/mActionAddOgrLayer.png
-%%DATADIR%%/themes/default/mActionScaleBar.png
-%%DATADIR%%/themes/default/mActionProjectProperties.png
-%%DATADIR%%/themes/default/mActionExpandTree.png
-%%DATADIR%%/themes/default/mActionZoomToSelected.png
-%%DATADIR%%/themes/default/mActionHelpAbout.png
-%%DATADIR%%/themes/default/mActionDeleteAttribute.png
-%%DATADIR%%/themes/default/mIconPyramid.png
-%%DATADIR%%/themes/default/mIconUnknownLayerType.png
-%%DATADIR%%/themes/default/mActionMoveVertex.png
-%%DATADIR%%/themes/default/mActionInOverview.png
-%%DATADIR%%/themes/default/mIconFirst.png
-%%DATADIR%%/themes/default/mActionSelectedToTop.png
-%%DATADIR%%/themes/default/mActionNewBookmark.png
-%%DATADIR%%/themes/default/mActionFileSave.png
-%%DATADIR%%/themes/default/mIconProjectionProblem.png
-%%DATADIR%%/themes/default/mActionZoomToLayer.png
-%%DATADIR%%/themes/default/mActionFileSmall.png
-%%DATADIR%%/themes/default/mActionCollapseTree.png
-%%DATADIR%%/themes/default/mActionAddNonDbLayer.png
-%%DATADIR%%/themes/default/mMapserverExport.png
-%%DATADIR%%/themes/default/mActionEditCut.png
-%%DATADIR%%/themes/default/mActionCustomProjection.png
-%%DATADIR%%/themes/default/mActionExportMapServer.png
-%%DATADIR%%/themes/default/mActionShowPluginManager.png
-%%DATADIR%%/themes/default/mAction.png
-%%DATADIR%%/themes/default/mIconLayer.png
-%%DATADIR%%/themes/default/mActionFolder.png
-%%DATADIR%%/themes/default/mActionMapTips.png
-%%DATADIR%%/themes/default/mActionDraw.png
-%%DATADIR%%/themes/default/mIconProjectionDisabled.png
-%%DATADIR%%/themes/default/mActionMeasureArea.png
-%%DATADIR%%/themes/default/mActionPan.png
-%%DATADIR%%/themes/default/mActionMoveFeature.png
-%%DATADIR%%/themes/default/mActionShowAllLayers.png
-%%DATADIR%%/themes/default/mActionToggleEditing.png
-%%DATADIR%%/themes/default/mActionAddAllToOverview.png
-%%DATADIR%%/themes/default/mActionEditCopy.png
-%%DATADIR%%/themes/default/mActionOptions.png
-%%DATADIR%%/themes/default/mActionFilePrint.png
-%%DATADIR%%/themes/default/mIconLast.png
-%%DATADIR%%/themes/default/mIconWaitingForLayerType.png
-%%DATADIR%%/themes/default/mIconNext.png
-%%DATADIR%%/themes/default/mActionFileNew.png
-%%DATADIR%%/themes/default/mActionSelect.png
-%%DATADIR%%/themes/default/mIconProperties.png
-%%DATADIR%%/themes/default/mIconNoPyramid.png
-%%DATADIR%%/themes/default/mIconProjectionEnabled.png
-%%DATADIR%%/themes/default/mActionPropertyItem.png
-%%DATADIR%%/themes/default/mIconNew.png
-%%DATADIR%%/themes/default/mActionAddRing.png
-%%DATADIR%%/themes/default/mIconGeometryLayer.png
-%%DATADIR%%/themes/default/mActionRemove.png
-%%DATADIR%%/themes/default/mActionSplitFeatures.png
-%%DATADIR%%/themes/default/mActionCapturePolygon.png
-%%DATADIR%%/themes/default/mActionHelpContents.png
-%%DATADIR%%/themes/default/mActionNewFolder.png
-%%DATADIR%%/themes/default/mActionDeleteSelected.png
-%%DATADIR%%/themes/default/mActionUnselectAttributes.png
-%%DATADIR%%/themes/default/mActionOpenTable.png
-%%DATADIR%%/themes/default/mActionNewAttribute.png
-%%DATADIR%%/themes/default/mActionCopySelected.png
-%%DATADIR%%/themes/default/mActionCaptureLine.png
-%%DATADIR%%/themes/default/mActionFileExit.png
-%%DATADIR%%/themes/default/mActionCapturePoint.png
-%%DATADIR%%/themes/default/mIconPrevious.png
-%%DATADIR%%/themes/default/mActionLabel.png
-%%DATADIR%%/themes/default/mActionFileSaveAs.png
-%%DATADIR%%/themes/default/mActionSaveMapAsImage.png
-%%DATADIR%%/themes/default/mActionFileOpen.png
-%%DATADIR%%/themes/default/mActionAddWmsLayer.png
-%%DATADIR%%/themes/default/mActionZoomFullExtent.png
-%%DATADIR%%/themes/default/mActionIdentify.png
-%%DATADIR%%/themes/default/mActionCheckQgisVersion.png
-%%DATADIR%%/themes/default/mActionAddLegend.png
-%%DATADIR%%/themes/default/mIconDelete.png
-%%DATADIR%%/themes/default/mActionRemoveAllFromOverview.png
-%%DATADIR%%/themes/default/mActionShowBookmarks.png
-%%DATADIR%%/themes/default/mActionContextHelp.png
-%%DATADIR%%/themes/default/mActionAddVertex.png
-%%DATADIR%%/themes/default/mActionEditPaste.png
-%%DATADIR%%/themes/default/mActionZoomIn.png
-%%DATADIR%%/themes/default/mActionInvertSelection.png
-%%DATADIR%%/themes/default/mIconEditable.png
-%%DATADIR%%/themes/default/mActionQgisHomePage.png
-%%DATADIR%%/themes/default/mActionDeleteVertex.png
-%%DATADIR%%/themes/default/mIconPolygonLayer.png
-%%DATADIR%%/themes/default/mActionSaveAsSVG.png
-%%DATADIR%%/themes/default/mActionNewVectorLayer.png
-%%DATADIR%%/themes/default/mActionAddIsland.png
-%%DATADIR%%/themes/default/mActionZoomOut.png
-%%DATADIR%%/themes/default/mActionAddRasterLayer.png
-%%DATADIR%%/themes/default/mActionAddLayer.png
-%%DATADIR%%/themes/default/mIconLineLayer.png
-%%DATADIR%%/themes/default/mActionHideAllLayers.png
-%%DATADIR%%/themes/default/tracking.png
-%%DATADIR%%/themes/default/mActionLowerItems.png
-%%DATADIR%%/themes/default/mActionMoveItemContent.png
-%%DATADIR%%/themes/default/favourites.png
-%%DATADIR%%/themes/default/extents.png
-%%DATADIR%%/themes/default/clearInput.png
-%%DATADIR%%/themes/default/geographic.png
-%%DATADIR%%/themes/default/mActionGroupItems.png
-%%DATADIR%%/themes/default/mActionUngroupItems.png
-%%DATADIR%%/themes/default/transformed.png
-%%DATADIR%%/themes/default/mActionSelectPan.png
-%%DATADIR%%/themes/default/mActionMoveItemsToTop.png
-%%DATADIR%%/themes/default/user.png
-%%DATADIR%%/themes/default/mActionRaiseItems.png
-%%DATADIR%%/themes/default/mActionMoveItemsToBottom.png
-%%DATADIR%%/themes/default/mActionAddSpatiaLiteLayer.png
-%%DATADIR%%/themes/default/mActionArrowUp.png
-%%DATADIR%%/themes/default/mIconLock.png
-%%DATADIR%%/themes/default/mActionSaveAsPDF.png
-%%DATADIR%%/themes/default/plugins/plugin_installer.png
-%%DATADIR%%/themes/default/mActionAlignTop.png
-%%DATADIR%%/themes/default/mActionDeletePart.png
-%%DATADIR%%/themes/default/mActionAddMap.png
-%%DATADIR%%/themes/default/mActionReshape.png
-%%DATADIR%%/themes/default/mActionAlignBottom.png
-%%DATADIR%%/themes/default/mActionAlignHCenter.png
-%%DATADIR%%/themes/default/mActionFromSelectedFeature.png
-%%DATADIR%%/themes/default/mActionAlignRight.png
-%%DATADIR%%/themes/default/mActionAlignVCenter.png
-%%DATADIR%%/themes/default/mActionDeleteRing.png
-%%DATADIR%%/themes/default/mActionAddImage.png
-%%DATADIR%%/themes/default/mActionUndo.png
-%%DATADIR%%/themes/default/mActionMergeFeatures.png
-%%DATADIR%%/themes/default/mActionRedo.png
-%%DATADIR%%/themes/default/mActionRemoveSelectedFeature.png
-%%DATADIR%%/themes/default/mActionNodeTool.png
-%%DATADIR%%/themes/default/mActionArrowDown.png
-%%DATADIR%%/themes/default/mActionAlignLeft.png
-%%DATADIR%%/themes/default/mActionSimplify.png
-%%DATADIR%%/themes/default/mActionZoomNext.png
-%%DATADIR%%/themes/nkids/mActionZoomLast.png
-%%DATADIR%%/themes/nkids/mActionMeasure.png
-%%DATADIR%%/themes/nkids/mActionRemoveLayer.png
-%%DATADIR%%/themes/nkids/mActionProjectProperties.png
-%%DATADIR%%/themes/nkids/mActionZoomToSelected.png
-%%DATADIR%%/themes/nkids/qgis32x32.png
-%%DATADIR%%/themes/nkids/mActionHelpAbout.png
-%%DATADIR%%/themes/nkids/mActionInOverview.png
-%%DATADIR%%/themes/nkids/mActionNewBookmark.png
-%%DATADIR%%/themes/nkids/delete_selected.png
-%%DATADIR%%/themes/nkids/mActionFileSave.png
-%%DATADIR%%/themes/nkids/mIconProjectionProblem.png
-%%DATADIR%%/themes/nkids/show_all_layers1.png
-%%DATADIR%%/themes/nkids/remove_all_to_overview.png
-%%DATADIR%%/themes/nkids/mActionZoomToLayer.png
-%%DATADIR%%/themes/nkids/mActionZoomNext.png
-%%DATADIR%%/themes/nkids/action.png
-%%DATADIR%%/themes/nkids/mActionAddNonDbLayer.png
-%%DATADIR%%/themes/nkids/mActionCustomProjection.png
-%%DATADIR%%/themes/nkids/mActionExportMapServer.png
-%%DATADIR%%/themes/nkids/mActionShowPluginManager.png
-%%DATADIR%%/themes/nkids/show_layerReal.png
-%%DATADIR%%/themes/nkids/mActionDraw.png
-%%DATADIR%%/themes/nkids/mIconProjectionDisabled.png
-%%DATADIR%%/themes/nkids/mActionPan.png
-%%DATADIR%%/themes/nkids/inline_table.png
-%%DATADIR%%/themes/nkids/layers.png
-%%DATADIR%%/themes/nkids/mActionShowAllLayers.png
-%%DATADIR%%/themes/nkids/mActionAddAllToOverview.png
-%%DATADIR%%/themes/nkids/mActionOptions.png
-%%DATADIR%%/themes/nkids/mActionFilePrint.png
-%%DATADIR%%/themes/nkids/mActionFileNew.png
-%%DATADIR%%/themes/nkids/contexthelp.png
-%%DATADIR%%/themes/nkids/mActionSelect.png
-%%DATADIR%%/themes/nkids/mIconProjectionEnabled.png
-%%DATADIR%%/themes/nkids/mActionCapturePolygon.png
-%%DATADIR%%/themes/nkids/mActionHelpContents.png
-%%DATADIR%%/themes/nkids/gis_plain_cursor.png
-%%DATADIR%%/themes/nkids/mActionOpenTable.png
-%%DATADIR%%/themes/nkids/mActionCaptureLine.png
-%%DATADIR%%/themes/nkids/mActionFileExit.png
-%%DATADIR%%/themes/nkids/mActionCapturePoint.png
-%%DATADIR%%/themes/nkids/mActionFileSaveAs.png
-%%DATADIR%%/themes/nkids/mActionSaveMapAsImage.png
-%%DATADIR%%/themes/nkids/mActionFileOpen.png
-%%DATADIR%%/themes/nkids/mActionAddWmsLayer.png
-%%DATADIR%%/themes/nkids/mActionZoomFullExtent.png
-%%DATADIR%%/themes/nkids/mActionIdentify.png
-%%DATADIR%%/themes/nkids/over-.png
-%%DATADIR%%/themes/nkids/mActionRemoveAllFromOverview.png
-%%DATADIR%%/themes/nkids/mActionShowBookmarks.png
-%%DATADIR%%/themes/nkids/mActionZoomIn.png
-%%DATADIR%%/themes/nkids/mActionQgisHomePage.png
-%%DATADIR%%/themes/nkids/mActionNewVectorLayer.png
-%%DATADIR%%/themes/nkids/mActionZoomOut.png
-%%DATADIR%%/themes/nkids/mActionAddRasterLayer.png
-%%DATADIR%%/themes/nkids/mActionAddLayer.png
-%%DATADIR%%/themes/nkids/over.png
-%%DATADIR%%/themes/nkids/mActionHideAllLayers.png
-%%DATADIR%%/themes/nkids/over1.png
-%%DATADIR%%/themes/gis/mActionZoomToSelected.png
-%%DATADIR%%/themes/gis/mActionHideAllLayers.png
-%%DATADIR%%/themes/gis/mActionFileSaveAs.png
-%%DATADIR%%/themes/gis/mActionEditPaste.png
-%%DATADIR%%/themes/gis/mActionAddVertex.png
-%%DATADIR%%/themes/gis/mActionShowAllLayers.png
-%%DATADIR%%/themes/gis/mActionShowBookmarks.png
-%%DATADIR%%/themes/gis/mActionInOverview.png
-%%DATADIR%%/themes/gis/mActionUnselectAttributes.png
-%%DATADIR%%/themes/gis/mActionAddGPSLayer.png
-%%DATADIR%%/themes/gis/mActionMoveVertex.png
-%%DATADIR%%/themes/gis/mActionFileOpen.png
-%%DATADIR%%/themes/gis/mActionNewVectorLayer.png
-%%DATADIR%%/themes/gis/mActionZoomIn.png
-%%DATADIR%%/themes/gis/mActionAddWfsLayer.png
-%%DATADIR%%/themes/gis/mActionHelpContents.png
-%%DATADIR%%/themes/gis/mActionDeleteSelected.png
-%%DATADIR%%/themes/gis/mActionCaptureLine.png
-%%DATADIR%%/themes/gis/mActionAddWmsLayer.png
-%%DATADIR%%/themes/gis/mActionCapturePoint.png
-%%DATADIR%%/themes/gis/mActionZoomOut.png
-%%DATADIR%%/themes/gis/mActionSelect.png
-%%DATADIR%%/themes/gis/mActionPan.png
-%%DATADIR%%/themes/gis/mActionZoomFullExtent.png
-%%DATADIR%%/themes/gis/mActionNewBookmark.png
-%%DATADIR%%/themes/gis/mActionMoveFeature.png
-%%DATADIR%%/themes/gis/mActionAddIsland.png
-%%DATADIR%%/themes/gis/mActionZoomToLayer.png
-%%DATADIR%%/themes/gis/mActionAddLayer.png
-%%DATADIR%%/themes/gis/mActionToggleEditing.png
-%%DATADIR%%/themes/gis/mActionFileNew.png
-%%DATADIR%%/themes/gis/mActionMeasureArea.png
-%%DATADIR%%/themes/gis/mActionRemoveLayer.png
-%%DATADIR%%/themes/gis/mActionSplitFeatures.png
-%%DATADIR%%/themes/gis/mActionFilePrint.png
-%%DATADIR%%/themes/gis/mActionDraw.png
-%%DATADIR%%/themes/gis/mActionAddOgrLayer.png
-%%DATADIR%%/themes/gis/mActionFileSave.png
-%%DATADIR%%/themes/gis/mActionAddRasterLayer.png
-%%DATADIR%%/themes/gis/mActionDeleteVertex.png
-%%DATADIR%%/themes/gis/mActionMeasure.png
-%%DATADIR%%/themes/gis/mActionEditCut.png
-%%DATADIR%%/themes/gis/mActionAddRing.png
-%%DATADIR%%/themes/gis/mActionZoomLast.png
-%%DATADIR%%/themes/gis/mActionOpenTable.png
-%%DATADIR%%/themes/gis/mActionIdentify.png
-%%DATADIR%%/themes/gis/mActionMapTips.png
-%%DATADIR%%/themes/gis/mActionCapturePolygon.png
-%%DATADIR%%/themes/gis/mActionEditCopy.png
-%%DATADIR%%/themes/gis/plugins/north_arrow.png
-%%DATADIR%%/themes/gis/plugins/copyright_label.png
-%%DATADIR%%/themes/gis/plugins/georeferencer.png
-%%DATADIR%%/themes/gis/plugins/dxf2shp_converter.png
-%%DATADIR%%/themes/gis/plugins/ogr_converter.png
-%%DATADIR%%/themes/gis/plugins/wfs.png
-%%DATADIR%%/themes/gis/plugins/spit.png
-%%DATADIR%%/themes/gis/plugins/scale_bar.png
-%%DATADIR%%/themes/gis/plugins/interpolation.png
-%%DATADIR%%/themes/gis/plugins/gps_importer.png
-%%DATADIR%%/themes/gis/plugins/delimited_text.png
-%%DATADIR%%/themes/gis/plugins/quick_print.png
-%%DATADIR%%/themes/gis/plugins/coordinate_capture/coordinate_capture.png
-%%DATADIR%%/themes/gis/mActionDeletePart.png
-%%DATADIR%%/themes/gis/mActionUngroupItems.png
-%%DATADIR%%/themes/gis/mActionAddMap.png
-%%DATADIR%%/themes/gis/mActionSelectPan.png
-%%DATADIR%%/themes/gis/mActionZoomNext.png
-%%DATADIR%%/themes/gis/mActionSaveMapAsImage.png
-%%DATADIR%%/themes/gis/mActionDeleteRing.png
-%%DATADIR%%/themes/gis/mActionSaveAsSVG.png
-%%DATADIR%%/themes/gis/mActionScaleBar.png
-%%DATADIR%%/themes/gis/mActionAddImage.png
-%%DATADIR%%/themes/gis/mActionUndo.png
-%%DATADIR%%/themes/gis/mActionMergeFeatures.png
-%%DATADIR%%/themes/gis/mActionGroupItems.png
-%%DATADIR%%/themes/gis/mActionRedo.png
-%%DATADIR%%/themes/gis/mActionMoveItemContent.png
-%%DATADIR%%/themes/gis/mActionAddLegend.png
-%%DATADIR%%/themes/gis/mActionNodeTool.png
-%%DATADIR%%/themes/gis/mActionAddSpatiaLiteLayer.png
-%%DATADIR%%/themes/gis/mActionLabel.png
-%%DATADIR%%/themes/gis/mActionSimplify.png
-%%DATADIR%%/themes/gis/mActionSaveAsPDF.png
 %%DATADIR%%/svg/biology/Coniferous.svg
 %%DATADIR%%/svg/biology/Flower.svg
 %%DATADIR%%/svg/biology/Deciduous.svg
@@ -490,6 +95,23 @@
 %%DATADIR%%/svg/north_arrows/NorthArrow14.svg
 %%DATADIR%%/svg/north_arrows/NorthArrow15.svg
 %%DATADIR%%/svg/north_arrows/NorthArrow16.svg
+%%DATADIR%%/svg/north_arrows/north-arrow_3_simple_symmetric_triangular.svg
+%%DATADIR%%/svg/north_arrows/north-arrow_14_steering_wheel.svg
+%%DATADIR%%/svg/north_arrows/north-arrow_16_corner_arrows_unfilled_with_circle.svg
+%%DATADIR%%/svg/north_arrows/north-arrow_8_checkered.svg
+%%DATADIR%%/svg/north_arrows/north-arrow_9_half_arrow_unfilled.svg
+%%DATADIR%%/svg/north_arrows/north-arrow_15_checkerboard_corner_arrows.svg
+%%DATADIR%%/svg/north_arrows/north-arrow_10_with_map_layers.svg
+%%DATADIR%%/svg/north_arrows/north-arrow_11_simple_corner.svg
+%%DATADIR%%/svg/north_arrows/north-arrow_17_corner_n_e.svg
+%%DATADIR%%/svg/north_arrows/north-arrow_13_checkerboard_earth.svg
+%%DATADIR%%/svg/north_arrows/north-arrow_12_triangular_arrows_with_worldmap.svg
+%%DATADIR%%/svg/north_arrows/north-arrow_7_big_circle_with_small_arrow_unfilled_n.svg
+%%DATADIR%%/svg/north_arrows/north-arrow_6_unfilled_big_arrow_symmetric.svg
+%%DATADIR%%/svg/north_arrows/north-arrow_5_arrow_in_circle_small_n.svg
+%%DATADIR%%/svg/north_arrows/north-arrow_1_simple_half_arrow.svg
+%%DATADIR%%/svg/north_arrows/north-arrow_4_double_arrow.svg
+%%DATADIR%%/svg/north_arrows/north-arrow_2_simple_half_arrow.svg
 %%DATADIR%%/svg/services/amenity=recycling.svg
 %%DATADIR%%/svg/services/amenity=post_box.svg
 %%DATADIR%%/svg/services/amenity=telephone.svg
@@ -518,83 +140,160 @@
 %%DATADIR%%/resources/srs.db
 %%DATADIR%%/resources/qgis.db
 %%DATADIR%%/resources/qgis_help.db
-%%DATADIR%%/resources/context_help/165149618_en_US
-%%DATADIR%%/resources/context_help/929865718_sv_SE
-%%DATADIR%%/resources/context_help/939347163_sv_SE
-%%DATADIR%%/resources/context_help/929865718_sk_SK
-%%DATADIR%%/resources/context_help/361087368_sv_SE
-%%DATADIR%%/resources/context_help/94000531_sk_SK
-%%DATADIR%%/resources/context_help/689216579_sk_SK
-%%DATADIR%%/resources/context_help/308026563_sv_SE
-%%DATADIR%%/resources/context_help/1033030847_sv_SE
-%%DATADIR%%/resources/context_help/1033030847_en_US
-%%DATADIR%%/resources/context_help/689216579_de_DE
-%%DATADIR%%/resources/context_help/995980174_sk_SK
-%%DATADIR%%/resources/context_help/831088384_de_DE
-%%DATADIR%%/resources/context_help/863656587_sk_SK
-%%DATADIR%%/resources/context_help/32338213_de_DE
-%%DATADIR%%/resources/context_help/151694916_es_ES
-%%DATADIR%%/resources/context_help/995980174_en_US
-%%DATADIR%%/resources/context_help/361087368_sk_SK
-%%DATADIR%%/resources/context_help/710979116_de_DE
-%%DATADIR%%/resources/context_help/687883780_sv_SE
-%%DATADIR%%/resources/context_help/863656587_en_US
-%%DATADIR%%/resources/context_help/151694916_de_DE
-%%DATADIR%%/resources/context_help/689216579_en_US
-%%DATADIR%%/resources/context_help/94000531_de_DE
-%%DATADIR%%/resources/context_help/995980174_de_DE
-%%DATADIR%%/resources/context_help/985715179_sk_SK
-%%DATADIR%%/resources/context_help/687883780_es_ES
-%%DATADIR%%/resources/context_help/151694916_sv_SE
-%%DATADIR%%/resources/context_help/308026563_en_US
-%%DATADIR%%/resources/context_help/308026563_sk_SK
-%%DATADIR%%/resources/context_help/165149618_de_DE
-%%DATADIR%%/resources/context_help/687883780_de_DE
-%%DATADIR%%/resources/context_help/929865718_en_US
-%%DATADIR%%/resources/context_help/165149618_sk_SK
-%%DATADIR%%/resources/context_help/863656587_de_DE
-%%DATADIR%%/resources/context_help/929865718_es_ES
-%%DATADIR%%/resources/context_help/689216579_sv_SE
-%%DATADIR%%/resources/context_help/689216579_es_ES
-%%DATADIR%%/resources/context_help/710979116_sk_SK
-%%DATADIR%%/resources/context_help/308026563_de_DE
-%%DATADIR%%/resources/context_help/151694916_sk_SK
-%%DATADIR%%/resources/context_help/985715179_en_US
-%%DATADIR%%/resources/context_help/710979116_en_US
-%%DATADIR%%/resources/context_help/710979116_sv_SE
-%%DATADIR%%/resources/context_help/361087368_es_ES
-%%DATADIR%%/resources/context_help/831088384_en_US
-%%DATADIR%%/resources/context_help/939347163_sk_SK
-%%DATADIR%%/resources/context_help/863656587_es_ES
-%%DATADIR%%/resources/context_help/985715179_de_DE
-%%DATADIR%%/resources/context_help/32338213_sk_SK
-%%DATADIR%%/resources/context_help/94000531_es_ES
-%%DATADIR%%/resources/context_help/32338213_en_US
-%%DATADIR%%/resources/context_help/361087368_de_DE
-%%DATADIR%%/resources/context_help/929865718_de_DE
-%%DATADIR%%/resources/context_help/687883780_sk_SK
-%%DATADIR%%/resources/context_help/1033030847_de_DE
-%%DATADIR%%/resources/context_help/32338213_sv_SE
-%%DATADIR%%/resources/context_help/939347163_de_DE
-%%DATADIR%%/resources/context_help/687883780_en_US
-%%DATADIR%%/resources/context_help/151694916_en_US
-%%DATADIR%%/resources/context_help/361087368_en_US
-%%DATADIR%%/resources/context_help/831088384_sk_SK
-%%DATADIR%%/resources/context_help/939347163_en_US
-%%DATADIR%%/resources/context_help/94000531_en_US
-%%DATADIR%%/resources/context_help/1033030847_sk_SK
-%%DATADIR%%/resources/context_help/361087368_pl_PL
-%%DATADIR%%/resources/context_help/348772824_en_US
-%%DATADIR%%/resources/context_help/863656587_pl_PL
-%%DATADIR%%/resources/context_help/939347163_pl_PL
-%%DATADIR%%/resources/context_help/831088384_pl_PL
-%%DATADIR%%/resources/context_help/63428984_en_US
-%%DATADIR%%/resources/context_help/151694916_pl_PL
-%%DATADIR%%/resources/context_help/985715179_pl_PL
-%%DATADIR%%/resources/context_help/687883780_pl_PL
-%%DATADIR%%/resources/context_help/94000531_pl_PL
-%%DATADIR%%/resources/context_help/689216579_pl_PL
-%%DATADIR%%/resources/context_help/929865718_pl_PL
+%%DATADIR%%/resources/symbology-ng-style.xml
+%%DATADIR%%/resources/context_help/QgsBookmarks-pl_PL
+%%DATADIR%%/resources/context_help/QgsPluginInstallerDialog-en_US
+%%DATADIR%%/resources/context_help/QgsAttributeTable-pt_BR
+%%DATADIR%%/resources/context_help/QgsIdentifyResults-de_DE
+%%DATADIR%%/resources/context_help/QgsOptions-it_IT
+%%DATADIR%%/resources/context_help/QgsVectorLayerProperties-ru_RU
+%%DATADIR%%/resources/context_help/QgsOptions-de_DE
+%%DATADIR%%/resources/context_help/QgsDelimitedTextPluginGui-en_US
+%%DATADIR%%/resources/context_help/QgsOpenVectorLayerDialog-en_US
+%%DATADIR%%/resources/context_help/QgsBookmarks-pt_BR
+%%DATADIR%%/resources/context_help/QgsCopyrightLabelPluginGui-sk_SK
+%%DATADIR%%/resources/context_help/QgsVectorLayerProperties-es_ES
+%%DATADIR%%/resources/context_help/eVisDatabaseConnectionGui-en_US
+%%DATADIR%%/resources/context_help/QgsNorthArrowPluginGui-it_IT
+%%DATADIR%%/resources/context_help/QgsCopyrightLabelPluginGui-it_IT
+%%DATADIR%%/resources/context_help/QgsNewOgrConnection-en_US
+%%DATADIR%%/resources/context_help/QgsCopyrightLabelPluginGui-de_DE
+%%DATADIR%%/resources/context_help/QgsPgSourceSelect-sv_SE
+%%DATADIR%%/resources/context_help/QgsVectorLayerProperties-en_US
+%%DATADIR%%/resources/context_help/QgsPgSourceSelect-de_DE
+%%DATADIR%%/resources/context_help/QgsComposer-it_IT
+%%DATADIR%%/resources/context_help/QgsPgSourceSelect-sk_SK
+%%DATADIR%%/resources/context_help/QgsComposer-de_DE
+%%DATADIR%%/resources/context_help/QgsProjectProperties-pl_PL
+%%DATADIR%%/resources/context_help/QgsNewVectorLayerDialog-ru_RU
+%%DATADIR%%/resources/context_help/QgsIdentifyResults-sv_SE
+%%DATADIR%%/resources/context_help/QgsDelimitedTextPluginGui-sv_SE
+%%DATADIR%%/resources/context_help/QgsNewHttpConnection-pt_BR
+%%DATADIR%%/resources/context_help/eVisDatabaseConnectionGui-de_DE
+%%DATADIR%%/resources/context_help/QgsGPSPlugin-pt_BR
+%%DATADIR%%/resources/context_help/QgsGPSPluginGui-de_DE
+%%DATADIR%%/resources/context_help/QgsWMSSourceSelect-en_US
+%%DATADIR%%/resources/context_help/QgsVectorLayerProperties-pt_BR
+%%DATADIR%%/resources/context_help/QgsMeasureDialog-pl_PL
+%%DATADIR%%/resources/context_help/QgsCustomProjectionDialog-en_US
+%%DATADIR%%/resources/context_help/QgsScaleBarPluginGui-de_DE
+%%DATADIR%%/resources/context_help/QgsNewConnection-sv_SE
+%%DATADIR%%/resources/context_help/QgsDelimitedTextPluginGui-pt_BR
+%%DATADIR%%/resources/context_help/QgsMapserverExport-sk_SK
+%%DATADIR%%/resources/context_help/QgsAttributeTableDialog-ru_RU
+%%DATADIR%%/resources/context_help/QgsNewOgrConnection-pt_BR
+%%DATADIR%%/resources/context_help/QgsIdentifyResults-pt_BR
+%%DATADIR%%/resources/context_help/QgsMapserverExport-es_ES
+%%DATADIR%%/resources/context_help/MapServerExport-it_IT
+%%DATADIR%%/resources/context_help/QgsNewConnection-pt_BR
+%%DATADIR%%/resources/context_help/QgsNewConnection-es_ES
+%%DATADIR%%/resources/context_help/QgsCopyrightLabelPluginGui-pl_PL
+%%DATADIR%%/resources/context_help/QgsDelimitedTextPluginGui-pl_PL
+%%DATADIR%%/resources/context_help/QgsMapserverExport-pt_BR
+%%DATADIR%%/resources/context_help/QgsComposer-sk_SK
+%%DATADIR%%/resources/context_help/QgsWMSSourceSelect-sv_SE
+%%DATADIR%%/resources/context_help/QgsPluginInstallerDialog-pl_PL
+%%DATADIR%%/resources/context_help/QgsGPSPluginGui-it_IT
+%%DATADIR%%/resources/context_help/QgsVectorLayerProperties-de_DE
+%%DATADIR%%/resources/context_help/QgsNewConnection-ru_RU
+%%DATADIR%%/resources/context_help/QgsComposer-ru_RU
+%%DATADIR%%/resources/context_help/QgsDbSourceSelect-pt_BR
+%%DATADIR%%/resources/context_help/QgsNewVectorLayerDialog-fr_FR
+%%DATADIR%%/resources/context_help/QgsNewVectorLayerDialog-en_US
+%%DATADIR%%/resources/context_help/QgsNewConnection-sk_SK
+%%DATADIR%%/resources/context_help/QgsProjectProperties-pt_BR
+%%DATADIR%%/resources/context_help/QgsIdentifyResults-pl_PL
+%%DATADIR%%/resources/context_help/QgsComposer-pl_PL
+%%DATADIR%%/resources/context_help/QgsAttributeTableDialog-en_US
+%%DATADIR%%/resources/context_help/QgsBookmarks-sk_SK
+%%DATADIR%%/resources/context_help/QgsOpenVectorLayerDialog-it_IT
+%%DATADIR%%/resources/context_help/QgsAttributeTableDialog-pl_PL
+%%DATADIR%%/resources/context_help/QgsGPSPluginGui-sk_SK
+%%DATADIR%%/resources/context_help/QgsOpenVectorLayerDialog-pt_BR
+%%DATADIR%%/resources/context_help/QgsWMSSourceSelect-de_DE
+%%DATADIR%%/resources/context_help/QgsGPSPluginGui-ru_RU
+%%DATADIR%%/resources/context_help/QgsNewConnection-pl_PL
+%%DATADIR%%/resources/context_help/QgsNewVectorLayerDialog-it_IT
+%%DATADIR%%/resources/context_help/QgsSpatiaLiteSourceSelect-pl_PL
+%%DATADIR%%/resources/context_help/QgsDelimitedTextPluginGui-ru_RU
+%%DATADIR%%/resources/context_help/QgsCustomProjectionDialog-de_DE
+%%DATADIR%%/resources/context_help/QgsAttributeTableDialog-it_IT
+%%DATADIR%%/resources/context_help/QgsNewOgrConnection-de_DE
+%%DATADIR%%/resources/context_help/QgsCopyrightLabelPluginGui-fr_FR
+%%DATADIR%%/resources/context_help/QgsIdentifyResults-it_IT
+%%DATADIR%%/resources/context_help/QgsComposer-en_US
+%%DATADIR%%/resources/context_help/QgsIdentifyResults-sk_SK
+%%DATADIR%%/resources/context_help/MapServerExport-pl_PL
+%%DATADIR%%/resources/context_help/QgsAttributeTableDialog-sk_SK
+%%DATADIR%%/resources/context_help/QgsStyleV2ManagerDialog-en_US
+%%DATADIR%%/resources/context_help/QgsOptions-en_US
+%%DATADIR%%/resources/context_help/QgsComposer-fr_FR
+%%DATADIR%%/resources/context_help/QgsOpenVectorLayerDialog-ru_RU
+%%DATADIR%%/resources/context_help/QgsWMSSourceSelect-sk_SK
+%%DATADIR%%/resources/context_help/QgsProjectProperties-en_US
+%%DATADIR%%/resources/context_help/QgsPluginInstallerDialog-de_DE
+%%DATADIR%%/resources/context_help/QgsNorthArrowPluginGui-en_US
+%%DATADIR%%/resources/context_help/QgsMeasureDialog-sv_SE
+%%DATADIR%%/resources/context_help/QgsCopyrightLabelPluginGui-pt_BR
+%%DATADIR%%/resources/context_help/QgsSpatiaLiteSourceSelect-en_US
+%%DATADIR%%/resources/context_help/QgsNewVectorLayerDialog-sk_SK
+%%DATADIR%%/resources/context_help/QgsBookmarks-en_US
+%%DATADIR%%/resources/context_help/QgsAttributeTableDialog-de_DE
+%%DATADIR%%/resources/context_help/eVisDatabaseConnectionGui-it_IT
+%%DATADIR%%/resources/context_help/QgsProjectProperties-de_DE
+%%DATADIR%%/resources/context_help/QgsDelimitedTextPluginGui-de_DE
+%%DATADIR%%/resources/context_help/QgsPgSourceSelect-en_US
+%%DATADIR%%/resources/context_help/QgsProjectProperties-sk_SK
+%%DATADIR%%/resources/context_help/QgsMeasureDialog-sk_SK
+%%DATADIR%%/resources/context_help/MapServerExport-en_US
+%%DATADIR%%/resources/context_help/QgsServerSourceSelect-pt_BR
+%%DATADIR%%/resources/context_help/QgsNewOgrConnection-it_IT
+%%DATADIR%%/resources/context_help/QgsProjectProperties-sv_SE
+%%DATADIR%%/resources/context_help/QgsCustomProjectionDialog-it_IT
+%%DATADIR%%/resources/context_help/QgsGPSPluginGui-en_US
+%%DATADIR%%/resources/context_help/QgsBookmarks-sv_SE
+%%DATADIR%%/resources/context_help/QgsCopyrightLabelPluginGui-sv_SE
+%%DATADIR%%/resources/context_help/QgsNewConnection-de_DE
+%%DATADIR%%/resources/context_help/QgsIdentifyResults-en_US
+%%DATADIR%%/resources/context_help/QgsMeasureDialog-ru_RU
+%%DATADIR%%/resources/context_help/QgsNewOgrConnection-ru_RU
+%%DATADIR%%/resources/context_help/QgsAttributeTableDialog-fr_FR
+%%DATADIR%%/resources/context_help/QgsDelimitedTextPluginGui-it_IT
+%%DATADIR%%/resources/context_help/QgsComposer-pt_BR
+%%DATADIR%%/resources/context_help/QgsIdentifyResults-es_ES
+%%DATADIR%%/resources/context_help/QgsIdentifyResults-ru_RU
+%%DATADIR%%/resources/context_help/QgsMeasure-pt_BR
+%%DATADIR%%/resources/context_help/QgsMeasureDialog-de_DE
+%%DATADIR%%/resources/context_help/QgsDelimitedTextPluginGui-sk_SK
+%%DATADIR%%/resources/context_help/QgsProjectProperties-es_ES
+%%DATADIR%%/resources/context_help/QgsPgSourceSelect-pl_PL
+%%DATADIR%%/resources/context_help/QgsPgSourceSelect-ru_RU
+%%DATADIR%%/resources/context_help/QgsMeasureDialog-en_US
+%%DATADIR%%/resources/context_help/QgsCreateNewVectorLayer-pt_BR
+%%DATADIR%%/resources/context_help/QgsWMSSourceSelect-ru_RU
+%%DATADIR%%/resources/context_help/QgsSpatiaLiteSourceSelect-de_DE
+%%DATADIR%%/resources/context_help/QgsVectorLayerProperties-sk_SK
+%%DATADIR%%/resources/context_help/QgsMapserverExport-ru_RU
+%%DATADIR%%/resources/context_help/QgsNorthArrowPluginGui-de_DE
+%%DATADIR%%/resources/context_help/QgsVectorLayerProperties-pl_PL
+%%DATADIR%%/resources/context_help/QgsScaleBarPluginGui-en_US
+%%DATADIR%%/resources/context_help/QgsBookmarks-fr_FR
+%%DATADIR%%/resources/context_help/QgsProjectProperties-ru_RU
+%%DATADIR%%/resources/context_help/QgsNewConnection-it_IT
+%%DATADIR%%/resources/context_help/QgsBookmarks-it_IT
+%%DATADIR%%/resources/context_help/QgsNewConnection-en_US
+%%DATADIR%%/resources/context_help/QgsCopyrightLabelPluginGui-en_US
+%%DATADIR%%/resources/context_help/QgsBookmarks-de_DE
+%%DATADIR%%/resources/context_help/QgsStyleV2ManagerDialog-de_DE
+%%DATADIR%%/resources/context_help/QgsNewVectorLayerDialog-de_DE
+%%DATADIR%%/resources/context_help/QgsOpenVectorLayerDialog-de_DE
+%%DATADIR%%/resources/context_help/MapServerExport-de_DE
+%%DATADIR%%/resources/context_help/QgsCopyrightLabelPluginGui-ru_RU
+%%DATADIR%%/resources/context_help/QgsBookmarks-es_ES
+%%DATADIR%%/resources/context_help/QgsBookmarks-ru_RU
+%%DATADIR%%/resources/context_help/QgsMeasureDialog-es_ES
+%%DATADIR%%/resources/context_help/QgsScaleBarPluginGui-pl_PL
+%%DATADIR%%/resources/context_help/QgsMeasureDialog-it_IT
 %%DATADIR%%/i18n/qgis_pt_BR.qm
 %%DATADIR%%/i18n/qt_ru.qm
 %%DATADIR%%/i18n/qgis_lo.qm
@@ -639,18 +338,21 @@
 %%DATADIR%%/i18n/qt_uk.qm
 %%DATADIR%%/i18n/qgis_uk.qm
 %%DATADIR%%/i18n/qgis_he.qm
+%%DATADIR%%/i18n/qgis_hr_HR.qm
+%%DATADIR%%/i18n/qgis_is.qm
 bin/qgis
 bin/qgis_help
 lib/libqgis_core.so
-lib/libqgis_core.so.1.3.0
+lib/libqgis_core.so.1.4.0
 lib/libqgis_gui.so
-lib/libqgis_gui.so.1.3.0
+lib/libqgis_gui.so.1.4.0
 lib/libqgis_analysis.so
-lib/libqgis_analysis.so.1.3.0
+lib/libqgis_analysis.so.1.4.0
 lib/qgis/libcopyrightlabelplugin.so
 lib/qgis/libdelimitedtextplugin.so
 lib/qgis/libdelimitedtextprovider.so
 lib/qgis/libgeorefplugin.so
+lib/qgis/liblabelingplugin.so
 lib/qgis/libgpsimporterplugin.so
 lib/qgis/libgpxprovider.so
 lib/qgis/libmemoryprovider.so
@@ -675,8 +377,7 @@ lib/qgis/librasterterrainplugin.so
 lib/qgis/libdiagramoverlay.so
 lib/qgis/libevis.so
 %%QGIS_PYTHON%%lib/libqgispython.so
-%%QGIS_PYTHON%%lib/libqgispython.so.1.3.0
-%%QGIS_PYTHON%%lib/libqgispython.so.1.3
+%%QGIS_PYTHON%%lib/libqgispython.so.1.4.0
 include/qgis/qgis.h
 include/qgis/qgisgui.h
 include/qgis/qgisinterface.h
@@ -688,6 +389,9 @@ include/qgis/qgsclipper.h
 include/qgis/qgscliptominmaxenhancement.h
 include/qgis/qgscolorbutton.h
 include/qgis/qgscolorrampshader.h
+include/qgis/qgscomposeritem.h
+include/qgis/qgscomposershape.h
+include/qgis/qgscomposition.h
 include/qgis/qgsconfig.h
 include/qgis/qgscontexthelp.h
 include/qgis/qgscontinuouscolorrenderer.h
@@ -710,6 +414,7 @@ include/qgis/qgsfreakoutshader.h
 include/qgis/qgsgeometry.h
 include/qgis/qgsgraduatedsymbolrenderer.h
 include/qgis/qgshttptransaction.h
+include/qgis/qgsinterpolator.h
 include/qgis/qgslabel.h
 include/qgis/qgslabelattributes.h
 include/qgis/qgslinearminmaxenhancement.h
@@ -751,6 +456,7 @@ include/qgis/qgsrasterlayer.h
 include/qgis/qgsrastershader.h
 include/qgis/qgsrastershaderfunction.h
 include/qgis/qgsrastertransparency.h
+include/qgis/qgsrasterviewport.h
 include/qgis/qgsrendercontext.h
 include/qgis/qgsrenderer.h
 include/qgis/qgsrendererplugin.h
@@ -787,12 +493,30 @@ include/qgis/qgscomposeritemgroup.h
 include/qgis/qgslegendmodel.h
 include/qgis/qgsgenericprojectionselector.h
 include/qgis/qgscomposerview.h
+include/qgis/qgszonalstatistics.h
+include/qgis/qgsgridfilewriter.h
+include/qgis/qgsidwinterpolator.h
+include/qgis/qgstininterpolator.h
+include/qgis/qgssymbollayerv2widget.h
+include/qgis/qgssymbolv2propertiesdialog.h
+include/qgis/qgssinglesymbolrendererv2widget.h
+include/qgis/qgsrendererv2propertiesdialog.h
+include/qgis/qgscategorizedsymbolrendererv2widget.h
+include/qgis/qgsgraduatedsymbolrendererv2widget.h
+include/qgis/qgsstylev2managerdialog.h
+include/qgis/qgssymbollevelsv2dialog.h
+include/qgis/qgssymbolv2selectordialog.h
+include/qgis/qgsvectorgradientcolorrampv2dialog.h
+include/qgis/qgsvectorrandomcolorrampv2dialog.h
+include/qgis/qgsvectorcolorbrewercolorrampv2dialog.h
+include/qgis/qgslegendinterface.h
+include/qgis/qgsludialog.h
+include/qgis/qgsprojectbadlayerguihandler.h
 @dirrm include/qgis
 @dirrm lib/qgis
 @dirrm %%DATADIR%%/doc/images
 @dirrm %%DATADIR%%/doc
 @dirrm %%DATADIR%%/i18n
-@dirrm %%DATADIR%%/images/developers
 @dirrm %%DATADIR%%/images/icons
 @dirrm %%DATADIR%%/images/north_arrows
 @dirrm %%DATADIR%%/images/splash
@@ -812,16 +536,10 @@ include/qgis/qgscomposerview.h
 @dirrm %%DATADIR%%/svg/symbol
 @dirrm %%DATADIR%%/svg/transport
 @dirrm %%DATADIR%%/svg
-@dirrm %%DATADIR%%/themes/classic
-@dirrm %%DATADIR%%/themes/default/plugins
-@dirrm %%DATADIR%%/themes/default
-@dirrm %%DATADIR%%/themes/nkids
-@dirrm %%DATADIR%%/themes/gis/plugins/coordinate_capture
-@dirrm %%DATADIR%%/themes/gis/plugins
-@dirrm %%DATADIR%%/themes/gis
-@dirrm %%DATADIR%%/themes
 %%QGIS_PYTHON%%%%DATADIR%%/python/qgis/__init__.py
+%%QGIS_PYTHON%%%%DATADIR%%/python/qgis/utils.py
 %%QGIS_PYTHON%%%%DATADIR%%/python/qgis/qgisconfig.py
+%%QGIS_PYTHON%%%%DATADIR%%/python/qgis/analysis.so
 %%QGIS_PYTHON%%%%DATADIR%%/python/qgis/core.so
 %%QGIS_PYTHON%%%%DATADIR%%/python/qgis/gui.so
 %%QGIS_PYTHON%%%%DATADIR%%/python/plugins/plugin_installer/ui_qgsplugininstallerbase.py
@@ -996,6 +714,7 @@ include/qgis/qgscomposerview.h
 %%QGIS_PYTHON%%%%DATADIR%%/python/plugins/osm/OsmAddRelationDlg.py
 %%QGIS_PYTHON%%%%DATADIR%%/python/plugins/osm/OsmSaveDlg.py
 %%QGIS_PYTHON%%%%DATADIR%%/python/plugins/osm/OsmPlugin.py
+%%QGIS_PYTHON%%%%DATADIR%%/python/plugins/osm/OsmTags.py
 %%QGIS_PYTHON%%%%DATADIR%%/python/plugins/osm/ui_OsmAddRelationDlg.py
 %%QGIS_PYTHON%%%%DATADIR%%/python/plugins/osm/ui_OsmImportDlg.py
 %%QGIS_PYTHON%%%%DATADIR%%/python/plugins/osm/ui_OsmDownloadDlg.py