From 9bc7eca7b2d781556cd6021ecd3609fd3cadf62d Mon Sep 17 00:00:00 2001
From: Nyall Dawson <nyall.dawson@gmail.com>
Date: Mon, 20 Oct 2014 17:26:01 +1100
Subject: [PATCH] Cleanup action text

Make sure all actions use standard capitalization and ... suffixes when
required. Add missing menu key shortcuts to composer actions.
---
 python/plugins/GdalTools/GdalTools.py         |  44 +++----
 python/plugins/fTools/fTools.py               |  82 ++++++-------
 python/plugins/processing/ProcessingPlugin.py |  12 +-
 src/app/composer/qgscomposer.cpp              |  32 +++---
 src/plugins/georeferencer/qgsgeorefplugin.cpp |   2 +-
 src/plugins/heatmap/heatmap.cpp               |   2 +-
 .../qgsrasterterrainanalysisplugin.cpp        |  10 +-
 src/ui/qgisapp.ui                             |  34 +++---
 src/ui/qgscomposerbase.ui                     | 108 +++++++++---------
 src/ui/qgsowssourceselectbase.ui              |   2 +-
 src/ui/qgsrasterlayerpropertiesbase.ui        |   4 +-
 src/ui/qgsrasterlayersaveasdialogbase.ui      |   2 +-
 src/ui/qgsvectorlayerpropertiesbase.ui        |   4 +-
 src/ui/qgswfssourceselectbase.ui              |   2 +-
 src/ui/qgswmssourceselectbase.ui              |   2 +-
 15 files changed, 172 insertions(+), 170 deletions(-)
 mode change 100644 => 100755 src/plugins/georeferencer/qgsgeorefplugin.cpp
 mode change 100644 => 100755 src/plugins/heatmap/heatmap.cpp
 mode change 100644 => 100755 src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisplugin.cpp
 mode change 100644 => 100755 src/ui/qgisapp.ui

diff --git a/python/plugins/GdalTools/GdalTools.py b/python/plugins/GdalTools/GdalTools.py
index e95d14b815e..b84005d404f 100644
--- a/python/plugins/GdalTools/GdalTools.py
+++ b/python/plugins/GdalTools/GdalTools.py
@@ -126,17 +126,17 @@ class GdalTools:
     self.projectionsMenu = QMenu( QCoreApplication.translate( "GdalTools", "Projections" ), self.iface.mainWindow() )
     self.projectionsMenu.setObjectName("projectionsMenu")
 
-    self.warp = QAction( QIcon(":/icons/warp.png"),  QCoreApplication.translate( "GdalTools", "Warp (Reproject)" ), self.iface.mainWindow() )
+    self.warp = QAction( QIcon(":/icons/warp.png"),  QCoreApplication.translate( "GdalTools", "Warp (Reproject)..." ), self.iface.mainWindow() )
     self.warp.setObjectName("warp")
     self.warp.setStatusTip( QCoreApplication.translate( "GdalTools", "Warp an image into a new coordinate system") )
     QObject.connect( self.warp, SIGNAL( "triggered()" ), self.doWarp )
 
-    self.projection = QAction( QIcon( ":icons/projection-add.png" ), QCoreApplication.translate( "GdalTools", "Assign projection" ), self.iface.mainWindow() )
+    self.projection = QAction( QIcon( ":icons/projection-add.png" ), QCoreApplication.translate( "GdalTools", "Assign Projection..." ), self.iface.mainWindow() )
     self.projection.setObjectName("projection")
     self.projection.setStatusTip( QCoreApplication.translate( "GdalTools", "Add projection info to the raster" ) )
     QObject.connect( self.projection, SIGNAL( "triggered()" ), self.doProjection )
 
-    self.extractProj = QAction( QIcon( ":icons/projection-export.png" ), QCoreApplication.translate( "GdalTools", "Extract projection" ), self.iface.mainWindow() )
+    self.extractProj = QAction( QIcon( ":icons/projection-export.png" ), QCoreApplication.translate( "GdalTools", "Extract Projection..." ), self.iface.mainWindow() )
     self.extractProj.setObjectName("extractProj")
     self.extractProj.setStatusTip( QCoreApplication.translate( "GdalTools", "Extract projection information from raster(s)" ) )
     QObject.connect( self.extractProj, SIGNAL( "triggered()" ), self.doExtractProj )
@@ -148,30 +148,30 @@ class GdalTools:
     self.conversionMenu.setObjectName("conversionMenu")
 
     if self.GdalVersionNum >= 1300:
-      self.rasterize = QAction( QIcon(":/icons/rasterize.png"), QCoreApplication.translate( "GdalTools", "Rasterize (Vector to raster)" ), self.iface.mainWindow() )
+      self.rasterize = QAction( QIcon(":/icons/rasterize.png"), QCoreApplication.translate( "GdalTools", "Rasterize (Vector to Raster)..." ), self.iface.mainWindow() )
       self.rasterize.setObjectName("rasterize")
       self.rasterize.setStatusTip( QCoreApplication.translate( "GdalTools", "Burns vector geometries into a raster") )
       QObject.connect( self.rasterize, SIGNAL( "triggered()" ), self.doRasterize )
       self.conversionMenu.addAction( self.rasterize )
 
     if self.GdalVersionNum >= 1600:
-      self.polygonize = QAction( QIcon(":/icons/polygonize.png"), QCoreApplication.translate( "GdalTools", "Polygonize (Raster to vector)" ), self.iface.mainWindow() )
+      self.polygonize = QAction( QIcon(":/icons/polygonize.png"), QCoreApplication.translate( "GdalTools", "Polygonize (Raster to Vector)..." ), self.iface.mainWindow() )
       self.polygonize.setObjectName("polygonize")
       self.polygonize.setStatusTip( QCoreApplication.translate( "GdalTools", "Produces a polygon feature layer from a raster") )
       QObject.connect( self.polygonize, SIGNAL( "triggered()" ), self.doPolygonize )
       self.conversionMenu.addAction( self.polygonize )
 
-    self.translate = QAction( QIcon(":/icons/translate.png"), QCoreApplication.translate( "GdalTools", "Translate (Convert format)" ), self.iface.mainWindow() )
+    self.translate = QAction( QIcon(":/icons/translate.png"), QCoreApplication.translate( "GdalTools", "Translate (Convert Format)..." ), self.iface.mainWindow() )
     self.translate.setObjectName("translate")
     self.translate.setStatusTip( QCoreApplication.translate( "GdalTools", "Converts raster data between different formats") )
     QObject.connect( self.translate, SIGNAL( "triggered()" ), self.doTranslate )
 
-    self.paletted = QAction( QIcon( ":icons/24-to-8-bits.png" ), QCoreApplication.translate( "GdalTools", "RGB to PCT" ), self.iface.mainWindow() )
+    self.paletted = QAction( QIcon( ":icons/24-to-8-bits.png" ), QCoreApplication.translate( "GdalTools", "RGB to PCT..." ), self.iface.mainWindow() )
     self.paletted.setObjectName("paletted")
     self.paletted.setStatusTip( QCoreApplication.translate( "GdalTools", "Convert a 24bit RGB image to 8bit paletted" ) )
     QObject.connect( self.paletted, SIGNAL( "triggered()" ), self.doPaletted )
 
-    self.rgb = QAction( QIcon( ":icons/8-to-24-bits.png" ), QCoreApplication.translate( "GdalTools", "PCT to RGB" ), self.iface.mainWindow() )
+    self.rgb = QAction( QIcon( ":icons/8-to-24-bits.png" ), QCoreApplication.translate( "GdalTools", "PCT to RGB..." ), self.iface.mainWindow() )
     self.rgb.setObjectName("rgb")
     self.rgb.setStatusTip( QCoreApplication.translate( "GdalTools", "Convert an 8bit paletted image to 24bit RGB" ) )
     QObject.connect( self.rgb, SIGNAL( "triggered()" ), self.doRGB )
@@ -183,13 +183,13 @@ class GdalTools:
     self.extractionMenu.setObjectName("extractionMenu")
 
     if self.GdalVersionNum >= 1600:
-      self.contour = QAction( QIcon(":/icons/contour.png"), QCoreApplication.translate( "GdalTools", "Contour" ), self.iface.mainWindow() )
+      self.contour = QAction( QIcon(":/icons/contour.png"), QCoreApplication.translate( "GdalTools", "Contour..." ), self.iface.mainWindow() )
       self.contour.setObjectName("contour")
       self.contour.setStatusTip( QCoreApplication.translate( "GdalTools", "Builds vector contour lines from a DEM") )
       QObject.connect( self.contour, SIGNAL( "triggered()" ), self.doContour )
       self.extractionMenu.addAction( self.contour )
 
-    self.clipper = QAction( QIcon( ":icons/raster-clip.png" ), QCoreApplication.translate( "GdalTools", "Clipper" ), self.iface.mainWindow() )
+    self.clipper = QAction( QIcon( ":icons/raster-clip.png" ), QCoreApplication.translate( "GdalTools", "Clipper..." ), self.iface.mainWindow() )
     self.clipper.setObjectName("clipper")
     #self.clipper.setStatusTip( QCoreApplication.translate( "GdalTools", "Converts raster data between different formats") )
     QObject.connect( self.clipper, SIGNAL( "triggered()" ), self.doClipper )
@@ -201,42 +201,42 @@ class GdalTools:
     self.analysisMenu.setObjectName("analysisMenu")
 
     if self.GdalVersionNum >= 1600:
