Merge remote-tracking branch 'upstream/master' into small-fixes-3
Standardize on "Delete..." for delete/remove action on various resource types
Fix a UI message
Merge pull request #3368 from ussuri/small-fixes-3

Fix some UI strings + add Pub-generated cache/ to .gitignore.