One deletes from, not on

m-kuhn · m-kuhn · commit 41bf860ad3e8 · 2018-05-01T10:11:21.000+02:00
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -7355,7 +7355,7 @@ void QgisApp::deleteSelected( QgsMapLayer *layer, QWidget *parent, bool checkFea
     if ( !allFeaturesInView )
     {
       // for extra safety to make sure we are not removing geometries by accident
-      int res = QMessageBox::warning( mMapCanvas, tr( "Delete %n feature(s) on layer \"%1\"", nullptr, numberOfSelectedFeatures ).arg( vlayer->name() ),
+      int res = QMessageBox::warning( mMapCanvas, tr( "Delete %n feature(s) from layer \"%1\"", nullptr, numberOfSelectedFeatures ).arg( vlayer->name() ),
                                       tr( "Some of the selected features are outside of the current map view. Would you still like to continue?" ),
                                       QMessageBox::Yes | QMessageBox::No );
       if ( res != QMessageBox::Yes )
@@ -7368,7 +7368,7 @@ void QgisApp::deleteSelected( QgsMapLayer *layer, QWidget *parent, bool checkFea
   if ( !vlayer->deleteSelectedFeatures( &deletedCount ) )
   {
     messageBar()->pushMessage( tr( "Problem deleting features" ),
-                               tr( "A problem occurred during deletion on layer \"%1\". %n feature(s) not deleted.", nullptr, numberOfSelectedFeatures - deletedCount ).arg( vlayer->name() ),
+                               tr( "A problem occurred during deletion from layer \"%1\". %n feature(s) not deleted.", nullptr, numberOfSelectedFeatures - deletedCount ).arg( vlayer->name() ),
                                Qgis::Warning );
   }
   else

Original file line number	Diff line number	Diff line change
`@@ -7355,7 +7355,7 @@ void QgisApp::deleteSelected( QgsMapLayer layer, QWidget parent, bool checkFea`
`7355`	`7355`	`if ( !allFeaturesInView )`
`7356`	`7356`	`{`
`7357`	`7357`	`// for extra safety to make sure we are not removing geometries by accident`
`7358`		`- int res = QMessageBox::warning( mMapCanvas, tr( "Delete %n feature(s) on layer \"%1\"", nullptr, numberOfSelectedFeatures ).arg( vlayer->name() ),`
	`7358`	`+ int res = QMessageBox::warning( mMapCanvas, tr( "Delete %n feature(s) from layer \"%1\"", nullptr, numberOfSelectedFeatures ).arg( vlayer->name() ),`
`7359`	`7359`	`tr( "Some of the selected features are outside of the current map view. Would you still like to continue?" ),`
`7360`	`7360`	`QMessageBox::Yes \| QMessageBox::No );`
`7361`	`7361`	`if ( res != QMessageBox::Yes )`
`@@ -7368,7 +7368,7 @@ void QgisApp::deleteSelected( QgsMapLayer layer, QWidget parent, bool checkFea`
`7368`	`7368`	`if ( !vlayer->deleteSelectedFeatures( &deletedCount ) )`
`7369`	`7369`	`{`
`7370`	`7370`	`messageBar()->pushMessage( tr( "Problem deleting features" ),`
`7371`		`- tr( "A problem occurred during deletion on layer \"%1\". %n feature(s) not deleted.", nullptr, numberOfSelectedFeatures - deletedCount ).arg( vlayer->name() ),`
	`7371`	`+ tr( "A problem occurred during deletion from layer \"%1\". %n feature(s) not deleted.", nullptr, numberOfSelectedFeatures - deletedCount ).arg( vlayer->name() ),`
`7372`	`7372`	`Qgis::Warning );`
`7373`	`7373`	`}`
`7374`	`7374`	`else`