-      self.sieve = QAction( QIcon(":/icons/sieve.png"), QCoreApplication.translate( "GdalTools", "Sieve" ), self.iface.mainWindow() )
+      self.sieve = QAction( QIcon(":/icons/sieve.png"), QCoreApplication.translate( "GdalTools", "Sieve..." ), self.iface.mainWindow() )
       self.sieve.setObjectName("sieve")
       self.sieve.setStatusTip( QCoreApplication.translate( "GdalTools", "Removes small raster polygons") )
       QObject.connect( self.sieve, SIGNAL( "triggered()" ), self.doSieve )
       self.analysisMenu.addAction( self.sieve )
 
     if self.GdalVersionNum >= 1500:
-      self.nearBlack = QAction( QIcon(":/icons/nearblack.png"),  QCoreApplication.translate( "GdalTools", "Near black" ), self.iface.mainWindow() )
+      self.nearBlack = QAction( QIcon(":/icons/nearblack.png"),  QCoreApplication.translate( "GdalTools", "Near Black..." ), self.iface.mainWindow() )
       self.nearBlack.setObjectName("nearBlack")
       self.nearBlack.setStatusTip( QCoreApplication.translate( "GdalTools", "Convert nearly black/white borders to exact value") )
       QObject.connect( self.nearBlack, SIGNAL( "triggered()" ), self.doNearBlack )
       self.analysisMenu.addAction( self.nearBlack )
 
     if self.GdalVersionNum >= 1700:
-      self.fillNodata = QAction( QIcon(":/icons/fillnodata.png"), QCoreApplication.translate( "GdalTools", "Fill nodata" ), self.iface.mainWindow() )
+      self.fillNodata = QAction( QIcon(":/icons/fillnodata.png"), QCoreApplication.translate( "GdalTools", "Fill nodata..." ), self.iface.mainWindow() )
       self.fillNodata.setObjectName("fillNodata")
       self.fillNodata.setStatusTip( QCoreApplication.translate( "GdalTools", "Fill raster regions by interpolation from edges") )
       QObject.connect( self.fillNodata, SIGNAL( "triggered()" ), self.doFillNodata )
       self.analysisMenu.addAction( self.fillNodata )
 
     if self.GdalVersionNum >= 1600:
-      self.proximity = QAction( QIcon(":/icons/proximity.png"),  QCoreApplication.translate( "GdalTools", "Proximity (Raster distance)" ), self.iface.mainWindow() )
+      self.proximity = QAction( QIcon(":/icons/proximity.png"),  QCoreApplication.translate( "GdalTools", "Proximity (Raster Distance)..." ), self.iface.mainWindow() )
       self.proximity.setObjectName("proximity")
       self.proximity.setStatusTip( QCoreApplication.translate( "GdalTools", "Produces a raster proximity map") )
       QObject.connect( self.proximity, SIGNAL( "triggered()" ), self.doProximity )
       self.analysisMenu.addAction( self.proximity )
 
     if self.GdalVersionNum >= 1500:
-      self.grid = QAction( QIcon(":/icons/grid.png"), QCoreApplication.translate( "GdalTools", "Grid (Interpolation)" ), self.iface.mainWindow() )
+      self.grid = QAction( QIcon(":/icons/grid.png"), QCoreApplication.translate( "GdalTools", "Grid (Interpolation)..." ), self.iface.mainWindow() )
       self.grid.setObjectName("grid")
       self.grid.setStatusTip( QCoreApplication.translate( "GdalTools", "Create raster from the scattered data") )
       QObject.connect( self.grid, SIGNAL( "triggered()" ), self.doGrid )
       self.analysisMenu.addAction( self.grid )
 
     if self.GdalVersionNum >= 1700:
-      self.dem = QAction( QIcon( ":icons/dem.png" ), QCoreApplication.translate( "GdalTools", "DEM (Terrain models)" ), self.iface.mainWindow() )
+      self.dem = QAction( QIcon( ":icons/dem.png" ), QCoreApplication.translate( "GdalTools", "DEM (Terrain Models)..." ), self.iface.mainWindow() )
       self.dem.setObjectName("dem")
       self.dem.setStatusTip( QCoreApplication.translate( "GdalTools", "Tool to analyze and visualize DEMs" ) )
       QObject.connect( self.dem, SIGNAL( "triggered()" ), self.doDEM )
@@ -249,28 +249,28 @@ class GdalTools:
     self.miscellaneousMenu.setObjectName("miscellaneousMenu")
 
     if self.GdalVersionNum >= 1600:
-      self.buildVRT = QAction( QIcon(":/icons/vrt.png"), QCoreApplication.translate( "GdalTools", "Build Virtual Raster (Catalog)" ), self.iface.mainWindow() )
+      self.buildVRT = QAction( QIcon(":/icons/vrt.png"), QCoreApplication.translate( "GdalTools", "Build Virtual Raster (Catalog)..." ), self.iface.mainWindow() )
       self.buildVRT.setObjectName("buildVRT")
       self.buildVRT.setStatusTip( QCoreApplication.translate( "GdalTools", "Builds a VRT from a list of datasets") )
       QObject.connect( self.buildVRT, SIGNAL( "triggered()" ), self.doBuildVRT )
       self.miscellaneousMenu.addAction( self.buildVRT )
 
-    self.merge = QAction( QIcon(":/icons/merge.png"), QCoreApplication.translate( "GdalTools", "Merge" ), self.iface.mainWindow() )
+    self.merge = QAction( QIcon(":/icons/merge.png"), QCoreApplication.translate( "GdalTools", "Merge..." ), self.iface.mainWindow() )
     self.merge.setObjectName("merge")
     self.merge.setStatusTip( QCoreApplication.translate( "GdalTools", "Build a quick mosaic from a set of images") )
     QObject.connect( self.merge, SIGNAL( "triggered()" ), self.doMerge )
 
-    self.info = QAction( QIcon( ":/icons/raster-info.png" ), QCoreApplication.translate( "GdalTools", "Information" ), self.iface.mainWindow() )
+    self.info = QAction( QIcon( ":/icons/raster-info.png" ), QCoreApplication.translate( "GdalTools", "Information..." ), self.iface.mainWindow() )
     self.info.setObjectName("info")
     self.info.setStatusTip( QCoreApplication.translate( "GdalTools", "Lists information about raster dataset" ) )
     QObject.connect( self.info, SIGNAL("triggered()"), self.doInfo )
 
-    self.overview = QAction( QIcon( ":icons/raster-overview.png" ), QCoreApplication.translate( "GdalTools", "Build overviews (Pyramids)" ), self.iface.mainWindow() )
+    self.overview = QAction( QIcon( ":icons/raster-overview.png" ), QCoreApplication.translate( "GdalTools", "Build Overviews (Pyramids)..." ), self.iface.mainWindow() )
     self.overview.setObjectName("overview")
     self.overview.setStatusTip( QCoreApplication.translate( "GdalTools", "Builds or rebuilds overview images" ) )
     QObject.connect( self.overview, SIGNAL( "triggered()" ), self.doOverview )
 
-    self.tileindex = QAction( QIcon( ":icons/tiles.png" ), QCoreApplication.translate( "GdalTools", "Tile index" ), self.iface.mainWindow() )
+    self.tileindex = QAction( QIcon( ":icons/tiles.png" ), QCoreApplication.translate( "GdalTools", "Tile Index..." ), self.iface.mainWindow() )
     self.tileindex.setObjectName("tileindex")
     self.tileindex.setStatusTip( QCoreApplication.translate( "GdalTools", "Build a shapefile as a raster tileindex" ) )
     QObject.connect( self.tileindex, SIGNAL( "triggered()" ), self.doTileIndex )
@@ -286,7 +286,7 @@ class GdalTools:
 
     self.menu.addMenu( self.miscellaneousMenu )
 
-    self.settings = QAction( QCoreApplication.translate( "GdalTools", "GdalTools settings" ), self.iface.mainWindow() )
+    self.settings = QAction( QCoreApplication.translate( "GdalTools", "GdalTools Settings..." ), self.iface.mainWindow() )
     self.settings.setObjectName("settings")
     self.settings.setStatusTip( QCoreApplication.translate( "GdalTools", "Various settings for Gdal Tools" ) )
     QObject.connect( self.settings, SIGNAL( "triggered()" ), self.doSettings )
diff --git a/python/plugins/fTools/fTools.py b/python/plugins/fTools/fTools.py
index e342a12c301..2c290c838bf 100644
--- a/python/plugins/fTools/fTools.py
+++ b/python/plugins/fTools/fTools.py
@@ -127,63 +127,63 @@ class fToolsPlugin:
 
     self.analysisMenu = QMenu(QCoreApplication.translate("fTools", "&Analysis Tools"))
     self.analysisMenu.setObjectName("analysisMenu")
-    self.distMatrix = QAction(QCoreApplication.translate("fTools", "Distance matrix"),self.iface.mainWindow())
+    self.distMatrix = QAction(QCoreApplication.translate("fTools", "Distance Matrix..."),self.iface.mainWindow())
     self.distMatrix.setObjectName("distMatrix")
-    self.sumLines = QAction(QCoreApplication.translate("fTools", "Sum line lengths"), self.iface.mainWindow())
+    self.sumLines = QAction(QCoreApplication.translate("fTools", "Sum Line Lengths..."), self.iface.mainWindow())
     self.sumLines.setObjectName("sumLines")
-    self.pointsPoly = QAction(QCoreApplication.translate("fTools", "Points in polygon"),self.iface.mainWindow())
+    self.pointsPoly = QAction(QCoreApplication.translate("fTools", "Points in Polygon..."),self.iface.mainWindow())
     self.pointsPoly.setObjectName("pointsPoly")
