Updated 'Remove' to 'Delete bot' on settings bot page to help clarify…

… the removal of the bot membership on the members page and the bot account in the settings (#800)

config/locales/en.yml

@@ -617,9 +617,9 @@ en:
           generate_new_token: Generate new token
           generate_new_token_aria_label: Generate a new personal access token for bot account
           never: Never
-          remove: Remove
-          remove_aria_label: Remove bot account
-          remove_confirmation: Are you sure you want to remove this bot account from the group?
+          remove: Delete bot
+          remove_aria_label: Delete bot account
+          remove_confirmation: This action will permanently delete the bot account from the group and will remove any existing memberships for the bot account. Are you sure you want to permanently delete this bot account from the group?
         bot_listing:
           access_level: Access Level
           actions: Actions
@@ -1063,9 +1063,9 @@ en:
           generate_new_token: Generate new token
           generate_new_token_aria_label: Generate a new personal access token for bot account
           never: Never
-          remove: Remove
-          remove_aria_label: Remove bot account
-          remove_confirmation: Are you sure you want to remove this bot account from the project?
+          remove: Delete bot
+          remove_aria_label: Delete bot account
+          remove_confirmation: This action will permanently delete the bot account from the project and will remove any existing membership for the bot account. Are you sure you want to permanently delete this bot account from the project?
         bot_listing:
           access_level: Access Level
           actions: Actions

config/locales/fr.yml

@@ -617,9 +617,9 @@ fr:
           generate_new_token: Generate new token
           generate_new_token_aria_label: Generate a new personal access token for bot account
           never: Never
-          remove: Remove
-          remove_aria_label: Remove bot account
-          remove_confirmation: Are you sure you want to remove this bot account from the group?
+          remove: Delete bot
+          remove_aria_label: Delete bot account
+          remove_confirmation: This action will permanently delete the bot account from the group and will remove any existing memberships for the bot account. Are you sure you want to permanently delete this bot account from the group?
         bot_listing:
           access_level: Access Level
           actions: Actions
@@ -1063,9 +1063,9 @@ fr:
           generate_new_token: Generate new token
           generate_new_token_aria_label: Generate a new personal access token for bot account
           never: Never
-          remove: Remove
-          remove_aria_label: Remove bot account
-          remove_confirmation: Are you sure you want to remove this bot account from the project?
+          remove: Delete bot
+          remove_aria_label: Delete bot account
+          remove_confirmation: This action will permanently delete the bot account from the project and will remove any existing membership for the bot account. Are you sure you want to permanently delete this bot account from the project?
         bot_listing:
           access_level: Access Level
           actions: Actions

docs-site/docs/user/organization/groups/bot-accounts/manage-bot-accounts.md

@@ -25,20 +25,20 @@ To add a bot account to a group:
 
 You should now see the new bot account listed within the bot accounts table. Above the table you should also see a section for the newly created personal access token. Copy the personal access token, as it cannot be accessed afterwards.
 
-## Remove Bot Account
+## Delete Bot Account
 
 Prerequisites:
 
 - You must have at least a **Maintainer** role.
 
-To remove an existing bot account from a group:
+To delete an existing bot account from a group:
 
 1. From the left sidebar, select **Groups** and find your group.
 2. From the left sidebar, select **Settings > Bot Accounts**.
-3. On the right hand side of the row for the bot account you want to remove, click the **Remove** link.
-4. Confirm that you would like to remove the bot account by clicking the **Confirm** button.
+3. On the right hand side of the row for the bot account you want to delete, click the **Delete bot** link.
+4. Confirm that you would like to permanently delete the bot account by clicking the **Confirm** button.
 
-All memberships associated with the removed bot will automatically be removed.
+All memberships associated with the deleted bot will automatically be removed.
 
 ## Add Membership
 

docs-site/docs/user/project/projects/bot-accounts/manage-bot-accounts.md

@@ -25,7 +25,7 @@ To add a bot account to a project:
 
 You should now see the new bot account listed within the bot accounts table. Above the table you should also see a section for the newly created personal access token. Copy the personal access token, as it cannot be accessed afterwards.
 
-## Remove Bot Account
+## Delete Bot Account
 
 Prerequisites:
 
@@ -35,10 +35,10 @@ To remove an existing bot account from a project:
 
 1. From the left sidebar, select **Projects** and find your project.
 2. From the left sidebar, select **Settings > Bot Accounts**.
-3. On the right hand side of the row for the bot account you want to remove, click the **Remove** link.
-4. Confirm that you would like to remove the bot account by clicking the **Confirm** button.
+3. On the right hand side of the row for the bot account you want to delete, click the **Delete bot** link.
+4. Confirm that you would like to permanently delete the bot account by clicking the **Confirm** button.
 
-All memberships associated with the removed bot will automatically be removed.
+All memberships associated with the deleted bot will automatically be removed.
 
 ## Add Membership
 

test/system/groups/bots_test.rb

@@ -136,7 +136,7 @@ def setup
 
       within('table') do
         within('table tbody tr:first-child td:last-child') do
-          click_link 'Remove'
+          click_link I18n.t(:'groups.bots.index.bot.remove')
         end
       end
 

test/system/projects/bots_test.rb

@@ -138,7 +138,7 @@ def setup
 
       within('table') do
         within('table tbody tr:first-child td:last-child') do
-          click_link 'Remove'
+          click_link I18n.t(:'projects.bots.index.bot.remove')
         end
       end