Merge branch 'chore/fix-service-account-description' into 'develop'

Rename Service account type to Bot

See merge request pleroma/admin-fe!194

CHANGELOG.md

@@ -12,6 +12,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ### Fixed
 - Crash when parsing tuples in Settings
+- The Service account type has been renamed to Bot so it's consistent with the termoniology used by most fediverse software.
 
 ## [2.4.0] - 2021-08-01
 

src/lang/en.js

@@ -283,7 +283,7 @@ export default {
     passwordResetTokenGenerated: 'Password reset token was generated:',
     linkToResetPassword: 'You can also use this link to reset password:',
     registrationReason: 'Registration Reason',
-    service: 'Service',
+    bot: 'Bot',
     person: 'Person',
     enableTagPolicy: 'Enable MRF TagPolicy to manage user tags',
     confirmEnablingTagPolicy: 'Are you sure you want to add TagPolicy to the list of enabled MRF policies?',

src/views/users/components/ModerationDropdown.vue

@@ -19,7 +19,7 @@
       <el-dropdown-item
         class="actor-type-dropdown">
         <el-select v-model="actorType" :placeholder="$t('userProfile.actorType')" class="actor-type-select">
-          <el-option :label="$t('users.service')" value="Service"/>
+          <el-option :label="$t('users.bot')" value="Service"/>
           <el-option :label="$t('users.person')" value="Person"/>
         </el-select>
       </el-dropdown-item>