-    self.compStats = QAction(QCoreApplication.translate("fTools",  "Basic statistics"),self.iface.mainWindow())
+    self.compStats = QAction(QCoreApplication.translate("fTools",  "Basic Statistics..."),self.iface.mainWindow())
     self.compStats.setObjectName("compStats")
-    self.listUnique = QAction(QCoreApplication.translate("fTools", "List unique values"),self.iface.mainWindow())
+    self.listUnique = QAction(QCoreApplication.translate("fTools", "List Unique Values..."),self.iface.mainWindow())
     self.listUnique.setObjectName("listUnique")
-    self.nearestNeigh = QAction(QCoreApplication.translate("fTools", "Nearest neighbour analysis"), self.iface.mainWindow())
+    self.nearestNeigh = QAction(QCoreApplication.translate("fTools", "Nearest Neighbour Analysis..."), self.iface.mainWindow())
     self.nearestNeigh.setObjectName("nearestNeigh")
-    self.meanCoords = QAction(QCoreApplication.translate("fTools", "Mean coordinate(s)"),self.iface.mainWindow())
+    self.meanCoords = QAction(QCoreApplication.translate("fTools", "Mean Coordinate(s)..."),self.iface.mainWindow())
     self.meanCoords.setObjectName("meanCoords")
-    self.intLines = QAction(QCoreApplication.translate("fTools", "Line intersections") ,self.iface.mainWindow())
+    self.intLines = QAction(QCoreApplication.translate("fTools", "Line Intersections...") ,self.iface.mainWindow())
     self.intLines.setObjectName("intLines")
     self.analysisMenu.addActions([self.distMatrix, self.sumLines, self.pointsPoly,
         self.listUnique, self.compStats, self.nearestNeigh, self.meanCoords, self.intLines])
 
     self.researchMenu = QMenu(QCoreApplication.translate("fTools", "&Research Tools"))
     self.researchMenu.setObjectName("researchMenu")
-    self.randSel = QAction(QCoreApplication.translate("fTools", "Random selection"),self.iface.mainWindow())
+    self.randSel = QAction(QCoreApplication.translate("fTools", "Random Selection..."),self.iface.mainWindow())
     self.randSel.setObjectName("randSel")
-    self.randSub = QAction(QCoreApplication.translate("fTools", "Random selection within subsets"),self.iface.mainWindow())
+    self.randSub = QAction(QCoreApplication.translate("fTools", "Random Selection Within Subsets..."),self.iface.mainWindow())
     self.randSub.setObjectName("randSub")
-    self.randPoints = QAction(QCoreApplication.translate("fTools", "Random points"),self.iface.mainWindow())
+    self.randPoints = QAction(QCoreApplication.translate("fTools", "Random Points..."),self.iface.mainWindow())
     self.randPoints.setObjectName("randPoints")
-    self.regPoints = QAction(QCoreApplication.translate("fTools", "Regular points"), self.iface.mainWindow())
+    self.regPoints = QAction(QCoreApplication.translate("fTools", "Regular Points..."), self.iface.mainWindow())
     self.regPoints.setObjectName("regPoints")
-    self.vectGrid = QAction(QCoreApplication.translate("fTools", "Vector grid"), self.iface.mainWindow())
+    self.vectGrid = QAction(QCoreApplication.translate("fTools", "Vector Grid..."), self.iface.mainWindow())
     self.vectGrid.setObjectName("vectGrid")
-    self.selectLocation = QAction(QCoreApplication.translate("fTools", "Select by location"), self.iface.mainWindow())
+    self.selectLocation = QAction(QCoreApplication.translate("fTools", "Select by Location..."), self.iface.mainWindow())
     self.selectLocation.setObjectName("selectLocation")
-    self.layerExtent = QAction(QCoreApplication.translate("fTools", "Polygon from layer extent"), self.iface.mainWindow())
+    self.layerExtent = QAction(QCoreApplication.translate("fTools", "Polygon from Layer Extent..."), self.iface.mainWindow())
     self.layerExtent.setObjectName("layerExtent")
     self.researchMenu.addActions([self.randSel, self.randSub, self.randPoints,
         self.regPoints, self.vectGrid, self.selectLocation, self.layerExtent])
 
     self.geoMenu = QMenu(QCoreApplication.translate("fTools", "&Geoprocessing Tools"))
     self.geoMenu.setObjectName("geoMenu")
-    self.minConvex = QAction(QCoreApplication.translate("fTools", "Convex hull(s)"),self.iface.mainWindow())
+    self.minConvex = QAction(QCoreApplication.translate("fTools", "Convex Hull(s)..."),self.iface.mainWindow())
     self.minConvex.setObjectName("minConvex")
-    self.dynaBuffer = QAction(QCoreApplication.translate("fTools", "Buffer(s)"),self.iface.mainWindow())
+    self.dynaBuffer = QAction(QCoreApplication.translate("fTools", "Buffer(s)..."),self.iface.mainWindow())
     self.dynaBuffer.setObjectName("dynaBuffer")
-    self.intersect = QAction(QCoreApplication.translate("fTools", "Intersect"),self.iface.mainWindow())
+    self.intersect = QAction(QCoreApplication.translate("fTools", "Intersect..."),self.iface.mainWindow())
     self.intersect.setObjectName("intersect")
-    self.union = QAction(QCoreApplication.translate("fTools", "Union"),self.iface.mainWindow())
+    self.union = QAction(QCoreApplication.translate("fTools", "Union..."),self.iface.mainWindow())
     self.union.setObjectName("union")
-    self.symDifference = QAction(QCoreApplication.translate("fTools", "Symetrical difference"),self.iface.mainWindow())
+    self.symDifference = QAction(QCoreApplication.translate("fTools", "Symetrical Difference..."),self.iface.mainWindow())
     self.symDifference.setObjectName("symDifference")
-    self.clip = QAction(QCoreApplication.translate("fTools", "Clip"),self.iface.mainWindow())
+    self.clip = QAction(QCoreApplication.translate("fTools", "Clip..."),self.iface.mainWindow())
     self.clip.setObjectName("clip")
-    self.dissolve = QAction(QCoreApplication.translate("fTools", "Dissolve"),self.iface.mainWindow())
+    self.dissolve = QAction(QCoreApplication.translate("fTools", "Dissolve..."),self.iface.mainWindow())
     self.dissolve.setObjectName("dissolve")
-    self.erase = QAction(QCoreApplication.translate("fTools", "Difference"),self.iface.mainWindow())
+    self.erase = QAction(QCoreApplication.translate("fTools", "Difference..."),self.iface.mainWindow())
     self.erase.setObjectName("erase")
