more renaming of trust level settings

app/assets/javascripts/discourse/models/_post.js

@@ -225,7 +225,7 @@ Discourse.Post = Discourse.Model.extend({
   setDeletedState: function(deletedBy) {
     this.set('oldCooked', this.get('cooked'));
 
-    // Moderators can delete posts. Regular users can only trigger a deleted at message.
+    // Moderators can delete posts. Users can only trigger a deleted at message.
     if (deletedBy.get('staff')) {
       this.setProperties({
         deleted_at: new Date(),

plugins/poll/poll.rb

@@ -54,7 +54,7 @@ module ::PollPlugin
           @post.errors.add(:poll_options, I18n.t('poll.cannot_add_or_remove_options'))
         end
       else
-        # Regular user, tell them to contact a moderator.
+        # not staff, tell them to contact one.
         @post.errors.add(:poll_options, I18n.t('poll.cannot_have_modified_options'))
       end
     end

spec/integration/spam_rules_spec.rb

@@ -63,7 +63,7 @@ describe SpamRulesEnforcer do
             Then { expect(spammer.reload).to be_blocked }
           end
 
-          context "spammer becomes a basic user" do
+          context "spammer becomes trust level 1" do
             When { spammer.change_trust_level!(:basic); spammer.reload }
             Then { expect(spammer.reload).to be_blocked }
           end