-    self.eliminate = QAction( QCoreApplication.translate( "fTools", "Eliminate sliver polygons" ),self.iface.mainWindow() )
+    self.eliminate = QAction( QCoreApplication.translate( "fTools", "Eliminate Sliver Polygons..." ),self.iface.mainWindow() )
     self.eliminate.setObjectName("eliminate")
     self.geoMenu.addActions([self.minConvex, self.dynaBuffer, self.intersect,
         self.union, self.symDifference, self.clip, self.erase, self.dissolve,
@@ -191,29 +191,29 @@ class fToolsPlugin:
 
     self.conversionMenu = QMenu(QCoreApplication.translate("fTools", "G&eometry Tools"))
     self.conversionMenu.setObjectName("conversionMenu")
-    self.compGeo = QAction(QCoreApplication.translate("fTools", "Export/Add geometry columns"),self.iface.mainWindow())
+    self.compGeo = QAction(QCoreApplication.translate("fTools", "Export/Add Geometry Columns..."),self.iface.mainWindow())
     self.compGeo.setObjectName("compGeo")
-    self.checkGeom = QAction(QCoreApplication.translate("fTools", "Check geometry validity"),self.iface.mainWindow())
+    self.checkGeom = QAction(QCoreApplication.translate("fTools", "Check Geometry Validity..."),self.iface.mainWindow())
     self.checkGeom.setObjectName("checkGeom")
-    self.centroids = QAction(QCoreApplication.translate("fTools", "Polygon centroids"),self.iface.mainWindow())
+    self.centroids = QAction(QCoreApplication.translate("fTools", "Polygon Centroids..."),self.iface.mainWindow())
     self.centroids.setObjectName("centroids")
-    self.delaunay = QAction(QCoreApplication.translate("fTools", "Delaunay triangulation"),self.iface.mainWindow())
+    self.delaunay = QAction(QCoreApplication.translate("fTools", "Delaunay Triangulation..."),self.iface.mainWindow())
     self.delaunay.setObjectName("delaunay")
-    self.voronoi = QAction(QCoreApplication.translate("fTools", "Voronoi Polygons"),self.iface.mainWindow())
+    self.voronoi = QAction(QCoreApplication.translate("fTools", "Voronoi Polygons..."),self.iface.mainWindow())
     self.voronoi.setObjectName("voronoi")
-    self.extNodes = QAction(QCoreApplication.translate("fTools", "Extract nodes"),self.iface.mainWindow())
+    self.extNodes = QAction(QCoreApplication.translate("fTools", "Extract Nodes..."),self.iface.mainWindow())
     self.extNodes.setObjectName("extNodes")
-    self.simplify = QAction(QCoreApplication.translate("fTools", "Simplify geometries"),self.iface.mainWindow())
+    self.simplify = QAction(QCoreApplication.translate("fTools", "Simplify Geometries..."),self.iface.mainWindow())
     self.simplify.setObjectName("simplify")
-    self.densify = QAction(QCoreApplication.translate("fTools", "Densify geometries"),self.iface.mainWindow())
+    self.densify = QAction(QCoreApplication.translate("fTools", "Densify Geometries..."),self.iface.mainWindow())
     self.densify.setObjectName("densify")
-    self.multiToSingle = QAction(QCoreApplication.translate("fTools", "Multipart to singleparts"),self.iface.mainWindow())
+    self.multiToSingle = QAction(QCoreApplication.translate("fTools", "Multipart to Singleparts..."),self.iface.mainWindow())
     self.multiToSingle.setObjectName("multiToSingle")
-    self.singleToMulti = QAction(QCoreApplication.translate("fTools", "Singleparts to multipart"),self.iface.mainWindow())
+    self.singleToMulti = QAction(QCoreApplication.translate("fTools", "Singleparts to Multipart..."),self.iface.mainWindow())
     self.singleToMulti.setObjectName("singleToMulti")
-    self.polysToLines = QAction(QCoreApplication.translate("fTools", "Polygons to lines"),self.iface.mainWindow())
+    self.polysToLines = QAction(QCoreApplication.translate("fTools", "Polygons to Lines..."),self.iface.mainWindow())
     self.polysToLines.setObjectName("polysToLines")
-    self.linesToPolys = QAction(QCoreApplication.translate("fTools", "Lines to polygons"),self.iface.mainWindow())
+    self.linesToPolys = QAction(QCoreApplication.translate("fTools", "Lines to Polygons..."),self.iface.mainWindow())
     self.linesToPolys.setObjectName("linesToPolys")
     self.conversionMenu.addActions([self.checkGeom, self.compGeo, self.centroids, self.delaunay, self.voronoi,
         self.simplify, self.densify, self.multiToSingle, self.singleToMulti, self.polysToLines, self.linesToPolys,
@@ -221,15 +221,15 @@ class fToolsPlugin:
 
     self.dataManageMenu = QMenu(QCoreApplication.translate("fTools", "&Data Management Tools"))
     self.dataManageMenu.setObjectName("dataManageMenu")
-    self.define = QAction(QCoreApplication.translate("fTools", "Define current projection"), self.iface.mainWindow())
+    self.define = QAction(QCoreApplication.translate("fTools", "Define Current Projection..."), self.iface.mainWindow())
     self.define.setObjectName("define")
-    self.spatJoin = QAction(QCoreApplication.translate("fTools", "Join attributes by location"), self.iface.mainWindow())
+    self.spatJoin = QAction(QCoreApplication.translate("fTools", "Join Attributes by Location..."), self.iface.mainWindow())
     self.spatJoin.setObjectName("spatJoin")
-    self.splitVect = QAction(QCoreApplication.translate("fTools", "Split vector layer"), self.iface.mainWindow())
+    self.splitVect = QAction(QCoreApplication.translate("fTools", "Split Vector Layer..."), self.iface.mainWindow())
     self.splitVect.setObjectName("splitVect")
-    self.mergeShapes = QAction(QCoreApplication.translate("fTools", "Merge shapefiles to one"), self.iface.mainWindow())
+    self.mergeShapes = QAction(QCoreApplication.translate("fTools", "Merge Shapefiles to One..."), self.iface.mainWindow())
     self.mergeShapes.setObjectName("mergeShapes")
-    self.spatialIndex = QAction(QCoreApplication.translate("fTools", "Create spatial index"), self.iface.mainWindow())
+    self.spatialIndex = QAction(QCoreApplication.translate("fTools", "Create Spatial Index..."), self.iface.mainWindow())
     self.spatialIndex.setObjectName("spatialIndex")
     self.dataManageMenu.addActions([self.define, self.spatJoin, self.splitVect, self.mergeShapes, self.spatialIndex])
 
diff --git a/python/plugins/processing/ProcessingPlugin.py b/python/plugins/processing/ProcessingPlugin.py
index 06645cc98b3..169a3962613 100644
--- a/python/plugins/processing/ProcessingPlugin.py
+++ b/python/plugins/processing/ProcessingPlugin.py
@@ -62,18 +62,18 @@ class ProcessingPlugin:
         self.menu = QMenu(self.iface.mainWindow().menuBar())
         self.menu.setObjectName( 'processing' )
         self.menu.setTitle(QCoreApplication.translate('Processing',
-                           'Processing'))
+                           'Pro&cessing'))
 
         self.toolboxAction = self.toolbox.toggleViewAction()
         self.toolboxAction.setObjectName( 'toolboxAction' )
         self.toolboxAction.setIcon(QIcon(':/processing/images/alg.png'))
         self.toolboxAction.setText(QCoreApplication.translate('Processing',
-                                   'Toolbox'))
+                                   '&Toolbox'))
         self.menu.addAction(self.toolboxAction)
 
         self.modelerAction = QAction(QIcon(':/processing/images/model.png'),
                                      QCoreApplication.translate('Processing',
-                                     'Graphical modeler'),
+                                     'Graphical &Modeler...'),
                                      self.iface.mainWindow())
         self.modelerAction.setObjectName( 'modelerAction' )
         self.modelerAction.triggered.connect(self.openModeler)
@@ -81,7 +81,7 @@ class ProcessingPlugin:
 
         self.historyAction = QAction(QIcon(':/processing/images/history.gif'),
                                      QCoreApplication.translate('Processing',
-                                     'History and log'),
+                                     '&History and Log...'),
                                      self.iface.mainWindow())
         self.historyAction.setObjectName( 'historyAction' )
         self.historyAction.triggered.connect(self.openHistory)
@@ -89,7 +89,7 @@ class ProcessingPlugin:
 
         self.configAction = QAction(QIcon(':/processing/images/config.png'),
                                     QCoreApplication.translate('Processing',
-                                    'Options and configuration'),
+                                    '&Options...'),
                                     self.iface.mainWindow())
         self.configAction.setObjectName( 'configAction' )
         self.configAction.triggered.connect(self.openConfig)
@@ -97,7 +97,7 @@ class ProcessingPlugin:
 
         self.resultsAction = QAction(QIcon(':/processing/images/results.png'),
                                      QCoreApplication.translate('Processing',
-                                     '&Results viewer'),
+                                     '&Results Viewer...'),
                                      self.iface.mainWindow())
         self.resultsAction.setObjectName( 'resultsAction' )
         self.resultsAction.triggered.connect(self.openResults)
diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
index 17a2acb32d0..79c779a36ac 100755
--- a/src/app/composer/qgscomposer.cpp
+++ b/src/app/composer/qgscomposer.cpp
@@ -182,6 +182,7 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title )
   mActionPan->setCheckable( true );
   mActionMouseZoom->setCheckable( true );
   mActionAddArrow->setCheckable( true );
+  mActionAddHtml->setCheckable( true );
 
   mActionShowGrid->setCheckable( true );
   mActionSnapGrid->setCheckable( true );
@@ -200,14 +201,14 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title )
   appMenu->addAction( mQgis->actionOptions() );
 #endif
 
-  QMenu *composerMenu = menuBar()->addMenu( tr( "Composer" ) );
+  QMenu *composerMenu = menuBar()->addMenu( tr( "&Composer" ) );
   composerMenu->addAction( mActionSaveProject );
   composerMenu->addSeparator();
   composerMenu->addAction( mActionNewComposer );
   composerMenu->addAction( mActionDuplicateComposer );
   composerMenu->addAction( mActionComposerManager );
 
-  mPrintComposersMenu = new QMenu( tr( "Print Composers" ), this );
+  mPrintComposersMenu = new QMenu( tr( "Print &Composers" ), this );
   mPrintComposersMenu->setObjectName( "mPrintComposersMenu" );
   connect( mPrintComposersMenu, SIGNAL( aboutToShow() ), this, SLOT( populatePrintComposersMenu() ) );
   composerMenu->addMenu( mPrintComposersMenu );
@@ -246,7 +247,7 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title )
   mActionPaste->setIcon( QgsApplication::getThemeIcon( "/mActionEditPaste.png" ) );
   connect( mActionPaste, SIGNAL( triggered() ), this, SLOT( actionPasteTriggered() ) );
 
-  QMenu *editMenu = menuBar()->addMenu( tr( "Edit" ) );
+  QMenu *editMenu = menuBar()->addMenu( tr( "&Edit" ) );
   editMenu->addAction( mActionUndo );
   editMenu->addAction( mActionRedo );
   editMenu->addSeparator();
@@ -269,24 +270,24 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title )
   editMenu->addAction( mActionSelectNextBelow );
   editMenu->addAction( mActionSelectNextAbove );
 
-  mActionPreviewModeOff = new QAction( tr( "Normal" ), this );
+  mActionPreviewModeOff = new QAction( tr( "&Normal" ), this );
   mActionPreviewModeOff->setStatusTip( tr( "Normal" ) );
   mActionPreviewModeOff->setCheckable( true );
   mActionPreviewModeOff->setChecked( true );
   connect( mActionPreviewModeOff, SIGNAL( triggered() ), this, SLOT( disablePreviewMode() ) );
-  mActionPreviewModeGrayscale = new QAction( tr( "Simulate Photocopy (Grayscale)" ), this );
+  mActionPreviewModeGrayscale = new QAction( tr( "Simulate Photocopy (&Grayscale)" ), this );
   mActionPreviewModeGrayscale->setStatusTip( tr( "Simulate photocopy (grayscale)" ) );
   mActionPreviewModeGrayscale->setCheckable( true );
   connect( mActionPreviewModeGrayscale, SIGNAL( triggered() ), this, SLOT( activateGrayscalePreview() ) );
-  mActionPreviewModeMono = new QAction( tr( "Simulate Fax (Mono)" ), this );
+  mActionPreviewModeMono = new QAction( tr( "Simulate Fax (&Mono)" ), this );
   mActionPreviewModeMono->setStatusTip( tr( "Simulate fax (mono)" ) );
   mActionPreviewModeMono->setCheckable( true );
   connect( mActionPreviewModeMono, SIGNAL( triggered() ), this, SLOT( activateMonoPreview() ) );
-  mActionPreviewProtanope = new QAction( tr( "Simulate Color Blindness (Protanope)" ), this );
+  mActionPreviewProtanope = new QAction( tr( "Simulate Color Blindness (&Protanope)" ), this );
   mActionPreviewProtanope->setStatusTip( tr( "Simulate color blindness (Protanope)" ) );
   mActionPreviewProtanope->setCheckable( true );
   connect( mActionPreviewProtanope, SIGNAL( triggered() ), this, SLOT( activateProtanopePreview() ) );
-  mActionPreviewDeuteranope = new QAction( tr( "Simulate Color Blindness (Deuteranope)" ), this );
+  mActionPreviewDeuteranope = new QAction( tr( "Simulate Color Blindness (&Deuteranope)" ), this );
   mActionPreviewDeuteranope->setStatusTip( tr( "Simulate color blindness (Deuteranope)" ) );
   mActionPreviewDeuteranope->setCheckable( true );
   connect( mActionPreviewDeuteranope, SIGNAL( triggered() ), this, SLOT( activateDeuteranopePreview() ) );
@@ -299,7 +300,7 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title )
   mActionPreviewProtanope->setActionGroup( mPreviewGroup );
   mActionPreviewDeuteranope->setActionGroup( mPreviewGroup );
 
-  QMenu *viewMenu = menuBar()->addMenu( tr( "View" ) );
+  QMenu *viewMenu = menuBar()->addMenu( tr( "&View" ) );
   //Ctrl+= should also trigger zoom in
   QShortcut* ctrlEquals = new QShortcut( QKeySequence( "Ctrl+=" ), this );
   connect( ctrlEquals, SIGNAL( activated() ), mActionZoomIn, SLOT( trigger() ) );
@@ -307,7 +308,7 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title )
 #ifndef Q_WS_MAC
   //disabled for OSX - see #10761
   //also see http://qt-project.org/forums/viewthread/3630 QGraphicsEffects are not well supported on OSX
-  QMenu *previewMenu = viewMenu->addMenu( "Preview" );
+  QMenu *previewMenu = viewMenu->addMenu( "&Preview" );
   previewMenu->addAction( mActionPreviewModeOff );
   previewMenu->addAction( mActionPreviewModeGrayscale );
   previewMenu->addAction( mActionPreviewModeMono );
@@ -334,9 +335,9 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title )
   viewMenu->addAction( mActionShowRulers );
 
   // Panel and toolbar submenus
-  mPanelMenu = new QMenu( tr( "Panels" ), this );
+  mPanelMenu = new QMenu( tr( "P&anels" ), this );
   mPanelMenu->setObjectName( "mPanelMenu" );
-  mToolbarMenu = new QMenu( tr( "Toolbars" ), this );
+  mToolbarMenu = new QMenu( tr( "&Toolbars" ), this );
   mToolbarMenu->setObjectName( "mToolbarMenu" );
   viewMenu->addSeparator();
   viewMenu->addMenu( mPanelMenu );
@@ -347,7 +348,7 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title )
   mToolbarMenu->addAction( mItemActionToolbar->toggleViewAction() );
   mToolbarMenu->addAction( mItemToolbar->toggleViewAction() );
 
-  QMenu *layoutMenu = menuBar()->addMenu( tr( "Layout" ) );
+  QMenu *layoutMenu = menuBar()->addMenu( tr( "&Layout" ) );
   layoutMenu->addAction( mActionAddNewMap );
   layoutMenu->addAction( mActionAddNewLabel );
   layoutMenu->addAction( mActionAddNewScalebar );
@@ -356,6 +357,7 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title )
   layoutMenu->addAction( mActionAddArrow );
   //layoutMenu->addAction( mActionAddTable );
   layoutMenu->addAction( mActionAddAttributeTable );
+  layoutMenu->addAction( mActionAddHtml );
   layoutMenu->addSeparator();
   layoutMenu->addAction( mActionSelectMoveItem );
   layoutMenu->addAction( mActionMoveItemContent );
@@ -370,7 +372,7 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title )
   layoutMenu->addAction( mActionLockItems );
   layoutMenu->addAction( mActionUnlockAll );
 
-  QMenu *atlasMenu = menuBar()->addMenu( tr( "Atlas" ) );
+  QMenu *atlasMenu = menuBar()->addMenu( tr( "&Atlas" ) );
   atlasMenu->addAction( mActionAtlasPreview );
   atlasMenu->addAction( mActionAtlasFirst );
   atlasMenu->addAction( mActionAtlasPrev );
@@ -394,7 +396,7 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title )
   atlasExportToolButton->setDefaultAction( mActionExportAtlasAsImage );
   mAtlasToolbar->insertWidget( mActionAtlasSettings, atlasExportToolButton );
 
-  QMenu *settingsMenu = menuBar()->addMenu( tr( "Settings" ) );
+  QMenu *settingsMenu = menuBar()->addMenu( tr( "&Settings" ) );
   settingsMenu->addAction( mActionOptions );
 
 #ifdef Q_WS_MAC
diff --git a/src/plugins/georeferencer/qgsgeorefplugin.cpp b/src/plugins/georeferencer/qgsgeorefplugin.cpp
old mode 100644
new mode 100755
index 6853005da90..0c04c3d9d8a
--- a/src/plugins/georeferencer/qgsgeorefplugin.cpp
+++ b/src/plugins/georeferencer/qgsgeorefplugin.cpp
@@ -98,7 +98,7 @@ void QgsGeorefPlugin::initGui()
   delete mActionRunGeoref;
 
   // Create the action for tool
-  mActionRunGeoref = new QAction( QIcon(), tr( "&Georeferencer" ), this );
+  mActionRunGeoref = new QAction( QIcon(), tr( "&Georeferencer..." ), this );
   mActionRunGeoref->setObjectName( "mActionRunGeoref" );
 
   // Connect the action to the run
diff --git a/src/plugins/heatmap/heatmap.cpp b/src/plugins/heatmap/heatmap.cpp
old mode 100644
new mode 100755
index 075c85a0197..f5569289d0e
--- a/src/plugins/heatmap/heatmap.cpp
+++ b/src/plugins/heatmap/heatmap.cpp
@@ -87,7 +87,7 @@ void Heatmap::initGui()
   delete mQActionPointer;
 
   // Create the action for tool
-  mQActionPointer = new QAction( QIcon( ":/heatmap/heatmap.png" ), tr( "Heatmap" ), this );
+  mQActionPointer = new QAction( QIcon( ":/heatmap/heatmap.png" ), tr( "Heatmap..." ), this );
   mQActionPointer->setObjectName( "mQActionPointer" );
   // Set the what's this text
   mQActionPointer->setWhatsThis( tr( "Creates a heatmap raster for the input point vector." ) );
diff --git a/src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisplugin.cpp b/src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisplugin.cpp
old mode 100644
new mode 100755
index 27e34f69b61..8a1d45b5aee
--- a/src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisplugin.cpp
+++ b/src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisplugin.cpp
@@ -87,19 +87,19 @@ void QgsRasterTerrainAnalysisPlugin::initGui()
       return;
     }
 
-    mTerrainAnalysisMenu = new QMenu( tr( "Terrain analysis" ), rasterMenu );
+    mTerrainAnalysisMenu = new QMenu( tr( "Terrain Analysis" ), rasterMenu );
     mTerrainAnalysisMenu->setObjectName( "mTerrainAnalysisMenu" );
     mTerrainAnalysisMenu->setIcon( QIcon( ":/raster/dem.png" ) );
     QAction *slopeAction = mTerrainAnalysisMenu->addAction( tr( "Slope" ), this, SLOT( slope() ) );
     slopeAction->setObjectName( "slopeAction" );
 
-    QAction *aspectAction = mTerrainAnalysisMenu->addAction( tr( "Aspect" ), this, SLOT( aspect() ) );
+    QAction *aspectAction = mTerrainAnalysisMenu->addAction( tr( "Aspect..." ), this, SLOT( aspect() ) );
     aspectAction->setObjectName( "aspectAction" );
-    QAction *hilshadeAction = mTerrainAnalysisMenu->addAction( tr( "Hillshade" ), this, SLOT( hillshade() ) );
+    QAction *hilshadeAction = mTerrainAnalysisMenu->addAction( tr( "Hillshade..." ), this, SLOT( hillshade() ) );
     hilshadeAction->setObjectName( "hilshadeAction" );
-    QAction *reliefAction = mTerrainAnalysisMenu->addAction( tr( "Relief" ), this, SLOT( relief() ) );
+    QAction *reliefAction = mTerrainAnalysisMenu->addAction( tr( "Relief..." ), this, SLOT( relief() ) );
     reliefAction->setObjectName( "reliefAction" );
-    QAction *ruggednesIndex = mTerrainAnalysisMenu->addAction( tr( "Ruggedness index" ), this, SLOT( ruggedness() ) );
+    QAction *ruggednesIndex = mTerrainAnalysisMenu->addAction( tr( "Ruggedness Index..." ), this, SLOT( ruggedness() ) );
     ruggednesIndex->setObjectName( "ruggednesIndex" );
 
     rasterMenu->addMenu( mTerrainAnalysisMenu );
diff --git a/src/ui/qgisapp.ui b/src/ui/qgisapp.ui
old mode 100644
new mode 100755
index 1fd726c8f3f..8b7cd5cc831
--- a/src/ui/qgisapp.ui
+++ b/src/ui/qgisapp.ui
@@ -1177,7 +1177,7 @@
      <normaloff>:/images/themes/default/mActionNewSpatiaLiteLayer.svg</normaloff>:/images/themes/default/mActionNewSpatiaLiteLayer.svg</iconset>
    </property>
    <property name="text">
-    <string>New SpatiaLite Layer ...</string>
+    <string>New SpatiaLite Layer...</string>
    </property>
    <property name="shortcut">
     <string>Ctrl+Shift+A</string>
@@ -1189,7 +1189,7 @@
      <normaloff>:/images/themes/default/mActionShowRasterCalculator.png</normaloff>:/images/themes/default/mActionShowRasterCalculator.png</iconset>
    </property>
    <property name="text">
-    <string>Raster calculator ...</string>
+    <string>Raster Calculator...</string>
    </property>
   </action>
   <action name="mActionAddOgrLayer">
@@ -1465,7 +1465,7 @@
      <normaloff>:/images/themes/default/mActionOptions.svg</normaloff>:/images/themes/default/mActionOptions.svg</iconset>
    </property>
    <property name="text">
-    <string>Configure shortcuts...</string>
+    <string>Configure Shortcuts...</string>
    </property>
    <property name="menuRole">
     <enum>QAction::NoRole</enum>
@@ -1497,7 +1497,7 @@
   </action>
   <action name="mActionHelpAPI">
    <property name="text">
-    <string>API documentation</string>
+    <string>API Documentation</string>
    </property>
   </action>
   <action name="mActionQgisHomePage">
@@ -1608,7 +1608,7 @@ Ctl (Cmd) increments by 15 deg.</string>
      <normaloff>:/images/themes/default/mActionFullHistogramStretch.png</normaloff>:/images/themes/default/mActionFullHistogramStretch.png</iconset>
    </property>
    <property name="text">
-    <string>Full histogram stretch</string>
+    <string>Full Histogram Stretch</string>
    </property>
    <property name="toolTip">
     <string>Stretch Histogram to Full Dataset</string>
@@ -1740,7 +1740,7 @@ Ctl (Cmd) increments by 15 deg.</string>
      <normaloff>:/images/themes/default/mActionTouch.png</normaloff>:/images/themes/default/mActionTouch.png</iconset>
    </property>
    <property name="text">
-    <string>Touch zoom and pan</string>
+    <string>Touch Zoom and Pan</string>
    </property>
    <property name="toolTip">
     <string>Touch zoom and pan</string>
@@ -1923,7 +1923,7 @@ Acts on currently active editable layer</string>
      <normaloff>:/images/themes/default/mActionSaveAsSVG.png</normaloff>:/images/themes/default/mActionSaveAsSVG.png</iconset>
    </property>
    <property name="text">
-    <string>SVG annotation</string>
+    <string>SVG Annotation</string>
    </property>
   </action>
   <action name="mActionSaveAllEdits">
@@ -2045,17 +2045,17 @@ Acts on currently active editable layer</string>
   </action>
   <action name="mActionOSMDownload">
    <property name="text">
-    <string>&amp;Download data</string>
+    <string>&amp;Download Data...</string>
    </property>
   </action>
   <action name="mActionOSMImport">
    <property name="text">
-    <string>&amp;Import topology from XML</string>
+    <string>&amp;Import Topology from XML...</string>
    </property>
   </action>
   <action name="mActionOSMExport">
    <property name="text">
-    <string>&amp;Export topology to SpatiaLite</string>
+    <string>&amp;Export Topology to SpatiaLite...</string>
    </property>
   </action>
   <action name="mActionIncreaseBrightness">
@@ -2064,7 +2064,7 @@ Acts on currently active editable layer</string>
      <normaloff>:/images/themes/default/mActionIncreaseBrightness.svg</normaloff>:/images/themes/default/mActionIncreaseBrightness.svg</iconset>
    </property>
    <property name="text">
-    <string>Increase brightness</string>
+    <string>Increase Brightness</string>
    </property>
   </action>
   <action name="mActionDecreaseBrightness">
@@ -2073,7 +2073,7 @@ Acts on currently active editable layer</string>
      <normaloff>:/images/themes/default/mActionDecreaseBrightness.svg</normaloff>:/images/themes/default/mActionDecreaseBrightness.svg</iconset>
    </property>
    <property name="text">
-    <string>Decrease brightness</string>
+    <string>Decrease Brightness</string>
    </property>
   </action>
   <action name="mActionIncreaseContrast">
@@ -2082,7 +2082,7 @@ Acts on currently active editable layer</string>
      <normaloff>:/images/themes/default/mActionIncreaseContrast.svg</normaloff>:/images/themes/default/mActionIncreaseContrast.svg</iconset>
    </property>
    <property name="text">
-    <string>Increase contrast</string>
+    <string>Increase Contrast</string>
    </property>
   </action>
   <action name="mActionDecreaseContrast">
@@ -2091,7 +2091,7 @@ Acts on currently active editable layer</string>
      <normaloff>:/images/themes/default/mActionDecreaseContrast.svg</normaloff>:/images/themes/default/mActionDecreaseContrast.svg</iconset>
    </property>
    <property name="text">
-    <string>Decrease contrast</string>
+    <string>Decrease Contrast</string>
    </property>
   </action>
   <action name="mActionSelectByExpression">
@@ -2100,7 +2100,7 @@ Acts on currently active editable layer</string>
      <normaloff>:/images/themes/default/mIconExpressionSelect.svg</normaloff>:/images/themes/default/mIconExpressionSelect.svg</iconset>
    </property>
    <property name="text">
-    <string>Select By Expression</string>
+    <string>Select By Expression...</string>
    </property>
    <property name="toolTip">
     <string>Select features using an expression</string>
@@ -2108,7 +2108,7 @@ Acts on currently active editable layer</string>
   </action>
   <action name="mActionNeedSupport">
    <property name="text">
-    <string>Need commercial support?</string>
+    <string>Need Commercial Support?</string>
    </property>
   </action>
   <action name="mActionOpenFieldCalc">
@@ -2117,7 +2117,7 @@ Acts on currently active editable layer</string>
      <normaloff>:/images/themes/default/mActionCalculateField.png</normaloff>:/images/themes/default/mActionCalculateField.png</iconset>
    </property>
    <property name="text">
-    <string>Open Field Calculator</string>
+    <string>Open Field Calculator...</string>
    </property>
    <property name="toolTip">
     <string>Open Field Calculator</string>
diff --git a/src/ui/qgscomposerbase.ui b/src/ui/qgscomposerbase.ui
index 71f9797b786..74041ded76e 100755
--- a/src/ui/qgscomposerbase.ui
+++ b/src/ui/qgscomposerbase.ui
@@ -191,7 +191,7 @@
      <normaloff>:/images/themes/default/mActionZoomFullExtent.svg</normaloff>:/images/themes/default/mActionZoomFullExtent.svg</iconset>
    </property>
    <property name="text">
-    <string>Zoom Full</string>
+    <string>Zoom &amp;Full</string>
    </property>
    <property name="toolTip">
     <string>Zoom full</string>
@@ -206,7 +206,7 @@
      <normaloff>:/images/themes/default/mActionZoomIn.svg</normaloff>:/images/themes/default/mActionZoomIn.svg</iconset>
    </property>
    <property name="text">
-    <string>Zoom In</string>
+    <string>Zoom &amp;In</string>
    </property>
    <property name="toolTip">
     <string>Zoom in</string>
@@ -221,7 +221,7 @@
      <normaloff>:/images/themes/default/mActionZoomOut.svg</normaloff>:/images/themes/default/mActionZoomOut.svg</iconset>
    </property>
    <property name="text">
-    <string>Zoom Out</string>
+    <string>Zoom &amp;Out</string>
    </property>
    <property name="toolTip">
     <string>Zoom out</string>
@@ -236,7 +236,7 @@
      <normaloff>:/images/themes/default/mActionZoomActual.svg</normaloff>:/images/themes/default/mActionZoomActual.svg</iconset>
    </property>
    <property name="text">
-    <string>Zoom to 100%</string>
+    <string>Zoom to &amp;100%</string>
    </property>
    <property name="toolTip">
     <string>Zoom to 100%</string>
@@ -266,7 +266,7 @@
      <normaloff>:/images/themes/default/mActionAddMap.png</normaloff>:/images/themes/default/mActionAddMap.png</iconset>
    </property>
    <property name="text">
-    <string>Add Map</string>
+    <string>Add &amp;Map</string>
    </property>
    <property name="toolTip">
     <string>Add new map</string>
@@ -278,7 +278,7 @@
      <normaloff>:/images/themes/default/mActionLabel.png</normaloff>:/images/themes/default/mActionLabel.png</iconset>
    </property>
    <property name="text">
-    <string>Add Label</string>
+    <string>Add Lab&amp;el</string>
    </property>
    <property name="toolTip">
     <string>Add new label</string>
@@ -290,7 +290,7 @@
      <normaloff>:/images/themes/default/mActionAddLegend.png</normaloff>:/images/themes/default/mActionAddLegend.png</iconset>
    </property>
    <property name="text">
-    <string>Add Legend</string>
+    <string>Add Legen&amp;d</string>
    </property>
    <property name="toolTip">
     <string>Add new legend</string>
@@ -302,7 +302,7 @@
      <normaloff>:/images/themes/default/mActionPan.svg</normaloff>:/images/themes/default/mActionPan.svg</iconset>
    </property>
    <property name="text">
-    <string>Move Item</string>
+    <string>Move &amp;Item</string>
    </property>
    <property name="toolTip">
     <string>Select/Move item</string>
@@ -317,7 +317,7 @@
      <normaloff>:/images/themes/default/mActionSaveMapAsImage.png</normaloff>:/images/themes/default/mActionSaveMapAsImage.png</iconset>
    </property>
    <property name="text">
-    <string>Export as Image...</string>
+    <string>Export as &amp;Image...</string>
    </property>
    <property name="toolTip">
     <string>Export as image</string>
@@ -329,7 +329,7 @@
      <normaloff>:/images/themes/default/mActionSaveAsPDF.png</normaloff>:/images/themes/default/mActionSaveAsPDF.png</iconset>
    </property>
    <property name="text">
-    <string>Export as PDF...</string>
+    <string>&amp;Export as PDF...</string>
    </property>
   </action>
   <action name="mActionExportAsSVG">
@@ -338,7 +338,7 @@
      <normaloff>:/images/themes/default/mActionSaveAsSVG.png</normaloff>:/images/themes/default/mActionSaveAsSVG.png</iconset>
    </property>
    <property name="text">
-    <string>Export as SVG...</string>
+    <string>Export as S&amp;VG...</string>
    </property>
   </action>
   <action name="mActionAddNewScalebar">
@@ -347,7 +347,7 @@
      <normaloff>:/images/themes/default/mActionScaleBar.png</normaloff>:/images/themes/default/mActionScaleBar.png</iconset>
    </property>
    <property name="text">
-    <string>Add Scalebar</string>
+    <string>Add &amp;Scalebar</string>
    </property>
    <property name="toolTip">
     <string>Add new scalebar</string>
@@ -359,7 +359,7 @@
      <normaloff>:/images/themes/default/mActionDraw.svg</normaloff>:/images/themes/default/mActionDraw.svg</iconset>
    </property>
    <property name="text">
-    <string>Refresh</string>
+    <string>&amp;Refresh</string>
    </property>
    <property name="toolTip">
     <string>Refresh view</string>
@@ -374,7 +374,7 @@
      <normaloff>:/icons/default/vector_grid.png</normaloff>:/icons/default/vector_grid.png</iconset>
    </property>
    <property name="text">
-    <string>Show Grid</string>
+    <string>Show &amp;Grid</string>
    </property>
    <property name="toolTip">
     <string>Show grid</string>
@@ -385,7 +385,7 @@
   </action>
   <action name="mActionSnapGrid">
    <property name="text">
-    <string>Snap to Grid</string>
+    <string>S&amp;nap to Grid</string>
    </property>
    <property name="toolTip">
     <string>Snap to grid</string>
@@ -396,7 +396,7 @@
   </action>
   <action name="mActionShowGuides">
    <property name="text">
-    <string>Show Guides</string>
+    <string>Show G&amp;uides</string>
    </property>
    <property name="toolTip">
     <string>Show guides</string>
@@ -407,7 +407,7 @@
   </action>
   <action name="mActionSnapGuides">
    <property name="text">
-    <string>Snap to Guides</string>
+    <string>&amp;Snap to Guides</string>
    </property>
    <property name="toolTip">
     <string>Snap to guides</string>
@@ -418,7 +418,7 @@
   </action>
   <action name="mActionSmartGuides">
    <property name="text">
-    <string>Smart Guides</string>
+    <string>S&amp;mart Guides</string>
    </property>
    <property name="toolTip">
     <string>Smart guides</string>
@@ -429,7 +429,7 @@
   </action>
   <action name="mActionClearGuides">
    <property name="text">
-    <string>Clear Guides</string>
+    <string>&amp;Clear Guides</string>
    </property>
    <property name="toolTip">
     <string>Clear guides</string>
@@ -441,7 +441,7 @@
      <normaloff>:/images/themes/default/mActionAddImage.png</normaloff>:/images/themes/default/mActionAddImage.png</iconset>
    </property>
    <property name="text">
-    <string>Add Image</string>
+    <string>Add Im&amp;age</string>
    </property>
    <property name="toolTip">
     <string>Add image</string>
@@ -449,7 +449,7 @@
   </action>
   <action name="mActionMoveItemContent">
    <property name="text">
-    <string>Move Content</string>
+    <string>Move &amp;Content</string>
    </property>
    <property name="toolTip">
     <string>Move item content</string>
@@ -460,7 +460,7 @@
   </action>
   <action name="mActionGroupItems">
    <property name="text">
-    <string>Group</string>
+    <string>&amp;Group</string>
    </property>
    <property name="toolTip">
     <string>Group items</string>
@@ -471,7 +471,7 @@
   </action>
   <action name="mActionUngroupItems">
    <property name="text">
-    <string>Ungroup</string>
+    <string>&amp;Ungroup</string>
    </property>
    <property name="toolTip">
     <string>Ungroup items</string>
@@ -482,7 +482,7 @@
   </action>
   <action name="mActionRaiseItems">
    <property name="text">
-    <string>Raise</string>
+    <string>&amp;Raise</string>
    </property>
    <property name="toolTip">
     <string>Raise selected items</string>
@@ -493,7 +493,7 @@
   </action>
   <action name="mActionLowerItems">
    <property name="text">
-    <string>Lower</string>
+    <string>&amp;Lower</string>
    </property>
    <property name="toolTip">
     <string>Lower selected items</string>
@@ -504,7 +504,7 @@
   </action>
   <action name="mActionMoveItemsToTop">
    <property name="text">
-    <string>Bring to Front</string>
+    <string>Bring to &amp;Front</string>
    </property>
    <property name="toolTip">
     <string>Move selected items to top</string>
@@ -515,7 +515,7 @@
   </action>
   <action name="mActionMoveItemsToBottom">
    <property name="text">
-    <string>Send to Back</string>
+    <string>Send to &amp;Back</string>
    </property>
    <property name="toolTip">
     <string>Move selected items to bottom</string>
@@ -526,7 +526,7 @@
   </action>
   <action name="mActionLoadFromTemplate">
    <property name="text">
-    <string>Add Items from Template</string>
+    <string>&amp;Add Items from Template...</string>
    </property>
    <property name="toolTip">
     <string>Add items from template</string>
@@ -534,7 +534,7 @@
   </action>
   <action name="mActionSaveAsTemplate">
    <property name="text">
-    <string>Save as Template</string>
+    <string>Save as &amp;Template...</string>
    </property>
    <property name="toolTip">
     <string>Save as template</string>
@@ -604,7 +604,7 @@
     <bool>true</bool>
    </property>
    <property name="text">
-    <string>Add Arrow</string>
+    <string>Add Arro&amp;w</string>
    </property>
    <property name="toolTip">
     <string>Add arrow</string>
@@ -626,7 +626,7 @@
     <bool>true</bool>
    </property>
    <property name="text">
-    <string>Add Attribute Table</string>
+    <string>Add Attribute &amp;Table</string>
    </property>
    <property name="toolTip">
     <string>Add attribute table</string>
@@ -634,7 +634,7 @@
   </action>
   <action name="mActionPageSetup">
    <property name="text">
-    <string>Page Setup</string>
+    <string>Pa&amp;ge Setup...</string>
    </property>
    <property name="toolTip">
     <string>Page setup</string>
@@ -712,7 +712,7 @@
     <bool>true</bool>
    </property>
    <property name="text">
-    <string>Add HTML</string>
+    <string>Add &amp;HTML</string>
    </property>
    <property name="toolTip">
     <string>Add html frame</string>
@@ -720,7 +720,7 @@
   </action>
   <action name="mActionComposerManager">
    <property name="text">
-    <string>Composer Manager</string>
+    <string>Composer &amp;Manager...</string>
    </property>
    <property name="toolTip">
     <string>Composer manager</string>
@@ -728,7 +728,7 @@
   </action>
   <action name="mActionNewComposer">
    <property name="text">
-    <string>&amp;New Composer</string>
+    <string>&amp;New Composer...</string>
    </property>
    <property name="toolTip">
     <string>New composer</string>
@@ -750,7 +750,7 @@
   </action>
   <action name="mActionDuplicateComposer">
    <property name="text">
-    <string>&amp;Duplicate Composer</string>
+    <string>&amp;Duplicate Composer...</string>
    </property>
    <property name="toolTip">
     <string>Duplicate composer</string>
@@ -762,7 +762,7 @@
      <normaloff>:/images/themes/default/locked.svg</normaloff>:/images/themes/default/locked.svg</iconset>
    </property>
    <property name="text">
-    <string>Lock Selected Items</string>
+    <string>Loc&amp;k Selected Items</string>
    </property>
    <property name="shortcut">
     <string>Ctrl+L</string>
@@ -774,7 +774,7 @@
      <normaloff>:/images/themes/default/unlocked.svg</normaloff>:/images/themes/default/unlocked.svg</iconset>
    </property>
    <property name="text">
-    <string>Unlock All</string>
+    <string>Unl&amp;ock All</string>
    </property>
    <property name="toolTip">
     <string>Unlock All Items</string>
@@ -785,7 +785,7 @@
   </action>
   <action name="mActionPasteInPlace">
    <property name="text">
-    <string>Pa&amp;ste in Place</string>
+    <string>Paste in P&amp;lace</string>
    </property>
    <property name="toolTip">
     <string>Paste in place</string>
@@ -815,7 +815,7 @@
      <normaloff>:/images/themes/default/mActionDeselectAll.svg</normaloff>:/images/themes/default/mActionDeselectAll.svg</iconset>
    </property>
    <property name="text">
-    <string>De&amp;select All</string>
+    <string>D&amp;eselect All</string>
    </property>
    <property name="toolTip">
     <string>Deselect all</string>
@@ -826,7 +826,7 @@
   </action>
   <action name="mActionSelectAll">
    <property name="text">
-    <string>Select &amp;All</string>
+    <string>&amp;Select All</string>
    </property>
    <property name="toolTip">
     <string>Select all items</string>
@@ -887,7 +887,7 @@
      <normaloff>:/images/themes/default/mActionOptions.svg</normaloff>:/images/themes/default/mActionOptions.svg</iconset>
    </property>
    <property name="text">
-    <string>Composer Options...</string>
+    <string>Composer &amp;Options...</string>
    </property>
    <property name="menuRole">
     <enum>QAction::PreferencesRole</enum>
@@ -895,7 +895,7 @@
   </action>
   <action name="mActionShowRulers">
    <property name="text">
-    <string>Show Rulers</string>
+    <string>Show Ru&amp;lers</string>
    </property>
    <property name="toolTip">
     <string>Show rulers</string>
@@ -910,7 +910,7 @@
      <normaloff>:/images/themes/default/mActionAtlasFirst.svg</normaloff>:/images/themes/default/mActionAtlasFirst.svg</iconset>
    </property>
    <property name="text">
-    <string>First Feature</string>
+    <string>&amp;First Feature</string>
    </property>
    <property name="shortcut">
     <string>Ctrl+&lt;</string>
@@ -922,7 +922,7 @@
      <normaloff>:/images/themes/default/mActionAtlasPrev.svg</normaloff>:/images/themes/default/mActionAtlasPrev.svg</iconset>
    </property>
    <property name="text">
-    <string>Previous Feature</string>
+    <string>P&amp;revious Feature</string>
    </property>
    <property name="shortcut">
     <string>Ctrl+,</string>
@@ -934,7 +934,7 @@
      <normaloff>:/images/themes/default/mActionAtlasNext.svg</normaloff>:/images/themes/default/mActionAtlasNext.svg</iconset>
    </property>
    <property name="text">
-    <string>Next Feature</string>
+    <string>&amp;Next Feature</string>
    </property>
    <property name="shortcut">
     <string>Ctrl+.</string>
@@ -946,7 +946,7 @@
      <normaloff>:/images/themes/default/mActionAtlasLast.svg</normaloff>:/images/themes/default/mActionAtlasLast.svg</iconset>
    </property>
    <property name="text">
-    <string>Last Feature</string>
+    <string>&amp;Last Feature</string>
    </property>
    <property name="shortcut">
     <string>Ctrl+&gt;</string>
@@ -958,7 +958,7 @@
      <normaloff>:/images/themes/default/mIconAtlas.svg</normaloff>:/images/themes/default/mIconAtlas.svg</iconset>
    </property>
    <property name="text">
-    <string>Preview Atlas</string>
+    <string>Preview &amp;Atlas</string>
    </property>
    <property name="shortcut">
     <string>Ctrl+Alt+/</string>
@@ -970,7 +970,7 @@
      <normaloff>:/images/themes/default/mActionFilePrint.png</normaloff>:/images/themes/default/mActionFilePrint.png</iconset>
    </property>
    <property name="text">
-    <string>Print Atlas...</string>
+    <string>&amp;Print Atlas...</string>
    </property>
   </action>
   <action name="mActionExportAtlasAsImage">
@@ -979,7 +979,7 @@
      <normaloff>:/images/themes/default/mActionSaveMapAsImage.png</normaloff>:/images/themes/default/mActionSaveMapAsImage.png</iconset>
    </property>
    <property name="text">
-    <string>Export Atlas as Images...</string>
+    <string>Export Atlas as &amp;Images...</string>
    </property>
   </action>
   <action name="mActionExportAtlasAsSVG">
@@ -988,7 +988,7 @@
      <normaloff>:/images/themes/default/mActionSaveAsSVG.png</normaloff>:/images/themes/default/mActionSaveAsSVG.png</iconset>
    </property>
    <property name="text">
-    <string>Export Atlas as SVG...</string>
+    <string>Export Atlas as S&amp;VG...</string>
    </property>
   </action>
   <action name="mActionExportAtlasAsPDF">
@@ -997,7 +997,7 @@
      <normaloff>:/images/themes/default/mActionSaveAsPDF.png</normaloff>:/images/themes/default/mActionSaveAsPDF.png</iconset>
    </property>
    <property name="text">
-    <string>Export Atlas as PDF...</string>
+    <string>&amp;Export Atlas as PDF...</string>
    </property>
    <property name="toolTip">
     <string>Export Atlas as PDF</string>
@@ -1009,13 +1009,13 @@
      <normaloff>:/images/themes/default/mActionAtlasSettings.svg</normaloff>:/images/themes/default/mActionAtlasSettings.svg</iconset>
    </property>
    <property name="text">
-    <string>Atlas Settings</string>
+    <string>Atlas &amp;Settings</string>
    </property>
   </action>
  </widget>
  <resources>
-  <include location="../../images/images.qrc"/>
   <include location="../../python/plugins/fTools/resources.qrc"/>
+  <include location="../../images/images.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/src/ui/qgsowssourceselectbase.ui b/src/ui/qgsowssourceselectbase.ui
index 92533bdfc19..bad0c14e1c4 100644
--- a/src/ui/qgsowssourceselectbase.ui
+++ b/src/ui/qgsowssourceselectbase.ui
@@ -250,7 +250,7 @@
              <bool>false</bool>
             </property>
             <property name="text">
-             <string>Change ...</string>
+             <string>Change...</string>
             </property>
            </widget>
           </item>
diff --git a/src/ui/qgsrasterlayerpropertiesbase.ui b/src/ui/qgsrasterlayerpropertiesbase.ui
index 419a4def44a..8fb735b5dcc 100644
--- a/src/ui/qgsrasterlayerpropertiesbase.ui
+++ b/src/ui/qgsrasterlayerpropertiesbase.ui
@@ -2020,7 +2020,7 @@ p, li { white-space: pre-wrap; }
       <item row="0" column="2">
        <widget class="QPushButton" name="pbnLoadStyle">
         <property name="text">
-         <string>Load Style ...</string>
+         <string>Load Style...</string>
         </property>
        </widget>
       </item>
@@ -2034,7 +2034,7 @@ p, li { white-space: pre-wrap; }
       <item row="0" column="3">
        <widget class="QPushButton" name="pbnSaveStyleAs">
         <property name="text">
-         <string>Save Style ...</string>
+         <string>Save Style...</string>
         </property>
        </widget>
       </item>
diff --git a/src/ui/qgsrasterlayersaveasdialogbase.ui b/src/ui/qgsrasterlayersaveasdialogbase.ui
index ac396d1a62d..9ff5b042d2f 100644
--- a/src/ui/qgsrasterlayersaveasdialogbase.ui
+++ b/src/ui/qgsrasterlayersaveasdialogbase.ui
@@ -179,7 +179,7 @@ datasets with maximum width and height specified below.</string>
         </sizepolicy>
        </property>
        <property name="text">
-        <string>Change ...</string>
+        <string>Change...</string>
        </property>
       </widget>
      </item>
diff --git a/src/ui/qgsvectorlayerpropertiesbase.ui b/src/ui/qgsvectorlayerpropertiesbase.ui
index 8884234e412..868d5c2a8e2 100644
--- a/src/ui/qgsvectorlayerpropertiesbase.ui
+++ b/src/ui/qgsvectorlayerpropertiesbase.ui
@@ -1574,7 +1574,7 @@
          <item>
           <widget class="QPushButton" name="pbnLoadStyle">
            <property name="text">
-            <string>Load Style ...</string>
+            <string>Load Style...</string>
            </property>
           </widget>
          </item>
@@ -1595,7 +1595,7 @@
          <item>
           <widget class="QPushButton" name="pbnSaveStyleAs">
            <property name="text">
-            <string>Save Style ...</string>
+            <string>Save Style...</string>
            </property>
           </widget>
          </item>
diff --git a/src/ui/qgswfssourceselectbase.ui b/src/ui/qgswfssourceselectbase.ui
index 3c66351516b..3a4fa4e16ee 100644
--- a/src/ui/qgswfssourceselectbase.ui
+++ b/src/ui/qgswfssourceselectbase.ui
@@ -65,7 +65,7 @@
          <bool>false</bool>
         </property>
         <property name="text">
-         <string>Change ...</string>
+         <string>Change...</string>
         </property>
        </widget>
       </item>
diff --git a/src/ui/qgswmssourceselectbase.ui b/src/ui/qgswmssourceselectbase.ui
index 860c7698c9f..149e6370bf5 100644
--- a/src/ui/qgswmssourceselectbase.ui
+++ b/src/ui/qgswmssourceselectbase.ui
@@ -223,7 +223,7 @@
              <bool>false</bool>
             </property>
             <property name="text">
-             <string>Change ...</string>
+             <string>Change...</string>
             </property>
            </widget>
           </item>