3.4.1 bump (#4548)

* Query members for unchunked guilds in massban

* that thing that is a thing ;)

.gitattributes

@@ -0,0 +1,4 @@
+* text eol=lf
+
+# binary file excludsions
+*.png binary

.github/CODEOWNERS

@@ -1,65 +1,23 @@
-# Default
-*                                   @Twentysix26
-
-# Core
-redbot/core/bank.py                      @palmtree5
-redbot/core/checks.py                    @tekulvw
-redbot/core/cli.py                       @tekulvw
-redbot/core/config.py                    @tekulvw
-redbot/core/cog_manager.py               @tekulvw
-redbot/core/core_commands.py             @tekulvw
-redbot/core/context.py                   @Tobotimus
-redbot/core/commands/*                   @mikeshardmind
-redbot/core/data_manager.py              @tekulvw
-redbot/core/dev_commands.py              @tekulvw
-redbot/core/drivers/*                    @tekulvw
-redbot/core/events.py                    @tekulvw
-redbot/core/global_checks.py             @tekulvw
-redbot/core/i18n.py                      @tekulvw
-redbot/core/modlog.py                    @palmtree5
-redbot/core/rpc.py                       @tekulvw
-redbot/core/utils/chat_formatting.py     @tekulvw
-redbot/core/utils/mod.py                 @palmtree5
-redbot/core/utils/data_converter.py      @mikeshardmind
-redbot/core/utils/antispam.py            @mikeshardmind
-redbot/core/utils/tunnel.py              @mikeshardmind
-redbot/core/utils/caching.py             @mikeshardmind
-redbot/core/utils/common_filters.py      @mikeshardmind
-redbot/core/utils/dbtools.py             @mikeshardmind
-
 # Cogs
-redbot/cogs/admin/*                 @tekulvw
-redbot/cogs/alias/*                 @tekulvw
-redbot/cogs/audio/*                 @aikaterna @Drapersniper
-redbot/cogs/bank/*                  @tekulvw
-redbot/cogs/cleanup/*               @palmtree5
-redbot/cogs/customcom/*             @palmtree5
-redbot/cogs/downloader/*            @tekulvw @jack1142
-redbot/cogs/economy/*               @palmtree5
-redbot/cogs/filter/*                @palmtree5
-redbot/cogs/general/*               @palmtree5
-redbot/cogs/image/*                 @palmtree5
-redbot/cogs/mod/*                   @palmtree5
-redbot/cogs/modlog/*                @palmtree5
-redbot/cogs/streams/*               @Twentysix26 @palmtree5
-redbot/cogs/trivia/*                @Tobotimus
-redbot/cogs/reports/*               @mikeshardmind
-redbot/cogs/permissions/*           @mikeshardmind
-redbot/cogs/warnings/*              @palmtree5
+/redbot/cogs/audio/** @aikaterna @Drapersniper
+/redbot/cogs/downloader/* @jack1142
+/redbot/cogs/streams/* @palmtree5
+/redbot/cogs/mutes/* @TrustyJAID
 
-# Docs
-docs/*                              @tekulvw @palmtree5
+# Trivia Lists
+/redbot/cogs/trivia/data/lists/whosthatpokemon*.yaml @aikaterna
 
 # Tests
-tests/cogs/downloader/*             @jack1142
+/redbot/pytest/downloader* @jack1142
+/tests/cogs/downloader/* @jack1142
 
-# Setup, instance setup, and running the bot
-setup.py                            @tekulvw
-redbot/__init__.py                  @tekulvw
-redbot/__main__.py                  @tekulvw @mikeshardmind
-redbot/setup.py                     @tekulvw
+# Schemas
+/schema/* @jack1142
 
-# Others
-.travis.yml                         @Kowlin
-crowdin.yml                         @Kowlin
-.github/workflows/*                 @Kowlin
+# CI
+/.travis.yml @Kowlin
+/crowdin.yml @Kowlin
+/.github/workflows/* @Kowlin
+
+# Excludes
+**/locales/* @ghost

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,5 @@
+blank_issues_enabled: true
+contact_links:
+  - name: Support question
+    url: https://discord.gg/red
+    about: For any questions regarding on how to operate and run Red.

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,52 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: [V3/develop]
+  pull_request:
+    # The branches below must be a subset of the branches above
+  schedule:
+    - cron: '0 14 * * 4'
+  workflow_dispatch:
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+      with:
+        # We must fetch at least the immediate parents so that if this is
+        # a pull request then we can checkout the head.
+        fetch-depth: 2
+
+    # If this run was triggered by a pull request event, then checkout
+    # the head of the pull request instead of the merge commit.
+    - run: git checkout HEAD^2
+      if: ${{ github.event_name == 'pull_request' }}
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: 'python'
+        # Override automatic language detection by changing the below list
+        # Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
+        # Learn more...
+        # https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

.github/workflows/lint_python.yaml

@@ -1,16 +1,26 @@
 name: Lint Python
-on: [push, pull_request] 
+on:
+  pull_request:
+  push:
+  repository_dispatch:
+    types:
+      - dispatched_test
+
+env:
+  ref: ${{ github.event.client_payload.ref || '' }}
 
 jobs:
   lint_python:
     name: Lint Python
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
+        with:
+          ref: ${{ env.ref }}
       - uses: actions/setup-python@v1
         with:
-          python_version: "3.8"
-      - run: "python -m pip install flake8"
+          python-version: "3.8"
+      - run: "python -m pip install git+https://github.com/pycqa/pyflakes@1911c20#egg=pyflakes git+https://github.com/pycqa/pycodestyle@d219c68#egg=pycodestyle git+https://gitlab.com/pycqa/flake8@3.7.9#egg=flake8"
         name: Install Flake8
       - run: "python -m flake8 . --count --select=E9,F7,F82 --show-source"
         name: Flake8 Linting

.github/workflows/publish_crowdin.yml

@@ -1,11 +1,18 @@
 name: Publish to Crowdin
 on:
-  push:
-    tags:
-    - "*"
+  schedule:
+    - cron: '0 12 * * THU'
+  workflow_dispatch:
+  repository_dispatch:
+    types: crowdin
+
+env:
+  CROWDIN_API_KEY: ${{ secrets.crowdin_token}}
+  CROWDIN_PROJECT_ID: ${{ secrets.crowdin_identifier }}
 
 jobs:
   deploy:
+    if: github.repository == 'Cog-Creators/Red-DiscordBot'
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
@@ -20,9 +27,23 @@ jobs:
         sudo apt-get update -qq
         sudo apt-get install -y crowdin
         pip install redgettext==3.1
-    - name: Publish
-      env:
-        CROWDIN_API_KEY: ${{ secrets.crowdin_token}}
-        CROWDIN_PROJECT_ID: ${{ secrets.crowdin_identifier }}
+    - name: Generate source files
+      run: |
+        make gettext
+    - name: Upload source files
       run: |
         make upload_translations
+    - name: Download translations
+      run: |
+        make download_translations
+    - name: Create Pull Request
+      uses: peter-evans/create-pull-request@v2
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+        commit-message: Automated Crowdin downstream
+        title: "[i18n] Automated Crowdin downstream"
+        body: |
+          This is an automated PR.
+          Please ensure that there are no errors or invalid files are in the PR.
+        labels: "Automated PR, Category: i18n, Changelog Entry: Skipped"
+        branch: "automated/i18n"

.github/workflows/publish_pypi.yml

@@ -6,6 +6,7 @@ on:
 
 jobs:
   deploy:
+    if: github.repository == 'Cog-Creators/Red-DiscordBot'
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2

.github/workflows/tests.yml

@@ -1,5 +1,13 @@
 name: Tests
-on: [push, pull_request]
+on:
+  pull_request:
+  push:
+  repository_dispatch:
+    types:
+      - dispatched_test
+
+env:
+  ref: ${{ github.event.client_payload.ref || '' }}
 
 jobs:
     tox:
@@ -23,6 +31,8 @@ jobs:
       name: Tox - ${{ matrix.friendly_name }}
       steps:
         - uses: actions/checkout@v2
+          with:
+            ref: ${{ env.ref }}
         - name: Set up Python
           uses: actions/setup-python@v1
           with:
@@ -55,6 +65,8 @@ jobs:
             POSTGRES_USER: postgres
       steps:
         - uses: actions/checkout@v2
+          with:
+            ref: ${{ env.ref }}
         - name: Set up Python
           uses: actions/setup-python@v1
           with:

.gitignore

@@ -1,4 +1,3 @@
-*.json
 *.exe
 *.dll
 *.pot
@@ -6,6 +5,7 @@
 !/tests/cogs/dataconverter/data/**/*.json
 Pipfile
 Pipfile.lock
+.directory
 
 ### JetBrains template
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
@@ -14,6 +14,7 @@ Pipfile.lock
 # User-specific stuff:
 .idea/
 *.iws
+.vscode/
 
 ## Plugin-specific files:
 

CONTRIBUTING.md

@@ -11,9 +11,8 @@
   * [4.4 Make](#44-make)
   * [4.5 Keeping your dependencies up to date](#45-keeping-your-dependencies-up-to-date)
   * [4.6 To contribute changes](#46-to-contribute-changes)
-  * [4.7 Using towncrier](#47-using-towncrier)
-  * [4.8 How To Report A Bug](#48-how-to-report-a-bug)
-  * [4.9 How To Suggest A Feature Or Enhancement](#49-how-to-suggest-a-feature-or-enhancement)
+  * [4.7 How To Report A Bug](#47-how-to-report-a-bug)
+  * [4.8 How To Suggest A Feature Or Enhancement](#48-how-to-suggest-a-feature-or-enhancement)
 * [5. Code Review Process](#5-code-review-process)
   * [5.1 Issues](#51-issues)
   * [5.2 Pull Requests](#52-pull-requests)
@@ -79,7 +78,7 @@ If you're not on Windows, you should also have GNU make installed, and you can o
 **Note:** If you're comfortable with setting up virtual environments yourself and would rather do it manually, just run `pip install -Ur tools/dev-requirements.txt` after setting it up.
 
 ### 4.2 Testing
-We've recently started using [tox](https://github.com/tox-dev/tox) to run all of our tests. It's extremely simple to use, and if you followed the previous section correctly, it is already installed to your virtual environment.
+We're using [tox](https://github.com/tox-dev/tox) to run all of our tests. It's extremely simple to use, and if you followed the previous section correctly, it is already installed to your virtual environment.
 
 Currently, tox does the following, creating its own virtual environments for each stage:
 - Runs all of our unit tests with [pytest](https://github.com/pytest-dev/pytest) on python 3.8 (test environment `py38`)
@@ -95,7 +94,7 @@ Your PR will not be merged until all of these tests pass.
 ### 4.3 Style
 Our style checker of choice, [black](https://github.com/ambv/black), actually happens to be an auto-formatter. The checking functionality simply detects whether or not it would try to reformat something in your code, should you run the formatter on it. For this reason, we recommend using this tool as a formatter, regardless of any disagreements you might have with the style it enforces.
 
-Use the command `black --help` to see how to use this tool. The full style guide is explained in detail on [black's GitHub repository](https://github.com/ambv/black). **There is one exception to this**, however, which is that we set the line length to 99, instead of black's default 88. When using `black` on the command line, simply use it like so: `black -l 99 -N <src>`.
+Use the command `black --help` to see how to use this tool. The full style guide is explained in detail on [black's GitHub repository](https://github.com/ambv/black). **There is one exception to this**, however, which is that we set the line length to 99, instead of black's default 88. This is already set in `pyproject.toml` configuration file in the repo so you can simply format code with Black like so: `black <src>`.
 
 ### 4.4 Make
 You may have noticed we have a `Makefile` and a `make.bat` in the top-level directory. For now, you can do a few things with them:
@@ -116,39 +115,17 @@ Whenever you pull from upstream (V3/develop on the main repository) and you noti
 1. Create a new branch on your fork
 2. Make the changes
 3. If you like the changes and think the main Red project could use it:
-    * Create a towncrier entry for the changes. (See next section for details)
     * Run tests with `tox` to ensure your code is up to scratch
     * Create a Pull Request on GitHub with your changes
+      - If you are contributing a behavior change, please keep in mind that behavior changes
+        are conditional on them being appropriate for the project's current goals.
+        If you would like to reduce the risk of putting in effort for something we aren't
+        going to use, open an issue discussing it first.
 
-### 4.7 Using towncrier
-
-Red uses towncrier to create changelogs.
-
-To create a towncrier entry for your PR, create a file in `changelog.d` for it. If the changes are for a specific cog, place the file in the related subdirectory.
-
-The filename should be of the format `issuenumber.changetype(.count).rst`, where `(.count)` is an optional
-part of the filename should multiple entries for the same issue number and type be necessary.
-If there is not an issue associated with your PR,
-you may use the PR number in place of the issue number.
-
-Valid changetypes are:
-
-  * breaking : Breaking changes
-  * dep : Changes to dependencies
-  * enhance : Enhancements
-  * feature : New features
-  * bugfix : Bugfixes
-  * docs : documentation improvements and additions
-  * removal : removal of something
-  * misc : any changes which don't have a user facing change, and don't belong in the changelog for users
-
-The contents of the file should be a short, human readable description of the impact of the changes made,
-not the technical details of the change.
-
-### 4.8 How To Report A Bug
+### 4.7 How To Report A Bug
 Please see our **ISSUES.MD** for more information.
 
-### 4.9 How To Suggest A Feature Or Enhancement
+### 4.8 How To Suggest A Feature Or Enhancement
 The goal of Red is to be as useful to as many people as possible, this means that all features must be useful to anyone and any server that uses Red.
 
 If you find yourself wanting a feature that Red does not already have, you're probably not alone. There's bound to be a great number of users out there needing the same thing and a lot of the features that Red has today have been added because of the needs of our users. Open an issue on our issues list and describe the feature you would like to see, how you would use it, how it should work, and why it would be useful to the Red community as a whole.

LICENSE

@@ -632,7 +632,8 @@ state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     Red - A fully customizable Discord bot
-    Copyright (C) 2015-2020  Twentysix
+    Copyright (C) 2017-2020  Cog Creators
+    Copyright (C) 2015-2017  Twentysix
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -652,7 +653,8 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    Red-DiscordBot  Copyright (C) 2015-2020  Twentysix
+    Red-DiscordBot  Copyright (C) 2017-2020  Cog Creators
+    Red-DiscordBot  Copyright (C) 2015-2017  Twentysix
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
@@ -700,3 +702,6 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
+
+This project vendors discord.ext.menus package (https://github.com/Rapptz/discord-ext-menus) made by Danny Y. (Rapptz) which is distributed under MIT License.
+Copy of this license can be found in discord-ext-menus.LICENSE file in redbot/vendored folder of this repository.

Makefile

@@ -1,16 +1,19 @@
 PYTHON ?= python3.8
 
+ROOT_DIR:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
+
 # Python Code Style
 reformat:
-	$(PYTHON) -m black -l 99 --target-version py38 `git ls-files "*.py"`
+	$(PYTHON) -m black $(ROOT_DIR)
 stylecheck:
-	$(PYTHON) -m black --check -l 99 --target-version py38 `git ls-files "*.py"`
+	$(PYTHON) -m black --check $(ROOT_DIR)
+stylediff:
+	$(PYTHON) -m black --check --diff $(ROOT_DIR)
 
 # Translations
 gettext:
 	$(PYTHON) -m redgettext --command-docstrings --verbose --recursive redbot --exclude-files "redbot/pytest/**/*"
 upload_translations:
-	$(MAKE) gettext
 	crowdin upload sources
 download_translations:
 	crowdin download
@@ -22,12 +25,7 @@ bumpdeps:
 # Development environment
 newenv:
 	$(PYTHON) -m venv --clear .venv
-	.venv/bin/pip install -U pip setuptools
+	.venv/bin/pip install -U pip setuptools wheel
 	$(MAKE) syncenv
 syncenv:
 	.venv/bin/pip install -Ur ./tools/dev-requirements.txt
-
-# Changelog check
-checkchangelog:
-	bash tools/check_changelog_entries.sh
-	$(PYTHON) -m towncrier --draft

README.md

@@ -12,22 +12,22 @@
   <a href="https://discord.gg/red">
     <img src="https://discordapp.com/api/guilds/133049272517001216/widget.png?style=shield" alt="Discord Server">
   </a>
-  <a href="https://www.patreon.com/Red_Devs">
-    <img src="https://img.shields.io/badge/Support-Red!-yellow.svg" alt="Support Red on Patreon!">
+  <a href="https://pypi.org/project/Red-DiscordBot/">
+     <img alt="PyPI" src="https://img.shields.io/pypi/v/Red-Discordbot">
   </a>
   <a href="https://www.python.org/downloads/">
-    <img src="https://img.shields.io/badge/Made%20With-Python%203.8-blue.svg?style=for-the-badge" alt="Made with Python 3.8">
-  </a>
-  <a href="https://crowdin.com/project/red-discordbot">
-    <img src="https://d322cqt584bo4o.cloudfront.net/red-discordbot/localized.svg" alt="Localized with Crowdin">
+    <img alt="PyPI - Python Version" src="https://img.shields.io/pypi/pyversions/Red-Discordbot">
   </a>
   <a href="https://github.com/Rapptz/discord.py/">
      <img src="https://img.shields.io/badge/discord-py-blue.svg" alt="discord.py">
   </a>
+  <a href="https://www.patreon.com/Red_Devs">
+    <img src="https://img.shields.io/badge/Support-Red!-red.svg" alt="Support Red on Patreon!">
+  </a>
 </p>
 <p align="center">
   <a href="https://github.com/Cog-Creators/Red-DiscordBot/actions">
-    <img src="https://github.com/Cog-Creators/Red-DiscordBot/workflows/Tests/badge.svg" alt="GitHub Actions">
+    <img src="https://img.shields.io/github/workflow/status/Cog-Creators/Red-Discordbot/Tests?label=tests" alt="GitHub Actions">
   </a>
   <a href="http://red-discordbot.readthedocs.io/en/stable/?badge=stable">
     <img src="https://readthedocs.org/projects/red-discordbot/badge/?version=stable" alt="Red on readthedocs.org">
@@ -38,6 +38,9 @@
   <a href="http://makeapullrequest.com">
     <img src="https://img.shields.io/badge/PRs-welcome-brightgreen.svg">
   </a>
+  <a href="https://crowdin.com/project/red-discordbot">
+    <img src="https://d322cqt584bo4o.cloudfront.net/red-discordbot/localized.svg" alt="Localized with Crowdin">
+  </a>
 </p>
 
 <p align="center">
@@ -57,19 +60,19 @@
 # Overview
 
 Red is a fully modular bot – meaning all features and commands can be enabled/disabled to your
-liking, making it completely customizable. This is also a *self-hosted bot* – meaning you will need
+liking, making it completely customizable. This is a *self-hosted bot* – meaning you will need
 to host and maintain your own instance. You can turn Red into an admin bot, music bot, trivia bot,
 new best friend or all of these together!  
 
 [Installation](#installation) is easy, and you do **NOT** need to know anything about coding! Aside
-from installation and updating, every part of the bot can be controlled from within Discord.
+from installing and updating, every part of the bot can be controlled from within Discord.
 
 **The default set of modules includes and is not limited to:**
 
 - Moderation features (kick/ban/softban/hackban, mod-log, filter, chat cleanup)
 - Trivia (lists are included and can be easily added)
 - Music features (YouTube, SoundCloud, local files, playlists, queues)
-- Stream alerts (Twitch, Youtube, Mixer, Hitbox, Picarto)
+- Stream alerts (Twitch, Youtube, Hitbox, Picarto)
 - Bank (slot machine, user credits)
 - Custom commands
 - Imgur/gif search
@@ -104,7 +107,7 @@ plugins directly from Discord! A few examples are:
 - AniList
 - And much, much more!
 
-Feel free to take a [peek](https://cogboard.red/t/approved-repositories/210) at a list of
+Feel free to take a [peek](https://index.discord.red) at a list of
 available 3rd party cogs!
 
 # Join the community!
@@ -126,3 +129,6 @@ Red is named after the main character of "Transistor", a video game by
 
 Artwork created by [Sinlaire](https://sinlaire.deviantart.com/) on Deviant Art for the Red Discord
 Bot Project.
+
+This project vendors [discord.ext.menus](https://github.com/Rapptz/discord-ext-menus) package made by Danny Y. (Rapptz) which is distributed under MIT License.
+Copy of this license can be found in [discord-ext-menus.LICENSE](redbot/vendored/discord-ext-menus.LICENSE) file in [redbot/vendored](redbot/vendored) folder of this repository.

changelog.d/.gitignore

@@ -1 +0,0 @@
-!.gitignore

changelog.d/admin/.gitignore

@@ -1 +0,0 @@
-!.gitignore

changelog.d/alias/.gitignore

@@ -1 +0,0 @@
-!.gitignore

changelog.d/audio/.gitignore

@@ -1 +0,0 @@
-!.gitignore

changelog.d/bank/.gitignore

@@ -1 +0,0 @@
-!.gitignore

changelog.d/cleanup/.gitignore

@@ -1 +0,0 @@
-!.gitignore

changelog.d/customcom/.gitignore

@@ -1 +0,0 @@
-!.gitignore

changelog.d/downloader/.gitignore

@@ -1 +0,0 @@
-!.gitignore

changelog.d/economy/.gitignore

@@ -1 +0,0 @@
-!.gitignore

changelog.d/filter/.gitignore

@@ -1 +0,0 @@
-!.gitignore

changelog.d/general/.gitignore

@@ -1 +0,0 @@
-!.gitignore

changelog.d/image/.gitignore

@@ -1 +0,0 @@
-!.gitignore

changelog.d/mod/.gitignore

@@ -1 +0,0 @@
-!.gitignore

changelog.d/modlog/.gitignore

@@ -1 +0,0 @@
-!.gitignore

changelog.d/mutes/.gitignore

@@ -1 +0,0 @@
-!.gitignore

changelog.d/permissions/.gitignore

@@ -1 +0,0 @@
-!.gitignore

changelog.d/reports/.gitignore

@@ -1 +0,0 @@
-!.gitignore

changelog.d/streams/.gitignore

@@ -1 +0,0 @@
-!.gitignore

changelog.d/trivia/.gitignore

@@ -1 +0,0 @@
-!.gitignore

changelog.d/warnings/.gitignore

@@ -1 +0,0 @@
-!.gitignore

crowdin.yml

@@ -1,6 +1,7 @@
 api_key_env: CROWDIN_API_KEY
 project_identifier_env: CROWDIN_PROJECT_ID
 base_path: ./redbot/
+preserve_hierarchy: true
 files:
   - source: cogs/**/messages.pot
     translation: /%original_path%/%locale%.po

docs/_templates/layout.html

@@ -1,5 +1,14 @@
 {% extends '!layout.html' %}
 {% block document %}
+{% if version_slug == 'latest' %}
+<div class="admonition warning">
+    <p class="first admonition-title">Warning</p>
+    <p class="last">
+        This document is for Red's development version, which can be significantly different from previous releases.
+        If you're a regular user, you should read the <a href="{{ dict(versions)['stable'] }}">Red documentation for the current stable release</a>.
+    </p>
+</div>
+{% endif %}
 {{ super() }}
 <a href="https://github.com/Cog-Creators/Red-DiscordBot">
     <img style="position: absolute; top: 0; right: 0; border: 0;"

docs/about_venv.rst

@@ -0,0 +1,39 @@
+.. _about-venvs:
+
+==========================
+About Virtual Environments
+==========================
+Creating a virtual environment is really easy and usually prevents many common installation
+problems.
+
+**What Are Virtual Environments For?**
+
+Virtual environments allow you to isolate Red's library dependencies, cog dependencies and python
+binaries from the rest of your system. There is no performance overhead to using virtual environment
+and it saves you from a lot of troubles during setup. It also makes sure Red and its dependencies
+are installed to a predictable location which makes uninstalling Red as simple as removing a single folder,
+without worrying about losing your data or other things on your system becoming broken.
+
+
+--------------------------------------------
+Virtual Environments with Multiple Instances
+--------------------------------------------
+If you are running multiple instances of Red on the same machine, you have the option of either
+using the same virtual environment for all of them, or creating separate ones.
+
+.. note::
+
+    This only applies for multiple instances of V3. If you are running a V2 instance as well,
+    you **must** use separate virtual environments.
+
+The advantages of using a *single* virtual environment for all of your V3 instances are:
+
+- When updating Red, you will only need to update it once for all instances (however you will still need to restart all instances for the changes to take effect)
+- It will save space on your hard drive
+
+On the other hand, you may wish to update each of your instances individually.
+
+.. important::
+
+    Windows users with multiple instances should create *separate* virtual environments, as
+    updating multiple running instances at once is likely to cause errors.

docs/autostart_systemd.rst

@@ -8,29 +8,39 @@ Setting up auto-restart using systemd on Linux
 Creating the service file
 -------------------------
 
-In order to create the service file, you will first need the location of your :code:`redbot` binary.
+In order to create the service file, you will first need to know two things, your Linux :code:`username` and your Python :code:`path`
+
+First, your Linux :code:`username` can be fetched with the following command:
 
 .. code-block:: bash
 
-    # If redbot is installed in a virtualenv
-    source redenv/bin/activate
+    whoami
+
+Next, your python :code:`path` can be fetched with the following commands:
+
+.. code-block:: bash
+
+    # If redbot is installed in a venv
+    source ~/redenv/bin/activate
     which python
 
-    # If you are using pyenv
-    pyenv shell <name>
+    # If redbot is installed in a pyenv virtualenv
+    pyenv shell <virtualenv_name>
     pyenv which python
 
 Then create the new service file:
 
 :code:`sudo -e /etc/systemd/system/red@.service`
 
-Paste the following and replace all instances of :code:`username` with the username, and :code:`path` with the location you obtained above:
+Paste the following in the file, and replace all instances of :code:`username` with the Linux username you retrieved above, and :code:`path` with the python path you retrieved above.
 
 .. code-block:: none
 
     [Unit]
     Description=%I redbot
     After=multi-user.target
+    After=network-online.target
+    Wants=network-online.target
 
     [Service]
     ExecStart=path -O -m redbot %I --no-prompt

docs/bot_application_guide.rst

@@ -0,0 +1,79 @@
+===========================================
+Creating a bot account
+===========================================
+
+To use Red you will require a bot account and to enable privileged intents. Both these steps will be covered below.
+
+.. _creating-a-bot-account:
+
+-------------------------------
+Creating the bot application
+-------------------------------
+
+In order to use Red, we must first create a Discord Bot account.
+
+Creating a Bot account is a pretty straightforward process.
+
+1. Make sure you're logged on to the `Discord website <https://discord.com>`_.
+2. Navigate to the `application page <https://discord.com/developers/applications>`_
+3. Click on the "New Application" button.
+
+    .. image:: /.resources/bot-guide/discord_create_app_button.png
+        :alt: The new application button.
+
+4. Give the application a name and click "Create".
+
+    .. image::  /.resources/bot-guide/discord_create_app_form.png
+        :alt: The new application form filled in.
+
+5. Create a Bot User by navigating to the "Bot" tab and clicking "Add Bot".
+
+    - Click "Yes, do it!" to continue.
+
+    .. image::  /.resources/bot-guide/discord_create_bot_user.png
+        :alt: The Add Bot button.
+6. If you want others to be able to invite your bot tick the **Public Bot**. Keeping it unticked will prevent others from inviting your bot to their servers and only you will be able to add the bot to servers (provided that you have needed permissions in the server you want to add the bot to).
+
+    - Make sure **Require OAuth2 Code Grant** is unchecked.
+
+    .. image::  /.resources/bot-guide/discord_bot_user_options.png
+        :alt: How the Bot User options should look like for most people.
+
+7. Copy the token using the "Copy" button.
+
+    - **This is not the Client Secret at the General Information page**
+
+    .. warning::
+
+        Do not share your token as it is like your password.
+        If you shared your token you can regenerate it.
+
+Continue to the next section to enable privileged intents.
+
+.. _enabling-privileged-intents:
+
+-------------------------------
+Enabling Privileged Intents
+-------------------------------
+.. warning::
+    Due to Discord API changes, Red Bot requires all intents.
+    \This section is required.
+
+1. Make sure you're logged on to the `Discord website <https://discord.com>`_.
+2. Navigate to the `application page <https://discord.com/developers/applications>`_
+3. Click on the bot you want to enable privileged intents for.
+4. Navigate to the bot tab on the left side of the screen.
+
+    .. image:: /.resources/bot-guide/discord_bot_tab.png
+        :alt: The bot tab in the application page.
+
+5. Scroll down to the "Privileged Gateway Intents" section, enable both privileged intents and save your changes.
+
+    .. image:: /.resources/bot-guide/discord_privileged_intents.png
+        :alt: The privileged gateway intents selector.
+
+.. warning::
+
+    Red bots with over 100 servers require `bot verification <https://support.discord.com/hc/en-us/articles/360040720412>`_ which is not covered in this guide.
+
+*Parts of this guide have been adapted from* `discord.py intro <https://discordpy.readthedocs.io/en/stable/discord.html#discord-intro>`_ *and* `discord.py privileged intents <https://discordpy.readthedocs.io/en/stable/intents.html#privileged-intents>`_.

docs/changelog_3_3_0.rst

@@ -1,5 +1,813 @@
 .. 3.3.x Changelogs
 
+Redbot 3.3.12 (2020-08-18)
+==========================
+
+| Thanks to all these amazing people that contributed to this release:
+| :ghuser:`Dav-Git`, :ghuser:`douglas-cpp`, :ghuser:`flaree`, :ghuser:`jack1142`, :ghuser:`Kowlin`, :ghuser:`MeatyChunks`, :ghuser:`PredaaA`, :ghuser:`Predeactor`, :ghuser:`thisisjvgrace`, :ghuser:`Vexed01`, :ghuser:`zephyrkul`
+
+End-user changelog
+------------------
+
+Core Bot
+********
+
+- Red now logs clearer error if it can't find package to load in any cog path during bot startup (:issue:`4079`)
+
+Mod
+***
+
+- ``[p]mute voice`` and ``[p]unmute voice`` now take action instantly if bot has Move Members permission (:issue:`4064`)
+- Added typing to ``[p](un)mute guild`` to indicate that mute is being processed (:issue:`4066`, :issue:`4172`)
+
+Streams
+*******
+
+- Improve error messages for invalid channel names/IDs (:issue:`4147`, :issue:`4148`)
+
+Trivia Lists
+************
+
+- Added ``whosthatpokemon2`` trivia containing Pokémons from 2nd generation (:issue:`4102`)
+- Added ``whosthatpokemon3`` trivia containing Pokémons from 3rd generation (:issue:`4141`)
+
+
+Miscellaneous
+-------------
+
+- Updated features list in ``[p]serverinfo`` with the latest changes from Discord (:issue:`4116`)
+- Simple version of ``[p]serverinfo`` now shows info about more detailed ``[p]serverinfo 1`` (:issue:`4121`)
+
+
+Redbot 3.3.11 (2020-08-10)
+==========================
+
+| Thanks to all these amazing people that contributed to this release:
+| :ghuser:`douglas-cpp`, :ghuser:`Drapersniper`, :ghuser:`Flame`, :ghuser:`jack1142`, :ghuser:`MeatyChunks`, :ghuser:`Vexed01`, :ghuser:`yamikaitou`
+
+End-user changelog
+------------------
+
+Audio
+*****
+
+- Audio should now work again on all voice regions (:issue:`4162`, :issue:`4168`)
+- Removed an edge case where an unfriendly error message was sent in Audio cog (:issue:`3879`)
+
+Cleanup
+*******
+
+- Fixed a bug causing ``[p]cleanup`` commands to clear all messages within last 2 weeks when ``0`` is passed as the amount of messages to delete (:issue:`4114`, :issue:`4115`)
+
+CustomCommands
+**************
+
+- ``[p]cc show`` now sends an error message when command with the provided name couldn't be found (:issue:`4108`)
+
+Downloader
+**********
+
+- ``[p]findcog`` no longer fails for 3rd-party cogs without any author (:issue:`4032`, :issue:`4042`)
+- Update commands no longer crash when a different repo is added under a repo name that was once used (:issue:`4086`)
+
+Permissions
+***********
+
+- ``[p]permissions removeserverrule`` and ``[p]permissions removeglobalrule`` no longer error when trying to remove a rule that doesn't exist (:issue:`4028`, :issue:`4036`)
+
+Warnings
+********
+
+- ``[p]warn`` now sends an error message (instead of no feedback) when an unregistered reason is used by someone who doesn't have Administrator permission (:issue:`3839`, :issue:`3840`)
+
+
+Redbot 3.3.10 (2020-07-09)
+==========================
+
+| Thanks to all these amazing people that contributed to this release:
+| :ghuser:`aikaterna`, :ghuser:`bobloy`, :ghuser:`Dav-Git`, :ghuser:`Drapersniper`, :ghuser:`Flame442`, :ghuser:`flaree`, :ghuser:`Injabie3`, :ghuser:`jack1142`, :ghuser:`mikeshardmind`, :ghuser:`MiniJennJenn`, :ghuser:`NeuroAssassin`, :ghuser:`thisisjvgrace`, :ghuser:`Vexed01`
+
+End-user changelog
+------------------
+
+Audio
+*****
+
+- Added information about internally managed jar to ``[p]audioset info`` (:issue:`3915`)
+- Updated to Lavaplayer 1.3.50
+- Twitch playback and YouTube searching should be functioning again.
+
+Core Bot
+********
+
+- Fixed delayed help when ``[p]set deletedelay`` is enabled (:issue:`3884`, :issue:`3883`)
+- Bumped the Discord.py requirement from 1.3.3 to 1.3.4 (:issue:`4053`)
+- Added settings view commands for nearly all cogs. (:issue:`4041`)
+- Added more strings to be fully translatable by i18n. (:issue:`4044`)
+
+Downloader
+**********
+
+- Added ``[p]cog listpinned`` subcommand to see currently pinned cogs (:issue:`3974`)
+- Fixed unnecessary typing when running downloader commands (:issue:`3964`, :issue:`3948`)
+- Added embed version of ``[p]findcog`` (:issue:`3965`, :issue:`3944`)
+- Fixed ``[p]findcog`` not differentiating between core cogs and local cogs(:issue:`3969`, :issue:`3966`)
+
+Filter
+******
+
+- Added ``[p]filter list`` to show filtered words, and removed DMs when no subcommand was passed (:issue:`3973`)
+
+Image
+*****
+
+- Updated instructions for obtaining and setting the GIPHY API key (:issue:`3994`)
+
+Mod
+***
+
+- Added option to delete messages within the passed amount of days with ``[p]tempban`` (:issue:`3958`)
+- Added the ability to permanently ban a temporary banned user with ``[p]hackban`` (:issue:`4025`)
+- Fixed the passed reason not being used when using ``[p]tempban`` (:issue:`3958`)
+- Fixed invite being sent with ``[p]tempban`` even when no invite was set (:issue:`3991`)
+- Prevented an issue whereby the author may lock him self out of using the bot via whitelists (:issue:`3903`)
+- Reduced the number of API calls made to the storage APIs (:issue:`3910`)
+
+Permissions
+***********
+
+- Uploaded YAML files now accept integer commands without quotes (:issue:`3987`, :issue:`3185`)
+- Uploaded YAML files now accept command rules with empty dictionaries (:issue:`3987`, :issue:`3961`)
+
+Streams
+*******
+
+- Fixed streams cog sending multiple owner notifications about twitch secret not set (:issue:`3901`, :issue:`3587`)
+- Fixed old bearer tokens not being invalidated when the API key is updated (:issue:`3990`, :issue:`3917`)
+
+Trivia Lists
+************
+
+- Fixed URLs in ``whosthatpokemon`` (:issue:`3975`, :issue:`3023`)
+- Fixed trivia files ``leagueults`` and ``sports`` (:issue:`4026`)
+- Updated ``greekmyth`` to include more answer variations (:issue:`3970`)
+- Added new ``lotr`` trivia list (:issue:`3980`)
+- Added new ``r6seige`` trivia list (:issue:`4026`)
+
+
+Developer changelog
+-------------------
+
+- Added the utility functions ``map``, ``find``, and ``next`` to ``AsyncIter`` (:issue:`3921`, :issue:`3887`)
+- Updated deprecation times for ``APIToken``, and loops being passed to various functions to the first minor release (represented by ``X`` in ``3.X.0``) after 2020-08-05 (:issue:`3608`)
+- Updated deprecation warnings for shared libs to reflect that they have been moved for an undefined time (:issue:`3608`)
+- Added new ``discord.com`` domain to ``INVITE_URL_RE`` common filter (:issue:`4012`)
+- Fixed incorrect role mention regex in ``MessagePredicate`` (:issue:`4030`)
+- Vendor the ``discord.ext.menus`` module (:issue:`4039`)
+
+
+Miscellaneous
+-------------
+
+- Improved error responses for when Modlog and Autoban on mention spam were already disabled (:issue:`3951`, :issue:`3949`)
+- Clarified that ``[p]embedset user`` only affects commands executed in DMs (:issue:`3972`, :issue:`3953`)
+- Added link to Getting Started guide if the bot was not in any guilds (:issue:`3906`)
+- Fixed exceptions being ignored or not sent to log files in special cases (:issue:`3895`)
+- Added the option of using dots in the instance name when creating your instances (:issue:`3920`)
+- Added a confirmation when using hyphens in instance names to discourage the use of them (:issue:`3920`)
+- Fixed migration owner notifications being sent even when migration was not necessary (:issue:`3911`. :issue:`3909`)
+- Fixed commands being translated where they should not be (:issue:`3938`, :issue:`3919`)
+- Fixed grammar errors and added full stopts in ``core_commands.py`` (:issue:`4023`)
+
+
+Redbot 3.3.9 (2020-06-12)
+=========================
+
+| Thanks to all these amazing people that contributed to this release:
+| :ghuser:`aikaterna`, :ghuser:`Dav-Git`, :ghuser:`Drapersniper`, :ghuser:`Flame442`, :ghuser:`mikeshardmind`, :ghuser:`NeuroAssassin`, :ghuser:`Predeactor`, :ghuser:`Vexed01`
+|
+| **Read before updating**:
+| 1. Bot owners can no longer restrict access to some commands in Permissions cog using global permissions rules. Look at `Permissions changelog <important-339-2>` for full details.
+| 2. There's been a change in behavior of warning messages. Look at `Warnings changelog <important-339-1>` for full details.
+
+
+End-user changelog
+------------------
+
+Security
+********
+
+**NOTE**: If you can't update immediately, we recommend disabling the affected command until you can.
+
+- **Mod** - ``[p]tempban`` now properly respects Discord's hierarchy rules (:issue:`3957`)
+
+Core Bot
+********
+
+- ``[p]info`` command can now be used when bot doesn't have Embed Links permission (:issue:`3907`, :issue:`3102`)
+- Fixed ungraceful error that happened in ``[p]set custominfo`` when provided text was too long (:issue:`3923`)
+- Red's start up message now shows storage type (:issue:`3935`)
+
+Audio
+*****
+
+- Audio now properly ignores streams when max length is enabled (:issue:`3878`, :issue:`3877`)
+- Commands that should work in DMs no longer error (:issue:`3880`)
+
+Filter
+******
+
+- Fixed behavior of detecting quotes in commands for adding/removing filtered words (:issue:`3925`)
+
+.. _important-339-2:
+
+Permissions
+***********
+
+- **Both global and server rules** can no longer prevent guild owners from accessing commands for changing server rules. Bot owners can still use ``[p]command disable`` if they wish to completely disable any command in Permissions cog (:issue:`3955`, :issue:`3107`)
+
+  Full list of affected commands:
+
+  - ``[p]permissions acl getserver``
+  - ``[p]permissions acl setserver``
+  - ``[p]permissions acl updateserver``
+  - ``[p]permissions addserverrule``
+  - ``[p]permissions removeserverrule``
+  - ``[p]permissions setdefaultserverrule``
+  - ``[p]permissions clearserverrules``
+  - ``[p]permissions canrun``
+  - ``[p]permissions explain``
+
+.. _important-339-1:
+
+Warnings
+********
+
+- Warnings sent to users don't show the moderator who warned the user by default now. Newly added ``[p]warningset showmoderators`` command can be used to switch this behaviour (:issue:`3781`)
+- Warn channel functionality has been fixed (:issue:`3781`)
+
+
+Developer changelog
+-------------------
+
+Core Bot
+********
+
+- Added `bot.set_prefixes() <RedBase.set_prefixes()>` method that allows developers to set global/server prefixes (:issue:`3890`)
+
+
+Documentation changes
+---------------------
+
+- Added Oracle Cloud to free hosting section in :ref:`host-list` (:issue:`3916`)
+
+Miscellaneous
+-------------
+
+- Added missing help message for Downloader, Reports and Streams cogs (:issue:`3892`)
+- **Core Bot** - cooldown in ``[p]contact`` no longer applies when it's used without any arguments (:issue:`3942`)
+- **Core Bot** - improved instructions on obtaining user ID in help of ``[p]dm`` command (:issue:`3946`)
+- **Alias** - ``[p]alias global`` group, ``[p]alias help``, and ``[p]alias show`` commands can now be used in DMs (:issue:`3941`, :issue:`3940`)
+- **Audio** - Typo fix (:issue:`3889`, :issue:`3900`)
+- **Audio** - Fixed ``[p]audioset autoplay`` being available in DMs (:issue:`3899`)
+- **Bank** - ``[p]bankset`` now displays bank's scope (:issue:`3954`)
+- **Mod** - Preemptive fix for d.py 1.4 (:issue:`3891`)
+
+
+Redbot 3.3.8 (2020-05-29)
+==================================
+
+| Thanks to all these amazing people that contributed to this release:
+| :ghuser:`aikaterna`, :ghuser:`Bakersbakebread`, :ghuser:`DariusStClair`, :ghuser:`Dav-Git`, :ghuser:`Drapersniper`, :ghuser:`Flame442`, :ghuser:`jack1142`, :ghuser:`mikeshardmind`, :ghuser:`NeuroAssassin`, :ghuser:`PredaaA`, :ghuser:`Predeactor`, :ghuser:`qaisjp`, :ghuser:`Tobotimus`
+
+End-user changelog
+------------------
+
+Core Bot
+********
+
+- Important fixes to how PostgreSQL data backend saves data in bulks (:issue:`3829`)
+- Fixed ``[p]localwhitelist`` and ``[p]localblacklist`` commands (:issue:`3857`)
+- Red now includes information on how to update when sending information about being out of date (:issue:`3744`)
+- Using backslashes in bot's username/nickname no longer causes issues (:issue:`3826`, :issue:`3825`)
+
+Admin
+*****
+
+- Fixed server lock (:issue:`3815`, :issue:`3814`)
+
+Alias
+*****
+
+- Added pagination to ``[p]alias list`` and ``[p]alias global list`` to avoid errors for users with a lot of aliases (:issue:`3844`, :issue:`3834`)
+- ``[p]alias help`` should now work more reliably (:issue:`3864`)
+
+Audio
+*****
+
+- Twitch playback is functional once again (:issue:`3873`)
+- Recent errors with YouTube playback should be resolved (:issue:`3873`)
+- Added new option (settable with ``[p]audioset lyrics``) that makes Audio cog prefer (prioritize) tracks with lyrics (:issue:`3519`)
+- Added global daily (historical) queues (:issue:`3518`)
+- Added ``[p]audioset countrycode`` that allows to set the country code for spotify searches (:issue:`3528`)
+- Fixed ``[p]local search`` (:issue:`3528`, :issue:`3501`)
+- Local folders with special characters should work properly now (:issue:`3528`, :issue:`3467`)
+- Audio no longer fails to take the last spot in the voice channel with user limit (:issue:`3528`)
+- ``[p]local play`` no longer enqueues tracks from nested folders (:issue:`3528`)
+- Fixed ``[p]playlist dedupe`` not removing tracks (:issue:`3518`)
+- ``[p]disconnect`` now allows to disconnect if both DJ mode and voteskip aren't enabled (:issue:`3502`, :issue:`3485`)
+- Many UX improvements and fixes, including, among other things:
+
+  - Creating playlists without explicitly passing ``-scope`` no longer causes errors (:issue:`3500`)
+  - ``[p]playlist list`` now shows all accessible playlists if ``--scope`` flag isn't used (:issue:`3518`)
+  - ``[p]remove`` now also accepts a track URL in addition to queue index (:issue:`3201`)
+  - ``[p]playlist upload`` now accepts a playlist file uploaded in the message with a command (:issue:`3251`)
+  - Commands now send friendly error messages for common errors like lost Lavalink connection or bot not connected to voice channel (:issue:`3503`, :issue:`3528`, :issue:`3353`, :issue:`3712`)
+
+CustomCommands
+**************
+
+- ``[p]customcom create`` no longer allows spaces in custom command names (:issue:`3816`)
+
+Mod
+***
+
+- ``[p]userinfo`` now shows default avatar when no avatar is set (:issue:`3819`)
+
+Modlog
+******
+
+- Fixed (again) ``AttributeError`` for cases whose moderator doesn't share the server with the bot (:issue:`3805`, :issue:`3784`, :issue:`3778`)
+
+Permissions
+***********
+
+- Commands for settings ACL using yaml files now properly works on PostgreSQL data backend (:issue:`3829`, :issue:`3796`)
+
+Warnings
+********
+
+- Warnings cog no longer allows to warn bot users (:issue:`3855`, :issue:`3854`)
+
+
+Developer changelog
+-------------------
+
+| **Important:**
+| If you're using RPC, please see the full annoucement about current state of RPC in main Red server
+  `by clicking here <https://discord.com/channels/133049272517001216/411381123101491200/714560168465137694>`_.
+
+
+Core Bot
+********
+
+- Red now inherits from `discord.ext.commands.AutoShardedBot` for better compatibility with code expecting d.py bot (:issue:`3822`)
+- Libraries using ``pkg_resources`` (like ``humanize`` or ``google-api-python-client``) that were installed through Downloader should now work properly (:issue:`3843`)
+- All bot owner IDs can now be found under ``bot.owner_ids`` attribute (:issue:`3793`)
+
+  -  Note: If you want to use this on bot startup (e.g. in cog's initialisation), you need to await ``bot.wait_until_red_ready()`` first
+
+
+Documentation changes
+---------------------
+
+- Added information about provisional status of RPC (:issue:`3862`)
+- Revised install instructions (:issue:`3847`)
+- Improved navigation in `document about updating Red <update_red>` (:issue:`3856`, :issue:`3849`)
+
+
+Miscellaneous
+-------------
+
+- Few clarifications and typo fixes in few command help docstrings (:issue:`3817`, :issue:`3823`, :issue:`3837`, :issue:`3851`, :issue:`3861`)
+- **Downloader** - Downloader no longer removes the repo when it fails to load it (:issue:`3867`)
+
+
+Redbot 3.3.7 (2020-04-28)
+=========================
+
+This is a hotfix release fixing issue with generating messages for new cases in Modlog.
+
+
+Redbot 3.3.6 (2020-04-27)
+=========================
+
+| Thanks to all these amazing people that contributed to this release:
+| :ghuser:`aikaterna`, :ghuser:`Drapersniper`, :ghuser:`jack1142`, :ghuser:`Kowlin`, :ghuser:`MiniJennJenn`, :ghuser:`NeuroAssassin`, :ghuser:`PredaaA`, :ghuser:`TrustyJAID`, :ghuser:`yamikaitou`
+
+End-user changelog
+------------------
+
+Core Bot
+********
+
+- Converting from and to Postgres driver with ``redbot-setup convert`` have been fixed (:issue:`3714`, :issue:`3115`)
+- Fixed big delays in commands that happened when the bot was owner-less (or if it only used co-owners feature) and command caller wasn't the owner (:issue:`3782`)
+- Various optimizations
+
+  - Reduced calls to data backend when loading bot's commands (:issue:`3764`)
+  - Reduced calls to data backend when showing help for cogs/commands (:issue:`3766`)
+  - Improved performance for bots with big amount of guilds (:issue:`3767`)
+  - Mod cog no longer fetches guild's bans every 60 seconds when handling unbanning for tempbans (:issue:`3783`)
+  - Reduced the bot load for messages starting with a prefix when fuzzy search is disabled (:issue:`3718`)
+  - Aliases in Alias cog are now cached for better performance (:issue:`3788`)
+
+Core Commands
+*************
+
+- ``[p]set avatar`` now supports setting avatar using attachment (:issue:`3747`)
+- Added ``[p]set avatar remove`` subcommand for removing bot's avatar (:issue:`3757`)
+- Fixed list of ignored channels that is shown in ``[p]ignore``/``[p]unignore`` (:issue:`3746`)
+
+Audio
+*****
+
+- Age-restricted tracks, live streams, and mix playlists from YouTube should work in Audio again (:issue:`3791`)
+- Soundcloud's sets and playlists with more than 50 tracks should work in Audio again (:issue:`3791`)
+
+CustomCommands
+**************
+
+- Added ``[p]cc raw`` command that gives you the raw response of a custom command for ease of copy pasting (:issue:`3795`)
+
+Modlog
+******
+
+- Fixed ``AttributeError`` for cases whose moderator doesn't share the server with the bot (:issue:`3784`, :issue:`3778`)
+
+Streams
+*******
+
+- Fixed incorrect stream URLs for Twitch channels that have localised display name (:issue:`3773`, :issue:`3772`)
+
+Trivia
+******
+
+- Fixed the error in ``[p]trivia stop`` that happened when there was no ongoing trivia session in the channel (:issue:`3774`)
+
+Trivia Lists
+************
+
+- Updated ``leagueoflegends`` list with new changes to League of Legends (`b8ac70e <https://github.com/Cog-Creators/Red-DiscordBot/commit/b8ac70e59aa1328f246784f14f992d6ffe00d778>`_)
+
+
+Developer changelog
+-------------------
+
+Utility Functions
+*****************
+
+- Added `redbot.core.utils.AsyncIter` utility class which allows you to wrap regular iterable into async iterator yielding items and sleeping for ``delay`` seconds every ``steps`` items (:issue:`3767`, :issue:`3776`)
+- `bold()`, `italics()`, `strikethrough()`, and `underline()` now accept ``escape_formatting`` argument that can be used to disable escaping of markdown formatting in passed text (:issue:`3742`)
+
+
+Documentation changes
+---------------------
+
+- Added `document about updating Red <update_red>` (:issue:`3790`)
+- ``pyenv`` instructions will now update ``pyenv`` if it's already installed (:issue:`3740`)
+- Updated Python version in ``pyenv`` instructions (:issue:`3740`)
+- Updated install docs to include Ubuntu 20.04 (:issue:`3792`)
+
+
+Miscellaneous
+-------------
+
+- **Config** - JSON driver will now properly have only one lock per cog name (:issue:`3780`)
+- **Core Commands** - ``[p]debuginfo`` now shows used storage type (:issue:`3794`)
+- **Trivia** - Corrected spelling of Compact Disc in ``games`` list (:issue:`3759`, :issue:`3758`)
+
+
+Redbot 3.3.5 (2020-04-09)
+=========================
+
+| Thanks to all these amazing people that contributed to this release:
+| :ghuser:`jack1142`, :ghuser:`Kowlin`
+
+End-user changelog
+------------------
+
+Core Bot
+********
+
+- "Outdated" field no longer shows in ``[p]info`` when Red is up-to-date (:issue:`3730`)
+
+Alias
+*****
+
+- Fixed regression in ``[p]alias add`` that caused it to reject commands containing arguments (:issue:`3734`)
+
+
+Redbot 3.3.4 (2020-04-05)
+=========================
+
+| Thanks to all these amazing people that contributed to this release:
+| :ghuser:`jack1142`, :ghuser:`kennnyshiwa`
+
+End-user changelog
+------------------
+
+Core Bot
+********
+
+- Fixed checks related to bank's global state that were used in commands in Bank, Economy and Trivia cogs (:issue:`3707`)
+
+Alias
+*****
+
+- ``[p]alias add`` now sends an error when command user tries to alias doesn't exist (:issue:`3710`, :issue:`3545`)
+
+Developer changelog
+-------------------
+
+Core Bot
+********
+
+- Bump dependencies, including update to discord.py 1.3.3 (:issue:`3723`)
+
+Utility Functions
+*****************
+
+- `redbot.core.utils.common_filters.filter_invites` now filters ``discord.io/discord.li`` invites links (:issue:`3717`)
+- Fixed false-positives in `redbot.core.utils.common_filters.filter_invites` (:issue:`3717`)
+
+Documentation changes
+---------------------
+
+- Versions of pre-requirements are now included in Windows install guide (:issue:`3708`)
+
+
+Redbot 3.3.3 (2020-03-28)
+=========================
+
+| Thanks to all these amazing people that contributed to this release:
+| :ghuser:`AnonGuy`, :ghuser:`Dav-Git`, :ghuser:`FancyJesse`, :ghuser:`Ianardo-DiCaprio`, :ghuser:`jack1142`, :ghuser:`kennnyshiwa`, :ghuser:`Kowlin`, :ghuser:`NeuroAssassin`, :ghuser:`PredaaA`, :ghuser:`Stonedestroyer`, :ghuser:`TrustyJAID`
+
+End-user changelog
+------------------
+
+Core Bot
+********
+
+- Delete delay for command messages has been moved from Mod cog to Core (:issue:`3638`, :issue:`3636`)
+- Fixed various bugs with blacklist and whitelist (:issue:`3643`, :issue:`3642`)
+- Added ``[p]set regionalformat`` command that allows users to set regional formatting that is different from bot's locale (:issue:`3677`, :issue:`3588`)
+- ``[p]set locale`` allows any valid locale now, not just locales for which Red has translations (:issue:`3676`, :issue:`3596`)
+- Permissions for commands in Bank, Economy and Trivia cogs can now be overridden by Permissions cog (:issue:`3672`, :issue:`3233`)
+- Outages of ``pypi.org`` no longer prevent the bot from starting (:issue:`3663`)
+- Fixed formatting of help strings in fuzzy search results (:issue:`3673`, :issue:`3507`)
+- Fixed few deprecation warnings related to menus and uvloop (:issue:`3644`, :issue:`3700`)
+
+Core Commands
+*************
+
+- ``[p]set game`` no longer errors when trying to clear the status (:issue:`3630`, :issue:`3628`)
+- All owner notifcations in Core now use proper prefixes in messages (:issue:`3632`)
+- Added ``[p]set playing`` and ``[p]set streaming`` aliases for respectively ``[p]set game`` and ``[p]set stream`` (:issue:`3646`, :issue:`3590`)
+
+ModLog
+******
+
+- Modlog's cases now keep last known username to prevent losing that information from case's message on edit (:issue:`3674`, :issue:`3443`)
+
+CustomCom
+*********
+
+- Added ``[p]cc search`` command that allows users to search through created custom commands (:issue:`2573`)
+
+Cleanup
+*******
+
+- Added ``[p]cleanup spam`` command that deletes duplicate messages from the last X messages and keeps only one copy (:issue:`3688`)
+- Removed regex support in ``[p]cleanup self`` (:issue:`3704`)
+
+Downloader
+**********
+
+- ``[p]cog checkforupdates`` now includes information about cogs that can't be installed due to Red/Python version requirements (:issue:`3678`, :issue:`3448`)
+
+General
+*******
+
+- Added more detailed mode to ``[p]serverinfo`` command that can be accessed with ``[p]serverinfo 1`` (:issue:`2382`, :issue:`3659`)
+
+Image
+*****
+
+- Users can now specify how many images should be returned in ``[p]imgur search`` and ``[p]imgur subreddit`` using ``[count]`` argument (:issue:`3667`, :issue:`3044`)
+- ``[p]imgur search`` and ``[p]imgur subreddit`` now return one image by default (:issue:`3667`, :issue:`3044`)
+
+Mod
+***
+
+- ``[p]userinfo`` now shows user's activities (:issue:`3669`)
+- ``[p]userinfo`` now shows status icon near the username (:issue:`3669`)
+- Muting no longer fails if user leaves while applying overwrite (:issue:`3627`)
+- Fixed error that happened when Mod cog was loaded for the first time during bot startup (:issue:`3632`, :issue:`3626`)
+
+Permissions
+***********
+
+- Commands for setting default rules now error when user tries to deny access to command designated as being always available (:issue:`3504`, :issue:`3465`)
+
+Streams
+*******
+
+- Fixed an error that happened when no game was set on Twitch stream (:issue:`3631`)
+- Preview picture for YouTube stream alerts is now bigger (:issue:`3689`, :issue:`3685`)
+- YouTube channels with a livestream that doesn't have any current viewer are now properly showing as streaming (:issue:`3690`)
+- Failures in Twitch API authentication are now logged (:issue:`3657`)
+
+Trivia
+******
+
+- Added ``[p]triviaset custom upload/delete/list`` commands for managing custom trivia lists from Discord (:issue:`3420`, :issue:`3307`)
+- Trivia sessions no longer error on payout when winner's balance would exceed max balance (:issue:`3666`, :issue:`3584`)
+
+Warnings
+********
+
+- Sending warnings to warned user can now be disabled with ``[p]warnset toggledm`` command (:issue:`2929`, :issue:`2800`)
+- Added ``[p]warnset warnchannel`` command that allows to set a channel where warnings should be sent to instead of the channel command was called in (:issue:`2929`, :issue:`2800`)
+- Added ``[p]warnset togglechannel`` command that allows to disable sending warn message in guild channel (:issue:`2929`, :issue:`2800`)
+- ``[p]warn`` now tells the moderator when bot wasn't able to send the warning to the user (:issue:`3653`, :issue:`3633`)
+
+
+Developer changelog
+-------------------
+
+Core Bot
+********
+
+- Deprecation warnings issued by Red now use correct stack level so that the cog developers can find the cause of them (:issue:`3644`)
+
+Dev Cog
+*******
+
+- Add ``__name__`` to environment's globals (:issue:`3649`, :issue:`3648`)
+
+
+Documentation changes
+---------------------
+
+- Fixed install instructions for Mac in `install_linux_mac` (:issue:`3675`, :issue:`3436`)
+- Windows install instructions now use ``choco upgrade`` commands instead of ``choco install`` to ensure up-to-date packages (:issue:`3684`)
+
+
+Miscellaneous
+-------------
+
+- **Core Bot** - Command errors (i.e. command on cooldown, dm-only and guild-only commands, etc) can now be translated (:issue:`3665`, :issue:`2988`)
+- **Core Bot** - ``redbot-setup`` now prints link to Getting started guide at the end of the setup (:issue:`3027`)
+- **Core Bot** - Whitelist and blacklist commands now properly require passing at least one user (or role in case of local whitelist/blacklist) (:issue:`3652`, :issue:`3645`)
+- **Downloader** - Fix misleading error appearing when repo name is already taken in ``[p]repo add`` (:issue:`3695`)
+- **Downloader** - Improved error messages for unexpected errors in ``[p]repo add`` (:issue:`3656`)
+- **Downloader** - Prevent encoding errors from crashing ``[p]cog update`` (:issue:`3639`, :issue:`3637`)
+- **Trivia** - Non-finite numbers can no longer be passed to ``[p]triviaset timelimit``, ``[p]triviaset stopafter`` and ``[p]triviaset payout`` (:issue:`3668`, :issue:`3583`)
+- **Utility Functions** - `redbot.core.utils.menus.menu()` now checks permissions *before* trying to clear reactions (:issue:`3589`, :issue:`3145`)
+
+
+Redbot 3.3.2 (2020-02-28)
+=========================
+
+| Thanks to all these amazing people that contributed to this release:
+| :ghuser:`aikaterna`, :ghuser:`chasehult`, :ghuser:`Dav-Git`, :ghuser:`DiscordLiz`, :ghuser:`Drapersniper`, :ghuser:`fixator10`, :ghuser:`Flame442`, :ghuser:`Hedlund01`, :ghuser:`jack1142`, :ghuser:`Kowlin`, :ghuser:`mikeshardmind`, :ghuser:`PredaaA`, :ghuser:`Stonedestroyer`, :ghuser:`trundleroo`, :ghuser:`TrustyJAID`, :ghuser:`zephyrkul`
+
+End-user changelog
+------------------
+
+Core Bot
+********
+
+- Ignored guilds/channels and whitelist/blacklist are now cached for performance (:issue:`3472`)
+- Ignored guilds/channels have been moved from Mod cog to Core (:issue:`3472`)
+- ``[p]ignore channel`` command can now also ignore channel categories (:issue:`3472`)
+
+Core Commands
+*************
+
+- Core cogs will now send bot mention prefix properly in places where discord doesn't render mentions (:issue:`3579`, :issue:`3591`, :issue:`3499`)
+- Fix a bug with ``[p]blacklist add`` that made it impossible to blacklist users that bot doesn't share a server with (:issue:`3472`, :issue:`3220`)
+- Improve user experience of ``[p]set game/listening/watching/`` commands (:issue:`3562`)
+- Add ``[p]licenceinfo`` alias for ``[p]licenseinfo`` command to conform with non-American English (:issue:`3460`)
+
+Admin
+*****
+
+- ``[p]announce`` will now only send error message if an actual errors occurs (:issue:`3514`, :issue:`3513`)
+
+Alias
+*****
+
+- ``[p]alias help`` will now properly work in non-English locales (:issue:`3546`)
+
+Audio
+*****
+
+- Users should be able to play age-restricted tracks from YouTube again (:issue:`3620`)
+
+Economy
+*******
+
+- Next payday time will now be adjusted for users when payday time is changed (:issue:`3496`, :issue:`3438`)
+
+Downloader
+**********
+
+- Downloader will no longer fail because of invalid ``info.json`` files (:issue:`3533`, :issue:`3456`)
+- Add better logging of errors when Downloader fails to add a repo (:issue:`3558`)
+
+Image
+*****
+
+- Fix load error for users that updated Red from version lower than 3.1 to version 3.2 or newer (:issue:`3617`)
+
+Mod
+***
+
+- ``[p]hackban`` and ``[p]unban`` commands support user mentions now (:issue:`3524`)
+- Ignored guilds/channels have been moved from Mod cog to Core (:issue:`3472`)
+
+Streams
+*******
+
+- Fix stream alerts for Twitch (:issue:`3487`)
+- Significantly reduce the quota usage for YouTube stream alerts (:issue:`3237`)
+- Add ``[p]streamset timer`` command which can be used to control how often the cog checks for live streams (:issue:`3237`)
+
+Trivia
+******
+
+- Add better handling for errors in trivia session (:issue:`3606`)
+
+Trivia Lists
+************
+
+- Remove empty answers in trivia lists (:issue:`3581`)
+
+Warnings
+********
+
+- Users can now pass a reason to ``[p]unwarn`` command (:issue:`3490`, :issue:`3093`)
+
+
+Developer changelog
+-------------------
+
+Core Bot
+********
+
+- Updated all our dependencies - we're using discord.py 1.3.2 now (:issue:`3609`)
+- Add traceback logging to task exception handling (:issue:`3517`)
+- Developers can now create a command from an async function wrapped in `functools.partial` (:issue:`3542`)
+- Bot will now show deprecation warnings in logs (:issue:`3527`, :issue:`3615`)
+- Subcommands of command group with ``invoke_without_command=True`` will again inherit this group's checks (:issue:`3614`)
+
+Config
+******
+
+- Fix Config's singletons (:issue:`3137`, :issue:`3136`)
+
+Utility Functions
+*****************
+
+- Add clearer error when page is of a wrong type in `redbot.core.utils.menus.menu()` (:issue:`3571`)
+
+Dev Cog
+*******
+
+- Allow for top-level `await`, `async for` and `async with` in ``[p]debug`` and ``[p]repl`` commands (:issue:`3508`)
+
+Downloader
+**********
+
+- Downloader will now replace ``[p]`` with clean prefix same as it does in help command (:issue:`3592`)
+- Add schema validation to ``info.json`` file processing - it should now be easier to notice any issues with those files (:issue:`3533`, :issue:`3442`)
+
+
+Documentation changes
+---------------------
+
+- Add guidelines for Cog Creators in `guide_cog_creation` document (:issue:`3568`)
+- Restructure virtual environment instructions to improve user experience (:issue:`3495`, :issue:`3411`, :issue:`3412`)
+- Getting started guide now explain use of quotes for arguments with spaces (:issue:`3555`, :issue:`3111`)
+- ``latest`` version of docs now displays a warning about possible differences from current stable release (:issue:`3570`)
+- Make systemd guide clearer on obtaining username and python path (:issue:`3537`, :issue:`3462`)
+- Indicate instructions for different venv types in systemd guide better (:issue:`3538`)
+- Service file in `autostart_systemd` now also waits for network connection to be ready (:issue:`3549`)
+- Hide alias of ``randomize_colour`` in docs (:issue:`3491`)
+- Add separate headers for each event predicate class for better navigation (:issue:`3595`, :issue:`3164`)
+- Improve wording of explanation for ``required_cogs`` key in `guide_publish_cogs` (:issue:`3520`)
+
+
+Miscellaneous
+-------------
+
+- Use more reliant way of checking if command is bot owner only in ``[p]warnaction`` (Warnings cog) (:issue:`3516`, :issue:`3515`)
+- Update PyPI domain in ``[p]info`` and update checker (:issue:`3607`)
+- Stop using deprecated code in core (:issue:`3610`)
+
+
 Redbot 3.3.1 (2020-02-05)
 =========================
 

docs/changelog_3_4_0.rst

@@ -0,0 +1,373 @@
+.. 3.4.x Changelogs
+
+Redbot 3.4.1 (2020-10-27)
+=========================
+
+| Thanks to all these amazing people that contributed to this release:
+| :ghuser:`absj30`, :ghuser:`aikaterna`, :ghuser:`bobloy`, :ghuser:`chloecormier`, :ghuser:`Dav-Git`, :ghuser:`Drapersniper`, :ghuser:`fixator10`, :ghuser:`Flame442`, :ghuser:`flaree`, :ghuser:`Generaleoley`, :ghuser:`hisztendahl`, :ghuser:`jack1142`, :ghuser:`KaiGucci`, :ghuser:`Kowlin`, :ghuser:`maxbooiii`, :ghuser:`MeatyChunks`, :ghuser:`NeuroAssassin`, :ghuser:`nfitzen`, :ghuser:`palmtree5`, :ghuser:`phenom4n4n`, :ghuser:`PredaaA`, :ghuser:`Predeactor`, :ghuser:`PythonTryHard`, :ghuser:`SharkyTheKing`, :ghuser:`Stonedestroyer`, :ghuser:`thisisjvgrace`, :ghuser:`TrustyJAID`, :ghuser:`TurnrDev`, :ghuser:`Vexed01`, :ghuser:`Vuks69`, :ghuser:`xBlynd`, :ghuser:`zephyrkul`
+
+Read before updating
+--------------------
+
+1. This release fixes a security issue in Mod cog. See `Security changelog below <important-341-2>` for more information.
+2. This Red update bumps discord.py to version 1.5.1, which explicitly requests Discord intents. Red requires all Prvileged Intents to be enabled. More information can be found at :ref:`enabling-privileged-intents`.
+3. Mutes functionality has been moved from the Mod cog to a new separate cog (Mutes) featuring timed and role-based mutes. If you were using it (or want to start now), you can load the new cog with ``[p]load mutes``. You can see the full `Mutes changelog below <important-341-1>`.
+4. Information for Audio users that are using an external Lavalink instance (if you don't know what that is, you should skip this point):
+
+   We've updated our `application.yml file <https://github.com/Cog-Creators/Red-DiscordBot/blob/3.4.1/redbot/cogs/audio/data/application.yml>`_ and you should update your instance's ``application.yml`` appropriately.
+   Please ensure that the WS port in Audio's settings (``[p]llset wsport``) is set to the port from the ``application.yml``.
+
+End-user changelog
+------------------
+
+.. _important-341-2:
+
+Security
+********
+
+**NOTE:** If you can't update immediately, we recommend globally disabling the affected command until you can.
+
+- **Mod** - Fixed unauthorized privilege escalation exploit in ``[p]massban`` (also called ``[p]hackban``) command. Full security advisory `can be found on our GitHub <https://github.com/Cog-Creators/Red-DiscordBot/security/advisories/GHSA-mp9m-g7qj-6vqr>`_.
+
+Core Bot
+********
+
+- Fixed an incorrect error being reported on ``[p]set name`` when the passed name was longer than 32 characters (:issue:`4364`, :issue:`4363`)
+- Fixed ``[p]set nickname`` erroring when the passed name was longer than 32 characters (:issue:`4364`, :issue:`4363`)
+- Fixed an ungraceful error being raised when running ``[p]traceback`` with closed DMs (:issue:`4329`)
+- Fixed errors that could arise from invalid URLs in ``[p]set avatar`` (:issue:`4437`)
+- Fixed an error being raised with ``[p]set nickname`` when no nickname was provided (:issue:`4451`)
+- Fixed and clarified errors being raised with ``[p]set username`` (:issue:`4463`)
+- Fixed an ungraceful error being raised when the output of ``[p]unload`` is larger than 2k characters (:issue:`4469`)
+- Fixed an ungraceful error being raised when running ``[p]choose`` with empty options (:issue:`4499`)
+- Fixed an ungraceful error being raised when a bot left a guild while a menu was open (:issue:`3902`)
+- Fixed info missing on the non-embed version of ``[p]debuginfo`` (:issue:`4524`)
+- Added ``[p]set api list`` to list all currently set API services, without tokens (:issue:`4370`)
+- Added ``[p]set api remove`` to remove API services, including tokens (:issue:`4370`)
+- Added ``[p]helpset usetick``, toggling command message being ticked when help is sent to DM (:issue:`4467`, :issue:`4075`)
+- Added a default color field to ``[p]set showsettings`` (:issue:`4498`, :issue:`4497`)
+- Added the datapath and metadata file to ``[p]debuginfo`` (:issue:`4524`)
+- Added a list of disabled intents to ``[p]debuginfo`` (:issue:`4423`)
+- Bumped discord.py dependency to version 1.5.1 (:issue:`4423`)
+- Locales and regional formats can now be set in individual guilds using ``[p]set locale`` and ``[p]set regionalformat`` (:issue:`3896`, :issue:`1970`)
+
+    - Global locale and regional format setters have been renamed to ``[p]set globallocale`` and ``[p]set globalregionalformat``
+
+Audio
+*****
+
+- Scattered grammar and typo fixes (:issue:`4446`)
+- Fixed Bandcamp playback (:issue:`4504`)
+- Fixed YouTube playlist playback (:issue:`4504`)
+- Fixed YouTube searching issues (:issue:`4504`)
+- Fixed YouTube age restricted track playback (:issue:`4504`)
+- Fixed the Audio cog not being translated when setting locale (:issue:`4492`, :issue:`4495`)
+- Fixed tracks getting stuck at 0:00 after long player sessions (:issue:`4529`)
+- Removed lavalink logs from being added to backup (:issue:`4453`, :issue:`4452`)
+- Removed stream durations from being in queue duration (:issue:`4513`)
+- Added the Global Audio API, to cut down on Youtube 429 errors and allow Spotify playback past user's quota. (:issue:`4446`)
+- Added persistent queues, allowing for queues to be restored on a bot restart or cog reload (:issue:`4446`)
+- Added ``[p]audioset restart``, allowing for Lavalink connection to be restarted (:issue:`4446`)
+- Added ``[p]audioset autodeafen``, allowing for bot to auto-deafen itself when entering voice channel (:issue:`4446`)
+- Added ``[p]audioset mycountrycode``, allowing Spotify search locale per user (:issue:`4446`)
+- Added ``[p]llsetup java``, allowing for a custom Java executable path (:issue:`4446`)
+- Added ``[p]llset info`` to show Lavalink settings (:issue:`4527`)
+- Added ``[p]audioset logs`` to download Lavalink logs if the Lavalink server is set to internal (:issue:`4527`)
+
+Cleanup
+*******
+
+- Allowed ``[p]cleanup self`` to work in DMs for all users (:issue:`4481`)
+
+Custom Commands
+***************
+
+- Fixed an ungraceful error being thrown on ``[p]cc edit`` (:issue:`4325`)
+
+Dev
+***
+
+- Added ``[p]repl pause`` to pause/resume the REPL session in the current channel (:issue:`4366`)
+
+Economy
+*******
+
+- Added an embed option for ``[p]leaderboard`` (:issue:`4184`, :issue:`4104`)
+
+General
+*******
+
+- Fixed issues with text not being properly URL encoded (:issue:`4024`)
+- Fixed an ungraceful error occurring when a title is longer than 256 characters in ``[p]urban`` (:issue:`4474`)
+- Changed "boosters" to "boosts" in ``[p]serverinfo`` to clarify what the number represents (:issue:`4507`)
+
+Mod
+***
+
+- Added ``[p]modset mentionspam strict`` allowing for duplicated mentions to count towards the mention spam cap (:issue:`4359`)
+- Added an option to ban users not in the guild to ``[p]ban`` (:issue:`4422`, :issue:`4419`)
+- Added a default tempban duration for ``[p]tempban`` (:issue:`4473`, :issue:`3992`)
+- Fixed nicknames not being properly stored and logged (:issue:`4131`)
+- Fixed plural typos in ``[p]userinfo`` (:issue:`4397`, :issue:`4379`)
+- Renamed ``[p]hackban`` to ``[p]massban``, keeping ``[p]hackban`` as an alias, allowing for multiple users to be banned at once (:issue:`4422`, :issue:`4419`)
+- Moved mutes to a separate, individual cog (:issue:`3634`)
+
+.. _important-341-1:
+
+Mutes
+*****
+
+- Added ``[p]muteset forcerole`` to make mutes role based, instead of permission based (:issue:`3634`)
+- Added an optional time argument to all mutes, to specify when the user should be unmuted (:issue:`3634`)
+- Changed ``[p]mute`` to only handle serverwide muting, ``[p]mute voice`` and ``[p]mute channel`` have been moved to separate commands called ``[p]mutechannel`` and ``[p]mutevoice`` (:issue:`3634`)
+- Mute commands can now take multiple user arguments, to mute multiple users at a time (:issue:`3634`)
+
+Modlog
+******
+
+- Fixed an error being raised when running ``[p]casesfor`` and ``[p]case`` (:issue:`4415`)
+- Long reasons in Modlog are now properly shortened in message content (:issue:`4541`)
+
+Trivia Lists
+************
+
+- Fixed incorrect order of Machamp and Machoke questions (:issue:`4424`)
+- Added new MLB trivia list (:issue:`4455`)
+- Added new Who's That Pokémon - Gen. IV trivia list (:issue:`4434`)
+- Added new Hockey trivia list (:issue:`4384`)
+
+Warnings
+********
+
+- Fixed users being able to warn users above them in hierarchy (:issue:`4100`)
+- Added bool arguments to toggle commands to improve consistency (:issue:`4409`)
+
+Developer changelog
+-------------------
+
+| **Important:**
+| 1. Red now allows users to set locale per guild, which requires 3rd-party cogs to set contextual locale manually in code ran outside of command's context. See the `Core Bot changelog below <important-dev-341-1>` for more information.
+
+.. _important-dev-341-1:
+
+Core Bot
+********
+
+- Added API for setting contextual locales (:issue:`3896`, :issue:`1970`)
+
+    - New function added: `redbot.core.i18n.set_contextual_locales_from_guild()`
+    - Contextual locale is automatically set for commands and only needs to be done manually for things like event listeners; see `guidelines-for-cog-creators` for more information
+
+- Added `bot.remove_shared_api_services() <RedBase.remove_shared_api_services()>` to remove all keys and tokens associated with an API service (:issue:`4370`)
+- Added an option to return all tokens for an API service if ``service_name`` is not specified in `bot.get_shared_api_tokens() <RedBase.get_shared_api_tokens()>` (:issue:`4370`)
+- Added `bot.get_or_fetch_user() <RedBase.get_or_fetch_user()>` and `bot.get_or_fetch_member() <RedBase.get_or_fetch_member()>` methods (:issue:`4403`, :issue:`4402`)
+- Moved ``redbot.core.checks.bot_in_a_guild()`` to `redbot.core.commands.bot_in_a_guild()` (old name has been left as an alias) (:issue:`4515`, :issue:`4510`)
+
+Bank
+****
+
+- Bank API methods now consistently throw TypeError if a non-integer amount is supplied (:issue:`4376`)
+
+Mod
+***
+
+- Deprecated ``redbot.core.utils.mod.is_allowed_by_hierarchy`` (:issue:`4435`)
+
+Modlog
+******
+
+- Added an option to accept a ``discord.Object`` in case creation (:issue:`4326`)
+- Added ``last_known_username`` parameter to `modlog.create_case()` function (:issue:`4326`)
+- Fixed an error being raised with a deleted channel in `Case.message_content()` (:issue:`4415`)
+
+Utility
+*******
+
+- Added `redbot.core.utils.get_end_user_data_statement()` and `redbot.core.utils.get_end_user_data_statement_or_raise()` to attempt to fetch a cog's End User Data Statement (:issue:`4404`)
+- Added `redbot.core.utils.chat_formatting.quote()` to quote text in a message (:issue:`4425`)
+
+Documentation changes
+---------------------
+
+Config
+******
+
+- Added custom group documentation and tutorial (:issue:`4416`, :issue:`2896`)
+
+Modlog
+******
+
+- Clarified that naive ``datetime`` objects will be treated as local times for parameters ``created_at`` and ``until`` in `modlog.create_case()` (:issue:`4389`)
+
+Other
+*****
+
+- Added guide to creating a Bot Application in Discord Developer Portal, with enabling intents (:issue:`4502`)
+
+Miscellaneous
+-------------
+
+- Added JSON schema files for ``info.json`` files (:issue:`4375`)
+- Added ``[all]`` and ``[dev]`` bundled install extras (:issue:`4443`)
+- Replaced the link to the approved repository list on CogBoard and references to ``cogs.red`` with a link to new Red Index (:issue:`4439`)
+- Improved documentation about arguments in command syntax (:issue:`4058`)
+- Replaced a few instances of Red with the bot name in command docstrings (:issue:`4470`)
+- Fixed grammar in places scattered throughout bot (:issue:`4500`)
+- Properly define supported Python versions to be lower than 3.9 (:issue:`4538`)
+
+
+Redbot 3.4.0 (2020-08-17)
+=========================
+
+| Thanks to all these amazing people that contributed to this release:
+| :ghuser:`Dav-Git`, :ghuser:`DevilXD`, :ghuser:`douglas-cpp`, :ghuser:`Drapersniper`, :ghuser:`flaree`, :ghuser:`jack1142`, :ghuser:`kablekompany`, :ghuser:`Kowlin`, :ghuser:`maxbooiii`, :ghuser:`MeatyChunks`, :ghuser:`mikeshardmind`, :ghuser:`NeuroAssassin`, :ghuser:`PredaaA`, :ghuser:`Predeactor`, :ghuser:`retke`, :ghuser:`SharkyTheKing`, :ghuser:`thisisjvgrace`, :ghuser:`Tinonb`, :ghuser:`TrustyJAID`, :ghuser:`Twentysix26`, :ghuser:`Vexed01`, :ghuser:`zephyrkul`
+|
+| **Read before updating**:
+| 1. Red 3.4 comes with support for data deletion requests. Bot owners should read `red_core_data_statement` to ensure they know what information about their users is stored by the bot.
+| 2. Debian Stretch, Fedora 30 and lower, and OpenSUSE Leap 15.0 and lower are no longer supported as they have already reached end of life.
+| 3. There's been a change in behavior of ``[p]tempban``. Look at `Mod changelog <important-340-1>` for full details.
+| 4. There's been a change in behavior of announcements in Admin cog. Look at `Admin changelog <important-340-2>` for full details.
+| 5. Red 3.4 comes with breaking changes for cog developers. Look at `Developer changelog <important-340-3>` for full details.
+
+End-user changelog
+------------------
+
+Core Bot
+********
+
+- Added per-guild cog disabling (:issue:`4043`, :issue:`3945`)
+
+    - Bot owners can set the default state for a cog using ``[p]command defaultdisablecog`` and ``[p]command defaultenablecog`` commands
+    - Guild owners can enable/disable cogs for their guild using ``[p]command disablecog`` and ``[p]command enablecog`` commands
+    - Cogs disabled in the guild can be listed with ``[p]command listdisabledcogs``
+
+- Added support for data deletion requests; see `red_core_data_statement` for more information (:issue:`4045`)
+- Red now logs clearer error if it can't find package to load in any cog path during bot startup (:issue:`4079`)
+- ``[p]licenseinfo`` now has a 3 minute cooldown to prevent a single user from spamming channel by using it (:issue:`4110`)
+- Added ``[p]helpset showsettings`` command (:issue:`4013`, :issue:`4022`)
+- Updated Red's emoji usage to ensure consistent rendering accross different devices (:issue:`4106`, :issue:`4105`, :issue:`4127`)
+- Whitelist and blacklist are now called allowlist and blocklist. Old names have been left as aliases (:issue:`4138`)
+
+.. _important-340-2:
+
+Admin
+*****
+
+- ``[p]announce`` will now only send announcements to guilds that have explicitly configured text channel to send announcements to using ``[p]announceset channel`` command (:issue:`4088`, :issue:`4089`)
+
+Downloader
+**********
+
+- ``[p]cog info`` command now shows end user data statement made by the cog creator (:issue:`4169`)
+- ``[p]cog update`` command will now notify the user if cog's end user data statement has changed since last update (:issue:`4169`)
+
+.. _important-340-1:
+
+Mod
+***
+
+- ``[p]tempban`` now respects default days setting (``[p]modset defaultdays``) (:issue:`3993`)
+- Users can now set mention spam triggers which will warn or kick the user. See ``[p]modset mentionspam`` for more information (:issue:`3786`, :issue:`4038`)
+- ``[p]mute voice`` and ``[p]unmute voice`` now take action instantly if bot has Move Members permission (:issue:`4064`)
+- Added typing to ``[p](un)mute guild`` to indicate that mute is being processed (:issue:`4066`, :issue:`4172`)
+
+ModLog
+******
+
+- Added timestamp to text version of ``[p]casesfor`` and ``[p]case`` commands (:issue:`4118`, :issue:`4137`)
+
+Streams
+*******
+
+- Stream alerts will no longer make roles temporarily mentionable if bot has "Mention @everyone, @here, and All Roles" permission in the channel (:issue:`4182`)
+- Mixer service has been closed and for that reason we've removed support for it from the cog (:issue:`4072`)
+- Hitbox commands have been renamed to smashcast (:issue:`4161`)
+- Improve error messages for invalid channel names/IDs (:issue:`4147`, :issue:`4148`)
+
+Trivia Lists
+************
+
+- Added ``whosthatpokemon2`` trivia containing Pokémons from 2nd generation (:issue:`4102`)
+- Added ``whosthatpokemon3`` trivia containing Pokémons from 3rd generation (:issue:`4141`)
+
+.. _important-340-3:
+
+Developer changelog
+-------------------
+
+| **Important:**
+| 1. Red now offers cog disabling API, which should be respected by 3rd-party cogs in guild-related actions happening outside of command's context. See the `Core Bot changelog below <important-dev-340-1>` for more information.
+| 2. Red now provides data request API, which should be supported by all 3rd-party cogs. See the changelog entries in the `Core Bot changelog below <important-dev-340-1>` for more information.
+
+Breaking changes
+****************
+
+- By default, none of the ``.send()`` methods mention roles or ``@everyone/@here`` (:issue:`3845`)
+
+    - see `discord.AllowedMentions` and ``allowed_mentions`` kwarg of ``.send()`` methods, if your cog requires to mention roles or ``@everyone/@here``
+
+- `Context.maybe_send_embed()` now supresses all mentions, including user mentions (:issue:`4192`)
+- The default value of the ``filter`` keyword argument has been changed to ``None`` (:issue:`3845`)
+- Cog package names (i.e. name of the folder the cog is in and the name used when loading the cog) now have to be `valid Python identifiers <https://docs.python.org/3/reference/lexical_analysis.html#identifiers>`_ (:issue:`3605`, :issue:`3679`)
+- Method/attribute names starting with ``red_`` or being in the form of ``__red_*__`` are now reserved. See `version_guarantees` for more information (:issue:`4085`)
+- `humanize_list()` no longer raises `IndexError` for empty sequences (:issue:`2982`)
+- Removed things past deprecation time: (:issue:`4163`)
+
+    - ``redbot.core.commands.APIToken``
+    - ``loop`` kwarg from `bounded_gather_iter()`, `bounded_gather()`, and `start_adding_reactions()`
+
+.. _important-dev-340-1:
+
+Core Bot
+********
+
+- Added cog disabling API (:issue:`4043`, :issue:`3945`)
+
+    - New methods added: `bot.cog_disabled_in_guild() <RedBase.cog_disabled_in_guild()>`, `bot.cog_disabled_in_guild_raw() <RedBase.cog_disabled_in_guild_raw()>`
+    - Cog disabling is automatically applied for commands and only needs to be done manually for things like event listeners; see `guidelines-for-cog-creators` for more information
+
+- Added data request API (:issue:`4045`,  :issue:`4169`)
+
+    - New special methods added to `commands.Cog`: `red_get_data_for_user()` (documented provisionally), `red_delete_data_for_user()`
+    - New special module level variable added: ``__red_end_user_data_statement__``
+    - These methods and variables should be added by all cogs according to their documentation; see `guidelines-for-cog-creators` for more information
+    - New ``info.json`` key added: ``end_user_data_statement``; see `Info.json format documentation <info-json-format>` for more information
+
+- Added `bot.message_eligible_as_command() <RedBase.message_eligible_as_command()>` utility method which can be used to determine if a message may be responded to as a command (:issue:`4077`)
+- Added a provisional API for replacing the help formatter. See `documentation <framework-commands-help>` for more details (:issue:`4011`)
+- `bot.ignored_channel_or_guild() <RedBase.ignored_channel_or_guild()>` now accepts `discord.Message` objects (:issue:`4077`)
+- `commands.NoParseOptional <NoParseOptional>` is no longer provisional and is now fully supported part of API (:issue:`4142`)
+- Red no longer fails to run subcommands of a command group allowed or denied by permission hook (:issue:`3956`)
+- Autohelp in group commands is now sent *after* invoking the group, which allows before invoke hooks to prevent autohelp from getting triggered (:issue:`4129`)
+- RPC functionality no longer makes Red hang for a minute on shutdown (:issue:`4134`, :issue:`4143`)
+
+Vendored packages
+*****************
+
+- Updated ``discord.ext.menus`` vendor (:issue:`4167`)
+
+Utility Functions
+*****************
+
+- `humanize_list()` now accepts ``locale`` and ``style`` keyword arguments. See its documentation for more information (:issue:`2982`)
+- `humanize_list()` is now properly localized (:issue:`2906`, :issue:`2982`)
+- `humanize_list()` now accepts empty sequences (:issue:`2982`)
+
+
+Documentation changes
+---------------------
+
+- Removed install instructions for Debian Stretch (:issue:`4099`)
+- Added admin user guide (:issue:`3081`)
+- Added alias user guide (:issue:`3084`)
+- Added bank user guide (:issue:`4149`)
+
+
+Miscellaneous
+-------------
+
+- Updated features list in ``[p]serverinfo`` with the latest changes from Discord (:issue:`4116`)
+- Simple version of ``[p]serverinfo`` now shows info about more detailed ``[p]serverinfo 1`` (:issue:`4121`)
+- ``[p]set nickname``, ``[p]set serverprefix``, ``[p]streamalert``, and ``[p]streamset`` commands now can be run by users with permissions related to the actions they're making (:issue:`4109`)
+- `bordered()` now uses ``+`` for corners if keyword argument ``ascii_border`` is set to `True` (:issue:`4097`)
+- Fixed timestamp storage in few places in Red (:issue:`4017`)

docs/cog_guides/admin.rst

@@ -0,0 +1,435 @@
+.. _admin:
+
+=====
+Admin
+=====
+
+This is the cog guide for the admin cog. You will
+find detailed docs about usage and commands.
+
+``[p]`` is considered as your prefix.
+
+.. note:: To use this cog, load it by typing this::
+
+        [p]load admin
+
+.. _admin-usage:
+
+-----
+Usage
+-----
+
+This cog will provide tools for server admins and bot owners.
+
+It can add or remove a role to a member, edit one or make some available
+for members so they can self-assign them as they wish.
+
+It also provides tools for the bot owner such as server locking (once enabled,
+the bot will instantly leave new servers she joins) and announcements, which
+will send something in all the servers of the bot.
+
+.. _admin-commands:
+
+--------
+Commands
+--------
+
+Here's a list of all commands available for this cog.
+
+.. _admin-command-selfrole:
+
+^^^^^^^^
+selfrole
+^^^^^^^^
+
+**Syntax**
+
+.. code-block:: none
+
+    [p]selfrole
+
+**Description**
+
+Add or remove roles to yourself. Those roles must have been configured as user
+settable by admins using the :ref:`selfroleset command
+<admin-command-selfroleset>`.
+
+.. _admin-command-selfrole-add:
+
+""""""""""""
+selfrole add
+""""""""""""
+
+**Syntax**
+
+.. code-block:: none
+
+    [p]selfrole add <selfrole>
+
+**Description**
+
+Add a role to yourself. It must have been configured as user settable
+by admins using the :ref:`selfroleset command <admin-command-selfroleset>`.
+
+**Arguments**
+
+* ``<selfrole>``: The role you want to attribute to yourself. |role-input|
+
+.. _admin-command-selfrole-remove:
+
+"""""""""""""""
+selfrole remove
+"""""""""""""""
+
+**Syntax**
+
+.. code-block:: none
+
+    [p]selfrole remove <selfrole>
+
+**Description**
+
+Remove a role from yourself. It must have been configured as user settable
+by admins using the :ref:`selfroleset command <admin-command-selfroleset>`.
+
+**Arguments**
+
+* ``<selfrole>``: The role you want to remove from yourself. |role-input|
+
+
+.. _admin-command-selfrole-list:
+
+"""""""""""""
+selfrole list
+"""""""""""""
+
+**Syntax**
+
+.. code-block:: none
+
+    [p]selfrole list
+
+**Description**
+
+List all of the available roles you can assign to yourself.
+
+.. _admin-command-selfroleset:
+
+^^^^^^^^^^^
+selfroleset
+^^^^^^^^^^^
+
+.. note:: |admin-lock| This is also usable by the members with the
+    ``Manage roles`` permission.
+
+**Syntax**
+
+.. code-block:: none
+
+    [p]selfroleset
+
+**Description**
+
+Define the list of user settable roles. Those roles will be available to any
+member using the :ref:`selfrole command <admin-command-selfrole>`.
+
+.. _admin-command-selfroleset-add:
+
+"""""""""""""""
+selfroleset add
+"""""""""""""""
+
+**Syntax**
+
+.. code-block:: none
+
+    [p]selfroleset add <role>
+
+**Description**
+
+Add a role to the list of selfroles.
+
+.. warning:: Members will be able to assign themselves the role.
+    Make sure it doesn't give extra perms or anything that can break
+    your server's security.
+
+**Arguments**
+
+* ``<role>``: The role to add to the list. |role-input|
+
+.. _admin-command-selfroleset-remove:
+
+""""""""""""""""""
+selfroleset remove
+""""""""""""""""""
+
+**Syntax**
+
+.. code-block:: none
+
+    [p]selfroleset remove <role>
+
+**Description**
+
+Removes a role from the list of selfroles.
+
+**Arguments**
+
+* ``<role>``: The role to remove from the list. |role-input|
+
+.. _admin-command-addrole:
+
+^^^^^^^
+addrole
+^^^^^^^
+
+.. note:: |admin-lock| This is also usable by the members with the ``Manage
+    roles`` permission.
+
+**Syntax**
+
+.. code-block:: none
+
+    [p]addrole <rolename> [user]
+
+**Description**
+
+Adds a role to a member. If ``user`` is not given, it will be considered
+as yourself, the command author.
+
+**Arguments**
+
+* ``<role>``: The role to add to the member. |role-input-quotes|
+
+* ``[user]``: The member you want to add the role to. Defaults to the
+  command author. |member-input|
+
+.. _admin-command-removerole:
+
+^^^^^^^^^^
+removerole
+^^^^^^^^^^
+
+.. note:: |admin-lock| This is also usable by the members with the
+    ``Manage roles`` permission.
+
+**Syntax**
+
+.. code-block:: none
+
+    [p]removerole <rolename> [user]
+
+**Description**
+
+Removes a role from a member. If ``user`` is not given, it will be considered
+as yourself, the command author.
+
+**Arguments**
+
+* ``<role>``: The role to remove. |role-input-quotes|
+
+* ``[user]``: The member to remove the role from. |member-input| Defaults
+    to the command author.
+
+.. _admin-command-editrole:
+
+^^^^^^^^
+editrole
+^^^^^^^^
+
+.. note:: |admin-lock|
+
+**Syntax**
+
+.. code-block:: none
+
+    [p]editrole
+
+**Description**
+
+Edits the settings of a role.
+
+.. _admin-command-editrole-name:
+
+"""""""""""""
+editrole name
+"""""""""""""
+
+**Syntax**
+
+.. code-block:: none
+
+    [p]editrole name <role> <name>
+
+**Description**
+
+Edits the name of a role.
+
+**Arguments**
+
+* ``<role>``: The role name to edit. |role-input-quotes|
+
+* ``<name>``: The new role name. If it has spaces, you must use quotes.
+
+.. _admin-command-editrole-color:
+
+""""""""""""""
+editrole color
+""""""""""""""
+
+**Syntax**
+
+.. code-block:: none
+
+    [p]editrole color <role> <color>
+
+**Description**
+
+Edits the color of a role.
+
+**Arguments**
+
+* ``<role>``: The role name to edit. |role-input-quotes|
+
+* ``<color>``: The new color to assign. |color-input|
+
+**Examples**
+
+* ``[p]editrole color "My role" #ff0000``
+
+* ``[p]editrole color "My role" dark_blue``
+
+.. _admin-command-announce:
+
+^^^^^^^^
+announce
+^^^^^^^^
+
+.. note:: |owner-lock|
+
+**Syntax**
+
+.. code-block:: none
+
+    [p]announce <message>
+
+**Description**
+
+Announce your message to all of the servers the bot is in.
+
+The bot will announce the message in the guild's announcements channel.
+If this channel is not set, the message won't be announced.
+
+**Arguments**
+
+* ``<message>``: The message to send.
+
+.. _admin-command-announce-cancel:
+
+"""""""""""""""
+announce cancel
+"""""""""""""""
+
+.. note:: |owner-lock|
+
+**Syntax**
+
+.. code-block:: none
+
+    [p]announce cancel
+
+**Description**
+
+Cancels an active announcement.
+
+.. _admin-command-announceset:
+
+^^^^^^^^^^^
+announceset
+^^^^^^^^^^^
+
+.. note:: |guildowner-lock|
+
+**Syntax**
+
+.. code-block:: none
+
+    [p]announceset
+
+**Description**
+
+Change how announcements are received in this guild.
+
+.. _admin-command-announceset-channel:
+
+"""""""""""""""""""
+announceset channel
+"""""""""""""""""""
+
+**Syntax**
+
+.. code-block:: none
+
+    [p]announceset channel [channel]
+
+**Description**
+
+Sets the channel where the bot owner announcements will be sent.
+
+**Arguments**
+
+* ``[channel]``: The channel that will be used for bot announcements.
+  |channel-input| Defaults to where you typed the command.
+
+.. _admin-command-announceset-clearchannel:
+
+""""""""""""""""""""""""
+announceset clearchannel
+""""""""""""""""""""""""
+
+**Syntax**
+
+.. code-block:: none
+
+    [p]announceset clearchannel
+
+**Description**
+
+Disables announcements on your server. To enable them again, you will have to
+re-enter your announcements channel with the :ref:`announceset channel
+<admin-command-announceset-channel>` command.
+
+.. _admin-command-serverlock:
+
+^^^^^^^^^^
+serverlock
+^^^^^^^^^^
+
+.. note:: |owner-lock| This is also usable by the members with the
+    ``Administrator`` permission.
+
+**Syntax**
+
+.. code-block:: none
+
+    [p]serverlock
+
+**Description**
+
+Lock a bot to its current servers only.
+
+This means that, once you enable this, if someone invites the bot to a new
+server, the bot will automatically leave the server.
+
+.. tip:: Another way to prevent your bot from being invited on more servers is
+    making it private directly from the developer portal.
+
+    Once a bot is private, it can only be invited by its owner (or team
+    owners). Other users will get an error on Discord's webpage explaining that
+    the bot is private.
+
+    To do this, go to the `Discord developer portal
+    <https://discord.com/developers>`_, select your application, click "Bot" in
+    the sidebar, then untick "Public bot".
+
+    .. image:: ../.resources/admin/public_bot.png

docs/cog_guides/alias.rst

@@ -0,0 +1,277 @@
+.. _alias:
+
+=====
+Alias
+=====
+
+This is the cog guide for the alias cog. You will
+find detailed docs about the usage and the commands.
+
+``[p]`` is considered as your prefix.
+
+.. note:: To use this cog, load it by typing this::
+
+        [p]load alias
+
+.. _alias-usage:
+
+-----
+Usage
+-----
+
+This cog is used to create shortcuts for commands.
+
+Here's an example:
+
+.. code-block:: python
+
+    [p]play
+    # with an alias, you can call the command above with a shortcut like this:
+    [p]p
+    # "p" is now a shortcut for "play"
+
+In this example, we made an alias named ``p`` that will
+invoke the ``play`` command. If you use ``[p]play`` or ``[p]p``, the result will
+be the same.
+
+----
+
+Here's another example
+
+.. code-block:: python
+
+    [p]cleanup messages
+    # now we're creating another alias that will group both the command and the subcommand into this:
+    [p]clear
+    # "clear" is now a shortcut for "cleanup messages"
+
+In this second example, we made an alias called ``clear`` that will
+invoke the ``cleanup messages`` subcommand. Now if you use ``[p]cleanup
+message`` or ``[p]clear``, the result will be the same.
+
+----
+
+This is the basic usage, where you can define an alias for the first part of
+the command and give the second part when invoking the command. A more advanced
+usage of aliases is the usage of arguments.
+
+Let's suppose you want to make an alias to ban someone, delete 7 days of
+messages and set the reason to "Spam bot.", that cannot be done with a classic
+alias since the required member argument is the first one. If you create the
+alias "spamban" using arguments like this ``ban {0} 7 Spam bot.``, ``{0}`` will
+be replaced by the first argument of your alias:
+
+.. code-block:: none
+
+    # we created the following alias named "spamban"
+    [p]spamban Slime#3160
+    # this alias will execute the following command:
+    [p]ban Slime#3160 7 Spam bot.
+
+For a more detailed explaination, read :ref:`this <alias-command-alias-add>`.
+
+.. _alias-commands:
+
+--------
+Commands
+--------
+
+.. _alias-command-alias:
+
+^^^^^
+alias
+^^^^^
+
+**Syntax**
+
+.. code-block:: none
+
+    [p]alias
+
+**Description**
+
+This is the main command used for setting up the cog.
+It will be used for all other commands.
+
+.. _alias-command-alias-add:
+
+"""""""""
+alias add
+"""""""""
+
+.. note:: |mod-lock|
+
+**Syntax**
+
+.. code-block:: none
+
+    [p]alias add <alias_name> <command>
+
+**Description**
+
+Creates an alias. It will be used like this ``[p]alias_name <arguments>``
+and will be equal to this ``[p]command <arguments>``.
+
+Let's develop the examples given :ref:`earlier <alias-usage>` a bit more,
+the left part of the command is the alias (blue), and the right part is the
+parameters members have to give for the command (orange).
+
+.. image:: ../.resources/alias/example-1.png
+
+One more thing you can do with aliases is using arguments, a bit like
+CustomCommands. Let's suppose you want an alias that bans x member and deletes
+7 days of messages. Without aliases, the command would look like this:
+
+``[p]ban NotSoTrustyJAID#0001 7 My random reason``
+
+A classic alias wouldn't work because the member argument is the first one,
+and you can only shorten the left part before the required argument.
+
+An alias with arguments can fix that, you can define the alias on the whole
+command and replace the required argument by ``{0}``, which will be replaced
+by the first parameter given when invoking the alias.
+
+Back to our example, let's make an alias named ``bigban`` which will be
+assigned to this expression: ``ban {0} 7``
+
+.. image:: ../.resources/alias/example-2.png
+
+You can see in blue the "static" part of the alias, what is contained and
+doesn't need to be given, the orange part is the arguments given at the end of
+the command, just like a classic alias, and the green part is the positional
+argument we defined: the first argument of the alias will be the green part.
+
+You can add as many arguments as you want, they can start at ``{0}`` or ``{1}``
+and must be in order: ``{1}`` will be the first argument, ``{2}`` will be the
+second one...
+
+.. attention:: The numbers must be in order, you cannot use ``{0}`` and ``{2}``
+    without using ``{1}``.
+
+Here are more examples:
+
+*   *   Full command: ``[p]cleanup messages 75 True``
+    *   Alias: ``[p]alias add fullclear cleanup messages {0} True``
+    *   Invoked alias: ``[p]fullclear 75``
+
+    *The* ``True`` *at the end tells the bot to also clear pinned messages.*
+
+*   *   Full command: ``[p]repo add SinbadCogs
+        https://github.com/mikeshardmind/SinbadCogs v3``
+    
+    *   Alias: ``[p]alias add newrepo repo add {2} https://github.com/{1}/{2}``
+    *   Invoked with alias: ``[p]newrepo mikeshardmind SinbadCogs v3``
+
+**Arguments**
+
+* ``<alias_name>``: The new command name.
+
+* ``<command>``: The command to execute when ``[p]alias_name`` is invoked.
+
+.. _alias-command-alias-delete:
+
+""""""""""""
+alias delete
+""""""""""""
+
+.. note:: |mod-lock|
+
+**Syntax**
+
+.. code-block:: none
+
+    [p]alias [delete|remove|del] <alias_name>
+
+**Description**
+
+Removes an alias from the list. Check the list with
+the :ref:`alias list <alias-command-alias-list>` command.
+
+**Arguments**
+
+* ``<alias_name>``: The alias' name to delete.
+
+.. _alias-command-alias-list:
+
+""""""""""
+alias list
+""""""""""
+
+**Syntax**
+
+.. code-block:: none
+
+    [p]alias list
+
+**Description**
+
+Shows all of the existing aliases on the current server.
+
+.. _alias-command-alias-show:
+
+""""""""""
+alias show
+""""""""""
+
+**Syntax**
+
+.. code-block:: none
+
+    [p]alias show <alias_name>
+
+**Description**
+
+Shows the command associated to the alias.
+
+**Arguments**
+
+* ``<alias_name>``: The alias you want information from.
+
+.. _alias-command-alias-help:
+
+""""""""""
+alias help
+""""""""""
+
+**Syntax**
+
+.. code-block:: none
+
+    [p]alias help <alias_name>
+
+**Description**
+
+Shows help message for an alias.
+
+**Arguments**
+
+* ``<alias_name>``: Alias you want to get help from.
+
+.. _alias-command-alias-global:
+
+""""""""""""
+alias global
+""""""""""""
+
+.. note:: |owner-lock|
+
+**Syntax**
+
+.. code-block:: none
+
+    [p]alias global
+
+**Description**
+
+Another group command which contains the :ref:`add
+<alias-command-alias-add>`, :ref:`del
+<alias-command-alias-delete>` and :ref:`list
+<alias-command-alias-list>` commands.
+
+They work the same, except the created aliases will be
+global instead of being only server-wide.
+
+Please refer to these docs for the commands, they work with the
+same arguments. For example, if you want to add a global alias,
+instead of doing ``[p]alias add <arguments>``, do ``[p]alias
+global add <arguments>``.

docs/cog_guides/bank.rst

@@ -0,0 +1,186 @@
+.. _bank:
+
+====
+Bank
+====
+
+This is the cog guide for the bank cog. You will
+find detailed docs about usage and commands.
+
+``[p]`` is considered as your prefix.
+
+.. note:: To use this cog, load it by typing this::
+
+        [p]load bank
+
+.. _bank-usage:
+
+-----
+Usage
+-----
+
+This cog manages the bank. It won't be used often by
+users but this is what makes any interaction with the
+money possible.
+
+You will be able to switch between a global and a server-
+wide bank and choose the bank/currency name.
+
+.. _bank-commands:
+
+--------
+Commands
+--------
+
+.. _bank-command-bankset:
+
+^^^^^^^
+bankset
+^^^^^^^
+
+.. note:: |guildowner-lock|
+
+**Syntax**
+
+.. code-block:: none
+
+    [p]bankset
+
+**Description**
+
+Base command for configuring bank settings.
+
+.. _bank-command-bankset-toggleglobal:
+
+""""""""""""""""""""
+bankset toggleglobal
+""""""""""""""""""""
+
+.. note:: |owner-lock|
+
+**Syntax**
+
+.. code-block:: none
+
+    [p]bankset toggleglobal [confirm=False]
+
+**Description**
+
+Makes the bank global instead of server-wide. If it
+is already global, the command will switch it back
+to the server-wide bank.
+
+.. warning:: Using this command will reset **all** accounts.
+
+**Arguments**
+
+* ``[confirm=False]``: Put ``yes`` to confirm.
+
+.. _bank-command-bankset-creditsname:
+
+"""""""""""""""""""
+bankset creditsname
+"""""""""""""""""""
+
+.. note:: |owner-lock| However, if the bank is server-wide, the
+    server owner or an administrator can use this command.
+
+**Syntax**
+
+.. code-block:: none
+
+    [p]bankset creditsname <name>
+
+**Description**
+
+Change the credits name of the bank. It is ``credits`` by default.
+
+For example, if you switch it to ``dollars``, the payday
+command will show this:
+
+.. TODO reference the payday command
+
+.. code-block:: none
+
+    Here, take some dollars. Enjoy! (+120 dollars!)
+
+    You currently have 220 dollars.
+
+**Arguments**
+
+* ``<name>``: The new credits name.
+
+.. _bank-command-bankset-bankname:
+
+""""""""""""""""
+bankset bankname
+""""""""""""""""
+
+.. note:: |owner-lock| However, if the bank is server-wide, the
+    server owner or an administrator can use this command.
+
+**Syntax**
+
+.. code-block:: none
+
+    [p]bankset bankname <name>
+
+**Description**
+
+Set bank's name.
+
+**Arguments**
+
+* ``<name>``: The new bank's name.
+
+.. _bank-command-bankset-maxbal:
+
+""""""""""""""
+bankset maxbal
+""""""""""""""
+
+.. note:: |owner-lock| However, if the bank is server-wide, the
+    server owner or an administrator can use this command.
+
+**Syntax**
+
+.. code-block:: none
+
+    [p]bankset maxbal <amount>
+
+**Description**
+
+Defines the maximum amount of money a user can have with the bot.
+
+If an user reaches this limit, he will be unable to gain more money.
+
+**Arguments**
+
+*   ``<amount>``: The maximum amount of money for users.
+
+.. _bank-command-bankset-showsettings:
+
+""""""""""""""""""""
+bankset showsettings
+""""""""""""""""""""
+
+.. note:: |owner-lock| However, if the bank is server-wide, the
+    server owner or an administrator can use this command.
+
+**Syntax**
+
+.. code-block:: none
+
+    [p]bankset showsettings
+
+**Description**
+
+Shows the current settings of your bank.
+
+This will display the following information:
+
+*   Name of the bank
+*   Scope of the bank (global or per server)
+*   Currency name
+*   Default balance
+*   Maximum allowed balance

docs/conf.py

@@ -108,9 +108,6 @@ rst_prolog += f"\n.. |DPY_VERSION| replace:: {dpy_version}"
 #
 html_theme = "sphinx_rtd_theme"
 
-# This will be needed until sphinx_rtd_theme supports the html5 writer
-html4_writer = True
-
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.
@@ -217,12 +214,17 @@ intersphinx_mapping = {
     "python": ("https://docs.python.org/3", None),
     "dpy": (f"https://discordpy.readthedocs.io/en/v{dpy_version}/", None),
     "motor": ("https://motor.readthedocs.io/en/stable/", None),
+    "babel": ("http://babel.pocoo.org/en/stable/", None),
 }
 
 # Extlinks
 # This allows to create links to d.py docs with
 # :dpy_docs:`link text <site_name.html>`
-extlinks = {"dpy_docs": (f"https://discordpy.readthedocs.io/en/v{dpy_version}/%s", None)}
+extlinks = {
+    "dpy_docs": (f"https://discordpy.readthedocs.io/en/v{dpy_version}/%s", None),
+    "issue": ("https://github.com/Cog-Creators/Red-DiscordBot/issues/%s", "#"),
+    "ghuser": ("https://github.com/%s", "@"),
+}
 
 # Doctest
 # If this string is non-empty, all blocks with ``>>>`` in them will be
@@ -230,5 +232,5 @@ extlinks = {"dpy_docs": (f"https://discordpy.readthedocs.io/en/v{dpy_version}/%s
 doctest_test_doctest_blocks = ""
 
 # Autodoc options
-autodoc_default_flags = ["show-inheritance"]
+autodoc_default_options = {"show-inheritance": True}
 autodoc_typehints = "none"

docs/framework_apikeys.rst

@@ -73,3 +73,5 @@ Additional References
 .. automethod:: Red.set_shared_api_tokens
 
 .. automethod:: Red.remove_shared_api_tokens
+
+.. automethod:: Red.remove_shared_api_services

docs/framework_checks.rst

@@ -7,5 +7,5 @@ Command Check Decorators
 The following are all decorators for commands, which add restrictions to where and when they can be
 run.
 
-.. automodule:: redbot.core.checks
-    :members:
+.. automodule:: redbot.core.commands
+    :members: permissions_check, bot_has_permissions, bot_in_a_guild, has_permissions, has_guild_permissions, is_owner, guildowner, guildowner_or_permissions, admin, admin_or_permissions, mod, mod_or_permissions

docs/framework_commands.rst

@@ -13,6 +13,14 @@ extend functionalities used throughout the bot, as outlined below.
 
 .. autofunction:: redbot.core.commands.group
 
+.. autoclass:: redbot.core.commands.Cog
+
+    .. automethod:: format_help_for_context
+    
+    .. automethod:: red_get_data_for_user
+    
+    .. automethod:: red_delete_data_for_user
+
 .. autoclass:: redbot.core.commands.Command
     :members:
     :inherited-members: format_help_for_context
@@ -32,5 +40,24 @@ extend functionalities used throughout the bot, as outlined below.
 
 .. automodule:: redbot.core.commands.converter
     :members:
-    :exclude-members: convert
+    :exclude-members: UserInputOptional, convert
     :no-undoc-members:
+
+    .. autodata:: UserInputOptional
+        :annotation:
+
+.. _framework-commands-help:
+
+******************
+Help Functionality
+******************
+
+.. warning::
+
+    The content in this section is provisional and may change
+    without prior notice or warning. Updates to this will be communicated
+    on `this issue <https://github.com/Cog-Creators/Red-DiscordBot/issues/4084>`_
+
+
+.. automodule:: redbot.core.commands.help
+    :members:

docs/framework_config.rst

@@ -21,8 +21,9 @@ Basic Usage
 .. code-block:: python
 
     from redbot.core import Config
+    from redbot.core import commands
 
-    class MyCog:
+    class MyCog(commands.Cog):
         def __init__(self):
             self.config = Config.get_conf(self, identifier=1234567890)
 
@@ -52,7 +53,7 @@ Then, in the class's :code:`__init__` function, you need to get a config instanc
 
 .. code-block:: python
 
-    class MyCog:
+    class MyCog(commands.Cog):
         def __init__(self):
             self.config = Config.get_conf(self, identifier=1234567890)
 
@@ -68,7 +69,7 @@ After we've gotten that, we need to register default values:
 
 .. code-block:: python
 
-    class MyCog:
+    class MyCog(commands.Cog):
         def __init__(self):
             self.config = Config.get_conf(self, identifier=1234567890)
             default_global = {
@@ -188,29 +189,130 @@ features within Config to enable developers to work with data how they wish.
 
 This usage guide will cover the following features:
 
+- :py:meth:`Config.init_custom`
+- :py:meth:`Config.register_custom`
+- :py:meth:`Config.custom`
 - :py:meth:`Group.get_raw`
 - :py:meth:`Group.set_raw`
 - :py:meth:`Group.clear_raw`
 
+
+Custom Groups
+^^^^^^^^^^^^^
+While Config has built-in groups for the common discord objects,
+sometimes you need a combination of these or your own defined grouping.
+Config handles this by allowing you to define custom groups.
+
+Let's start by showing how :py:meth:`Config.custom` can be equivalent to :py:meth:`Config.guild` by modifying the above
+Tutorial example.
+
+.. code-block:: python
+
+    from redbot.core import Config, commands
+
+
+    class MyCog(commands.Cog):
+        def __init__(self):
+            self.config = Config.get_conf(self, identifier=1234567890)
+            default_guild = {
+                "blah": [],
+                "baz": 1234567890
+            }
+
+            # self.config.register_guild(**default_guild)
+
+            self.config.init_custom("CustomGuildGroup", 1)
+            self.config.register_custom("CustomGuildGroup", **default_guild)
+
+In the above, we registered the custom group named "CustomGuildGroup" to contain the same defaults
+that :code:`self.config.guild` normally would. First, we initialized the group "CustomGuildGroup" to
+accept one identifier by calling :py:meth:`Config.init_custom` with the argument :code:`1`. Then we used
+:py:meth:`Config.register_custom` to register the default values.
+
+.. important::
+
+    :py:meth:`Config.init_custom` **must** be called prior to using a custom group.
+
+
+Now let's use this custom group:
+
+.. code-block:: python
+
+    @commands.command()
+    async def setbaz(self, ctx, new_value):
+        # await self.config.guild(ctx.guild).baz.set(new_value)
+
+        await self.config.custom("CustomGuildGroup", ctx.guild.id).baz.set(new_value)
+        await ctx.send("Value of baz has been changed!")
+
+    @commands.command()
+    async def checkbaz(self, ctx):
+        # baz_val = await self.config.guild(ctx.guild).baz()
+
+        baz_val = await self.config.custom("CustomGuildGroup", ctx.guild.id).baz()
+        await ctx.send("The value of baz is {}".format("True" if baz_val else "False"))
+
+Here we used :py:meth:`Config.custom` to access our custom group much like we would have used :py:meth:`Config.guild`.
+Since it's a custom group, we need to use :code:`id` attribute of guild to get a unique identifier.
+
+Now let's see an example that uses multiple identifiers:
+
+.. code-block:: python
+
+    from redbot.core import Config, commands, checks
+
+
+    class ChannelAccesss(commands.Cog):
+        def __init__(self):
+            self.config = Config.get_conf(self, identifier=1234567890)
+            default_access = {
+                "allowed": False
+            }
+
+            self.config.init_custom("ChannelAccess", 2)
+            self.config.register_custom("ChannelAccess", **default_access)
+
+        @commands.command()
+        @checks.is_owner()
+        async def grantaccess(self, ctx, channel: discord.TextChannel, member: discord.Member):
+            await self.config.custom("ChannelAccess", channel.id, member.id).allowed.set(True)
+            await ctx.send("Member has been granted access to that channel")
+
+        @commands.command()
+        async def checkaccess(self, ctx, channel: discord.TextChannel):
+            allowed = await self.config.custom("ChannelAccess", channel.id, ctx.author.id).allowed()
+            await ctx.send("Your access to this channel is {}".format("Allowed" if allowed else "Denied"))
+
+In the above example, we defined the custom group "ChannelAccess" to accept two identifiers
+using :py:meth:`Config.init_custom`. Then, we were able to set the default value for any member's
+access to any channel to `False` until the bot owner grants them access.
+
+.. important::
+
+    The ordering of the identifiers matter. :code:`custom("ChannelAccess", channel.id, member.id)` is NOT the same
+    as :code:`custom("ChannelAccess", member.id, channel.id)`
+
+Raw Group Access
+^^^^^^^^^^^^^^^^
+
 For this example let's suppose that we're creating a cog that allows users to buy and own multiple pets using
 the built-in Economy credits::
 
     from redbot.core import bank
-    from redbot.core import Config
-    from discord.ext import commands
+    from redbot.core import Config, commands
 
 
-    class Pets:
+    class Pets(commands.Cog):
         def __init__(self):
-            self.conf = Config.get_conf(self, 1234567890)
+            self.config = Config.get_conf(self, 1234567890)
 
             # Here we'll assign some default costs for the pets
-            self.conf.register_global(
+            self.config.register_global(
                 dog=100,
                 cat=100,
                 bird=50
             )
-            self.conf.register_user(
+            self.config.register_user(
                 pets={}
             )
 
@@ -229,7 +331,7 @@ And now that the cog is set up we'll need to create some commands that allow use
 
             # We will need to use "get_raw"
             try:
-                cost = await self.conf.get_raw(pet_type)
+                cost = await self.config.get_raw(pet_type)
             except KeyError:
                 # KeyError is thrown whenever the data you try to access does not
                 # exist in the registered defaults or in the saved data.
@@ -241,15 +343,15 @@ assign a new pet to the user. This is very easily done using the V3 bank API and
 
     # continued
             if await bank.can_spend(ctx.author, cost):
-                await self.conf.user(ctx.author).pets.set_raw(
+                await self.config.user(ctx.author).pets.set_raw(
                     pet_name, value={'cost': cost, 'hunger': 0}
                 )
 
                 # this is equivalent to doing the following
 
-                pets = await self.conf.user(ctx.author).pets()
+                pets = await self.config.user(ctx.author).pets()
                 pets[pet_name] = {'cost': cost, 'hunger': 0}
-                await self.conf.user(ctx.author).pets.set(pets)
+                await self.config.user(ctx.author).pets.set(pets)
 
 Since the pets can get hungry we're gonna need a command that let's pet owners check how hungry their pets are::
 
@@ -257,7 +359,7 @@ Since the pets can get hungry we're gonna need a command that let's pet owners c
         @commands.command()
         async def hunger(self, ctx, pet_name: str):
             try:
-                hunger = await self.conf.user(ctx.author).pets.get_raw(pet_name, 'hunger')
+                hunger = await self.config.user(ctx.author).pets.get_raw(pet_name, 'hunger')
             except KeyError:
                 # Remember, this is thrown if something in the provided identifiers
                 # is not found in the saved data or the defaults.
@@ -274,7 +376,7 @@ We're responsible pet owners here, so we've also got to have a way to feed our p
             # This is a bit more complicated because we need to check if the pet is
             # owned first.
             try:
-                pet = await self.conf.user(ctx.author).pets.get_raw(pet_name)
+                pet = await self.config.user(ctx.author).pets.get_raw(pet_name)
             except KeyError:
                 # If the given pet name doesn't exist in our data
                 await ctx.send("You don't own that pet!")
@@ -285,12 +387,12 @@ We're responsible pet owners here, so we've also got to have a way to feed our p
             # Determine the new hunger and make sure it doesn't go negative
             new_hunger = max(hunger - food, 0)
 
-            await self.conf.user(ctx.author).pets.set_raw(
+            await self.config.user(ctx.author).pets.set_raw(
                 pet_name, 'hunger', value=new_hunger
             )
 
             # We could accomplish the same thing a slightly different way
-            await self.conf.user(ctx.author).pets.get_attr(pet_name).hunger.set(new_hunger)
+            await self.config.user(ctx.author).pets.get_attr(pet_name).hunger.set(new_hunger)
 
             await ctx.send("Your pet is now at {}/100 hunger!".format(new_hunger)
 
@@ -300,7 +402,7 @@ Of course, if we're less than responsible pet owners, there are consequences::
         @commands.command()
         async def adopt(self, ctx, pet_name: str, *, member: discord.Member):
             try:
-                pet = await self.conf.user(member).pets.get_raw(pet_name)
+                pet = await self.config.user(member).pets.get_raw(pet_name)
             except KeyError:
                 await ctx.send("That person doesn't own that pet!")
                 return
@@ -310,15 +412,15 @@ Of course, if we're less than responsible pet owners, there are consequences::
                 await ctx.send("That pet is too well taken care of to be adopted.")
                 return
 
-            await self.conf.user(member).pets.clear_raw(pet_name)
+            await self.config.user(member).pets.clear_raw(pet_name)
 
             # this is equivalent to doing the following
 
-            pets = await self.conf.user(member).pets()
+            pets = await self.config.user(member).pets()
             del pets[pet_name]
-            await self.conf.user(member).pets.set(pets)
+            await self.config.user(member).pets.set(pets)
 
-            await self.conf.user(ctx.author).pets.set_raw(pet_name, value=pet)
+            await self.config.user(ctx.author).pets.set_raw(pet_name, value=pet)
             await ctx.send(
                 "Your request to adopt this pet has been granted due to "
                 "how poorly it was taken care of."
@@ -346,20 +448,20 @@ much the same way they would in V2. The following examples will demonstrate how
 
 .. code-block:: python
 
-    from redbot.core import Config
+    from redbot.core import Config, commands
 
 
-    class ExampleCog:
+    class ExampleCog(commands.Cog):
         def __init__(self):
-            self.conf = Config.get_conf(self, 1234567890)
-
+            self.config = Config.get_conf(self, 1234567890)
+            self.config.init_custom("V2", 1)
             self.data = {}
 
         async def load_data(self):
-            self.data = await self.conf.custom("V2", "V2").all()
+            self.data = await self.config.custom("V2", "V2").all()
 
         async def save_data(self):
-            await self.conf.custom("V2", "V2").set(self.data)
+            await self.config.custom("V2", "V2").set(self.data)
 
 
     async def setup(bot):
@@ -407,13 +509,13 @@ API Reference
     includes keys within a `dict` when one is being set, as well as keys in  nested dictionaries
     within that `dict`. For example::
 
-        >>> conf = Config.get_conf(self, identifier=999)
-        >>> conf.register_global(foo={})
-        >>> await conf.foo.set_raw(123, value=True)
-        >>> await conf.foo()
+        >>> config = Config.get_conf(self, identifier=999)
+        >>> config.register_global(foo={})
+        >>> await config.foo.set_raw(123, value=True)
+        >>> await config.foo()
         {'123': True}
-        >>> await conf.foo.set({123: True, 456: {789: False}}
-        >>> await conf.foo()
+        >>> await config.foo.set({123: True, 456: {789: False}}
+        >>> await config.foo()
         {'123': True, '456': {'789': False}}
 
 .. automodule:: redbot.core.config

docs/framework_i18n.rst

@@ -33,21 +33,17 @@ Tutorial
 
 After making your cog, generate a :code:`messages.pot` file
 
-The process of generating this will depend on the operating system
-you are using
+We recommend using redgettext - a modified version of pygettext for Red.
+You can install redgettext by running :code:`pip install redgettext` in a command prompt.
 
-In a command prompt in your cog's package (where yourcog.py is),
-create a directory called "locales".
-Then do one of the following:
-
-Windows: :code:`python <your python install path>\Tools\i18n\pygettext.py -D -n -p locales`
-
-Mac: ?
-
-Linux: :code:`pygettext3 -D -n -p locales`
-
-This will generate a messages.pot file with strings to be translated, including
+To generate the :code:`messages.pot` file, you will now need to run
+:code:`python -m redgettext -c [path_to_cog]`
+This file will contain all strings to be translated, including
 docstrings.
+(For advanced usage check :code:`python -m redgettext -h`)
+
+You can now use a tool like `poedit
+<https://poedit.net/>`_ to translate the strings in your messages.pot file.
 
 -------------
 API Reference

docs/framework_rpc.rst

@@ -4,6 +4,10 @@
 RPC
 ===
 
+.. important::
+
+  RPC support is included in Red on a provisional basis. Backwards incompatible changes (up to and including removal of the RPC) may occur if deemed necessary.
+
 V3 comes default with an internal RPC server that may be used to remotely control the bot in various ways.
 Cogs must register functions to be exposed to RPC clients.
 Each of those functions must only take JSON serializable parameters and must return JSON serializable objects.

docs/framework_utils.rst

@@ -8,7 +8,19 @@ General Utility
 ===============
 
 .. automodule:: redbot.core.utils
-    :members: deduplicate_iterables, bounded_gather, bounded_gather_iter
+    :members: deduplicate_iterables, bounded_gather, bounded_gather_iter, get_end_user_data_statement, get_end_user_data_statement_or_raise
+
+.. autoclass:: AsyncIter
+    :members:
+    :special-members: __await__
+    :exclude-members: enumerate, filter
+
+    .. automethod:: enumerate
+        :async-for:
+
+    .. automethod:: filter
+        :async-for:
+
 
 Chat Formatting
 ===============
@@ -21,6 +33,7 @@ Embed Helpers
 
 .. automodule:: redbot.core.utils.embed
     :members:
+    :exclude-members: randomize_color
 
 Reaction Menus
 ==============
@@ -31,7 +44,16 @@ Reaction Menus
 Event Predicates
 ================
 
-.. automodule:: redbot.core.utils.predicates
+MessagePredicate
+****************
+
+.. autoclass:: redbot.core.utils.predicates.MessagePredicate
+    :members:
+
+ReactionPredicate
+*****************
+
+.. autoclass:: redbot.core.utils.predicates.ReactionPredicate
     :members:
 
 Mod Helpers

docs/getting_started.rst

@@ -81,15 +81,23 @@ parameters.
 
     [p]help command
 
-The parameters are shown as enclosed in ``< >`` if they're required, or
-``[ ]`` if optional.
-As an example, the ban command will show this in the help message, assuming
-your prefix is ``!``:
-``Syntax: !ban <user> [days] [reason]``
+.. note::
+    Arguments enclosed in ``< >`` are **required** for the command to work.
 
-This means that it is necessary to provide ``user``. However, the
-``days`` value (number of messages to delete) is optional, as well as
-the ``reason`` value, used for the modlog.
+    Arguments enclosed in ``[ ]`` are **optional** for the command;
+    you can decide whether to use them or not.
+    
+    If your argument includes spaces like ``Hello world!``, most of the time
+    you will need to place it in double quotes like this: ``"Hello world!"``.
+    Sometimes (especially for the last argument) these double quotes are not
+    required.
+
+    Arguments followed by ``=value`` means that, if not specified,
+    the argument will be equal to ``value``.
+
+    For example, the command ``[p]cleanup messages`` in the cleanup cog has
+    the syntax ``cleanup messages <number> [delete_pinned=False]``, which means
+    ``delete_pinned`` default will be false, unless you specify it as true.
 
 You can use help to show the **categories** too, generally called cogs.
 Just do something like this (notice the capitalization):
@@ -153,14 +161,10 @@ download them using the downloader cog.
 
 You can start using the downloader cog by loading it: ``[p]load downloader``
 
-You can find cogs by searching on ``cogs.red``. Find whatever you want,
+You can find cogs by searching on `<https://index.discord.red>`_. Find whatever you want,
 there are hundreds of cogs available!
 
-.. note:: ``cogs.red``, the website that list all of the cogs is not
-    ready for v3 yet. For now, you can refer to `this post
-    <https://cogboard.red/t/approved-repositories/210>`_.
-
-.. 26-cogs not available, let's use my repo :3
+.. note:: An even better way to discover new cogs and repositories is in the works! Stay tuned!
 
 Cogs come in repositories. A repository is a container of cogs
 that you can install. Let's suppose you want to install the ``say``
@@ -270,7 +274,7 @@ If you want to do it, follow these steps.
 2. **Install Linux**
 
   Most of the VPS providers have tools for installing Linux automatically. If
-  you're a beginner, we recommend **Ubuntu 18**.
+  you're a beginner, we recommend **Ubuntu 20.04 LTS**.
 
   For Raspberry Pi users, just install `Raspbian
   <https://www.raspberrypi.org/downloads/raspbian/>`_ on a micro-SD card.
@@ -344,17 +348,3 @@ The cog guides are formatted the same. They're divided into 3 sections:
   * **Arguments**
 
     A list of all arguments needed (or not) for the command, with more details.
-
-    .. tip::
-        Arguments enclosed in ``< >`` means that the argument is **required**
-        for the command to work.
-
-        Arguments enclosed in ``[ ]`` means that the argument is **optional**
-        for the command; you can decide to use it or not.
-
-        Arguments followed by ``=something`` means that, if not specified,
-        the argument will be equal to ``something``.
-
-        For example, ``[days=1]`` in the ``ban`` command means that the number
-        of days of messages to be deleted will be equal to ``1`` if not
-        specified.

docs/guide_cog_creation.rst

@@ -35,8 +35,8 @@ Open a terminal or command prompt and type one of the following
   intended for normal users.** We will not support anyone using the development version in any
   support channels. Using the development version may break third party cogs and not all core
   commands may work. Downgrading to stable after installing the development version may cause
-  data loss, crashes or worse. Please keep this in mind when using the Development version
-  While working on cog creation.
+  data loss, crashes or worse. Please keep this in mind when using the development version
+  while working on cog creation.
 
   .. code-block:: none
 
@@ -98,6 +98,7 @@ Open :code:`__init__.py`. In that file, place the following:
 
     from .mycog import Mycog
 
+
     def setup(bot):
         bot.add_cog(Mycog())
 
@@ -162,3 +163,103 @@ Additional resources
 Be sure to check out the :doc:`/guide_migration` for some resources
 on developing cogs for V3. This will also cover differences between V2 and V3 for
 those who developed cogs for V2.
+
+
+.. _guidelines-for-cog-creators:
+
+---------------------------
+Guidelines for Cog Creators
+---------------------------
+
+The following are a list of guidelines Cog Creators should strive to follow.
+Not all of these are strict requirements (some are) but are all generally advisable.
+
+1. Cogs should follow a few naming conventions for consistency.
+
+  - Cog classes should be TitleCased, using alphabetic characters only.
+  - Commands should be lower case, using alphanumeric characters only.
+  - Cog modules should be lower case, using alphabetic characters only.
+
+2. Cogs and commands should have docstrings suitable for use in help output.
+
+  - This one is slightly flexible if using other methods of setting help.
+
+3. Don't prevent normal operation of the bot without the user opting into this.
+
+  - This includes as a side effect by blocking the event loop.
+
+4. If your cog uses logging:
+
+  - The namespace for logging should be: ``red.your_repo_name.cog_name``.
+  - Print statements are not a substitute for proper logging.
+
+5. If you use asyncio.create_task, your tasks need to:
+
+  - Be cancelled on cog unload.
+  - Handle errors.
+
+6. Event listeners should exit early if it is an event you don't need.
+   This makes your events less expensive in terms of CPU time. Examples below:
+
+  - Checking that you are in a guild before interacting with config for an antispam command.
+  - Checking that you aren't reacting to a bot message (``not message.author.bot``) early on.
+
+7. Use .gitignore (or something else) to keep unwanted files out of your cog repo.
+8. Put a license on your cog repo.
+
+  - By default, in most jurisdictions, without a license that at least offers the code for use,
+    users cannot legally use your code.
+
+9. Use botwide features when they apply. Some examples of this:
+
+  - ``ctx.embed_color``
+  - ``bot.is_automod_immune``
+
+10. Use checks to limit command use when the bot needs special permissions.
+11. Check against user input before doing things. Common things to check:
+
+  - Resulting output is safe.
+  - Values provided make sense. (eg. no negative numbers for payday)
+  - Don't unsafely use user input for things like database input.
+
+12. Don't abuse bot internals.
+
+  - If you need access to something, ask us or open an issue.
+  - If you're sure the current usage is safe, document why,
+    but we'd prefer you work with us on ensuring you have access to what you need.
+
+13. Update your cogs for breakage.
+
+  - We announce this in advance.
+  - If you need help, ask.
+
+14. Check events against `bot.cog_disabled_in_guild() <RedBase.cog_disabled_in_guild()>`
+
+  - Not all events need to be checked, only those that interact with a guild.
+  - Some discretion may apply, for example,
+    a cog which logs command invocation errors could choose to ignore this
+    but a cog which takes actions based on messages should not.
+
+15. Respect settings when treating non command messages as commands.
+
+16. Handle user data responsibly
+
+  - Don't do unexpected things with user data.
+  - Don't expose user data to additional audiences without permission.
+  - Don't collect data your cogs don't need.
+  - Don't store data in unexpected locations.
+    Utilize the cog data path, Config, or if you need something more
+    prompt the owner to provide it.
+
+17. Utilize the data deletion and statement APIs
+
+  - See `redbot.core.commands.Cog.red_delete_data_for_user`
+  - Make a statement about what data your cogs use with the module level
+    variable ``__red_end_user_data_statement__``.
+    This should be a string containing a user friendly explanation of what data
+    your cog stores and why.
+
+18. Set contextual locales in events and other background tasks that use i18n APIs
+
+  - See `redbot.core.i18n.set_contextual_locales_from_guild()`
+  - Usage of i18n APIs within commands automatically has proper contextual locales set.

docs/guide_publish_cogs.rst

@@ -55,6 +55,9 @@ Keys common to both repo and cog info.json (case sensitive)
 Keys specific to the cog info.json (case sensitive)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+- ``end_user_data_statement`` (string) - A statement explaining what end user data the cog is storing.
+  This is displayed when a user executes ``[p]cog info``. If the statement has changed since last update, user will be informed during the update.
+
 - ``min_bot_version`` (string) - Min version number of Red in the format ``MAJOR.MINOR.MICRO``
 
 - ``max_bot_version`` (string) - Max version number of Red in the format ``MAJOR.MINOR.MICRO``,
@@ -67,7 +70,8 @@ Keys specific to the cog info.json (case sensitive)
 
 - ``disabled`` (bool) - Determines if a cog is available for install.
 
-- ``required_cogs`` (map of cogname to repo URL) - A map of required cogs that this cog depends on.
+- ``required_cogs`` (dict mapping a cog name to repo URL) - A dict of required cogs that this cog depends on
+  in the format ``{cog_name : repo_url}``.
   Downloader will not deal with this functionality but it may be useful for other cogs.
 
 - ``requirements`` (list of strings) - list of required libraries that are
@@ -81,5 +85,4 @@ Keys specific to the cog info.json (case sensitive)
   ``SHARED_LIBRARY``. If ``SHARED_LIBRARY`` then ``hidden`` will be ``True``.
 
 .. warning::
-    Shared libraries are deprecated since version 3.2 and are marked for removal in version 3.4.
-
+    Shared libraries are deprecated since version 3.2 and are marked for removal in the future.

docs/host-list.rst

@@ -59,6 +59,9 @@ Others
 |`Microsoft Azure                     |Same as AWS, but it's Microsoft.                     |
 |<https://azure.microsoft.com>`_      |                                                     |
 +-------------------------------------+-----------------------------------------------------+
+|`Oracle Cloud                        |Same as AWS, but it's Oracle.                        |
+|<https://oracle.com/cloud/>`_        |                                                     |
++-------------------------------------+-----------------------------------------------------+
 |`LowEndBox <http://lowendbox.com/>`_ |A curator for lower specced servers.                 |
 +-------------------------------------+-----------------------------------------------------+
 
@@ -76,9 +79,13 @@ server. Any modern hardware should work 100% fine.
 Free hosting
 ------------
 
-Google Cloud and AWS both have free tier VPS suitable for small bots.
-Additionally, new Google Cloud customers get a $300 credit which is valid
-for 12 months.
+| `Google Cloud Compute Engine <https://cloud.google.com/free/docs/gcp-free-tier>`_,
+  `Oracle Cloud Compute <https://oracle.com/cloud/free/#always-free>`_ and
+  `AWS EC2 <https://aws.amazon.com/free/>`_ have free tier VPSes suitable for small bots.
+
+| **Note:** AWS EC2's free tier does not last forever - it's a 12 month trial.
+| Additionally, new Google Cloud customers get a $300 credit which is valid
+  for 12 months.
 
 Other than that... no. There is no good free VPS hoster, outside of
 persuading somebody to host for you, which is incredibly unlikely.

docs/index.rst

@@ -14,7 +14,9 @@ Welcome to Red - Discord Bot's documentation!
 
     install_windows
     install_linux_mac
-    venv_guide
+    bot_application_guide
+    update_red
+    about_venv
     autostart_systemd
     autostart_pm2
 
@@ -30,6 +32,10 @@ Welcome to Red - Discord Bot's documentation!
     :caption: User guides:
 
     getting_started
+    cog_guides/admin
+    cog_guides/alias
+    cog_guides/bank
+    red_core_data_statement
 
 .. toctree::
     :maxdepth: 2
@@ -57,6 +63,7 @@ Welcome to Red - Discord Bot's documentation!
     :maxdepth: 2
     :caption: Changelogs:
 
+    changelog_3_4_0
     changelog_3_3_0
     release_notes_3_2_0
     changelog_3_2_0

docs/install_linux_mac.rst

@@ -17,10 +17,10 @@ Installing the pre-requirements
 Please install the pre-requirements using the commands listed for your operating system.
 
 The pre-requirements are:
- - Python 3.8.1 or greater
+ - Python 3.8.1 or greater; **Python 3.9 is currently not supported!**
  - Pip 18.1 or greater
  - Git 2.11+
- - Java Runtime Environment 11 or later (for audio support)
+ - Java Runtime Environment 11 (for audio support)
 
 We also recommend installing some basic compiler tools, in case our dependencies don't provide
 pre-built "wheels" for your architecture.
@@ -43,14 +43,14 @@ Arch Linux
 
 .. code-block:: none
 
-    sudo pacman -Syu python python-pip git jre-openjdk-headless base-devel
+    sudo pacman -Syu python python-pip git jre11-openjdk-headless base-devel
 
 Continue by `creating-venv-linux`.
 
 ----
 
-.. _install-centos:
-.. _install-rhel:
+.. _install-centos7:
+.. _install-rhel7:
 
 ~~~~~~~~~~~~~~~~~
 CentOS and RHEL 7
@@ -58,17 +58,27 @@ CentOS and RHEL 7
 
 .. code-block:: none
 
-    yum -y groupinstall development
-    yum -y install https://centos7.iuscommunity.org/ius-release.rpm
+    sudo yum -y groupinstall development
     sudo yum -y install zlib-devel bzip2 bzip2-devel readline-devel sqlite sqlite-devel \
-      openssl-devel xz xz-devel libffi-devel findutils git2u java-11-openjdk
+      openssl-devel xz xz-devel tk-devel libffi-devel findutils java-11-openjdk-headless
+    sudo yum -y install centos-release-scl
+    sudo yum -y install devtoolset-8-gcc devtoolset-8-gcc-c++
+    echo "source scl_source enable devtoolset-8" >> ~/.bashrc
+    source ~/.bashrc
+
+In order to install Git 2.11 or greater, we recommend adding the IUS repository:
+
+.. code-block:: none
+
+    sudo yum -y install https://repo.ius.io/ius-release-el7.rpm
+    sudo yum -y swap git git224
 
 Complete the rest of the installation by `installing Python 3.8 with pyenv <install-python-pyenv>`.
 
 ----
 
-.. _install-centos8:
-.. _install-rhel8:
+.. _install-centos:
+.. _install-rhel:
 
 ~~~~~~~~~~~~~~~~~
 CentOS and RHEL 8
@@ -76,38 +86,11 @@ CentOS and RHEL 8
 
 .. code-block:: none
 
-    yum -y install epel-release
-    yum update -y
-    yum -y groupinstall development
-    yum -y install git zlib-devel bzip2 bzip2-devel readline-devel sqlite \
-     sqlite-devel openssl-devel xz xz-devel libffi-devel findutils java-11-openjdk
-     
-Complete the rest of the installation by `installing Python 3.8 with pyenv <install-python-pyenv>`.
-
-----
-
-.. _install-debian-stretch:
-
-~~~~~~~~~~~~~~
-Debian Stretch
-~~~~~~~~~~~~~~
-
-.. note::
-
-    This guide is only for Debian Stretch users, these instructions won't work with
-    Raspbian Stretch. Raspbian Buster is the only version of Raspbian supported by Red.
-
-We recommend installing pyenv as a method of installing non-native versions of python on
-Debian Stretch. This guide will tell you how. First, run the following commands:
-
-.. code-block:: none
-
-    sudo echo "deb http://deb.debian.org/debian stretch-backports main" >> /etc/apt/sources.list.d/red-sources.list
-    sudo apt update
-    sudo apt -y install make build-essential libssl-dev zlib1g-dev libbz2-dev libreadline-dev \
-      libsqlite3-dev wget curl llvm libncurses5-dev xz-utils tk-dev libxml2-dev \
-      libxmlsec1-dev libffi-dev liblzma-dev libgdbm-dev uuid-dev python3-openssl git openjdk-11-jre
-    CXX=/usr/bin/g++
+    sudo yum -y install epel-release
+    sudo yum -y update
+    sudo yum -y groupinstall development
+    sudo yum -y install git zlib-devel bzip2 bzip2-devel readline-devel sqlite sqlite-devel \
+      openssl-devel xz xz-devel tk-devel libffi-devel findutils java-11-openjdk-headless
 
 Complete the rest of the installation by `installing Python 3.8 with pyenv <install-python-pyenv>`.
 
@@ -127,8 +110,8 @@ Debian/Raspbian Buster. This guide will tell you how. First, run the following c
 
     sudo apt update
     sudo apt -y install make build-essential libssl-dev zlib1g-dev libbz2-dev libreadline-dev \
-      libsqlite3-dev wget curl llvm libncurses5-dev xz-utils tk-dev libxml2-dev \
-      libxmlsec1-dev libffi-dev liblzma-dev libgdbm-dev uuid-dev python3-openssl git openjdk-11-jre
+      libsqlite3-dev wget curl llvm libncurses5-dev xz-utils tk-dev libxml2-dev libxmlsec1-dev \
+      libffi-dev liblzma-dev libgdbm-dev uuid-dev python3-openssl git openjdk-11-jre-headless
     CXX=/usr/bin/g++
 
 Complete the rest of the installation by `installing Python 3.8 with pyenv <install-python-pyenv>`.
@@ -141,12 +124,12 @@ Complete the rest of the installation by `installing Python 3.8 with pyenv <inst
 Fedora Linux
 ~~~~~~~~~~~~
 
-Fedora Linux 30 and above has all required packages available in official repositories. Install
+Fedora Linux 31 and above has all required packages available in official repositories. Install
 them with dnf:
 
 .. code-block:: none
 
-    sudo dnf -y install python38 git java-latest-openjdk-headless @development-tools
+    sudo dnf -y install python38 git java-11-openjdk-headless @development-tools
 
 Continue by `creating-venv-linux`.
 
@@ -163,20 +146,18 @@ following, then press Enter:
 
 .. code-block:: none
 
-    /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
+    /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"
 
 After the installation, install the required packages by pasting the commands and pressing enter,
 one-by-one:
 
 .. code-block:: none
 
-    brew install python --with-brewed-openssl
+    brew install python@3.8
+    echo 'export PATH="/usr/local/opt/python@3.8/bin:$PATH"' >> ~/.profile
+    source ~/.profile
     brew install git
-    brew tap caskroom/versions
-    brew cask install homebrew/cask-versions/adoptopenjdk11
-
-It's possible you will have network issues. If so, go in your Applications folder, inside it, go in
-the Python 3.8 folder then double click ``Install certificates.command``.
+    brew cask install adoptopenjdk/openjdk/adoptopenjdk11
 
 Continue by `creating-venv-linux`.
 
@@ -188,10 +169,10 @@ Continue by `creating-venv-linux`.
 openSUSE
 ~~~~~~~~
 
-openSUSE Leap
-*************
+openSUSE Leap 15.1+
+*******************
 
-We recommend installing a community package to get Python 3.8 on openSUSE Leap. This package will
+We recommend installing a community package to get Python 3.8 on openSUSE Leap 15.1+. This package will
 be installed to the ``/opt`` directory.
 
 First, add the Opt-Python community repository:
@@ -199,14 +180,17 @@ First, add the Opt-Python community repository:
 .. code-block:: none
 
     source /etc/os-release
-    sudo zypper ar -f https://download.opensuse.org/repositories/home:/Rotkraut:/Opt-Python/openSUSE_Leap_${VERSION_ID}/ Opt-Python
+    sudo zypper -n ar -f \
+      https://download.opensuse.org/repositories/home:/Rotkraut:/Opt-Python/openSUSE_Leap_${VERSION_ID}/ \
+      Opt-Python
+    sudo zypper -n --gpg-auto-import-keys ref
 
 Now install the pre-requirements with zypper:
 
 .. code-block:: none
 
-    sudo zypper install opt-python38 opt-python38-setuptools git-core java-11-openjdk-headless
-    sudo zypper install -t pattern devel_basis
+    sudo zypper -n install opt-python38 opt-python38-setuptools git-core java-11-openjdk-headless
+    sudo zypper -n install -t pattern devel_basis
 
 Since Python is now installed to ``/opt/python``, we should add it to PATH. You can add a file in
 ``/etc/profile.d/`` to do this:
@@ -232,25 +216,31 @@ with zypper:
 
 .. code-block:: none
 
-    sudo zypper install python3-base python3-pip git-core java-12-openjdk-headless
-    sudo zypper install -t pattern devel_basis
+    sudo zypper -n install python3-base python3-pip git-core java-11-openjdk-headless
+    sudo zypper -n install -t pattern devel_basis
 
 Continue by `creating-venv-linux`.
 
 ----
 
-.. _install-ubuntu:
+.. _install-ubuntu-1604:
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Ubuntu LTS versions (18.04 and 16.04)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~
+Ubuntu 16.04 LTS
+~~~~~~~~~~~~~~~~
 
-We recommend adding the ``git-core`` ppa to install Git 2.11 or greater:
+We recommend adding the ``openjdk-r`` ppa to install Java 11:
 
 .. code-block:: none
 
     sudo apt update
     sudo apt -y install software-properties-common
+    sudo add-apt-repository -yu ppa:openjdk-r/ppa
+
+We recommend adding the ``git-core`` ppa to install Git 2.11 or greater:
+
+.. code-block:: none
+
     sudo add-apt-repository -yu ppa:git-core/ppa
 
 We recommend adding the ``deadsnakes`` ppa to install Python 3.8.1 or greater:
@@ -263,7 +253,63 @@ Now install the pre-requirements with apt:
 
 .. code-block:: none
 
-    sudo apt -y install python3.8 python3.8-dev python3.8-venv python3-pip git default-jre-headless \
+    sudo apt -y install python3.8 python3.8-dev python3.8-venv python3-pip git openjdk-11-jre-headless \
+      build-essential
+
+Continue by `creating-venv-linux`.
+
+----
+
+.. _install-ubuntu-1804:
+
+~~~~~~~~~~~~~~~~
+Ubuntu 18.04 LTS
+~~~~~~~~~~~~~~~~
+
+We recommend adding the ``git-core`` ppa to install Git 2.11 or greater:
+
+.. code-block:: none
+
+    sudo apt update
+    sudo apt -y install software-properties-common
+    sudo add-apt-repository -y ppa:git-core/ppa
+
+We recommend adding the ``deadsnakes`` ppa to install Python 3.8.1 or greater:
+
+.. code-block:: none
+
+    sudo add-apt-repository -y ppa:deadsnakes/ppa
+
+Now install the pre-requirements with apt:
+
+.. code-block:: none
+
+    sudo apt -y install python3.8 python3.8-dev python3.8-venv python3-pip git openjdk-11-jre-headless \
+      build-essential
+
+Continue by `creating-venv-linux`.
+
+----
+
+.. _install-ubuntu:
+
+~~~~~~~~~~~~~~~~
+Ubuntu 20.04 LTS
+~~~~~~~~~~~~~~~~
+
+We recommend adding the ``git-core`` ppa to install Git 2.11 or greater:
+
+.. code-block:: none
+
+    sudo apt update
+    sudo apt -y install software-properties-common
+    sudo add-apt-repository -y ppa:git-core/ppa
+
+Now install the pre-requirements with apt:
+
+.. code-block:: none
+
+    sudo apt -y install python3.8 python3.8-dev python3.8-venv python3-pip git openjdk-11-jre-headless \
       build-essential
 
 Continue by `creating-venv-linux`.
@@ -291,7 +337,7 @@ installing pyenv. To do this, first run the following commands:
 
     sudo apt -y install make build-essential libssl-dev zlib1g-dev libbz2-dev libreadline-dev \
       libsqlite3-dev wget curl llvm libncurses5-dev xz-utils tk-dev libxml2-dev \
-      libxmlsec1-dev libffi-dev liblzma-dev libgdbm-dev uuid-dev python3-openssl git openjdk-11-jre
+      libxmlsec1-dev libffi-dev liblzma-dev libgdbm-dev uuid-dev python3-openssl git openjdk-11-jre-headless
     CXX=/usr/bin/g++
 
 And then complete the rest of the installation by `installing Python 3.8 with pyenv <install-python-pyenv>`.
@@ -315,16 +361,16 @@ virtual environment.
 
 .. code-block:: none
 
-    curl -L https://github.com/pyenv/pyenv-installer/raw/master/bin/pyenv-installer | bash
+    command -v pyenv && pyenv update || curl https://pyenv.run | bash
 
-After this command, you may see a warning about 'pyenv' not being in the load path. Follow the
-instructions given to fix that, then close and reopen your shell.
+**After this command, you may see a warning about 'pyenv' not being in the load path. Follow the
+instructions given to fix that, then close and reopen your shell.**
 
 Then run the following command:
 
 .. code-block:: none
 
-    CONFIGURE_OPTS=--enable-optimizations pyenv install 3.8.1 -v
+    CONFIGURE_OPTS=--enable-optimizations pyenv install 3.8.6 -v
 
 This may take a long time to complete, depending on your hardware. For some machines (such as
 Raspberry Pis and micro-tier VPSes), it may take over an hour; in this case, you may wish to remove
@@ -336,7 +382,7 @@ After that is finished, run:
 
 .. code-block:: none
 
-    pyenv global 3.8.1
+    pyenv global 3.8.6
 
 Pyenv is now installed and your system should be configured to run Python 3.8.
 
@@ -348,8 +394,82 @@ Continue by `creating-venv-linux`.
 Creating a Virtual Environment
 ------------------------------
 
+.. tip::
+
+    If you want to learn more about virtual environments, see page: `about-venvs`
+
 We require installing Red into a virtual environment. Don't be scared, it's very
-straightforward. See the section `installing-in-virtual-environment`.
+straightforward.
+
+You have 2 options:
+
+* :ref:`using-venv` (quick and easy, involves just two commands)
+* :ref:`using-pyenv-virtualenv` (only available and recommended when you installed Python with pyenv)
+
+----
+
+.. _using-venv:
+
+**************
+Using ``venv``
+**************
+This is the quickest way to get your virtual environment up and running, as `venv` is shipped with
+python.
+
+First, choose a directory where you would like to create your virtual environment. It's a good idea
+to keep it in a location which is easy to type out the path to. From now, we'll call it
+``redenv`` and it will be located in your home directory.
+
+Create your virtual environment with the following command::
+
+    python3.8 -m venv ~/redenv
+
+And activate it with the following command::
+
+    source ~/redenv/bin/activate
+
+.. important::
+
+    You must activate the virtual environment with the above command every time you open a new
+    shell to run, install or update Red.
+
+Continue by `installing-red-linux-mac`.
+
+----
+
+.. _using-pyenv-virtualenv:
+
+**************************
+Using ``pyenv virtualenv``
+**************************
+
+Using ``pyenv virtualenv`` saves you the headache of remembering where you installed your virtual
+environments. This option is only available if you installed Python with pyenv.
+
+First, ensure your pyenv interpreter is set to python 3.8.1 or greater with the following command::
+
+    pyenv version
+
+Now, create a virtual environment with the following command::
+
+    pyenv virtualenv <name>
+
+Replace ``<name>`` with whatever you like. If you ever forget what you named it,
+you can always use the command ``pyenv versions`` to list all virtual environments.
+
+Now activate your virtualenv with the following command::
+
+    pyenv shell <name>
+
+.. important::
+
+    You must activate the virtual environment with the above command every time you open a new
+    shell to run, install or update Red. You can check out other commands like ``pyenv local`` and
+    ``pyenv global`` if you wish to keep the virtualenv activated all the time.
+
+Continue by `installing-red-linux-mac`.
+
+.. _pyenv-installer: https://github.com/pyenv/pyenv-installer/blob/master/README.rst
 
 .. _installing-red-linux-mac:
 
@@ -400,8 +520,7 @@ Once done setting up the instance, run the following command to run Red:
 
 It will walk through the initial setup, asking for your token and a prefix.
 You can find out how to obtain a token with
-:dpy_docs:`this guide <discord.html#creating-a-bot-account>`,
-section "Creating a Bot Account".
+`this guide <bot_application_guide>`.
 
 .. tip::
    If it's the first time you're using Red, you should check our `getting-started` guide

docs/install_windows.rst

@@ -4,40 +4,54 @@
 Installing Red on Windows
 =========================
 
----------------
-Needed Software
----------------
+-------------------------------
+Installing the pre-requirements
+-------------------------------
 
-The following software dependencies can all be installed quickly and easily through PowerShell,
-using a trusted package manager for Windows called `Chocolatey <https://chocolatey.org>`_
+Please install the pre-requirements by following instructions from one of the following subsections.
 
-We also provide instructions for manually installing all of the dependencies.
+The pre-requirements are:
+ - Python 3.8.1 or greater; **Python 3.9 is currently not supported!**
+ - Pip 18.1 or greater
+ - Git 2.11+
+ - Java Runtime Environment 11 (for audio support)
 
-******************************************
-Installing using powershell and chocolatey
-******************************************
+We also recommend installing some basic compiler tools, in case our dependencies don't provide
+pre-built "wheels" for your architecture.
+
+.. contents:: Choose a method of installing pre-requirements:
+    :local:
+
+----
+
+*********************************************
+Using PowerShell and Chocolatey (recommended)
+*********************************************
 
 To install via PowerShell, search "powershell" in the Windows start menu,
-right-click on it and then click "Run as administrator"
+right-click on it and then click "Run as administrator".
 
 Then run each of the following commands:
 
 .. code-block:: none
 
     Set-ExecutionPolicy Bypass -Scope Process -Force
+    [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072
     iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))
-    choco install git --params "/GitOnlyOnPath /WindowsTerminal" -y
-    choco install visualstudio2019-workload-vctools -y
-    choco install python3 -y
+    choco upgrade git --params "/GitOnlyOnPath /WindowsTerminal" -y
+    choco upgrade visualstudio2019-workload-vctools -y
+    choco upgrade python3 -y --version 3.8.6
 
 For Audio support, you should also run the following command before exiting:
 
 .. code-block:: none
 
-    choco install adoptopenjdk11jre -y
+    choco upgrade adoptopenjdk11jre -y
 
 
-From here, exit the prompt then continue onto `installing Red <installing-red-windows>`.
+From here, exit the prompt then continue onto `creating-venv-windows`.
+
+----
 
 ********************************
 Manually installing dependencies
@@ -50,26 +64,68 @@ Manually installing dependencies
 
 * `MSVC Build tools <https://www.visualstudio.com/downloads/#build-tools-for-visual-studio-2019>`_
 
-* `Python <https://www.python.org/downloads/>`_ - Red needs Python 3.8.1 or greater
+* `Python 3.8.1 or greater <https://www.python.org/downloads/>`_; **Python 3.9 is currently not supported!**
 
 .. attention:: Please make sure that the box to add Python to PATH is CHECKED, otherwise
                you may run into issues when trying to run Red.
 
-* `Git <https://git-scm.com/download/win>`_
+* `Git 2.11+ <https://git-scm.com/download/win>`_
 
 .. attention:: Please choose the option to "Git from the command line and also from 3rd-party software" in Git's setup.
 
-* `Java <https://adoptopenjdk.net/?variant=openjdk11&jvmVariant=hotspot>`_ - needed for Audio
+* `Java 11 <https://adoptopenjdk.net/?variant=openjdk11&jvmVariant=hotspot>`_ - needed for Audio
 
+From here, continue onto `creating-venv-windows`.
 
-.. _installing-red-windows:
+----
+
+.. _creating-venv-windows:
 
 ------------------------------
 Creating a Virtual Environment
 ------------------------------
 
+.. tip::
+
+    If you want to learn more about virtual environments, see page: `about-venvs`.
+
 We require installing Red into a virtual environment. Don't be scared, it's very
-straightforward. See the section `installing-in-virtual-environment`.
+straightforward.
+
+First, choose a directory where you would like to create your virtual environment. It's a good idea
+to keep it in a location which is easy to type out the path to. From now, we'll call it
+``redenv`` and it will be located in your home directory.
+
+Start with opening a command prompt (open Start, search for "command prompt", then click it).
+
+.. note:: 
+
+    You shouldn't run command prompt as administrator when creating your virtual environment, or
+    running Red.
+
+.. warning::
+
+    These commands will not work in PowerShell - you have to use command prompt as said above.
+
+Then create your virtual environment with the following command
+
+.. code-block:: none
+
+    py -3.8 -m venv "%userprofile%\redenv"
+
+And activate it with the following command
+
+.. code-block:: none
+
+    "%userprofile%\redenv\Scripts\activate.bat"
+
+.. important::
+
+    You must activate the virtual environment with the above command every time you open a new
+    Command Prompt to run, install or update Red.
+
+
+.. _installing-red-windows:
 
 --------------
 Installing Red
@@ -78,8 +134,7 @@ Installing Red
 .. attention:: You may need to restart your computer after installing dependencies
                for the PATH changes to take effect.
 
-1. Open a command prompt (open Start, search for "command prompt", then click it)
-2. Run **one** of the following set of commands, depending on what extras you want installed
+Run **one** of the following set of commands, depending on what extras you want installed
 
   * Normal installation:
 
@@ -95,11 +150,6 @@ Installing Red
         python -m pip install -U pip setuptools wheel
         python -m pip install -U Red-DiscordBot[postgres]
 
-
-.. note::
-
-    These commands are also used for updating Red
-
 --------------------------
 Setting Up and Running Red
 --------------------------
@@ -122,8 +172,7 @@ Once done setting up the instance, run the following command to run Red:
 
 It will walk through the initial setup, asking for your token and a prefix.
 You can find out how to obtain a token with
-:dpy_docs:`this guide <discord.html#creating-a-bot-account>`,
-section "Creating a Bot Account".
+`this guide <bot_application_guide>`.
 
 .. tip::
    If it's the first time you're using Red, you should check our `getting-started` guide

docs/prolog.txt

@@ -22,20 +22,29 @@
 
 .. This is for describing how a format should be formatted
 
-.. |quotes| replace:: enclosed in quotes if there are spaces
-
 .. |role-input| replace:: Please give **the exact role name or ID**, or it won't be detected.
+
+.. |role-input-quotes| replace:: Please give **the exact role name or ID**, or it won't be detected.
     If the role name has spaces, provide it enclosed in quotes like this: ``"my role with spaces"``
 
 .. |member-input| replace:: You can either mention the member, provide its ID, its exact name with
-    the tag or not, or its nickname (|quotes|).
+    the tag or not, or its nickname.
+
+.. |member-input-quotes| replace:: You can either mention the member, provide its ID, its exact
+    name with the tag or not, or its nickname enclosed in quotes if there are spaces.
 
 .. |user-input| replace:: You can either provide the member's ID or its exact name with the tag or
-    not (|quotes|).
+    not.
+
+.. |user-input-quotes| replace:: You can either provide the member's ID or its exact name with the
+    tag or not, enclosed in quotes if there are spaces.
 
 .. |channel-input| replace:: You can either mention the channel, provide its exact name or its ID.
 
-.. |vc-input| replace:: You can either provide the voice channel's ID or its exact name, |quotes|.
+.. |vc-input| replace:: You can either provide the voice channel's ID or its exact name.
+
+.. |vc-input-quotes| replace:: You can either provide the voice channel's ID or its exact name,
+    enclosed in quotes if there are spaces.
 
 .. |color-input| replace:: You can either provide the hexadecimal code of the color, or one of the
     colors listed here: :class:`discord.Color`.

docs/red_core_data_statement.rst

@@ -0,0 +1,87 @@
+.. Red Core Data Statement
+
+=====================
+Red and End User Data
+=====================
+
+Notes for everyone
+******************
+
+What data Red collects
+----------------------
+
+Red and the cogs included with it collect some amount of data
+about users for the bot's normal operations. 
+
+The bot will keep track of a short history of usernames/nicknames. It will also
+remember which actions were taken using your Discord account (such as creating a playlist)
+as well as the content of specific messages used directly as commands for the bot
+(such as reports sent to servers).
+
+By default, Red will not collect any more data than it needs, and will not use it
+for anything other than the portion of the Red's functionality that necessitated it.
+
+3rd party extensions may store additional data beyond what Red does by default.
+You can use the command ``[p]mydata 3rdparty``
+to view statements about how extensions use your data made by the authors of 
+the specific 3rd party extensions an instance of Red has installed.
+
+How can I delete data Red has about me?
+---------------------------------------
+
+The command ``[p]mydata forgetme`` provides a way for users to remove
+large portions of their own data from the bot. This command will not
+remove operational data, such as a record that your
+Discord account was the target of a moderation action.
+
+3rd party extensions to Red are able to delete data when this command
+is used as well, but this is something each extension must implement.
+If a loaded extension does not implement this, the user will be informed.
+
+Additional Notes for Bot Owners and Hosts
+*****************************************
+
+How to comply with a request from Discord Trust & Safety
+--------------------------------------------------------
+
+There are a handful of these available to bot owners in the command group
+``[p]mydata ownermanagement``.
+
+The most pertinent one if asked to delete data by a member of Trust & Safety
+is
+
+``[p]mydata ownermanagement processdiscordrequest`` 
+
+This will cause the bot to get rid of or disassociate all data
+from the specified user ID. 
+
+.. warning::
+
+    You should not use this unless
+    Discord has specifically requested this with regard to a deleted user.
+    This will remove the user from various anti-abuse measures.
+    If you are processing a manual request from a user, read the next section
+
+
+How to process deletion requests from users
+-------------------------------------------
+
+You can point users to the command ``[p]mydata forgetme`` as a first step.
+
+If users cannot use that for some reason, the command
+
+``[p]mydata ownermanagement deleteforuser``
+
+exists as a way to handle this as if the user had done it themselves.
+
+Be careful about using the other owner level deletion options on behalf of users,
+as this may also result in losing operational data such as data used to prevent spam.
+
+What owners and hosts are responsible for
+-----------------------------------------
+
+Owners and hosts must comply both with Discord's terms of service and any applicable laws.
+Owners and hosts are responsible for all actions their bot takes.
+
+We cannot give specific guidance on this, but recommend that if there are any issues
+you be forthright with users, own up to any mistakes, and do your best to handle it.

docs/update_red.rst

@@ -0,0 +1,139 @@
+============
+Updating Red
+============
+
+Updating to the latest version of Red has several benefits:
+
+- New features and improvements are added.
+- Bugs are fixed.
+- Your bot is safe from security vulnerabilities that have been found.
+
+Here are some things to consider to help make your upgrade as smooth as possible.
+
+.. note::
+
+    If you're developing for Red, you should also look for "Breaking changes" sections in release notes for each minor (X.Y.0) version that's been released since you last updated Red.
+
+.. important::
+
+    Make sure to read the **Read before updating** sections of the changelogs for all releases that were published since you last updated your instance. They contain important information and if you don't read them, you might run into some issues later.
+
+Updating differs depending on the version you currently have. Next sections will explain how to upgrade to latest version of Red (|version|) from the version that is in the header of the section.
+
+.. contents:: Choose the version you're currently on from the list below:
+    :local:
+    :depth: 1
+
+
+Red 3.2.0 or newer
+******************
+
+Windows
+-------
+
+If you have Red 3.2.0 or newer, you can upgrade by following these 4 easy steps:
+
+1. Shut your bot down.
+
+2. Activate your venv with the following command:
+
+    .. code:: none
+
+        "%userprofile%\redenv\Scripts\activate.bat"
+
+3. Update Red with this command:
+
+    .. code:: none
+
+        python -m pip install -U Red-DiscordBot
+
+.. attention::
+
+    If you're using PostgreSQL data backend, replace ``Red-DiscordBot`` in the second command with ``Red-DiscordBot[postgres]``
+
+4. Start your bot.
+
+Linux & Mac
+-----------
+
+If you have Red 3.2.0 or newer, you can upgrade by following these 4 easy steps:
+
+1. Shut your bot down.
+
+2. Activate your virtual environment.
+  
+    If you used ``venv`` for your virtual environment, use:
+
+    .. code:: none
+
+        source ~/redenv/bin/activate
+
+    If you used ``pyenv`` for your virtual environment, use:
+
+    .. code:: none
+
+        pyenv shell <name>
+
+3. Update Red with this command:
+
+    .. code:: none
+
+        python -m pip install -U Red-DiscordBot
+
+.. attention::
+
+    If you're using PostgreSQL data backend, replace ``Red-DiscordBot`` in the second command with ``Red-DiscordBot[postgres]``
+
+4. Start your bot.
+
+Red 3.1.X
+*********
+
+If you have Red 3.1.X, you will need to follow the install instructions for your operating system. Make sure that you turn your bot off first.
+
+- `Windows <install_windows>`
+- `Linux & Mac <install_linux_mac>`
+
+Follow every step to ensure you have all dependencies up-to-date and only skip ``redbot-setup`` step as you already have a bot instance.
+
+**If you already have Red installed in a virtual environment, you will need to delete it before starting this process.**
+
+.. attention::
+
+    Red 3.2 dropped support for the MongoDB driver
+
+     - If you were not using the MongoDB driver, this does not affect you.
+     - If you were using a 3rd party cog which required MongoDB, it probably still does.
+     - If you were using the MongoDB driver, **prior to launching your instance after update**,
+       you will need to run the following commands to convert:
+
+         .. code::
+
+           python -m pip install dnspython~=1.16.0 motor~=2.0.0 pymongo~=3.8.0
+           redbot-setup convert [instancename] json
+
+
+Red 3.0.2 and older
+*******************
+
+.. important::
+
+    Red 3.2 dropped support for the MongoDB driver
+
+     - If you were not using the MongoDB driver, this does not affect you.
+     - If you were using a 3rd party cog which required MongoDB, it probably still does.
+     - If you were using the MongoDB driver, **prior to updating**, you will need to convert your data to JSON backend,
+       using following command:
+
+         .. code::
+
+           redbot-setup --edit
+
+If you have Red 3.0.2 or older, you will need to follow the install instructions for your operating system. Make sure that you turn your bot off first.
+
+- `Windows <install_windows>`
+- `Linux & Mac <install_linux_mac>`
+
+Follow every step to ensure you have all dependencies up-to-date and only skip ``redbot-setup`` step as you already have a bot instance.
+
+**If you already have Red installed in a virtual environment, you will need to delete it before starting this process.**

docs/venv_guide.rst

@@ -1,142 +0,0 @@
-.. _installing-in-virtual-environment:
-
-=======================================
-Installing Red in a Virtual Environment
-=======================================
-Creating a virtual environment is really easy and usually prevents many common installation
-problems. Firstly, simply choose how you'd like to create your virtual environment:
-
-* :ref:`using-venv` (quick and easy, involves two commands)
-* :ref:`using-pyenv-virtualenv` (recommended if you installed Python with pyenv)
-
-**What Are Virtual Environments For?**
-
-Virtual environments allow you to isolate Red's library dependencies, cog dependencies and python
-binaries from the rest of your system. It also makes sure Red and its dependencies are installed to
-a predictable location. It makes uninstalling Red as simple as removing a single folder, without
-worrying about losing your data or other things on your system becoming broken.
-
-.. _using-venv:
-
---------------
-Using ``venv``
---------------
-This is the quickest way to get your virtual environment up and running, as `venv` is shipped with
-python.
-
-First, choose a directory where you would like to create your virtual environment. It's a good idea
-to keep it in a location which is easy to type out the path to. From now, we'll call it
-``redenv`` and it will be located in your home directory.
-
-~~~~~~~~~~~~~~~~~~~~~~~~
-``venv`` on Linux or Mac
-~~~~~~~~~~~~~~~~~~~~~~~~
-Create your virtual environment with the following command::
-
-    python3.8 -m venv ~/redenv
-
-And activate it with the following command::
-
-    source ~/redenv/bin/activate
-
-.. important::
-
-    You must activate the virtual environment with the above command every time you open a new
-    shell to run, install or update Red.
-
-Continue reading `below <after-activating-virtual-environment>`.
-
-~~~~~~~~~~~~~~~~~~~
-``venv`` on Windows
-~~~~~~~~~~~~~~~~~~~
-Create your virtual environment with the following command::
-
-    py -3.8 -m venv %userprofile%\redenv
-
-And activate it with the following command::
-
-    %userprofile%\redenv\Scripts\activate.bat
-
-.. important::
-
-    You must activate the virtual environment with the above command every time you open a new
-    Command Prompt to run, install or update Red.
-
-Continue reading `below <after-activating-virtual-environment>`.
-
-.. _using-pyenv-virtualenv:
-
---------------------------
-Using ``pyenv virtualenv``
---------------------------
-
-.. note::
-
-    This is for non-Windows users only.
-
-Using ``pyenv virtualenv`` saves you the headache of remembering where you installed your virtual
-environments. If you haven't already, install pyenv with `pyenv-installer`_.
-
-First, ensure your pyenv interpreter is set to python 3.8.1 or greater with the following command::
-
-    pyenv version
-
-Now, create a virtual environment with the following command::
-
-    pyenv virtualenv <name>
-
-Replace ``<name>`` with whatever you like. If you forget what you named it, use the command ``pyenv
-versions``.
-
-Now activate your virtualenv with the following command::
-
-    pyenv shell <name>
-
-.. important::
-
-    You must activate the virtual environment with the above command every time you open a new
-    shell to run, install or update Red. You can check out other commands like ``pyenv local`` and
-    ``pyenv global`` if you wish to keep the virtualenv activated all the time.
-
-Continue reading `below <after-activating-virtual-environment>`.
-
-.. _pyenv-installer: https://github.com/pyenv/pyenv-installer/blob/master/README.rst
-
-----
-
-.. _after-activating-virtual-environment:
-
-Once activated, your ``PATH`` environment variable will be modified to use the virtual
-environment's python executables, as well as other executables like ``pip``.
-
-From here, install Red using the commands listed on your installation guide (`Windows
-<installing-red-windows>` or `Non-Windows <installing-red-linux-mac>`).
-
-.. note::
-
-    The alternative to activating the virtual environment each time you open a new shell is to
-    provide the full path to the executable. This will automatically use the virtual environment's
-    python interpreter and installed libraries.
-
---------------------------------------------
-Virtual Environments with Multiple Instances
---------------------------------------------
-If you are running multiple instances of Red on the same machine, you have the option of either
-using the same virtual environment for all of them, or creating separate ones.
-
-.. note::
-
-    This only applies for multiple instances of V3. If you are running a V2 instance as well,
-    You **must** use separate virtual environments.
-
-The advantages of using a *single* virtual environment for all of your V3 instances are:
-
-- When updating Red, you will only need to update it once for all instances (however you will still need to restart all instances for the changes to take effect)
-- It will save space on your hard drive
-
-On the other hand, you may wish to update each of your instances individually.
-
-.. important::
-
-    Windows users with multiple instances should create *separate* virtual environments, as
-    updating multiple running instances at once is likely to cause errors.

docs/version_guarantees.rst

@@ -17,9 +17,16 @@ Guarantees
 Anything in the ``redbot.core`` module or any of its submodules 
 which is not private (even if not documented) should not break without notice.
 
-Anything in the ``redbot.cogs`` module or any of it's submodules is specifically
+Anything in the ``redbot.cogs`` and ``redbot.vendored`` modules or any of their submodules is specifically
 excluded from being guaranteed.
 
+Method names and names of attributes of classes, functions, extensions, and modules
+provided by or provided to the bot should not begin with 
+``red_`` or be of the form ``__red_*__`` except as documented.
+This allows us to add certain optional features non-breakingly without a name conflict.
+
+Any RPC method exposed by Red may break without notice.
+
 If you would like something in here to be guaranteed,
 open an issue making a case for it to be moved.
 

make.bat

@@ -5,37 +5,29 @@ if [%1] == [] goto help
 REM This allows us to expand variables at execution
 setlocal ENABLEDELAYEDEXPANSION
 
-REM This will set PYFILES as a list of tracked .py files
-set PYFILES=
-for /F "tokens=* USEBACKQ" %%A in (`git ls-files "*.py"`) do (
-    set PYFILES=!PYFILES! %%A
-)
-
 goto %1
 
 :reformat
-black -l 99 --target-version py38 !PYFILES!
+black "%~dp0."
 exit /B %ERRORLEVEL%
 
 :stylecheck
-black -l 99 --check --target-version py38 !PYFILES!
+black --check "%~dp0."
+exit /B %ERRORLEVEL%
+
+:stylediff
+black --check --diff "%~dp0."
 exit /B %ERRORLEVEL%
 
 :newenv
 py -3.8 -m venv --clear .venv
-.\.venv\Scripts\python -m pip install -U pip setuptools
+.\.venv\Scripts\python -m pip install -U pip setuptools wheel
 goto syncenv
 
 :syncenv
 .\.venv\Scripts\python -m pip install -Ur .\tools\dev-requirements.txt
 exit /B %ERRORLEVEL%
 
-:checkchangelog
-REM This should be written for windows at some point I guess.
-REM If we can swith to powershell, it can make this much easier.
-echo This doesn^'t do anything on windows ^(yet^)
-exit /b 0
-
 :help
 echo Usage:
 echo   make ^<command^>

pyproject.toml

@@ -1,125 +1,23 @@
-[tool.towncrier]
-    package = "redbot"
-    filename = "CHANGELOG.rst"
-    directory = "changelog.d"
-    issue_format = "`#{issue} <https://github.com/Cog-Creators/Red-DiscordBot/issues/{issue}>`_"
+[tool.black]
+    line-length = 99
+    target-version = ['py38']
+    include = '\.py$'
+    exclude = '''
+    /(
+          \.eggs
+        | \.git
+        | \.hg
+        | \.mypy_cache
+        | \.tox
+        | \.venv
+        | _build
+        | buck-out
+        | build
+        | dist
+        | redbot\/vendored
+    )/
+    '''
 
-    [[tool.towncrier.section]]
-        path = ""
-        name = "Core Bot Changes"
-
-    [[tool.towncrier.section]]
-        path = "admin"
-        name = "Admin"
-
-    [[tool.towncrier.section]]
-        path = "alias"
-        name = "Alias"
-    
-    [[tool.towncrier.section]]
-        path = "audio"
-        name = "Audio"
-
-    [[tool.towncrier.section]]
-        path = "bank"
-        name = "Bank"
-    
-    [[tool.towncrier.section]]
-        path = "cleanup"
-        name = "Cleanup"
-    
-    [[tool.towncrier.section]]
-        path = "customcom"
-        name = "CustomCom"
-    
-    [[tool.towncrier.section]]
-        path = "downloader"
-        name = "Downloader"
-
-    [[tool.towncrier.section]]
-        path = "economy"
-        name = "Economy"
-    
-    [[tool.towncrier.section]]
-        path = "filter"
-        name = "Filter"
-    
-    [[tool.towncrier.section]]
-        path = "general"
-        name = "General"
-    
-    [[tool.towncrier.section]]
-        path = "image"
-        name = "Image"
-    
-    [[tool.towncrier.section]]
-        path = "mod"
-        name = "Mod"
-
-    [[tool.towncrier.section]]
-        path = "modlog"
-        name = "ModLog"
-    
-    [[tool.towncrier.section]]
-        path = "mutes"
-        name = "Mutes"
-    
-    [[tool.towncrier.section]]
-        path = "permissions"
-        name = "Permissions"
-
-    [[tool.towncrier.section]]
-        path = "reports"
-        name = "Reports"
-    
-    [[tool.towncrier.section]]
-        path = "streams"
-        name = "Streams"
-    
-    [[tool.towncrier.section]]
-        path = "trivia"
-        name = "Trivia"
-    
-    [[tool.towncrier.section]]
-        path = "warnings"
-        name = "Warnings"
-
-    [[tool.towncrier.type]]
-        directory = "breaking"
-        name = "Breaking Changes"
-        showcontent = true
-
-    [[tool.towncrier.type]]
-        directory = "bugfix"
-        name = "Bug Fixes"
-        showcontent = true
-
-    [[tool.towncrier.type]]
-        directory = "enhance"
-        name = "Enhancements"
-        showcontent = true
-
-    [[tool.towncrier.type]]
-        directory = "feature"
-        name = "New Feature"
-        showcontent = true
-
-    [[tool.towncrier.type]]
-        directory = "removal"
-        name = "Removals"
-        showcontent = true
-
-    [[tool.towncrier.type]]
-        directory = "misc"
-        name = "Miscellaneous changes"
-        showcontent = false
-
-    [[tool.towncrier.type]]
-        directory = "dep"
-        name = "Changes to dependencies"
-        showcontent = true
-
-    [[tool.towncrier.type]]
-        directory = "docs"
-        name = "Documentation Changes"
-        showcontent = true
+[tool.pytest.ini_options]
+    minversion = "6.0"
+    addopts = "--import-mode=importlib"

redbot/__init__.py

@@ -191,8 +191,25 @@ def _update_event_loop_policy():
             _asyncio.set_event_loop_policy(_uvloop.EventLoopPolicy())
 
 
-__version__ = "3.3.2.dev1"
+__version__ = "3.4.1"
 version_info = VersionInfo.from_str(__version__)
 
 # Filter fuzzywuzzy slow sequence matcher warning
 _warnings.filterwarnings("ignore", module=r"fuzzywuzzy.*")
+# Show DeprecationWarning
+_warnings.filterwarnings("default", category=DeprecationWarning)
+
+if "--debug" not in _sys.argv:
+    # DEP-WARN
+    # Individual warnings - tracked in https://github.com/Cog-Creators/Red-DiscordBot/issues/3529
+    # DeprecationWarning: an integer is required (got type float).  Implicit conversion to integers using __int__ is deprecated, and may be removed in a future version of Python.
+    _warnings.filterwarnings("ignore", category=DeprecationWarning, module="importlib", lineno=219)
+    # DeprecationWarning: "@coroutine" decorator is deprecated since Python 3.8, use "async def" instead
+    #   def noop(*args, **kwargs):  # type: ignore
+    _warnings.filterwarnings("ignore", category=DeprecationWarning, module="aiohttp", lineno=107)
+    # DeprecationWarning: The loop argument is deprecated since Python 3.8, and scheduled for removal in Python 3.10.
+    #   hosts = await asyncio.shield(self._resolve_host(..
+    _warnings.filterwarnings("ignore", category=DeprecationWarning, module="aiohttp", lineno=964)
+    # DeprecationWarning: The loop argument is deprecated since Python 3.8, and scheduled for removal in Python 3.10.
+    #   self._event = asyncio.Event(loop=loop)
+    _warnings.filterwarnings("ignore", category=DeprecationWarning, module="aiohttp", lineno=21)

redbot/__main__.py

@@ -7,6 +7,7 @@ import json
 import logging
 import os
 import pip
+import pkg_resources
 import platform
 import shutil
 import signal
@@ -299,7 +300,7 @@ def handle_edit(cli_flags: Namespace):
     loop = asyncio.new_event_loop()
     asyncio.set_event_loop(loop)
     data_manager.load_basic_configuration(cli_flags.instance_name)
-    red = Red(cli_flags=cli_flags, description="Red V3", dm_help=None, fetch_offline_members=True)
+    red = Red(cli_flags=cli_flags, description="Red V3", dm_help=None)
     try:
         driver_cls = drivers.get_driver_class()
         loop.run_until_complete(driver_cls.initialize(**data_manager.storage_details()))
@@ -346,6 +347,14 @@ async def run_bot(red: Red, cli_flags: Namespace) -> None:
     LIB_PATH.mkdir(parents=True, exist_ok=True)
     if str(LIB_PATH) not in sys.path:
         sys.path.append(str(LIB_PATH))
+
+        # "It's important to note that the global `working_set` object is initialized from
+        # `sys.path` when `pkg_resources` is first imported, but is only updated if you do
+        # all future `sys.path` manipulation via `pkg_resources` APIs. If you manually modify
+        # `sys.path`, you must invoke the appropriate methods on the `working_set` instance
+        # to keep it in sync."
+        # Source: https://setuptools.readthedocs.io/en/latest/pkg_resources.html#workingset-objects
+        pkg_resources.working_set.add_entry(str(LIB_PATH))
     sys.meta_path.insert(0, SharedLibImportWarner())
 
     if cli_flags.token:
@@ -382,6 +391,13 @@ async def run_bot(red: Red, cli_flags: Namespace) -> None:
                 print("Token has been reset.")
                 sys.exit(0)
         sys.exit(1)
+    except discord.PrivilegedIntentsRequired:
+        print(
+            "Red requires all Privileged Intents to be enabled.\n"
+            "You can find out how to enable Privileged Intents with this guide:\n"
+            "https://docs.discord.red/en/stable/bot_application_guide.html#enabling-privileged-intents"
+        )
+        sys.exit(1)
 
     return None
 
@@ -430,6 +446,9 @@ def global_exception_handler(red, loop, context):
     msg = context.get("exception", context["message"])
     # These will get handled later when it *also* kills loop.run_forever
     if not isinstance(msg, (KeyboardInterrupt, SystemExit)):
+        if isinstance(msg, Exception):
+            log.critical("Caught unhandled exception in task:\n", exc_info=msg)
+        else:
             log.critical("Caught unhandled exception in task: %s", msg)
 
 
@@ -475,9 +494,7 @@ def main():
 
         data_manager.load_basic_configuration(cli_flags.instance_name)
 
-        red = Red(
-            cli_flags=cli_flags, description="Red V3", dm_help=None, fetch_offline_members=True
-        )
+        red = Red(cli_flags=cli_flags, description="Red V3", dm_help=None)
 
         if os.name != "nt":
             # None of this works on windows.
@@ -491,7 +508,7 @@ def main():
         exc_handler = functools.partial(global_exception_handler, red)
         loop.set_exception_handler(exc_handler)
         # We actually can't (just) use asyncio.run here
-        # We probably could if we didnt support windows, but we might run into
+        # We probably could if we didn't support windows, but we might run into
         # a scenario where this isn't true if anyone works on RPC more in the future
         fut = loop.create_task(run_bot(red, cli_flags))
         r_exc_handler = functools.partial(red_exception_handler, red)
@@ -516,7 +533,7 @@ def main():
             loop.run_until_complete(shutdown_handler(red, None, ExitCodes.CRITICAL))
     finally:
         # Allows transports to close properly, and prevent new ones from being opened.
-        # Transports may still not be closed correcly on windows, see below
+        # Transports may still not be closed correctly on windows, see below
         loop.run_until_complete(loop.shutdown_asyncgens())
         # *we* aren't cleaning up more here, but it prevents
         # a runtime error at the event loop on windows

redbot/cogs/admin/admin.py

@@ -1,3 +1,4 @@
+import asyncio
 import logging
 from typing import Tuple
 
@@ -70,17 +71,52 @@ class Admin(commands.Cog):
     """A collection of server administration utilities."""
 
     def __init__(self):
-        self.conf = Config.get_conf(self, 8237492837454039, force_registration=True)
+        self.config = Config.get_conf(self, 8237492837454039, force_registration=True)
 
-        self.conf.register_global(serverlocked=False)
+        self.config.register_global(serverlocked=False, schema_version=0)
 
-        self.conf.register_guild(
-            announce_ignore=False,
+        self.config.register_guild(
             announce_channel=None,  # Integer ID
             selfroles=[],  # List of integer ID's
         )
 
         self.__current_announcer = None
+        self._ready = asyncio.Event()
+        asyncio.create_task(self.handle_migrations())
+        # As this is a data migration, don't store this for cancelation.
+
+    async def cog_before_invoke(self, ctx: commands.Context):
+        await self._ready.wait()
+
+    async def red_delete_data_for_user(self, **kwargs):
+        """ Nothing to delete """
+        return
+
+    async def handle_migrations(self):
+
+        lock = self.config.get_guilds_lock()
+        async with lock:
+            # This prevents the edge case of someone loading admin,
+            # unloading it, loading it again during a migration
+            current_schema = await self.config.schema_version()
+
+            if current_schema == 0:
+                await self.migrate_config_from_0_to_1()
+                await self.config.schema_version.set(1)
+
+        self._ready.set()
+
+    async def migrate_config_from_0_to_1(self):
+
+        all_guilds = await self.config.all_guilds()
+
+        for guild_id, guild_data in all_guilds.items():
+            if guild_data.get("announce_ignore", False):
+                async with self.config.guild_from_id(guild_id).all(
+                    acquire_lock=False
+                ) as guild_config:
+                    guild_config.pop("announce_channel", None)
+                    guild_config.pop("announce_ignore", None)
 
     def cog_unload(self):
         try:
@@ -290,14 +326,14 @@ class Admin(commands.Cog):
     async def announce(self, ctx: commands.Context, *, message: str):
         """Announce a message to all servers the bot is in."""
         if not self.is_announcing():
-            announcer = Announcer(ctx, message, config=self.conf)
+            announcer = Announcer(ctx, message, config=self.config)
             announcer.start()
 
             self.__current_announcer = announcer
 
             await ctx.send(_("The announcement has begun."))
         else:
-            prefix = ctx.prefix
+            prefix = ctx.clean_prefix
             await ctx.send(_(RUNNING_ANNOUNCEMENT).format(prefix=prefix))
 
     @announce.command(name="cancel")
@@ -325,26 +361,16 @@ class Admin(commands.Cog):
         """
         if channel is None:
             channel = ctx.channel
-        await self.conf.guild(ctx.guild).announce_channel.set(channel.id)
+        await self.config.guild(ctx.guild).announce_channel.set(channel.id)
         await ctx.send(
             _("The announcement channel has been set to {channel.mention}").format(channel=channel)
         )
 
-    @announceset.command(name="ignore")
-    async def announceset_ignore(self, ctx):
-        """Toggle announcements being enabled this server."""
-        ignored = await self.conf.guild(ctx.guild).announce_ignore()
-        await self.conf.guild(ctx.guild).announce_ignore.set(not ignored)
-        if ignored:
-            await ctx.send(
-                _("The server {guild.name} will receive announcements.").format(guild=ctx.guild)
-            )
-        else:
-            await ctx.send(
-                _("The server {guild.name} will not receive announcements.").format(
-                    guild=ctx.guild
-                )
-            )
+    @announceset.command(name="clearchannel")
+    async def announceset_clear_channel(self, ctx):
+        """Unsets the channel for announcements."""
+        await self.config.guild(ctx.guild).announce_channel.clear()
+        await ctx.tick()
 
     async def _valid_selfroles(self, guild: discord.Guild) -> Tuple[discord.Role]:
         """
@@ -352,14 +378,14 @@ class Admin(commands.Cog):
         :param guild:
         :return:
         """
-        selfrole_ids = set(await self.conf.guild(guild).selfroles())
+        selfrole_ids = set(await self.config.guild(guild).selfroles())
         guild_roles = guild.roles
 
         valid_roles = tuple(r for r in guild_roles if r.id in selfrole_ids)
         valid_role_ids = set(r.id for r in valid_roles)
 
         if selfrole_ids != valid_role_ids:
-            await self.conf.guild(guild).selfroles.set(list(valid_role_ids))
+            await self.config.guild(guild).selfroles.set(list(valid_role_ids))
 
         # noinspection PyTypeChecker
         return valid_roles
@@ -427,7 +453,7 @@ class Admin(commands.Cog):
                 ).format(role=role)
             )
             return
-        async with self.conf.guild(ctx.guild).selfroles() as curr_selfroles:
+        async with self.config.guild(ctx.guild).selfroles() as curr_selfroles:
             if role.id not in curr_selfroles:
                 curr_selfroles.append(role.id)
                 await ctx.send(_("Added."))
@@ -449,7 +475,7 @@ class Admin(commands.Cog):
                 ).format(role=role)
             )
             return
-        async with self.conf.guild(ctx.guild).selfroles() as curr_selfroles:
+        async with self.config.guild(ctx.guild).selfroles() as curr_selfroles:
             curr_selfroles.remove(role.id)
 
         await ctx.send(_("Removed."))
@@ -458,8 +484,8 @@ class Admin(commands.Cog):
     @checks.is_owner()
     async def serverlock(self, ctx: commands.Context):
         """Lock a bot to its current servers only."""
-        serverlocked = await self.conf.serverlocked()
-        await self.conf.serverlocked.set(not serverlocked)
+        serverlocked = await self.config.serverlocked()
+        await self.config.serverlocked.set(not serverlocked)
 
         if serverlocked:
             await ctx.send(_("The bot is no longer serverlocked."))
@@ -467,8 +493,9 @@ class Admin(commands.Cog):
             await ctx.send(_("The bot is now serverlocked."))
 
     # region Event Handlers
+    @commands.Cog.listener()
     async def on_guild_join(self, guild: discord.Guild):
-        if await self.conf.serverlocked():
+        if await self.config.serverlocked():
             await guild.leave()
 
 

redbot/cogs/admin/announcer.py

@@ -1,8 +1,10 @@
 import asyncio
+from typing import Optional
 
 import discord
 from redbot.core import commands
 from redbot.core.i18n import Translator
+from redbot.core.utils import AsyncIter
 from redbot.core.utils.chat_formatting import humanize_list, inline
 
 _ = Translator("Announcer", __file__)
@@ -37,38 +39,29 @@ class Announcer:
         """
         self.active = False
 
-    async def _get_announce_channel(self, guild: discord.Guild) -> discord.TextChannel:
+    async def _get_announce_channel(self, guild: discord.Guild) -> Optional[discord.TextChannel]:
+        if await self.ctx.bot.cog_disabled_in_guild_raw("Admin", guild.id):
+            return
         channel_id = await self.config.guild(guild).announce_channel()
-        channel = None
-
-        if channel_id is not None:
-            channel = guild.get_channel(channel_id)
-
-        if channel is None:
-            channel = guild.system_channel
-
-        if channel is None:
-            channel = guild.text_channels[0]
-
-        return channel
+        return guild.get_channel(channel_id)
 
     async def announcer(self):
         guild_list = self.ctx.bot.guilds
         failed = []
-        for g in guild_list:
+        async for g in AsyncIter(guild_list, delay=0.5):
             if not self.active:
                 return
 
-            if await self.config.guild(g).announce_ignore():
-                continue
-
             channel = await self._get_announce_channel(g)
 
+            if channel:
+                if channel.permissions_for(g.me).send_messages:
                     try:
                         await channel.send(self.message)
                     except discord.Forbidden:
                         failed.append(str(g.id))
-            await asyncio.sleep(0.5)
+                else:
+                    failed.append(str(g.id))
 
         if failed:
             msg = (

redbot/cogs/admin/converters.py

@@ -14,8 +14,7 @@ class SelfRole(commands.Converter):
         role_converter = commands.RoleConverter()
         role = await role_converter.convert(ctx, arg)
 
-        conf = admin.conf
-        selfroles = await conf.guild(ctx.guild).selfroles()
+        selfroles = await admin.config.guild(ctx.guild).selfroles()
 
         if role.id not in selfroles:
             raise commands.BadArgument(_("The provided role is not a valid selfrole."))

redbot/cogs/admin/locales/af-ZA.po

@@ -1,9 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2019-07-14 04:24+0000\n"
-"PO-Revision-Date: 2020-01-07 21:47\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2020-09-03 12:24+0000\n"
+"Last-Translator: \n"
 "Language-Team: Afrikaans\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -11,175 +10,223 @@ msgstr ""
 "Generated-By: redgettext 3.1\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Crowdin-Project: red-discordbot\n"
+"X-Crowdin-Project-ID: 289505\n"
 "X-Crowdin-Language: af\n"
-"X-Crowdin-File: /admin/locales/messages.pot\n"
+"X-Crowdin-File-ID: 42\n"
 "Language: af_ZA\n"
 
-#: redbot/cogs/admin/admin.py:17
+#: redbot/cogs/admin/admin.py:18
 msgid "I attempted to do something that Discord denied me permissions for. Your command failed to successfully complete."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:22
-msgid "I tried to {verb} {role.name} to {member.display_name} but that role is higher than my highest role in the Discord hierarchy so I was unable to successfully add it. Please give me a higher role and try again."
+#: redbot/cogs/admin/admin.py:23
+msgid "I can not give {role.name} to {member.display_name} because that role is higher than or equal to my highest role in the Discord hierarchy."
 msgstr ""
 
 #: redbot/cogs/admin/admin.py:29
-msgid "I tried to {verb} {role.name} to {member.display_name} but that role is higher than your highest role in the Discord hierarchy so I was unable to successfully add it. Please get a higher role and try again."
+msgid "I can not remove {role.name} from {member.display_name} because that role is higher than or equal to my highest role in the Discord hierarchy."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:36
-msgid "I tried to edit {role.name} but that role is higher than your highest role in the Discord hierarchy so I was unable to successfully add it. Please get a higher role and try again."
+#: redbot/cogs/admin/admin.py:35
+msgid "I can not edit {role.name} because that role is higher than my or equal to highest role in the Discord hierarchy."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:43
-msgid "I am already announcing something. If you would like to make a different announcement please use `{prefix}announce cancel` first."
+#: redbot/cogs/admin/admin.py:41
+msgid "I can not let you give {role.name} to {member.display_name} because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:47
+msgid "I can not let you remove {role.name} from {member.display_name} because that role is higher than or equal to your highest role in the Discord hierarchy."
 msgstr ""
 
 #: redbot/cogs/admin/admin.py:53
+msgid "I can not let you edit {role.name} because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:59
+msgid "I need manage roles permission to do that."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:61
+msgid "I am already announcing something. If you would like to make a different announcement please use `{prefix}announce cancel` first."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:71
 #, docstring
 msgid "A collection of server administration utilities."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:115 redbot/cogs/admin/admin.py:160
-msgid "add"
+#: redbot/cogs/admin/admin.py:162
+msgid "{member.display_name} already has the role {role.name}."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:121
+#: redbot/cogs/admin/admin.py:182
 msgid "I successfully added {role.name} to {member.display_name}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:132 redbot/cogs/admin/admin.py:180
-msgid "remove"
+#: redbot/cogs/admin/admin.py:192
+msgid "{member.display_name} does not have the role {role.name}."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:138
+#: redbot/cogs/admin/admin.py:212
 msgid "I successfully removed {role.name} from {member.display_name}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:149
+#: redbot/cogs/admin/admin.py:223
 #, docstring
-msgid "Add a role to a user.\\n\\n        If user is left blank it defaults to the author of the command.\\n        "
+msgid "\\n        Add a role to a user.\\n\\n        Use double quotes if the role contains spaces.\\n        If user is left blank it defaults to the author of the command.\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:169
+#: redbot/cogs/admin/admin.py:239
 #, docstring
-msgid "Remove a role from a user.\\n\\n        If user is left blank it defaults to the author of the command.\\n        "
+msgid "\\n        Remove a role from a user.\\n\\n        Use double quotes if the role contains spaces.\\n        If user is left blank it defaults to the author of the command.\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:187
+#: redbot/cogs/admin/admin.py:253
 #, docstring
 msgid "Edit role settings."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:194
+#: redbot/cogs/admin/admin.py:260
 #, docstring
-msgid "Edit a role's colour.\\n\\n        Use double quotes if the role contains spaces.\\n        Colour must be in hexadecimal format.\\n        [Online colour picker](http://www.w3schools.com/colors/colors_picker.asp)\\n\\n        Examples:\\n            `[p]editrole colour \\\"The Transistor\\\" #ff0000`\\n            `[p]editrole colour Test #ff9900`\\n        "
+msgid "\\n        Edit a role's colour.\\n\\n        Use double quotes if the role contains spaces.\\n        Colour must be in hexadecimal format.\\n        [Online colour picker](http://www.w3schools.com/colors/colors_picker.asp)\\n\\n        Examples:\\n            `[p]editrole colour \\\"The Transistor\\\" #ff0000`\\n            `[p]editrole colour Test #ff9900`\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:217 redbot/cogs/admin/admin.py:245
+#: redbot/cogs/admin/admin.py:289 redbot/cogs/admin/admin.py:322
 msgid "Done."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:222
+#: redbot/cogs/admin/admin.py:293
 #, docstring
-msgid "Edit a role's name.\\n\\n        Use double quotes if the role or the name contain spaces.\\n\\n        Examples:\\n            `[p]editrole name \\\"The Transistor\\\" Test`\\n        "
+msgid "\\n        Edit a role's name.\\n\\n        Use double quotes if the role or the name contain spaces.\\n\\n        Example:\\n            `[p]editrole name \\\"The Transistor\\\" Test`\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:250
+#: redbot/cogs/admin/admin.py:327
 #, docstring
 msgid "Announce a message to all servers the bot is in."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:257
+#: redbot/cogs/admin/admin.py:334
 msgid "The announcement has begun."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:265
+#: redbot/cogs/admin/admin.py:341
 #, docstring
 msgid "Cancel a running announce."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:271
+#: redbot/cogs/admin/admin.py:343
+msgid "There is no currently running announcement."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:346
 msgid "The current announcement has been cancelled."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:277
+#: redbot/cogs/admin/admin.py:352
 #, docstring
-msgid "Change the channel to which the bot makes announcements."
+msgid "Change how announcements are sent in this guild."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:283
+#: redbot/cogs/admin/admin.py:357
+#, docstring
+msgid "\\n        Change the channel where the bot will send announcements.\\n\\n        If channel is left blank it defaults to the current channel.\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:366
 msgid "The announcement channel has been set to {channel.mention}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:290
-#, docstring
-msgid "Toggle announcements being enabled this server."
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:296
-msgid "The server {guild.name} will receive announcements."
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:300
-msgid "The server {guild.name} will not receive announcements."
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:326
-#, docstring
-msgid "Add a role to yourself.\\n\\n        Server admins must have configured the role as user settable.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:337
-#, docstring
-msgid "Remove a selfrole from yourself.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:347
-#, docstring
-msgid "Add a role to the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:355 redbot/cogs/admin/admin.py:367
-msgid "The selfroles list has been successfully modified."
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:360
-#, docstring
-msgid "Remove a role from the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr ""
-
 #: redbot/cogs/admin/admin.py:371
 #, docstring
+msgid "Unsets the channel for announcements."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:396
+#, docstring
+msgid "Apply selfroles."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:401
+#, docstring
+msgid "\\n        Add a selfrole to yourself.\\n\\n        Server admins must have configured the role as user settable.\\n        NOTE: The role is case sensitive!\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:412
+#, docstring
+msgid "\\n        Remove a selfrole from yourself.\\n\\n        Server admins must have configured the role as user settable.\\n        NOTE: The role is case sensitive!\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:423
+#, docstring
 msgid "\\n        Lists all available selfroles.\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:377
+#: redbot/cogs/admin/admin.py:433
 msgid "Available Selfroles:\\n{selfroles}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:394
+#: redbot/cogs/admin/admin.py:439
+#, docstring
+msgid "Manage selfroles."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:444
+#, docstring
+msgid "\\n        Add a role to the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:451
+msgid "I cannot let you add {role.name} as a selfrole because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:459
+msgid "Added."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:462
+msgid "That role is already a selfrole."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:466
+#, docstring
+msgid "\\n        Remove a role from the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:473
+msgid "I cannot let you remove {role.name} from being a selfrole because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:481
+msgid "Removed."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:486
 #, docstring
 msgid "Lock a bot to its current servers only."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:399
+#: redbot/cogs/admin/admin.py:491
 msgid "The bot is no longer serverlocked."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:401
+#: redbot/cogs/admin/admin.py:493
 msgid "The bot is now serverlocked."
 msgstr ""
 
-#: redbot/cogs/admin/announcer.py:70
-msgid "I could not announce to server: {server.id}"
+#: redbot/cogs/admin/announcer.py:68
+msgid "I could not announce to the following server: "
 msgstr ""
 
-#: redbot/cogs/admin/converters.py:25
+#: redbot/cogs/admin/announcer.py:70
+msgid "I could not announce to the following servers: "
+msgstr ""
+
+#: redbot/cogs/admin/converters.py:12
 msgid "The Admin cog is not loaded."
 msgstr ""
 
-#: redbot/cogs/admin/converters.py:34
+#: redbot/cogs/admin/converters.py:20
 msgid "The provided role is not a valid selfrole."
 msgstr ""
 

redbot/cogs/admin/locales/ar-SA.po

@@ -1,9 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2019-07-14 04:24+0000\n"
-"PO-Revision-Date: 2020-01-07 21:47\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2020-09-03 12:24+0000\n"
+"Last-Translator: \n"
 "Language-Team: Arabic\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -11,175 +10,223 @@ msgstr ""
 "Generated-By: redgettext 3.1\n"
 "Plural-Forms: nplurals=6; plural=(n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5);\n"
 "X-Crowdin-Project: red-discordbot\n"
+"X-Crowdin-Project-ID: 289505\n"
 "X-Crowdin-Language: ar\n"
-"X-Crowdin-File: /admin/locales/messages.pot\n"
+"X-Crowdin-File-ID: 42\n"
 "Language: ar_SA\n"
 
-#: redbot/cogs/admin/admin.py:17
+#: redbot/cogs/admin/admin.py:18
 msgid "I attempted to do something that Discord denied me permissions for. Your command failed to successfully complete."
 msgstr "حاولت القيام بشيء لا أملك تصريح من ديسكورد لفعله. فشل أمرك في إكمال نجاحه."
 
-#: redbot/cogs/admin/admin.py:22
-msgid "I tried to {verb} {role.name} to {member.display_name} but that role is higher than my highest role in the Discord hierarchy so I was unable to successfully add it. Please give me a higher role and try again."
-msgstr "حاولت إضافة {role.name} إلى {member.display_name} ولكن هذه الرتبة هي أعلى من رتبتي في قائمة الرتب في السيرفر, لذلك فشل الأمر. حاول رفع رتبتي والمحاولة مجدداً."
+#: redbot/cogs/admin/admin.py:23
+msgid "I can not give {role.name} to {member.display_name} because that role is higher than or equal to my highest role in the Discord hierarchy."
+msgstr ""
 
 #: redbot/cogs/admin/admin.py:29
-msgid "I tried to {verb} {role.name} to {member.display_name} but that role is higher than your highest role in the Discord hierarchy so I was unable to successfully add it. Please get a higher role and try again."
-msgstr "لقد حاولت إضافة {role.name} إلى {member.display_name} ولكن هذه الرتبة هي أعلى من رتبتك في قائمة الرتب في السيرفر, لذلك فشل الأمر. حاول رفع رتبتي والمحاولة مجدداً."
+msgid "I can not remove {role.name} from {member.display_name} because that role is higher than or equal to my highest role in the Discord hierarchy."
+msgstr ""
 
-#: redbot/cogs/admin/admin.py:36
-msgid "I tried to edit {role.name} but that role is higher than your highest role in the Discord hierarchy so I was unable to successfully add it. Please get a higher role and try again."
-msgstr "لقد حاولت تعديل {role.name} لكن هذه الرتبة أعلى من أعلى رتبة في قائمة الرتبة, لذلك فشل الأمر. المرجو الحصول على رتبة أعلى أو رفع ترتيب الرتبة الحالية والمحاولة مجدداً."
+#: redbot/cogs/admin/admin.py:35
+msgid "I can not edit {role.name} because that role is higher than my or equal to highest role in the Discord hierarchy."
+msgstr ""
 
-#: redbot/cogs/admin/admin.py:43
+#: redbot/cogs/admin/admin.py:41
+msgid "I can not let you give {role.name} to {member.display_name} because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:47
+msgid "I can not let you remove {role.name} from {member.display_name} because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:53
+msgid "I can not let you edit {role.name} because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:59
+msgid "I need manage roles permission to do that."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:61
 msgid "I am already announcing something. If you would like to make a different announcement please use `{prefix}announce cancel` first."
 msgstr "أنا بالفعل أُعلن شيئاً. إذا كنت ترغب في إصدار إعلان مختلف الرجاء إستخدام `{prefix}announce cancel` أولاً."
 
-#: redbot/cogs/admin/admin.py:53
+#: redbot/cogs/admin/admin.py:71
 #, docstring
 msgid "A collection of server administration utilities."
 msgstr "مجموعة من أدوات إدارة السيرفر."
 
-#: redbot/cogs/admin/admin.py:115 redbot/cogs/admin/admin.py:160
-msgid "add"
-msgstr "إضافة"
+#: redbot/cogs/admin/admin.py:162
+msgid "{member.display_name} already has the role {role.name}."
+msgstr ""
 
-#: redbot/cogs/admin/admin.py:121
+#: redbot/cogs/admin/admin.py:182
 msgid "I successfully added {role.name} to {member.display_name}"
 msgstr "لقد قمت بنجاح بإضافة {role.name} إلى {member.display_name}"
 
-#: redbot/cogs/admin/admin.py:132 redbot/cogs/admin/admin.py:180
-msgid "remove"
-msgstr "إزالة"
+#: redbot/cogs/admin/admin.py:192
+msgid "{member.display_name} does not have the role {role.name}."
+msgstr ""
 
-#: redbot/cogs/admin/admin.py:138
+#: redbot/cogs/admin/admin.py:212
 msgid "I successfully removed {role.name} from {member.display_name}"
 msgstr "لقد قمت بنجاح بإزالة {role.name} من {member.display_name}"
 
-#: redbot/cogs/admin/admin.py:149
+#: redbot/cogs/admin/admin.py:223
 #, docstring
-msgid "Add a role to a user.\\n\\n        If user is left blank it defaults to the author of the command.\\n        "
-msgstr "إذا تم ترك المستخدم فارغ, فسيكون إفتراضياً صاحب الأمر. \\n        "
+msgid "\\n        Add a role to a user.\\n\\n        Use double quotes if the role contains spaces.\\n        If user is left blank it defaults to the author of the command.\\n        "
+msgstr ""
 
-#: redbot/cogs/admin/admin.py:169
+#: redbot/cogs/admin/admin.py:239
 #, docstring
-msgid "Remove a role from a user.\\n\\n        If user is left blank it defaults to the author of the command.\\n        "
-msgstr "إذا تم ترك المستخدم فارغ, فسيكون إفتراضياً صاحب الأمر.\\n        "
+msgid "\\n        Remove a role from a user.\\n\\n        Use double quotes if the role contains spaces.\\n        If user is left blank it defaults to the author of the command.\\n        "
+msgstr ""
 
-#: redbot/cogs/admin/admin.py:187
+#: redbot/cogs/admin/admin.py:253
 #, docstring
 msgid "Edit role settings."
 msgstr "تعديل إعدادات الرتبة."
 
-#: redbot/cogs/admin/admin.py:194
+#: redbot/cogs/admin/admin.py:260
 #, docstring
-msgid "Edit a role's colour.\\n\\n        Use double quotes if the role contains spaces.\\n        Colour must be in hexadecimal format.\\n        [Online colour picker](http://www.w3schools.com/colors/colors_picker.asp)\\n\\n        Examples:\\n            `[p]editrole colour \\\"The Transistor\\\" #ff0000`\\n            `[p]editrole colour Test #ff9900`\\n        "
-msgstr "استخدم علامة اقتباس مزدوجة إذا كانت الرتبة تحتوي على مسافات.\\n        يجب أن يكون اللون بتنسيق سداسي عشري.\\n        موقع لإختيار الألوان (http://www.w3schools.com/colors/colors_picker.asp)\\n\\n        أمثلة:\\n            `[p]editrole colour \"The Transistor\" #ff0000`           \\n            `[p]editrole colour Test #ff9900`\\n        "
+msgid "\\n        Edit a role's colour.\\n\\n        Use double quotes if the role contains spaces.\\n        Colour must be in hexadecimal format.\\n        [Online colour picker](http://www.w3schools.com/colors/colors_picker.asp)\\n\\n        Examples:\\n            `[p]editrole colour \\\"The Transistor\\\" #ff0000`\\n            `[p]editrole colour Test #ff9900`\\n        "
+msgstr ""
 
-#: redbot/cogs/admin/admin.py:217 redbot/cogs/admin/admin.py:245
+#: redbot/cogs/admin/admin.py:289 redbot/cogs/admin/admin.py:322
 msgid "Done."
 msgstr "تم."
 
-#: redbot/cogs/admin/admin.py:222
+#: redbot/cogs/admin/admin.py:293
 #, docstring
-msgid "Edit a role's name.\\n\\n        Use double quotes if the role or the name contain spaces.\\n\\n        Examples:\\n            `[p]editrole name \\\"The Transistor\\\" Test`\\n        "
-msgstr "تعديل إسم الرتبة.\\n\\n          استخدم علامة اقتباس مزدوجة إذا كانت الرتبة تحتوي على مسافات.\\n\\n        أمثلة:\\n            `[p]editrole name \"The Transistor\" Test`\\n        "
+msgid "\\n        Edit a role's name.\\n\\n        Use double quotes if the role or the name contain spaces.\\n\\n        Example:\\n            `[p]editrole name \\\"The Transistor\\\" Test`\\n        "
+msgstr ""
 
-#: redbot/cogs/admin/admin.py:250
+#: redbot/cogs/admin/admin.py:327
 #, docstring
 msgid "Announce a message to all servers the bot is in."
 msgstr "الإعلان عن رسالة إلى جميع السيرفرات المتواجد بها البوت."
 
-#: redbot/cogs/admin/admin.py:257
+#: redbot/cogs/admin/admin.py:334
 msgid "The announcement has begun."
 msgstr "تم البدء في الإعلان."
 
-#: redbot/cogs/admin/admin.py:265
+#: redbot/cogs/admin/admin.py:341
 #, docstring
 msgid "Cancel a running announce."
 msgstr "إلغاء إعلان جارٍ."
 
-#: redbot/cogs/admin/admin.py:271
+#: redbot/cogs/admin/admin.py:343
+msgid "There is no currently running announcement."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:346
 msgid "The current announcement has been cancelled."
 msgstr "تم إلغاء الإعلان الحالي."
 
-#: redbot/cogs/admin/admin.py:277
+#: redbot/cogs/admin/admin.py:352
 #, docstring
-msgid "Change the channel to which the bot makes announcements."
-msgstr "تعديل القناة التي يستخدمها البوت للإعلانات."
+msgid "Change how announcements are sent in this guild."
+msgstr ""
 
-#: redbot/cogs/admin/admin.py:283
+#: redbot/cogs/admin/admin.py:357
+#, docstring
+msgid "\\n        Change the channel where the bot will send announcements.\\n\\n        If channel is left blank it defaults to the current channel.\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:366
 msgid "The announcement channel has been set to {channel.mention}"
 msgstr "تم تحديث قناة الإعلانات إلى {channel.mention}"
 
-#: redbot/cogs/admin/admin.py:290
-#, docstring
-msgid "Toggle announcements being enabled this server."
-msgstr "تم تمكين الإعلانات في السيرفر."
-
-#: redbot/cogs/admin/admin.py:296
-msgid "The server {guild.name} will receive announcements."
-msgstr "سيرفر {guild.name} سيتلقى إعلانات الآن."
-
-#: redbot/cogs/admin/admin.py:300
-msgid "The server {guild.name} will not receive announcements."
-msgstr "سيرفر {guild.name} لن يتلقى إعلانات."
-
-#: redbot/cogs/admin/admin.py:326
-#, docstring
-msgid "Add a role to yourself.\\n\\n        Server admins must have configured the role as user settable.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr "إضافة رتبة لنفسك.\\n\\n        يجب على أدمن السيرفر أولاً إضافة الرتبة.\\n\\n        ملاحظة: الرتبة حساسة لحالة الأحرف!\\n        "
-
-#: redbot/cogs/admin/admin.py:337
-#, docstring
-msgid "Remove a selfrole from yourself.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr "إزالة رتبة ذاتية من نفسك.\\n\\n        ملاحظة: الرتبة حساسة لحالة الأحرف!\\n        "
-
-#: redbot/cogs/admin/admin.py:347
-#, docstring
-msgid "Add a role to the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr "إضافة رتبة إلى قائمة الرتب الذاتية.\\n\\n        ملاحظة: الرتبة حساسة لحالة الأحرف!\\n        "
-
-#: redbot/cogs/admin/admin.py:355 redbot/cogs/admin/admin.py:367
-msgid "The selfroles list has been successfully modified."
-msgstr "تم تحديث/تعديل قائمة الرتب الذاتية بنجاح."
-
-#: redbot/cogs/admin/admin.py:360
-#, docstring
-msgid "Remove a role from the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr "إزالة الرتبة من قائمة الرتب الذاتية.\\n\\n        ملاحظة: الرتبة حساسة لحالة الأحرف!\\n        "
-
 #: redbot/cogs/admin/admin.py:371
 #, docstring
+msgid "Unsets the channel for announcements."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:396
+#, docstring
+msgid "Apply selfroles."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:401
+#, docstring
+msgid "\\n        Add a selfrole to yourself.\\n\\n        Server admins must have configured the role as user settable.\\n        NOTE: The role is case sensitive!\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:412
+#, docstring
+msgid "\\n        Remove a selfrole from yourself.\\n\\n        Server admins must have configured the role as user settable.\\n        NOTE: The role is case sensitive!\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:423
+#, docstring
 msgid "\\n        Lists all available selfroles.\\n        "
-msgstr "قائمة بجميع الرتب الذاتية."
+msgstr ""
 
-#: redbot/cogs/admin/admin.py:377
+#: redbot/cogs/admin/admin.py:433
 msgid "Available Selfroles:\\n{selfroles}"
-msgstr "الرتب الذاتية المتوفرة:\\n{selfroles}"
+msgstr ""
 
-#: redbot/cogs/admin/admin.py:394
+#: redbot/cogs/admin/admin.py:439
+#, docstring
+msgid "Manage selfroles."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:444
+#, docstring
+msgid "\\n        Add a role to the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:451
+msgid "I cannot let you add {role.name} as a selfrole because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:459
+msgid "Added."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:462
+msgid "That role is already a selfrole."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:466
+#, docstring
+msgid "\\n        Remove a role from the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:473
+msgid "I cannot let you remove {role.name} from being a selfrole because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:481
+msgid "Removed."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:486
 #, docstring
 msgid "Lock a bot to its current servers only."
 msgstr "قفل البوت للسيرفر الحالي فقط."
 
-#: redbot/cogs/admin/admin.py:399
+#: redbot/cogs/admin/admin.py:491
 msgid "The bot is no longer serverlocked."
 msgstr "لم يعد البوت مقفول للسيرفر الحالي فقط."
 
-#: redbot/cogs/admin/admin.py:401
+#: redbot/cogs/admin/admin.py:493
 msgid "The bot is now serverlocked."
 msgstr "لقد تم قفل البوت للسيرفر الحالي فقط."
 
-#: redbot/cogs/admin/announcer.py:70
-msgid "I could not announce to server: {server.id}"
-msgstr "لم أتمكن من الإعلان في السيرفر: {server.id}"
+#: redbot/cogs/admin/announcer.py:68
+msgid "I could not announce to the following server: "
+msgstr ""
 
-#: redbot/cogs/admin/converters.py:25
+#: redbot/cogs/admin/announcer.py:70
+msgid "I could not announce to the following servers: "
+msgstr ""
+
+#: redbot/cogs/admin/converters.py:12
 msgid "The Admin cog is not loaded."
 msgstr "لم يتم تحميل وحدة الأدمن cog."
 
-#: redbot/cogs/admin/converters.py:34
+#: redbot/cogs/admin/converters.py:20
 msgid "The provided role is not a valid selfrole."
 msgstr "الرتبة المذكورة ليست على قائمة الرتب الذاتية."
 

redbot/cogs/admin/locales/bg-BG.po

@@ -1,9 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2019-07-14 04:24+0000\n"
-"PO-Revision-Date: 2020-01-07 21:48\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2020-09-03 12:24+0000\n"
+"Last-Translator: \n"
 "Language-Team: Bulgarian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -11,175 +10,223 @@ msgstr ""
 "Generated-By: redgettext 3.1\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Crowdin-Project: red-discordbot\n"
+"X-Crowdin-Project-ID: 289505\n"
 "X-Crowdin-Language: bg\n"
-"X-Crowdin-File: /admin/locales/messages.pot\n"
+"X-Crowdin-File-ID: 42\n"
 "Language: bg_BG\n"
 
-#: redbot/cogs/admin/admin.py:17
+#: redbot/cogs/admin/admin.py:18
 msgid "I attempted to do something that Discord denied me permissions for. Your command failed to successfully complete."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:22
-msgid "I tried to {verb} {role.name} to {member.display_name} but that role is higher than my highest role in the Discord hierarchy so I was unable to successfully add it. Please give me a higher role and try again."
+#: redbot/cogs/admin/admin.py:23
+msgid "I can not give {role.name} to {member.display_name} because that role is higher than or equal to my highest role in the Discord hierarchy."
 msgstr ""
 
 #: redbot/cogs/admin/admin.py:29
-msgid "I tried to {verb} {role.name} to {member.display_name} but that role is higher than your highest role in the Discord hierarchy so I was unable to successfully add it. Please get a higher role and try again."
+msgid "I can not remove {role.name} from {member.display_name} because that role is higher than or equal to my highest role in the Discord hierarchy."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:36
-msgid "I tried to edit {role.name} but that role is higher than your highest role in the Discord hierarchy so I was unable to successfully add it. Please get a higher role and try again."
+#: redbot/cogs/admin/admin.py:35
+msgid "I can not edit {role.name} because that role is higher than my or equal to highest role in the Discord hierarchy."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:43
-msgid "I am already announcing something. If you would like to make a different announcement please use `{prefix}announce cancel` first."
+#: redbot/cogs/admin/admin.py:41
+msgid "I can not let you give {role.name} to {member.display_name} because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:47
+msgid "I can not let you remove {role.name} from {member.display_name} because that role is higher than or equal to your highest role in the Discord hierarchy."
 msgstr ""
 
 #: redbot/cogs/admin/admin.py:53
+msgid "I can not let you edit {role.name} because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:59
+msgid "I need manage roles permission to do that."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:61
+msgid "I am already announcing something. If you would like to make a different announcement please use `{prefix}announce cancel` first."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:71
 #, docstring
 msgid "A collection of server administration utilities."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:115 redbot/cogs/admin/admin.py:160
-msgid "add"
+#: redbot/cogs/admin/admin.py:162
+msgid "{member.display_name} already has the role {role.name}."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:121
+#: redbot/cogs/admin/admin.py:182
 msgid "I successfully added {role.name} to {member.display_name}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:132 redbot/cogs/admin/admin.py:180
-msgid "remove"
+#: redbot/cogs/admin/admin.py:192
+msgid "{member.display_name} does not have the role {role.name}."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:138
+#: redbot/cogs/admin/admin.py:212
 msgid "I successfully removed {role.name} from {member.display_name}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:149
+#: redbot/cogs/admin/admin.py:223
 #, docstring
-msgid "Add a role to a user.\\n\\n        If user is left blank it defaults to the author of the command.\\n        "
+msgid "\\n        Add a role to a user.\\n\\n        Use double quotes if the role contains spaces.\\n        If user is left blank it defaults to the author of the command.\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:169
+#: redbot/cogs/admin/admin.py:239
 #, docstring
-msgid "Remove a role from a user.\\n\\n        If user is left blank it defaults to the author of the command.\\n        "
+msgid "\\n        Remove a role from a user.\\n\\n        Use double quotes if the role contains spaces.\\n        If user is left blank it defaults to the author of the command.\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:187
+#: redbot/cogs/admin/admin.py:253
 #, docstring
 msgid "Edit role settings."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:194
+#: redbot/cogs/admin/admin.py:260
 #, docstring
-msgid "Edit a role's colour.\\n\\n        Use double quotes if the role contains spaces.\\n        Colour must be in hexadecimal format.\\n        [Online colour picker](http://www.w3schools.com/colors/colors_picker.asp)\\n\\n        Examples:\\n            `[p]editrole colour \\\"The Transistor\\\" #ff0000`\\n            `[p]editrole colour Test #ff9900`\\n        "
+msgid "\\n        Edit a role's colour.\\n\\n        Use double quotes if the role contains spaces.\\n        Colour must be in hexadecimal format.\\n        [Online colour picker](http://www.w3schools.com/colors/colors_picker.asp)\\n\\n        Examples:\\n            `[p]editrole colour \\\"The Transistor\\\" #ff0000`\\n            `[p]editrole colour Test #ff9900`\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:217 redbot/cogs/admin/admin.py:245
+#: redbot/cogs/admin/admin.py:289 redbot/cogs/admin/admin.py:322
 msgid "Done."
 msgstr "Завършено."
 
-#: redbot/cogs/admin/admin.py:222
+#: redbot/cogs/admin/admin.py:293
 #, docstring
-msgid "Edit a role's name.\\n\\n        Use double quotes if the role or the name contain spaces.\\n\\n        Examples:\\n            `[p]editrole name \\\"The Transistor\\\" Test`\\n        "
+msgid "\\n        Edit a role's name.\\n\\n        Use double quotes if the role or the name contain spaces.\\n\\n        Example:\\n            `[p]editrole name \\\"The Transistor\\\" Test`\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:250
+#: redbot/cogs/admin/admin.py:327
 #, docstring
 msgid "Announce a message to all servers the bot is in."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:257
+#: redbot/cogs/admin/admin.py:334
 msgid "The announcement has begun."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:265
+#: redbot/cogs/admin/admin.py:341
 #, docstring
 msgid "Cancel a running announce."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:271
+#: redbot/cogs/admin/admin.py:343
+msgid "There is no currently running announcement."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:346
 msgid "The current announcement has been cancelled."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:277
+#: redbot/cogs/admin/admin.py:352
 #, docstring
-msgid "Change the channel to which the bot makes announcements."
+msgid "Change how announcements are sent in this guild."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:283
+#: redbot/cogs/admin/admin.py:357
+#, docstring
+msgid "\\n        Change the channel where the bot will send announcements.\\n\\n        If channel is left blank it defaults to the current channel.\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:366
 msgid "The announcement channel has been set to {channel.mention}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:290
-#, docstring
-msgid "Toggle announcements being enabled this server."
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:296
-msgid "The server {guild.name} will receive announcements."
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:300
-msgid "The server {guild.name} will not receive announcements."
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:326
-#, docstring
-msgid "Add a role to yourself.\\n\\n        Server admins must have configured the role as user settable.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:337
-#, docstring
-msgid "Remove a selfrole from yourself.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:347
-#, docstring
-msgid "Add a role to the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:355 redbot/cogs/admin/admin.py:367
-msgid "The selfroles list has been successfully modified."
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:360
-#, docstring
-msgid "Remove a role from the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr ""
-
 #: redbot/cogs/admin/admin.py:371
 #, docstring
+msgid "Unsets the channel for announcements."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:396
+#, docstring
+msgid "Apply selfroles."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:401
+#, docstring
+msgid "\\n        Add a selfrole to yourself.\\n\\n        Server admins must have configured the role as user settable.\\n        NOTE: The role is case sensitive!\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:412
+#, docstring
+msgid "\\n        Remove a selfrole from yourself.\\n\\n        Server admins must have configured the role as user settable.\\n        NOTE: The role is case sensitive!\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:423
+#, docstring
 msgid "\\n        Lists all available selfroles.\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:377
+#: redbot/cogs/admin/admin.py:433
 msgid "Available Selfroles:\\n{selfroles}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:394
+#: redbot/cogs/admin/admin.py:439
+#, docstring
+msgid "Manage selfroles."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:444
+#, docstring
+msgid "\\n        Add a role to the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:451
+msgid "I cannot let you add {role.name} as a selfrole because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:459
+msgid "Added."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:462
+msgid "That role is already a selfrole."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:466
+#, docstring
+msgid "\\n        Remove a role from the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:473
+msgid "I cannot let you remove {role.name} from being a selfrole because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:481
+msgid "Removed."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:486
 #, docstring
 msgid "Lock a bot to its current servers only."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:399
+#: redbot/cogs/admin/admin.py:491
 msgid "The bot is no longer serverlocked."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:401
+#: redbot/cogs/admin/admin.py:493
 msgid "The bot is now serverlocked."
 msgstr ""
 
-#: redbot/cogs/admin/announcer.py:70
-msgid "I could not announce to server: {server.id}"
+#: redbot/cogs/admin/announcer.py:68
+msgid "I could not announce to the following server: "
 msgstr ""
 
-#: redbot/cogs/admin/converters.py:25
+#: redbot/cogs/admin/announcer.py:70
+msgid "I could not announce to the following servers: "
+msgstr ""
+
+#: redbot/cogs/admin/converters.py:12
 msgid "The Admin cog is not loaded."
 msgstr ""
 
-#: redbot/cogs/admin/converters.py:34
+#: redbot/cogs/admin/converters.py:20
 msgid "The provided role is not a valid selfrole."
 msgstr ""
 

redbot/cogs/admin/locales/bs-BA.po

@@ -0,0 +1,232 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: red-discordbot\n"
+"POT-Creation-Date: 2020-09-03 12:24+0000\n"
+"Last-Translator: \n"
+"Language-Team: Bosnian\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: redgettext 3.1\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Crowdin-Project: red-discordbot\n"
+"X-Crowdin-Project-ID: 289505\n"
+"X-Crowdin-Language: bs\n"
+"X-Crowdin-File-ID: 42\n"
+"Language: bs_BA\n"
+
+#: redbot/cogs/admin/admin.py:18
+msgid "I attempted to do something that Discord denied me permissions for. Your command failed to successfully complete."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:23
+msgid "I can not give {role.name} to {member.display_name} because that role is higher than or equal to my highest role in the Discord hierarchy."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:29
+msgid "I can not remove {role.name} from {member.display_name} because that role is higher than or equal to my highest role in the Discord hierarchy."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:35
+msgid "I can not edit {role.name} because that role is higher than my or equal to highest role in the Discord hierarchy."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:41
+msgid "I can not let you give {role.name} to {member.display_name} because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:47
+msgid "I can not let you remove {role.name} from {member.display_name} because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:53
+msgid "I can not let you edit {role.name} because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:59
+msgid "I need manage roles permission to do that."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:61
+msgid "I am already announcing something. If you would like to make a different announcement please use `{prefix}announce cancel` first."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:71
+#, docstring
+msgid "A collection of server administration utilities."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:162
+msgid "{member.display_name} already has the role {role.name}."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:182
+msgid "I successfully added {role.name} to {member.display_name}"
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:192
+msgid "{member.display_name} does not have the role {role.name}."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:212
+msgid "I successfully removed {role.name} from {member.display_name}"
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:223
+#, docstring
+msgid "\\n        Add a role to a user.\\n\\n        Use double quotes if the role contains spaces.\\n        If user is left blank it defaults to the author of the command.\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:239
+#, docstring
+msgid "\\n        Remove a role from a user.\\n\\n        Use double quotes if the role contains spaces.\\n        If user is left blank it defaults to the author of the command.\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:253
+#, docstring
+msgid "Edit role settings."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:260
+#, docstring
+msgid "\\n        Edit a role's colour.\\n\\n        Use double quotes if the role contains spaces.\\n        Colour must be in hexadecimal format.\\n        [Online colour picker](http://www.w3schools.com/colors/colors_picker.asp)\\n\\n        Examples:\\n            `[p]editrole colour \\\"The Transistor\\\" #ff0000`\\n            `[p]editrole colour Test #ff9900`\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:289 redbot/cogs/admin/admin.py:322
+msgid "Done."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:293
+#, docstring
+msgid "\\n        Edit a role's name.\\n\\n        Use double quotes if the role or the name contain spaces.\\n\\n        Example:\\n            `[p]editrole name \\\"The Transistor\\\" Test`\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:327
+#, docstring
+msgid "Announce a message to all servers the bot is in."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:334
+msgid "The announcement has begun."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:341
+#, docstring
+msgid "Cancel a running announce."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:343
+msgid "There is no currently running announcement."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:346
+msgid "The current announcement has been cancelled."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:352
+#, docstring
+msgid "Change how announcements are sent in this guild."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:357
+#, docstring
+msgid "\\n        Change the channel where the bot will send announcements.\\n\\n        If channel is left blank it defaults to the current channel.\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:366
+msgid "The announcement channel has been set to {channel.mention}"
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:371
+#, docstring
+msgid "Unsets the channel for announcements."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:396
+#, docstring
+msgid "Apply selfroles."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:401
+#, docstring
+msgid "\\n        Add a selfrole to yourself.\\n\\n        Server admins must have configured the role as user settable.\\n        NOTE: The role is case sensitive!\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:412
+#, docstring
+msgid "\\n        Remove a selfrole from yourself.\\n\\n        Server admins must have configured the role as user settable.\\n        NOTE: The role is case sensitive!\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:423
+#, docstring
+msgid "\\n        Lists all available selfroles.\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:433
+msgid "Available Selfroles:\\n{selfroles}"
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:439
+#, docstring
+msgid "Manage selfroles."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:444
+#, docstring
+msgid "\\n        Add a role to the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:451
+msgid "I cannot let you add {role.name} as a selfrole because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:459
+msgid "Added."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:462
+msgid "That role is already a selfrole."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:466
+#, docstring
+msgid "\\n        Remove a role from the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:473
+msgid "I cannot let you remove {role.name} from being a selfrole because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:481
+msgid "Removed."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:486
+#, docstring
+msgid "Lock a bot to its current servers only."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:491
+msgid "The bot is no longer serverlocked."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:493
+msgid "The bot is now serverlocked."
+msgstr ""
+
+#: redbot/cogs/admin/announcer.py:68
+msgid "I could not announce to the following server: "
+msgstr ""
+
+#: redbot/cogs/admin/announcer.py:70
+msgid "I could not announce to the following servers: "
+msgstr ""
+
+#: redbot/cogs/admin/converters.py:12
+msgid "The Admin cog is not loaded."
+msgstr ""
+
+#: redbot/cogs/admin/converters.py:20
+msgid "The provided role is not a valid selfrole."
+msgstr ""
+

redbot/cogs/admin/locales/ca-ES.po

@@ -1,9 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2019-07-14 04:24+0000\n"
-"PO-Revision-Date: 2020-01-07 21:48\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2020-09-03 12:24+0000\n"
+"Last-Translator: \n"
 "Language-Team: Catalan\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -11,175 +10,223 @@ msgstr ""
 "Generated-By: redgettext 3.1\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Crowdin-Project: red-discordbot\n"
+"X-Crowdin-Project-ID: 289505\n"
 "X-Crowdin-Language: ca\n"
-"X-Crowdin-File: /admin/locales/messages.pot\n"
+"X-Crowdin-File-ID: 42\n"
 "Language: ca_ES\n"
 
-#: redbot/cogs/admin/admin.py:17
+#: redbot/cogs/admin/admin.py:18
 msgid "I attempted to do something that Discord denied me permissions for. Your command failed to successfully complete."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:22
-msgid "I tried to {verb} {role.name} to {member.display_name} but that role is higher than my highest role in the Discord hierarchy so I was unable to successfully add it. Please give me a higher role and try again."
+#: redbot/cogs/admin/admin.py:23
+msgid "I can not give {role.name} to {member.display_name} because that role is higher than or equal to my highest role in the Discord hierarchy."
 msgstr ""
 
 #: redbot/cogs/admin/admin.py:29
-msgid "I tried to {verb} {role.name} to {member.display_name} but that role is higher than your highest role in the Discord hierarchy so I was unable to successfully add it. Please get a higher role and try again."
+msgid "I can not remove {role.name} from {member.display_name} because that role is higher than or equal to my highest role in the Discord hierarchy."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:36
-msgid "I tried to edit {role.name} but that role is higher than your highest role in the Discord hierarchy so I was unable to successfully add it. Please get a higher role and try again."
+#: redbot/cogs/admin/admin.py:35
+msgid "I can not edit {role.name} because that role is higher than my or equal to highest role in the Discord hierarchy."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:43
-msgid "I am already announcing something. If you would like to make a different announcement please use `{prefix}announce cancel` first."
+#: redbot/cogs/admin/admin.py:41
+msgid "I can not let you give {role.name} to {member.display_name} because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:47
+msgid "I can not let you remove {role.name} from {member.display_name} because that role is higher than or equal to your highest role in the Discord hierarchy."
 msgstr ""
 
 #: redbot/cogs/admin/admin.py:53
+msgid "I can not let you edit {role.name} because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:59
+msgid "I need manage roles permission to do that."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:61
+msgid "I am already announcing something. If you would like to make a different announcement please use `{prefix}announce cancel` first."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:71
 #, docstring
 msgid "A collection of server administration utilities."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:115 redbot/cogs/admin/admin.py:160
-msgid "add"
+#: redbot/cogs/admin/admin.py:162
+msgid "{member.display_name} already has the role {role.name}."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:121
+#: redbot/cogs/admin/admin.py:182
 msgid "I successfully added {role.name} to {member.display_name}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:132 redbot/cogs/admin/admin.py:180
-msgid "remove"
+#: redbot/cogs/admin/admin.py:192
+msgid "{member.display_name} does not have the role {role.name}."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:138
+#: redbot/cogs/admin/admin.py:212
 msgid "I successfully removed {role.name} from {member.display_name}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:149
+#: redbot/cogs/admin/admin.py:223
 #, docstring
-msgid "Add a role to a user.\\n\\n        If user is left blank it defaults to the author of the command.\\n        "
+msgid "\\n        Add a role to a user.\\n\\n        Use double quotes if the role contains spaces.\\n        If user is left blank it defaults to the author of the command.\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:169
+#: redbot/cogs/admin/admin.py:239
 #, docstring
-msgid "Remove a role from a user.\\n\\n        If user is left blank it defaults to the author of the command.\\n        "
+msgid "\\n        Remove a role from a user.\\n\\n        Use double quotes if the role contains spaces.\\n        If user is left blank it defaults to the author of the command.\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:187
+#: redbot/cogs/admin/admin.py:253
 #, docstring
 msgid "Edit role settings."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:194
+#: redbot/cogs/admin/admin.py:260
 #, docstring
-msgid "Edit a role's colour.\\n\\n        Use double quotes if the role contains spaces.\\n        Colour must be in hexadecimal format.\\n        [Online colour picker](http://www.w3schools.com/colors/colors_picker.asp)\\n\\n        Examples:\\n            `[p]editrole colour \\\"The Transistor\\\" #ff0000`\\n            `[p]editrole colour Test #ff9900`\\n        "
+msgid "\\n        Edit a role's colour.\\n\\n        Use double quotes if the role contains spaces.\\n        Colour must be in hexadecimal format.\\n        [Online colour picker](http://www.w3schools.com/colors/colors_picker.asp)\\n\\n        Examples:\\n            `[p]editrole colour \\\"The Transistor\\\" #ff0000`\\n            `[p]editrole colour Test #ff9900`\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:217 redbot/cogs/admin/admin.py:245
+#: redbot/cogs/admin/admin.py:289 redbot/cogs/admin/admin.py:322
 msgid "Done."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:222
+#: redbot/cogs/admin/admin.py:293
 #, docstring
-msgid "Edit a role's name.\\n\\n        Use double quotes if the role or the name contain spaces.\\n\\n        Examples:\\n            `[p]editrole name \\\"The Transistor\\\" Test`\\n        "
+msgid "\\n        Edit a role's name.\\n\\n        Use double quotes if the role or the name contain spaces.\\n\\n        Example:\\n            `[p]editrole name \\\"The Transistor\\\" Test`\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:250
+#: redbot/cogs/admin/admin.py:327
 #, docstring
 msgid "Announce a message to all servers the bot is in."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:257
+#: redbot/cogs/admin/admin.py:334
 msgid "The announcement has begun."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:265
+#: redbot/cogs/admin/admin.py:341
 #, docstring
 msgid "Cancel a running announce."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:271
+#: redbot/cogs/admin/admin.py:343
+msgid "There is no currently running announcement."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:346
 msgid "The current announcement has been cancelled."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:277
+#: redbot/cogs/admin/admin.py:352
 #, docstring
-msgid "Change the channel to which the bot makes announcements."
+msgid "Change how announcements are sent in this guild."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:283
+#: redbot/cogs/admin/admin.py:357
+#, docstring
+msgid "\\n        Change the channel where the bot will send announcements.\\n\\n        If channel is left blank it defaults to the current channel.\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:366
 msgid "The announcement channel has been set to {channel.mention}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:290
-#, docstring
-msgid "Toggle announcements being enabled this server."
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:296
-msgid "The server {guild.name} will receive announcements."
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:300
-msgid "The server {guild.name} will not receive announcements."
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:326
-#, docstring
-msgid "Add a role to yourself.\\n\\n        Server admins must have configured the role as user settable.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:337
-#, docstring
-msgid "Remove a selfrole from yourself.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:347
-#, docstring
-msgid "Add a role to the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:355 redbot/cogs/admin/admin.py:367
-msgid "The selfroles list has been successfully modified."
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:360
-#, docstring
-msgid "Remove a role from the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr ""
-
 #: redbot/cogs/admin/admin.py:371
 #, docstring
+msgid "Unsets the channel for announcements."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:396
+#, docstring
+msgid "Apply selfroles."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:401
+#, docstring
+msgid "\\n        Add a selfrole to yourself.\\n\\n        Server admins must have configured the role as user settable.\\n        NOTE: The role is case sensitive!\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:412
+#, docstring
+msgid "\\n        Remove a selfrole from yourself.\\n\\n        Server admins must have configured the role as user settable.\\n        NOTE: The role is case sensitive!\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:423
+#, docstring
 msgid "\\n        Lists all available selfroles.\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:377
+#: redbot/cogs/admin/admin.py:433
 msgid "Available Selfroles:\\n{selfroles}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:394
+#: redbot/cogs/admin/admin.py:439
+#, docstring
+msgid "Manage selfroles."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:444
+#, docstring
+msgid "\\n        Add a role to the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:451
+msgid "I cannot let you add {role.name} as a selfrole because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:459
+msgid "Added."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:462
+msgid "That role is already a selfrole."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:466
+#, docstring
+msgid "\\n        Remove a role from the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:473
+msgid "I cannot let you remove {role.name} from being a selfrole because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:481
+msgid "Removed."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:486
 #, docstring
 msgid "Lock a bot to its current servers only."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:399
+#: redbot/cogs/admin/admin.py:491
 msgid "The bot is no longer serverlocked."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:401
+#: redbot/cogs/admin/admin.py:493
 msgid "The bot is now serverlocked."
 msgstr ""
 
-#: redbot/cogs/admin/announcer.py:70
-msgid "I could not announce to server: {server.id}"
+#: redbot/cogs/admin/announcer.py:68
+msgid "I could not announce to the following server: "
 msgstr ""
 
-#: redbot/cogs/admin/converters.py:25
+#: redbot/cogs/admin/announcer.py:70
+msgid "I could not announce to the following servers: "
+msgstr ""
+
+#: redbot/cogs/admin/converters.py:12
 msgid "The Admin cog is not loaded."
 msgstr ""
 
-#: redbot/cogs/admin/converters.py:34
+#: redbot/cogs/admin/converters.py:20
 msgid "The provided role is not a valid selfrole."
 msgstr ""
 

redbot/cogs/admin/locales/cs-CZ.po

@@ -1,9 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2019-07-14 04:24+0000\n"
-"PO-Revision-Date: 2020-01-07 21:48\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2020-09-03 12:24+0000\n"
+"Last-Translator: \n"
 "Language-Team: Czech\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -11,175 +10,223 @@ msgstr ""
 "Generated-By: redgettext 3.1\n"
 "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 3;\n"
 "X-Crowdin-Project: red-discordbot\n"
+"X-Crowdin-Project-ID: 289505\n"
 "X-Crowdin-Language: cs\n"
-"X-Crowdin-File: /admin/locales/messages.pot\n"
+"X-Crowdin-File-ID: 42\n"
 "Language: cs_CZ\n"
 
-#: redbot/cogs/admin/admin.py:17
+#: redbot/cogs/admin/admin.py:18
 msgid "I attempted to do something that Discord denied me permissions for. Your command failed to successfully complete."
-msgstr "Pokusil jsem se udělat něco, co mi Discord odepřel. Tvůj příkaz se nepodařilo úspěšně dokončit."
+msgstr "Pokusil jsem se udělat něco, co mi Discord odepřel. Tvůj příkaz se nepodažilo úspěšně dokončit."
 
-#: redbot/cogs/admin/admin.py:22
-msgid "I tried to {verb} {role.name} to {member.display_name} but that role is higher than my highest role in the Discord hierarchy so I was unable to successfully add it. Please give me a higher role and try again."
-msgstr "Pokusil jsem se přidat {verb} {role.name} k {member.display_name}, ale tato role je vyšší než moje nejvyšší role v Discord hierarchii, takže jsem ji nedokázal úspešně přidat. Prosím, dej mi vyšší roli a zkus to znovu."
+#: redbot/cogs/admin/admin.py:23
+msgid "I can not give {role.name} to {member.display_name} because that role is higher than or equal to my highest role in the Discord hierarchy."
+msgstr "Nemohu dát {role.name} uživateli {member.display_name}, protože tato role je vyšší nebo rovna mé nejvyšší roli v Discord hierarchii."
 
 #: redbot/cogs/admin/admin.py:29
-msgid "I tried to {verb} {role.name} to {member.display_name} but that role is higher than your highest role in the Discord hierarchy so I was unable to successfully add it. Please get a higher role and try again."
-msgstr "Pokusil jsem se přidat {verb} {role.name} k {member.display_name}, ale tato role je vyšší než tvoje nejvyšší role v Discord hierarchii, takže jsem ji nedokázal úspěšně přidat. Prosím, získej vyšší roli a zkus to znovu."
+msgid "I can not remove {role.name} from {member.display_name} because that role is higher than or equal to my highest role in the Discord hierarchy."
+msgstr "Nemohu odebrat {role.name} uživateli {member.display_name}, protože tato role je vyšší nebo rovna mé nejvyšší roli v Discord hierarchii."
 
-#: redbot/cogs/admin/admin.py:36
-msgid "I tried to edit {role.name} but that role is higher than your highest role in the Discord hierarchy so I was unable to successfully add it. Please get a higher role and try again."
-msgstr "Pokusil jsem se editovat roli {role.name}, ale tato role je vyšší než tvoje role, takže jsem ji nedokázal úspěšně upravit. Prosím, získej vyšší roli a zkus to znovu."
+#: redbot/cogs/admin/admin.py:35
+msgid "I can not edit {role.name} because that role is higher than my or equal to highest role in the Discord hierarchy."
+msgstr "Nemohu upravit {role.name}, protože tato role je vyšší, než moje nebo stejná jako nejvyšší role v Discord hierarchii."
 
-#: redbot/cogs/admin/admin.py:43
+#: redbot/cogs/admin/admin.py:41
+msgid "I can not let you give {role.name} to {member.display_name} because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr "Nemohu ti dovolit dát {role.name} uživateli {member.display_name}, protože tato role je vyšší nebo rovna tvé nejvyšší roli v Discord hierarchii."
+
+#: redbot/cogs/admin/admin.py:47
+msgid "I can not let you remove {role.name} from {member.display_name} because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr "Nemohu ti dovolit odebrat {role.name} uživateli {member.display_name}, protože tato role je vyšší nebo rovna tvé nejvyšší roli v Discord hierarchii."
+
+#: redbot/cogs/admin/admin.py:53
+msgid "I can not let you edit {role.name} because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr "Nemohu ti dovolit upravit {role.name}, protože tato role je vyšší nebo rovna tvé nejvyšší roli v Discord hierarchii."
+
+#: redbot/cogs/admin/admin.py:59
+msgid "I need manage roles permission to do that."
+msgstr "K tomu potřebuji oprávnění spravovat role."
+
+#: redbot/cogs/admin/admin.py:61
 msgid "I am already announcing something. If you would like to make a different announcement please use `{prefix}announce cancel` first."
 msgstr "Už něco oznamuji. Pokud bys rád provedl jiné oznámení, nejdříve použij `{prefix}announce cancel`."
 
-#: redbot/cogs/admin/admin.py:53
+#: redbot/cogs/admin/admin.py:71
 #, docstring
 msgid "A collection of server administration utilities."
 msgstr "Kolekce nástrojů pro správu serveru."
 
-#: redbot/cogs/admin/admin.py:115 redbot/cogs/admin/admin.py:160
-msgid "add"
-msgstr "přidat"
+#: redbot/cogs/admin/admin.py:162
+msgid "{member.display_name} already has the role {role.name}."
+msgstr "{member.display_name} již má roli {role.name}."
 
-#: redbot/cogs/admin/admin.py:121
+#: redbot/cogs/admin/admin.py:182
 msgid "I successfully added {role.name} to {member.display_name}"
 msgstr "Úspěšně jsem přidal {role.name} k {member.display_name}"
 
-#: redbot/cogs/admin/admin.py:132 redbot/cogs/admin/admin.py:180
-msgid "remove"
-msgstr "odstranit"
+#: redbot/cogs/admin/admin.py:192
+msgid "{member.display_name} does not have the role {role.name}."
+msgstr "{member.display_name} již má roli {role.name}."
 
-#: redbot/cogs/admin/admin.py:138
+#: redbot/cogs/admin/admin.py:212
 msgid "I successfully removed {role.name} from {member.display_name}"
 msgstr "Úspěšně jsem odstranil {role.name} od {member.display_name}"
 
-#: redbot/cogs/admin/admin.py:149
+#: redbot/cogs/admin/admin.py:223
 #, docstring
-msgid "Add a role to a user.\\n\\n        If user is left blank it defaults to the author of the command.\\n        "
-msgstr "Přidá roli uživateli.\\n\\n        Pokud uživatel zůstane prázdný, bude jím autor příkazu.\\n        "
+msgid "\\n        Add a role to a user.\\n\\n        Use double quotes if the role contains spaces.\\n        If user is left blank it defaults to the author of the command.\\n        "
+msgstr "\\n        Přidá roli uživateli.\\n\\n        Pokud role obsahuje mezery, použijte dvojí uvozovky.\\n        Ponecháte-li uživatel prázdný, výchozí hodnota autorovi příkazu.\\n        "
 
-#: redbot/cogs/admin/admin.py:169
+#: redbot/cogs/admin/admin.py:239
 #, docstring
-msgid "Remove a role from a user.\\n\\n        If user is left blank it defaults to the author of the command.\\n        "
-msgstr "Odstraní roli od uživatele.\\n\\n        Pokud uživatel zůstane prázdný, bude jím autor příkazu.\\n        "
+msgid "\\n        Remove a role from a user.\\n\\n        Use double quotes if the role contains spaces.\\n        If user is left blank it defaults to the author of the command.\\n        "
+msgstr "\\n        Odebrat roli uživateli.\\n\\n        Pokud role obsahuje mezery, použijte dvojí uvozovky.\\n        Ponecháte-li uživatel prázdný, výchozí hodnota autorovi příkazu.\\n        "
 
-#: redbot/cogs/admin/admin.py:187
+#: redbot/cogs/admin/admin.py:253
 #, docstring
 msgid "Edit role settings."
 msgstr "Upraví nastavení role."
 
-#: redbot/cogs/admin/admin.py:194
+#: redbot/cogs/admin/admin.py:260
 #, docstring
-msgid "Edit a role's colour.\\n\\n        Use double quotes if the role contains spaces.\\n        Colour must be in hexadecimal format.\\n        [Online colour picker](http://www.w3schools.com/colors/colors_picker.asp)\\n\\n        Examples:\\n            `[p]editrole colour \\\"The Transistor\\\" #ff0000`\\n            `[p]editrole colour Test #ff9900`\\n        "
-msgstr "Upravit barvu role.\\n\\n        Pokud role obsahuje mezery, použij dvojité uvozovky.\\n        Barva musí být v hexadecimálním formátu.\\n        [Výběr barev online](http://www.w3schools.com/colors/colors_picker.asp)\\n\\n        Příklady:\\n            `[p]editrole colour \\\"Spravce\\\" #ff0000`\\n            `[p]editrole colour Spravce #ff9900`\\n        "
+msgid "\\n        Edit a role's colour.\\n\\n        Use double quotes if the role contains spaces.\\n        Colour must be in hexadecimal format.\\n        [Online colour picker](http://www.w3schools.com/colors/colors_picker.asp)\\n\\n        Examples:\\n            `[p]editrole colour \\\"The Transistor\\\" #ff0000`\\n            `[p]editrole colour Test #ff9900`\\n        "
+msgstr "\\n       Upravit barvu role.\\n\\n        Pokud role obsahuje mezery, použij dvojité uvozovky.\\n        Barva musí být v hexadecimálním formátu.\\n        [Výběr barev online](http://www.w3schools.com/colors/colors_picker.asp)\\n\\n        Příklady:\\n            `[p]editrole colour \\\"Spravce\\\" #ff0000`\\n            `[p]editrole colour Spravce #ff9900`\\n        "
 
-#: redbot/cogs/admin/admin.py:217 redbot/cogs/admin/admin.py:245
+#: redbot/cogs/admin/admin.py:289 redbot/cogs/admin/admin.py:322
 msgid "Done."
 msgstr "Hotovo."
 
-#: redbot/cogs/admin/admin.py:222
+#: redbot/cogs/admin/admin.py:293
 #, docstring
-msgid "Edit a role's name.\\n\\n        Use double quotes if the role or the name contain spaces.\\n\\n        Examples:\\n            `[p]editrole name \\\"The Transistor\\\" Test`\\n        "
-msgstr "Upraví název role\\n\\n        Použijte dvojité uvozovky, pokud role nebo název obsahuje mezery.\\n\\n        Příklady:\\n            `[p]editrole name \\\"Spravce\\\" Admin`\\n        "
+msgid "\\n        Edit a role's name.\\n\\n        Use double quotes if the role or the name contain spaces.\\n\\n        Example:\\n            `[p]editrole name \\\"The Transistor\\\" Test`\\n        "
+msgstr "\\n        Upraví název role\\n\\n        Použijte dvojité uvozovky, pokud role nebo název obsahuje mezery.\\n\\n        Příklady:\\n            `[p]editrole name \\\"Spravce\\\" Admin`\\n        "
 
-#: redbot/cogs/admin/admin.py:250
+#: redbot/cogs/admin/admin.py:327
 #, docstring
 msgid "Announce a message to all servers the bot is in."
 msgstr "Oznámit zprávu na všechny servery ve kterých je bot."
 
-#: redbot/cogs/admin/admin.py:257
+#: redbot/cogs/admin/admin.py:334
 msgid "The announcement has begun."
 msgstr "Oznámení začalo."
 
-#: redbot/cogs/admin/admin.py:265
+#: redbot/cogs/admin/admin.py:341
 #, docstring
 msgid "Cancel a running announce."
 msgstr "Zrušit běžící oznámení."
 
-#: redbot/cogs/admin/admin.py:271
+#: redbot/cogs/admin/admin.py:343
+msgid "There is no currently running announcement."
+msgstr "V současné době neexistuje žádné spuštěné oznámení."
+
+#: redbot/cogs/admin/admin.py:346
 msgid "The current announcement has been cancelled."
 msgstr "Momentální oznámení bylo zrušeno."
 
-#: redbot/cogs/admin/admin.py:277
+#: redbot/cogs/admin/admin.py:352
 #, docstring
-msgid "Change the channel to which the bot makes announcements."
-msgstr "Změnit kanál, ve kterém bot oznamuje."
+msgid "Change how announcements are sent in this guild."
+msgstr "Změňte způsob odesílání oznámení v tomto klanu."
 
-#: redbot/cogs/admin/admin.py:283
+#: redbot/cogs/admin/admin.py:357
+#, docstring
+msgid "\\n        Change the channel where the bot will send announcements.\\n\\n        If channel is left blank it defaults to the current channel.\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:366
 msgid "The announcement channel has been set to {channel.mention}"
 msgstr "Kanál pro oznámení byl nastaven na {channel.mention}"
 
-#: redbot/cogs/admin/admin.py:290
-#, docstring
-msgid "Toggle announcements being enabled this server."
-msgstr "Přepne oznamování na tomto serveru."
-
-#: redbot/cogs/admin/admin.py:296
-msgid "The server {guild.name} will receive announcements."
-msgstr "Server {guild.name} obdrží oznámení."
-
-#: redbot/cogs/admin/admin.py:300
-msgid "The server {guild.name} will not receive announcements."
-msgstr "Server {guild.name} nebude dostávat oznámení."
-
-#: redbot/cogs/admin/admin.py:326
-#, docstring
-msgid "Add a role to yourself.\\n\\n        Server admins must have configured the role as user settable.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr "Přidejte si self-roli.\\n\\n        Server admin musí nastavit roli jako nastavitelnou pro ostantí uživatele.\\n\\n        POZNÁMKA: Role je citlivá na malá a velká písmena!\\n        "
-
-#: redbot/cogs/admin/admin.py:337
-#, docstring
-msgid "Remove a selfrole from yourself.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr "Odstraň si vlastní self-roli.\\n\\n        POZNÁMKA: Role je citlivá na malá a velká písmena!\\n        "
-
-#: redbot/cogs/admin/admin.py:347
-#, docstring
-msgid "Add a role to the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr "Přidá roli do seznamu dostupných self-rolí.\\n\\n        POZNÁMKA: Role je citlivá na malá a velká písmena!\\n        "
-
-#: redbot/cogs/admin/admin.py:355 redbot/cogs/admin/admin.py:367
-msgid "The selfroles list has been successfully modified."
-msgstr "Seznam self-rolí byl úspěšně upraven."
-
-#: redbot/cogs/admin/admin.py:360
-#, docstring
-msgid "Remove a role from the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr "Odstraňí roli ze seznamu dostupných self-rolí.\\n\\n        POZNÁMKA: Role je citlivá na malá a velká písmena!\\n        "
-
 #: redbot/cogs/admin/admin.py:371
 #, docstring
+msgid "Unsets the channel for announcements."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:396
+#, docstring
+msgid "Apply selfroles."
+msgstr "Aplikovat self-role."
+
+#: redbot/cogs/admin/admin.py:401
+#, docstring
+msgid "\\n        Add a selfrole to yourself.\\n\\n        Server admins must have configured the role as user settable.\\n        NOTE: The role is case sensitive!\\n        "
+msgstr "\\n        Přidá vám self-roli.\\n\\n        Administrátoři serveru musí mít nastavenou roli podle nastaveného uživatele.\\n        POZNÁMKA: Role je citlivá na malá a velká písmena!\\n        "
+
+#: redbot/cogs/admin/admin.py:412
+#, docstring
+msgid "\\n        Remove a selfrole from yourself.\\n\\n        Server admins must have configured the role as user settable.\\n        NOTE: The role is case sensitive!\\n        "
+msgstr "\\n        Odstraní vámself-roli.\\n\\n        Administrátoři serveru musí mít nastavenou roli podle nastaveného uživatele.\\n        POZNÁMKA: Role je citlivá na malá a velká písmena!\\n        "
+
+#: redbot/cogs/admin/admin.py:423
+#, docstring
 msgid "\\n        Lists all available selfroles.\\n        "
-msgstr "\\n        Zobrazí všechny dostupné self-role\\n        "
+msgstr "\\n        Seznam všech dostupných self-rolí.\\n        "
 
-#: redbot/cogs/admin/admin.py:377
+#: redbot/cogs/admin/admin.py:433
 msgid "Available Selfroles:\\n{selfroles}"
-msgstr "Dostupné self-role:\\n{selfroles}"
+msgstr "Dostupné vlastní role:\\n{selfroles}"
 
-#: redbot/cogs/admin/admin.py:394
+#: redbot/cogs/admin/admin.py:439
+#, docstring
+msgid "Manage selfroles."
+msgstr "Spravovat self-role."
+
+#: redbot/cogs/admin/admin.py:444
+#, docstring
+msgid "\\n        Add a role to the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
+msgstr "\\n        Přidá roli do seznamu dostupných self-rolí.\\n\\n        POZNÁMKA: Role je citlivá na malá a velká písmena!\\n        "
+
+#: redbot/cogs/admin/admin.py:451
+msgid "I cannot let you add {role.name} as a selfrole because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr "Nemohu ti dovolit odebrat {role.name} jako self-roli uživateli, protože tato role je vyšší nebo rovna tvé nejvyšší roli v Discord hierarchii."
+
+#: redbot/cogs/admin/admin.py:459
+msgid "Added."
+msgstr "Přidáno."
+
+#: redbot/cogs/admin/admin.py:462
+msgid "That role is already a selfrole."
+msgstr "Tato role je již self-rolí."
+
+#: redbot/cogs/admin/admin.py:466
+#, docstring
+msgid "\\n        Remove a role from the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
+msgstr "\\n        Odstraní roli ze seznamu dostupných self-rolí.\\n\\n        POZNÁMKA: Role je citlivá na malá a velká písmena!\\n        "
+
+#: redbot/cogs/admin/admin.py:473
+msgid "I cannot let you remove {role.name} from being a selfrole because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr "Nemohu ti dovolit odebrat {role.name} uživateli, protože tato role je vyšší nebo rovna tvé nejvyšší roli v Discord hierarchii."
+
+#: redbot/cogs/admin/admin.py:481
+msgid "Removed."
+msgstr "Odstraněno."
+
+#: redbot/cogs/admin/admin.py:486
 #, docstring
 msgid "Lock a bot to its current servers only."
 msgstr "Uzamkne bota pouze na jeho aktuální servery."
 
-#: redbot/cogs/admin/admin.py:399
+#: redbot/cogs/admin/admin.py:491
 msgid "The bot is no longer serverlocked."
 msgstr "Bot již není uzamčen na server."
 
-#: redbot/cogs/admin/admin.py:401
+#: redbot/cogs/admin/admin.py:493
 msgid "The bot is now serverlocked."
-msgstr "Bot je teď uzamčen na momentální servery."
+msgstr "Bot je nyní serverem uzamčen."
+
+#: redbot/cogs/admin/announcer.py:68
+msgid "I could not announce to the following server: "
+msgstr "Nemohu oznámit následujícímu serveru: "
 
 #: redbot/cogs/admin/announcer.py:70
-msgid "I could not announce to server: {server.id}"
-msgstr "Nemohl jsem oznámit serveru: {server.id}"
+msgid "I could not announce to the following servers: "
+msgstr "Nemohu oznámit následujícím serverům: "
 
-#: redbot/cogs/admin/converters.py:25
+#: redbot/cogs/admin/converters.py:12
 msgid "The Admin cog is not loaded."
 msgstr "Admin cog není načten."
 
-#: redbot/cogs/admin/converters.py:34
+#: redbot/cogs/admin/converters.py:20
 msgid "The provided role is not a valid selfrole."
 msgstr "Daná role není platná self-role."
 

redbot/cogs/admin/locales/da-DK.po

@@ -1,9 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2019-07-14 04:24+0000\n"
-"PO-Revision-Date: 2020-01-07 21:48\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2020-09-03 12:24+0000\n"
+"Last-Translator: \n"
 "Language-Team: Danish\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -11,175 +10,223 @@ msgstr ""
 "Generated-By: redgettext 3.1\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Crowdin-Project: red-discordbot\n"
+"X-Crowdin-Project-ID: 289505\n"
 "X-Crowdin-Language: da\n"
-"X-Crowdin-File: /admin/locales/messages.pot\n"
+"X-Crowdin-File-ID: 42\n"
 "Language: da_DK\n"
 
-#: redbot/cogs/admin/admin.py:17
+#: redbot/cogs/admin/admin.py:18
 msgid "I attempted to do something that Discord denied me permissions for. Your command failed to successfully complete."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:22
-msgid "I tried to {verb} {role.name} to {member.display_name} but that role is higher than my highest role in the Discord hierarchy so I was unable to successfully add it. Please give me a higher role and try again."
+#: redbot/cogs/admin/admin.py:23
+msgid "I can not give {role.name} to {member.display_name} because that role is higher than or equal to my highest role in the Discord hierarchy."
 msgstr ""
 
 #: redbot/cogs/admin/admin.py:29
-msgid "I tried to {verb} {role.name} to {member.display_name} but that role is higher than your highest role in the Discord hierarchy so I was unable to successfully add it. Please get a higher role and try again."
+msgid "I can not remove {role.name} from {member.display_name} because that role is higher than or equal to my highest role in the Discord hierarchy."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:36
-msgid "I tried to edit {role.name} but that role is higher than your highest role in the Discord hierarchy so I was unable to successfully add it. Please get a higher role and try again."
+#: redbot/cogs/admin/admin.py:35
+msgid "I can not edit {role.name} because that role is higher than my or equal to highest role in the Discord hierarchy."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:43
-msgid "I am already announcing something. If you would like to make a different announcement please use `{prefix}announce cancel` first."
+#: redbot/cogs/admin/admin.py:41
+msgid "I can not let you give {role.name} to {member.display_name} because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:47
+msgid "I can not let you remove {role.name} from {member.display_name} because that role is higher than or equal to your highest role in the Discord hierarchy."
 msgstr ""
 
 #: redbot/cogs/admin/admin.py:53
+msgid "I can not let you edit {role.name} because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:59
+msgid "I need manage roles permission to do that."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:61
+msgid "I am already announcing something. If you would like to make a different announcement please use `{prefix}announce cancel` first."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:71
 #, docstring
 msgid "A collection of server administration utilities."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:115 redbot/cogs/admin/admin.py:160
-msgid "add"
+#: redbot/cogs/admin/admin.py:162
+msgid "{member.display_name} already has the role {role.name}."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:121
+#: redbot/cogs/admin/admin.py:182
 msgid "I successfully added {role.name} to {member.display_name}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:132 redbot/cogs/admin/admin.py:180
-msgid "remove"
+#: redbot/cogs/admin/admin.py:192
+msgid "{member.display_name} does not have the role {role.name}."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:138
+#: redbot/cogs/admin/admin.py:212
 msgid "I successfully removed {role.name} from {member.display_name}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:149
+#: redbot/cogs/admin/admin.py:223
 #, docstring
-msgid "Add a role to a user.\\n\\n        If user is left blank it defaults to the author of the command.\\n        "
+msgid "\\n        Add a role to a user.\\n\\n        Use double quotes if the role contains spaces.\\n        If user is left blank it defaults to the author of the command.\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:169
+#: redbot/cogs/admin/admin.py:239
 #, docstring
-msgid "Remove a role from a user.\\n\\n        If user is left blank it defaults to the author of the command.\\n        "
+msgid "\\n        Remove a role from a user.\\n\\n        Use double quotes if the role contains spaces.\\n        If user is left blank it defaults to the author of the command.\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:187
+#: redbot/cogs/admin/admin.py:253
 #, docstring
 msgid "Edit role settings."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:194
+#: redbot/cogs/admin/admin.py:260
 #, docstring
-msgid "Edit a role's colour.\\n\\n        Use double quotes if the role contains spaces.\\n        Colour must be in hexadecimal format.\\n        [Online colour picker](http://www.w3schools.com/colors/colors_picker.asp)\\n\\n        Examples:\\n            `[p]editrole colour \\\"The Transistor\\\" #ff0000`\\n            `[p]editrole colour Test #ff9900`\\n        "
+msgid "\\n        Edit a role's colour.\\n\\n        Use double quotes if the role contains spaces.\\n        Colour must be in hexadecimal format.\\n        [Online colour picker](http://www.w3schools.com/colors/colors_picker.asp)\\n\\n        Examples:\\n            `[p]editrole colour \\\"The Transistor\\\" #ff0000`\\n            `[p]editrole colour Test #ff9900`\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:217 redbot/cogs/admin/admin.py:245
+#: redbot/cogs/admin/admin.py:289 redbot/cogs/admin/admin.py:322
 msgid "Done."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:222
+#: redbot/cogs/admin/admin.py:293
 #, docstring
-msgid "Edit a role's name.\\n\\n        Use double quotes if the role or the name contain spaces.\\n\\n        Examples:\\n            `[p]editrole name \\\"The Transistor\\\" Test`\\n        "
+msgid "\\n        Edit a role's name.\\n\\n        Use double quotes if the role or the name contain spaces.\\n\\n        Example:\\n            `[p]editrole name \\\"The Transistor\\\" Test`\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:250
+#: redbot/cogs/admin/admin.py:327
 #, docstring
 msgid "Announce a message to all servers the bot is in."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:257
+#: redbot/cogs/admin/admin.py:334
 msgid "The announcement has begun."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:265
+#: redbot/cogs/admin/admin.py:341
 #, docstring
 msgid "Cancel a running announce."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:271
+#: redbot/cogs/admin/admin.py:343
+msgid "There is no currently running announcement."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:346
 msgid "The current announcement has been cancelled."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:277
+#: redbot/cogs/admin/admin.py:352
 #, docstring
-msgid "Change the channel to which the bot makes announcements."
+msgid "Change how announcements are sent in this guild."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:283
+#: redbot/cogs/admin/admin.py:357
+#, docstring
+msgid "\\n        Change the channel where the bot will send announcements.\\n\\n        If channel is left blank it defaults to the current channel.\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:366
 msgid "The announcement channel has been set to {channel.mention}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:290
-#, docstring
-msgid "Toggle announcements being enabled this server."
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:296
-msgid "The server {guild.name} will receive announcements."
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:300
-msgid "The server {guild.name} will not receive announcements."
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:326
-#, docstring
-msgid "Add a role to yourself.\\n\\n        Server admins must have configured the role as user settable.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:337
-#, docstring
-msgid "Remove a selfrole from yourself.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:347
-#, docstring
-msgid "Add a role to the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:355 redbot/cogs/admin/admin.py:367
-msgid "The selfroles list has been successfully modified."
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:360
-#, docstring
-msgid "Remove a role from the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr ""
-
 #: redbot/cogs/admin/admin.py:371
 #, docstring
+msgid "Unsets the channel for announcements."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:396
+#, docstring
+msgid "Apply selfroles."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:401
+#, docstring
+msgid "\\n        Add a selfrole to yourself.\\n\\n        Server admins must have configured the role as user settable.\\n        NOTE: The role is case sensitive!\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:412
+#, docstring
+msgid "\\n        Remove a selfrole from yourself.\\n\\n        Server admins must have configured the role as user settable.\\n        NOTE: The role is case sensitive!\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:423
+#, docstring
 msgid "\\n        Lists all available selfroles.\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:377
+#: redbot/cogs/admin/admin.py:433
 msgid "Available Selfroles:\\n{selfroles}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:394
+#: redbot/cogs/admin/admin.py:439
+#, docstring
+msgid "Manage selfroles."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:444
+#, docstring
+msgid "\\n        Add a role to the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:451
+msgid "I cannot let you add {role.name} as a selfrole because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:459
+msgid "Added."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:462
+msgid "That role is already a selfrole."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:466
+#, docstring
+msgid "\\n        Remove a role from the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:473
+msgid "I cannot let you remove {role.name} from being a selfrole because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:481
+msgid "Removed."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:486
 #, docstring
 msgid "Lock a bot to its current servers only."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:399
+#: redbot/cogs/admin/admin.py:491
 msgid "The bot is no longer serverlocked."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:401
+#: redbot/cogs/admin/admin.py:493
 msgid "The bot is now serverlocked."
 msgstr ""
 
-#: redbot/cogs/admin/announcer.py:70
-msgid "I could not announce to server: {server.id}"
+#: redbot/cogs/admin/announcer.py:68
+msgid "I could not announce to the following server: "
 msgstr ""
 
-#: redbot/cogs/admin/converters.py:25
+#: redbot/cogs/admin/announcer.py:70
+msgid "I could not announce to the following servers: "
+msgstr ""
+
+#: redbot/cogs/admin/converters.py:12
 msgid "The Admin cog is not loaded."
 msgstr ""
 
-#: redbot/cogs/admin/converters.py:34
+#: redbot/cogs/admin/converters.py:20
 msgid "The provided role is not a valid selfrole."
 msgstr ""
 

redbot/cogs/admin/locales/de-DE.po

@@ -1,9 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2019-07-14 04:24+0000\n"
-"PO-Revision-Date: 2020-01-07 21:48\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2020-09-03 12:24+0000\n"
+"Last-Translator: \n"
 "Language-Team: German\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -11,175 +10,223 @@ msgstr ""
 "Generated-By: redgettext 3.1\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Crowdin-Project: red-discordbot\n"
+"X-Crowdin-Project-ID: 289505\n"
 "X-Crowdin-Language: de\n"
-"X-Crowdin-File: /admin/locales/messages.pot\n"
+"X-Crowdin-File-ID: 42\n"
 "Language: de_DE\n"
 
-#: redbot/cogs/admin/admin.py:17
+#: redbot/cogs/admin/admin.py:18
 msgid "I attempted to do something that Discord denied me permissions for. Your command failed to successfully complete."
-msgstr "Ich habe versucht etwas zu tun, für das ich vermutlich keine Berechtigungen habe. Dein Befehl konnte nicht erfolgreich ausgeführt werden."
+msgstr "Ich habe versucht, etwas zu tun, wofür mir Discord die Erlaubnis verweigert hat. Dein Befehl wurde nicht erfolgreich ausgeführt."
 
-#: redbot/cogs/admin/admin.py:22
-msgid "I tried to {verb} {role.name} to {member.display_name} but that role is higher than my highest role in the Discord hierarchy so I was unable to successfully add it. Please give me a higher role and try again."
-msgstr "Ich habe versucht {member.display_name} er Rolle: {role.name} {verb}, aber diese Rolle hat höhere Rechte als ich. Also war es nicht möglich die Rolle erfolgreich hinzuzufügen. Bitte geb mir eine höhere Rolle und versuche es erneut."
+#: redbot/cogs/admin/admin.py:23
+msgid "I can not give {role.name} to {member.display_name} because that role is higher than or equal to my highest role in the Discord hierarchy."
+msgstr "Ich kann die Rolle „{role.name}“ nicht an {member.display_name} vergeben, weil diese Rolle höher oder gleich meiner höchsten Rolle in der Discord Rollen-Hierarchie ist."
 
 #: redbot/cogs/admin/admin.py:29
-msgid "I tried to {verb} {role.name} to {member.display_name} but that role is higher than your highest role in the Discord hierarchy so I was unable to successfully add it. Please get a higher role and try again."
-msgstr "Ich habe versucht die Rolle {role.name} an {member.display_name} zu {verb}, aber die Rolle ist höher als meine Rolle in der Discord Hierarchie, daher war es mir nicht möglich sie hinzuzufügen. Bitte gib mir eine höhere Rolle und versuche es erneut."
+msgid "I can not remove {role.name} from {member.display_name} because that role is higher than or equal to my highest role in the Discord hierarchy."
+msgstr "Ich kann {member.display_name} nicht die Rolle „{role.name}“ entziehen, weil diese Rolle höher oder gleich meiner höchsten Rolle in der Discord Rollen-Hierarchie ist."
 
-#: redbot/cogs/admin/admin.py:36
-msgid "I tried to edit {role.name} but that role is higher than your highest role in the Discord hierarchy so I was unable to successfully add it. Please get a higher role and try again."
-msgstr "Ich habe versucht {role.name} zu bearbeiten, aber die Rolle ist höher als deine höhste Rolle im Discord. Also konnte ich dies nicht erfolgreich hinzufügen. Versuche es mit einer höheren Rolle erneut."
+#: redbot/cogs/admin/admin.py:35
+msgid "I can not edit {role.name} because that role is higher than my or equal to highest role in the Discord hierarchy."
+msgstr "Ich kann die Rolle „{role.name}“ nicht bearbeiten, weil diese Rolle höher oder gleich meiner höchsten Rolle in der Discord Rollen-Hierarchie ist."
 
-#: redbot/cogs/admin/admin.py:43
+#: redbot/cogs/admin/admin.py:41
+msgid "I can not let you give {role.name} to {member.display_name} because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr "Du darfst, die Rolle „{role.name}“ nicht an {member.display_name} vergeben, weil diese Rolle höher oder gleich deiner höchsten Rolle in der Discord Rollen-Hierarchie ist."
+
+#: redbot/cogs/admin/admin.py:47
+msgid "I can not let you remove {role.name} from {member.display_name} because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr "Du darfst {member.display_name} nicht die Rolle „{role.name}“ entziehen, weil diese Rolle höher oder gleich deiner höchsten Rolle in der Discord Rollen-Hierarchie ist."
+
+#: redbot/cogs/admin/admin.py:53
+msgid "I can not let you edit {role.name} because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr "Du darfst nicht die Rolle „{role.name}“ bearbeiten, weil diese Rolle höher oder gleich deiner höchsten Rolle in der Discord Rollen-Hierarchie ist."
+
+#: redbot/cogs/admin/admin.py:59
+msgid "I need manage roles permission to do that."
+msgstr "Ich braucht dafür die Bereichtigung „Rollen verwalten“."
+
+#: redbot/cogs/admin/admin.py:61
 msgid "I am already announcing something. If you would like to make a different announcement please use `{prefix}announce cancel` first."
 msgstr "Ich kündige bereits etwas an. Wenn du eine andere Ankündigung machen willst, benutze bitte zuerst `{prefix}announce cancel`."
 
-#: redbot/cogs/admin/admin.py:53
+#: redbot/cogs/admin/admin.py:71
 #, docstring
 msgid "A collection of server administration utilities."
-msgstr "Eine Sammlung von Serververwaltungstools."
+msgstr "Eine Sammlung von administrativen Server-Verwaltungsprogrammen."
 
-#: redbot/cogs/admin/admin.py:115 redbot/cogs/admin/admin.py:160
-msgid "add"
-msgstr "hinzuzufügen"
+#: redbot/cogs/admin/admin.py:162
+msgid "{member.display_name} already has the role {role.name}."
+msgstr "{member.display_name} hat die Rolle „{role.name}“ bereits."
 
-#: redbot/cogs/admin/admin.py:121
+#: redbot/cogs/admin/admin.py:182
 msgid "I successfully added {role.name} to {member.display_name}"
-msgstr "Ich habe erfolgreich {role.name} zu {member.display_name} hinzugefügt"
+msgstr "Ich habe {member.display_name} erfolgreich die Rolle „{role.name}“ gegeben."
 
-#: redbot/cogs/admin/admin.py:132 redbot/cogs/admin/admin.py:180
-msgid "remove"
-msgstr "entfernen"
+#: redbot/cogs/admin/admin.py:192
+msgid "{member.display_name} does not have the role {role.name}."
+msgstr "{member.display_name} hat nicht die Rolle „{role.name}“."
 
-#: redbot/cogs/admin/admin.py:138
+#: redbot/cogs/admin/admin.py:212
 msgid "I successfully removed {role.name} from {member.display_name}"
-msgstr "Ich habe {role.name} erfolgreich von {member.display_name} entfernt"
+msgstr "Ich habe die Rolle „{role.name}“ erfolgreich von {member.display_name} entfernt."
 
-#: redbot/cogs/admin/admin.py:149
+#: redbot/cogs/admin/admin.py:223
 #, docstring
-msgid "Add a role to a user.\\n\\n        If user is left blank it defaults to the author of the command.\\n        "
-msgstr "Füge einem Benutzer eine Rolle hinzu.\\n\\n       Wenn kein Benutzer angegeben wird, wird standardmäßig der Autor des Befehls gewählt.\\n        "
+msgid "\\n        Add a role to a user.\\n\\n        Use double quotes if the role contains spaces.\\n        If user is left blank it defaults to the author of the command.\\n        "
+msgstr "\\n        Füge einem Mitglied eine Rolle hinzu.\\n\\n        Benutze (amerikanische) Anführungszeichen, wenn im Namen Leerzeichen enthalten sind.\\n        Wenn keine Person definiert wurde, wird die Rolle dem Ausführer des Befehls gegeben.\\n        "
 
-#: redbot/cogs/admin/admin.py:169
+#: redbot/cogs/admin/admin.py:239
 #, docstring
-msgid "Remove a role from a user.\\n\\n        If user is left blank it defaults to the author of the command.\\n        "
-msgstr "Entferne eine Rolle von einem Benutzer.\\n\\n        Wenn kein Benutzer angegeben wird, wird standardmäßig der Autor des Befehls gewählt.\\n        "
+msgid "\\n        Remove a role from a user.\\n\\n        Use double quotes if the role contains spaces.\\n        If user is left blank it defaults to the author of the command.\\n        "
+msgstr "\\n        Füge einem Mitglied eine Rolle hinzu.\\n\\n        Benutze (amerikanische) Anführungszeichen, wenn im Namen Leerzeichen enthalten sind.\\n        Wenn keine Person definiert wurde, wird die Rolle von dem Ausführer des Befehls entfernt.\\n        "
 
-#: redbot/cogs/admin/admin.py:187
+#: redbot/cogs/admin/admin.py:253
 #, docstring
 msgid "Edit role settings."
-msgstr "Bearbeiten der Rollen Einstellungen."
+msgstr "Rolleneinstellungen bearbeiten."
 
-#: redbot/cogs/admin/admin.py:194
+#: redbot/cogs/admin/admin.py:260
 #, docstring
-msgid "Edit a role's colour.\\n\\n        Use double quotes if the role contains spaces.\\n        Colour must be in hexadecimal format.\\n        [Online colour picker](http://www.w3schools.com/colors/colors_picker.asp)\\n\\n        Examples:\\n            `[p]editrole colour \\\"The Transistor\\\" #ff0000`\\n            `[p]editrole colour Test #ff9900`\\n        "
-msgstr "Bearbeite die Farbe einer Rolle.\\n\\n        Benutze Anführungszeichen wenn die Rolle ein Leerzeichen enthält.\\n        Die Farbe muss im Hexadezimal Format angegeben werden.\\n        [Online Farbwähler](<http://www.w3schools.com/colors/colors_picker.asp>)\\n\\n        Beispiele:\\n            `[p]editrole colour \\\"The Transistor\\\" #ff0000`\\n            `[p]editrole colour Test #ff9900`\\n        "
+msgid "\\n        Edit a role's colour.\\n\\n        Use double quotes if the role contains spaces.\\n        Colour must be in hexadecimal format.\\n        [Online colour picker](http://www.w3schools.com/colors/colors_picker.asp)\\n\\n        Examples:\\n            `[p]editrole colour \\\"The Transistor\\\" #ff0000`\\n            `[p]editrole colour Test #ff9900`\\n        "
+msgstr "\\n        Bearbeite die Farbe einer Rolle.\\n\\n        Verwende (amerikanische) Anführungszeichen, wenn die Rolle Leerzeichen enthält.\\n        Die Farbe muss im Hexadezimalformat angegeben werden.\\n        [Online Farbwähler](http://www.w3schools.com/colors/colors_picker.asp)\\n\\n        Beispiele:\\n            `[p]editrole colour \\\"The Transistor\\\" #ff0000`\\n            `[p]editrole colour Test #ff9900`\\n        "
 
-#: redbot/cogs/admin/admin.py:217 redbot/cogs/admin/admin.py:245
+#: redbot/cogs/admin/admin.py:289 redbot/cogs/admin/admin.py:322
 msgid "Done."
 msgstr "Erledigt."
 
-#: redbot/cogs/admin/admin.py:222
+#: redbot/cogs/admin/admin.py:293
 #, docstring
-msgid "Edit a role's name.\\n\\n        Use double quotes if the role or the name contain spaces.\\n\\n        Examples:\\n            `[p]editrole name \\\"The Transistor\\\" Test`\\n        "
-msgstr "Bearbeite den Namen einer Rolle.\\n\\n        Benutze Anführungszeichen wenn die Rolle Leerzeichen enthält.\\n\\n        Beispiele:\\n            `[p]editrole name \\\"The Transistor\\\" Test`\\n        "
+msgid "\\n        Edit a role's name.\\n\\n        Use double quotes if the role or the name contain spaces.\\n\\n        Example:\\n            `[p]editrole name \\\"The Transistor\\\" Test`\\n        "
+msgstr "\\n        Bearbeite den Namen einer Rolle.\\n\\n        Verwende (amerikanische) Anführungszeichen, wenn die Rolle Leerzeichen enthält.\\n\\n        Beispiel:\\n            `[p]editrole name \\\"The Transistor\\\" Test`\\n        "
 
-#: redbot/cogs/admin/admin.py:250
+#: redbot/cogs/admin/admin.py:327
 #, docstring
 msgid "Announce a message to all servers the bot is in."
-msgstr "Sende eine Ankündigung in allen Servern auf denen der Bot ist."
+msgstr "Mache eine Ankündigung auf allen Servern auf denen der Bot ist."
 
-#: redbot/cogs/admin/admin.py:257
+#: redbot/cogs/admin/admin.py:334
 msgid "The announcement has begun."
 msgstr "Die Ankündigung hat begonnen."
 
-#: redbot/cogs/admin/admin.py:265
+#: redbot/cogs/admin/admin.py:341
 #, docstring
 msgid "Cancel a running announce."
-msgstr "Brich eine laufende Ankündigung ab."
+msgstr "Breche eine laufende Ankündigung ab."
 
-#: redbot/cogs/admin/admin.py:271
+#: redbot/cogs/admin/admin.py:343
+msgid "There is no currently running announcement."
+msgstr "Es gibt keine derzeit laufende Ankündigung."
+
+#: redbot/cogs/admin/admin.py:346
 msgid "The current announcement has been cancelled."
 msgstr "Die aktuelle Ankündigung wurde abgebrochen."
 
-#: redbot/cogs/admin/admin.py:277
+#: redbot/cogs/admin/admin.py:352
 #, docstring
-msgid "Change the channel to which the bot makes announcements."
-msgstr "Ändere den Channel, in dem der Bot Ankündigungen macht."
+msgid "Change how announcements are sent in this guild."
+msgstr "Ändere, wie Ankündigungen in diesem Server gesendet werden."
 
-#: redbot/cogs/admin/admin.py:283
+#: redbot/cogs/admin/admin.py:357
+#, docstring
+msgid "\\n        Change the channel where the bot will send announcements.\\n\\n        If channel is left blank it defaults to the current channel.\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:366
 msgid "The announcement channel has been set to {channel.mention}"
-msgstr "Ankündigungen werden nun in {channel.mention} gesendet."
-
-#: redbot/cogs/admin/admin.py:290
-#, docstring
-msgid "Toggle announcements being enabled this server."
-msgstr "Schaltet Ankündigungen auf diesem Server ein oder aus."
-
-#: redbot/cogs/admin/admin.py:296
-msgid "The server {guild.name} will receive announcements."
-msgstr "Der Server {guild.name} wird Ankündigunen erhalten."
-
-#: redbot/cogs/admin/admin.py:300
-msgid "The server {guild.name} will not receive announcements."
-msgstr "Der Server {guild.name} wird keine Ankündigunen erhalten."
-
-#: redbot/cogs/admin/admin.py:326
-#, docstring
-msgid "Add a role to yourself.\\n\\n        Server admins must have configured the role as user settable.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr "Gib dir selbst eine Rolle.\\n\\n        Server Admins müssen die Rolle für Nutzer freigeben.\\n\\n        HINWEIS: Beachte Groß- und Kleinschreibung!\\n        "
-
-#: redbot/cogs/admin/admin.py:337
-#, docstring
-msgid "Remove a selfrole from yourself.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr "Entferne eine Rolle von dir selbst.\\n\\n        HINWEIS: Beachte Groß- und Kleinschreibung!\\n        "
-
-#: redbot/cogs/admin/admin.py:347
-#, docstring
-msgid "Add a role to the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr "Füge eine Rolle zur Liste der selbst auswählbaren Rollen hinzu.\\n\\n        HINWEIS: Beachte Groß- und Kleinschreibung!\\n        "
-
-#: redbot/cogs/admin/admin.py:355 redbot/cogs/admin/admin.py:367
-msgid "The selfroles list has been successfully modified."
-msgstr "Die Liste der selbst auswählbarer Rollen wurde erfolgreich bearbeitet."
-
-#: redbot/cogs/admin/admin.py:360
-#, docstring
-msgid "Remove a role from the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr "Entferne eine selbst auswählbare Rolle von der Liste der verfügbaren Rollen.\\n\\n        HINWEIS: Beachte Groß- und Kleinschreibung!\\n        "
+msgstr "{channel.mention} wurde nun als Ankündigungskanal festgelegt."
 
 #: redbot/cogs/admin/admin.py:371
 #, docstring
+msgid "Unsets the channel for announcements."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:396
+#, docstring
+msgid "Apply selfroles."
+msgstr "Selbst hinzufügbare Rollen anwenden."
+
+#: redbot/cogs/admin/admin.py:401
+#, docstring
+msgid "\\n        Add a selfrole to yourself.\\n\\n        Server admins must have configured the role as user settable.\\n        NOTE: The role is case sensitive!\\n        "
+msgstr "\\n        Gib dir selbst eine Rolle.\\n\\n        Server Admins müssen die Rolle für Mitglieder freigeben.\\n\\n        HINWEIS: Beachte Groß- und Kleinschreibung!\\n        "
+
+#: redbot/cogs/admin/admin.py:412
+#, docstring
+msgid "\\n        Remove a selfrole from yourself.\\n\\n        Server admins must have configured the role as user settable.\\n        NOTE: The role is case sensitive!\\n        "
+msgstr "\\n        Entferne eine Rolle von dir selbst.\\n\\n        Server Admins müssen die Rolle für Mitglieder freigeben.\\n\\n        HINWEIS: Beachte Groß- und Kleinschreibung!\\n        "
+
+#: redbot/cogs/admin/admin.py:423
+#, docstring
 msgid "\\n        Lists all available selfroles.\\n        "
 msgstr "\\nGibt eine Liste verfügbarer selbst auswählbarer Rollen aus.\\n        "
 
-#: redbot/cogs/admin/admin.py:377
+#: redbot/cogs/admin/admin.py:433
 msgid "Available Selfroles:\\n{selfroles}"
-msgstr "Verfügbare, selbst auswählbare Rollen:\\n{selfroles}"
+msgstr "Verfügbare selbst auswählbare Rollen:\\n{selfroles}"
 
-#: redbot/cogs/admin/admin.py:394
+#: redbot/cogs/admin/admin.py:439
+#, docstring
+msgid "Manage selfroles."
+msgstr "Selbst hinzufügbare Rollen verwalten."
+
+#: redbot/cogs/admin/admin.py:444
+#, docstring
+msgid "\\n        Add a role to the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
+msgstr "\\n        Füge eine Rolle zur Liste der selbst hinzufügbaren Rollen hinzu.\\n\\n        HINWEIS: Beachte Groß- und Kleinschreibung!\\n        "
+
+#: redbot/cogs/admin/admin.py:451
+msgid "I cannot let you add {role.name} as a selfrole because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr "Du kannst dir nicht die Rolle „{role.name}“ zuweisen, weil diese Rolle höher oder gleich deiner höchsten Rolle in der Discord Rollen-Hierarchie ist."
+
+#: redbot/cogs/admin/admin.py:459
+msgid "Added."
+msgstr "Hinzugefügt."
+
+#: redbot/cogs/admin/admin.py:462
+msgid "That role is already a selfrole."
+msgstr "Diese Rolle ist bereits selbst hinzufügbar."
+
+#: redbot/cogs/admin/admin.py:466
+#, docstring
+msgid "\\n        Remove a role from the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
+msgstr "\\n        Entferne eine Rolle von der Liste der selbst hinzufügbaren Rollen.\\n\\n        HINWEIS: Beachte Groß- und Kleinschreibung!\\n        "
+
+#: redbot/cogs/admin/admin.py:473
+msgid "I cannot let you remove {role.name} from being a selfrole because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr "Du darfst nicht die Rolle „{role.name}“ von der Liste der selbst hinzufügbaren Rollen entfernen, weil diese Rolle höher oder gleich deiner höchsten Rolle in der Discord Rollen-Hierarchie ist."
+
+#: redbot/cogs/admin/admin.py:481
+msgid "Removed."
+msgstr "Entfernt."
+
+#: redbot/cogs/admin/admin.py:486
 #, docstring
 msgid "Lock a bot to its current servers only."
-msgstr "Beschränkt den Bot auf die aktuellen Server."
+msgstr "Der Bot kann keinem neuen Server beitreten."
 
-#: redbot/cogs/admin/admin.py:399
+#: redbot/cogs/admin/admin.py:491
 msgid "The bot is no longer serverlocked."
-msgstr "Der Bot kann jetzt wieder anderen Servern beitreten."
+msgstr "Der Bot kann nun anderen Servern beitreten."
 
-#: redbot/cogs/admin/admin.py:401
+#: redbot/cogs/admin/admin.py:493
 msgid "The bot is now serverlocked."
-msgstr "Der Bot kann jetzt keinen weiteren Servern mehr beitreten."
+msgstr "Der Bot ist jetzt gesperrt neuen Servern beizutreten."
+
+#: redbot/cogs/admin/announcer.py:68
+msgid "I could not announce to the following server: "
+msgstr "Ich konnte die Ankündigung auf diesem Server nicht ausführen: "
 
 #: redbot/cogs/admin/announcer.py:70
-msgid "I could not announce to server: {server.id}"
-msgstr "Ich konnte keine Ankündigung an diesen Server senden: {server.id}"
+msgid "I could not announce to the following servers: "
+msgstr "Ich konnte die Ankündigung auf diesen Servern nicht ausführen: "
 
-#: redbot/cogs/admin/converters.py:25
+#: redbot/cogs/admin/converters.py:12
 msgid "The Admin cog is not loaded."
 msgstr "Das Admin-Cog ist nicht geladen."
 
-#: redbot/cogs/admin/converters.py:34
+#: redbot/cogs/admin/converters.py:20
 msgid "The provided role is not a valid selfrole."
-msgstr "Die angegebene Rolle ist keine selbst hinzufügbare Rolle."
+msgstr "Die angegebene Rolle ist keine gültige selbst auswählbare Rolle."
 

redbot/cogs/admin/locales/el-GR.po

@@ -1,9 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2019-07-14 04:24+0000\n"
-"PO-Revision-Date: 2020-01-07 21:48\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2020-09-03 12:24+0000\n"
+"Last-Translator: \n"
 "Language-Team: Greek\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -11,175 +10,223 @@ msgstr ""
 "Generated-By: redgettext 3.1\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Crowdin-Project: red-discordbot\n"
+"X-Crowdin-Project-ID: 289505\n"
 "X-Crowdin-Language: el\n"
-"X-Crowdin-File: /admin/locales/messages.pot\n"
+"X-Crowdin-File-ID: 42\n"
 "Language: el_GR\n"
 
-#: redbot/cogs/admin/admin.py:17
+#: redbot/cogs/admin/admin.py:18
 msgid "I attempted to do something that Discord denied me permissions for. Your command failed to successfully complete."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:22
-msgid "I tried to {verb} {role.name} to {member.display_name} but that role is higher than my highest role in the Discord hierarchy so I was unable to successfully add it. Please give me a higher role and try again."
+#: redbot/cogs/admin/admin.py:23
+msgid "I can not give {role.name} to {member.display_name} because that role is higher than or equal to my highest role in the Discord hierarchy."
 msgstr ""
 
 #: redbot/cogs/admin/admin.py:29
-msgid "I tried to {verb} {role.name} to {member.display_name} but that role is higher than your highest role in the Discord hierarchy so I was unable to successfully add it. Please get a higher role and try again."
+msgid "I can not remove {role.name} from {member.display_name} because that role is higher than or equal to my highest role in the Discord hierarchy."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:36
-msgid "I tried to edit {role.name} but that role is higher than your highest role in the Discord hierarchy so I was unable to successfully add it. Please get a higher role and try again."
+#: redbot/cogs/admin/admin.py:35
+msgid "I can not edit {role.name} because that role is higher than my or equal to highest role in the Discord hierarchy."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:43
-msgid "I am already announcing something. If you would like to make a different announcement please use `{prefix}announce cancel` first."
+#: redbot/cogs/admin/admin.py:41
+msgid "I can not let you give {role.name} to {member.display_name} because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:47
+msgid "I can not let you remove {role.name} from {member.display_name} because that role is higher than or equal to your highest role in the Discord hierarchy."
 msgstr ""
 
 #: redbot/cogs/admin/admin.py:53
+msgid "I can not let you edit {role.name} because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:59
+msgid "I need manage roles permission to do that."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:61
+msgid "I am already announcing something. If you would like to make a different announcement please use `{prefix}announce cancel` first."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:71
 #, docstring
 msgid "A collection of server administration utilities."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:115 redbot/cogs/admin/admin.py:160
-msgid "add"
+#: redbot/cogs/admin/admin.py:162
+msgid "{member.display_name} already has the role {role.name}."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:121
+#: redbot/cogs/admin/admin.py:182
 msgid "I successfully added {role.name} to {member.display_name}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:132 redbot/cogs/admin/admin.py:180
-msgid "remove"
+#: redbot/cogs/admin/admin.py:192
+msgid "{member.display_name} does not have the role {role.name}."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:138
+#: redbot/cogs/admin/admin.py:212
 msgid "I successfully removed {role.name} from {member.display_name}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:149
+#: redbot/cogs/admin/admin.py:223
 #, docstring
-msgid "Add a role to a user.\\n\\n        If user is left blank it defaults to the author of the command.\\n        "
+msgid "\\n        Add a role to a user.\\n\\n        Use double quotes if the role contains spaces.\\n        If user is left blank it defaults to the author of the command.\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:169
+#: redbot/cogs/admin/admin.py:239
 #, docstring
-msgid "Remove a role from a user.\\n\\n        If user is left blank it defaults to the author of the command.\\n        "
+msgid "\\n        Remove a role from a user.\\n\\n        Use double quotes if the role contains spaces.\\n        If user is left blank it defaults to the author of the command.\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:187
+#: redbot/cogs/admin/admin.py:253
 #, docstring
 msgid "Edit role settings."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:194
+#: redbot/cogs/admin/admin.py:260
 #, docstring
-msgid "Edit a role's colour.\\n\\n        Use double quotes if the role contains spaces.\\n        Colour must be in hexadecimal format.\\n        [Online colour picker](http://www.w3schools.com/colors/colors_picker.asp)\\n\\n        Examples:\\n            `[p]editrole colour \\\"The Transistor\\\" #ff0000`\\n            `[p]editrole colour Test #ff9900`\\n        "
+msgid "\\n        Edit a role's colour.\\n\\n        Use double quotes if the role contains spaces.\\n        Colour must be in hexadecimal format.\\n        [Online colour picker](http://www.w3schools.com/colors/colors_picker.asp)\\n\\n        Examples:\\n            `[p]editrole colour \\\"The Transistor\\\" #ff0000`\\n            `[p]editrole colour Test #ff9900`\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:217 redbot/cogs/admin/admin.py:245
+#: redbot/cogs/admin/admin.py:289 redbot/cogs/admin/admin.py:322
 msgid "Done."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:222
+#: redbot/cogs/admin/admin.py:293
 #, docstring
-msgid "Edit a role's name.\\n\\n        Use double quotes if the role or the name contain spaces.\\n\\n        Examples:\\n            `[p]editrole name \\\"The Transistor\\\" Test`\\n        "
+msgid "\\n        Edit a role's name.\\n\\n        Use double quotes if the role or the name contain spaces.\\n\\n        Example:\\n            `[p]editrole name \\\"The Transistor\\\" Test`\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:250
+#: redbot/cogs/admin/admin.py:327
 #, docstring
 msgid "Announce a message to all servers the bot is in."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:257
+#: redbot/cogs/admin/admin.py:334
 msgid "The announcement has begun."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:265
+#: redbot/cogs/admin/admin.py:341
 #, docstring
 msgid "Cancel a running announce."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:271
+#: redbot/cogs/admin/admin.py:343
+msgid "There is no currently running announcement."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:346
 msgid "The current announcement has been cancelled."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:277
+#: redbot/cogs/admin/admin.py:352
 #, docstring
-msgid "Change the channel to which the bot makes announcements."
+msgid "Change how announcements are sent in this guild."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:283
+#: redbot/cogs/admin/admin.py:357
+#, docstring
+msgid "\\n        Change the channel where the bot will send announcements.\\n\\n        If channel is left blank it defaults to the current channel.\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:366
 msgid "The announcement channel has been set to {channel.mention}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:290
-#, docstring
-msgid "Toggle announcements being enabled this server."
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:296
-msgid "The server {guild.name} will receive announcements."
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:300
-msgid "The server {guild.name} will not receive announcements."
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:326
-#, docstring
-msgid "Add a role to yourself.\\n\\n        Server admins must have configured the role as user settable.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:337
-#, docstring
-msgid "Remove a selfrole from yourself.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:347
-#, docstring
-msgid "Add a role to the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:355 redbot/cogs/admin/admin.py:367
-msgid "The selfroles list has been successfully modified."
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:360
-#, docstring
-msgid "Remove a role from the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr ""
-
 #: redbot/cogs/admin/admin.py:371
 #, docstring
+msgid "Unsets the channel for announcements."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:396
+#, docstring
+msgid "Apply selfroles."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:401
+#, docstring
+msgid "\\n        Add a selfrole to yourself.\\n\\n        Server admins must have configured the role as user settable.\\n        NOTE: The role is case sensitive!\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:412
+#, docstring
+msgid "\\n        Remove a selfrole from yourself.\\n\\n        Server admins must have configured the role as user settable.\\n        NOTE: The role is case sensitive!\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:423
+#, docstring
 msgid "\\n        Lists all available selfroles.\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:377
+#: redbot/cogs/admin/admin.py:433
 msgid "Available Selfroles:\\n{selfroles}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:394
+#: redbot/cogs/admin/admin.py:439
+#, docstring
+msgid "Manage selfroles."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:444
+#, docstring
+msgid "\\n        Add a role to the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:451
+msgid "I cannot let you add {role.name} as a selfrole because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:459
+msgid "Added."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:462
+msgid "That role is already a selfrole."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:466
+#, docstring
+msgid "\\n        Remove a role from the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:473
+msgid "I cannot let you remove {role.name} from being a selfrole because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:481
+msgid "Removed."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:486
 #, docstring
 msgid "Lock a bot to its current servers only."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:399
+#: redbot/cogs/admin/admin.py:491
 msgid "The bot is no longer serverlocked."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:401
+#: redbot/cogs/admin/admin.py:493
 msgid "The bot is now serverlocked."
 msgstr ""
 
-#: redbot/cogs/admin/announcer.py:70
-msgid "I could not announce to server: {server.id}"
+#: redbot/cogs/admin/announcer.py:68
+msgid "I could not announce to the following server: "
 msgstr ""
 
-#: redbot/cogs/admin/converters.py:25
+#: redbot/cogs/admin/announcer.py:70
+msgid "I could not announce to the following servers: "
+msgstr ""
+
+#: redbot/cogs/admin/converters.py:12
 msgid "The Admin cog is not loaded."
 msgstr ""
 
-#: redbot/cogs/admin/converters.py:34
+#: redbot/cogs/admin/converters.py:20
 msgid "The provided role is not a valid selfrole."
 msgstr ""
 

redbot/cogs/admin/locales/es-ES.po

@@ -1,9 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2019-07-14 04:24+0000\n"
-"PO-Revision-Date: 2020-01-07 21:47\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2020-09-03 12:24+0000\n"
+"Last-Translator: \n"
 "Language-Team: Spanish\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -11,175 +10,223 @@ msgstr ""
 "Generated-By: redgettext 3.1\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Crowdin-Project: red-discordbot\n"
+"X-Crowdin-Project-ID: 289505\n"
 "X-Crowdin-Language: es-ES\n"
-"X-Crowdin-File: /admin/locales/messages.pot\n"
+"X-Crowdin-File-ID: 42\n"
 "Language: es_ES\n"
 
-#: redbot/cogs/admin/admin.py:17
+#: redbot/cogs/admin/admin.py:18
 msgid "I attempted to do something that Discord denied me permissions for. Your command failed to successfully complete."
-msgstr "Intenté hacer algo para lo que Discord me negó permisos. Tu comando no pudo completarse correctamente."
+msgstr "Intenté hacer algo que Discord me ha negado el permiso. Su comando no se pudo completar."
 
-#: redbot/cogs/admin/admin.py:22
-msgid "I tried to {verb} {role.name} to {member.display_name} but that role is higher than my highest role in the Discord hierarchy so I was unable to successfully add it. Please give me a higher role and try again."
-msgstr "Intenté {verb} {role.name} a {member.display_name} pero ese rol es más alto que mi rol en la jerarquía de Discord, por lo que no he podido añadirlo con éxito. Por favor dame un rol más alto y vuelve a intentarlo."
+#: redbot/cogs/admin/admin.py:23
+msgid "I can not give {role.name} to {member.display_name} because that role is higher than or equal to my highest role in the Discord hierarchy."
+msgstr "No puedo dar el rol{role.name} a {member.display_name} porque ese rol es mayor o igual a mi rol más alto en la jerarquía de Discord."
 
 #: redbot/cogs/admin/admin.py:29
-msgid "I tried to {verb} {role.name} to {member.display_name} but that role is higher than your highest role in the Discord hierarchy so I was unable to successfully add it. Please get a higher role and try again."
-msgstr "Intenté {verb} {role.name} a {member.display_name} pero ese rol es más alto que tu rol más alto en la jerarquía de Discord, por lo que no he podido añadirlo con éxito. Por favor consigue un rol más alto y vuelve a intentarlo."
+msgid "I can not remove {role.name} from {member.display_name} because that role is higher than or equal to my highest role in the Discord hierarchy."
+msgstr "No puedo eliminar el rol {role.name} de {member.display_name} porque ese rol es mayor o igual que mi rol más alto en la jerarquía de Discord."
 
-#: redbot/cogs/admin/admin.py:36
-msgid "I tried to edit {role.name} but that role is higher than your highest role in the Discord hierarchy so I was unable to successfully add it. Please get a higher role and try again."
-msgstr "He intentado agregar {role.name} a pero ese rol es más alto que mi rol en la jerarquía de Discord, por lo que no he podido añadirlo con éxito. Por favor dame un rol más alto y vuelva a intentarlo."
+#: redbot/cogs/admin/admin.py:35
+msgid "I can not edit {role.name} because that role is higher than my or equal to highest role in the Discord hierarchy."
+msgstr "No puedo editar el rol {role.name} porque ese rol es mayor que el mío o igual al rol más alto en la jerarquía de Discord."
 
-#: redbot/cogs/admin/admin.py:43
+#: redbot/cogs/admin/admin.py:41
+msgid "I can not let you give {role.name} to {member.display_name} because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr "No puedo dejar que le des el rol {role.name} a {member.display_name} porque ese rol es mayor o igual a tu rol más alto en la jerarquía de Discord."
+
+#: redbot/cogs/admin/admin.py:47
+msgid "I can not let you remove {role.name} from {member.display_name} because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr "No puedo dejar que elimines el rol {role.name} de {member.display_name} porque ese rol es mayor o igual a tu rol más alto en la jerarquía de Discord."
+
+#: redbot/cogs/admin/admin.py:53
+msgid "I can not let you edit {role.name} because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr "No puedo permitir que edites el rol{role.name} porque ese rol es mayor o igual a tu rol más alto en la jerarquía de Discord."
+
+#: redbot/cogs/admin/admin.py:59
+msgid "I need manage roles permission to do that."
+msgstr "Necesito el permiso gestionar roles para hacerlo."
+
+#: redbot/cogs/admin/admin.py:61
 msgid "I am already announcing something. If you would like to make a different announcement please use `{prefix}announce cancel` first."
 msgstr "Ya estoy anunciando algo. Si quieres hacer un anuncio diferente, por favor usa `{prefix}announce cancel` primero."
 
-#: redbot/cogs/admin/admin.py:53
+#: redbot/cogs/admin/admin.py:71
 #, docstring
 msgid "A collection of server administration utilities."
 msgstr "Una colección de utilidades de administración de servidores."
 
-#: redbot/cogs/admin/admin.py:115 redbot/cogs/admin/admin.py:160
-msgid "add"
-msgstr "añadir"
+#: redbot/cogs/admin/admin.py:162
+msgid "{member.display_name} already has the role {role.name}."
+msgstr "{member.display_name} ya tiene el rol {role.name}."
 
-#: redbot/cogs/admin/admin.py:121
+#: redbot/cogs/admin/admin.py:182
 msgid "I successfully added {role.name} to {member.display_name}"
 msgstr "He añadido con éxito {role.name} a {member.display_name}"
 
-#: redbot/cogs/admin/admin.py:132 redbot/cogs/admin/admin.py:180
-msgid "remove"
-msgstr "eliminar"
+#: redbot/cogs/admin/admin.py:192
+msgid "{member.display_name} does not have the role {role.name}."
+msgstr "{member.display_name} no tiene el rol {role.name}."
 
-#: redbot/cogs/admin/admin.py:138
+#: redbot/cogs/admin/admin.py:212
 msgid "I successfully removed {role.name} from {member.display_name}"
 msgstr "He retirado con éxito {role.name} de {member.display_name}"
 
-#: redbot/cogs/admin/admin.py:149
+#: redbot/cogs/admin/admin.py:223
 #, docstring
-msgid "Add a role to a user.\\n\\n        If user is left blank it defaults to the author of the command.\\n        "
-msgstr "Añadir un rol a un usuario.\\n\\n        Si el usuario se deja en blanco, por defecto se convierte en autor del comando.\\n        "
+msgid "\\n        Add a role to a user.\\n\\n        Use double quotes if the role contains spaces.\\n        If user is left blank it defaults to the author of the command.\\n        "
+msgstr "\\n        Añadir un rol a un usuario.\\n\\n        Usar comillas dobles si el rol contiene espacios.\\n        Si el usuario se deja en blanco el valor por defecto es el autor del comando.\\n        "
 
-#: redbot/cogs/admin/admin.py:169
+#: redbot/cogs/admin/admin.py:239
 #, docstring
-msgid "Remove a role from a user.\\n\\n        If user is left blank it defaults to the author of the command.\\n        "
-msgstr "Eliminar un rol de un usuario.\\n\\n        Si el usuario se deja en blanco, por defecto se convierte en autor del comando.\\n        "
+msgid "\\n        Remove a role from a user.\\n\\n        Use double quotes if the role contains spaces.\\n        If user is left blank it defaults to the author of the command.\\n        "
+msgstr "\\n        Elimina un rol de un usuario.\\n\\n        Usar comillas dobles si el rol contiene espacios.\\n        Si el usuario se deja en blanco el valor por defecto es el autor del comando.\\n        "
 
-#: redbot/cogs/admin/admin.py:187
+#: redbot/cogs/admin/admin.py:253
 #, docstring
 msgid "Edit role settings."
 msgstr "Editar configuración de rol."
 
-#: redbot/cogs/admin/admin.py:194
+#: redbot/cogs/admin/admin.py:260
 #, docstring
-msgid "Edit a role's colour.\\n\\n        Use double quotes if the role contains spaces.\\n        Colour must be in hexadecimal format.\\n        [Online colour picker](http://www.w3schools.com/colors/colors_picker.asp)\\n\\n        Examples:\\n            `[p]editrole colour \\\"The Transistor\\\" #ff0000`\\n            `[p]editrole colour Test #ff9900`\\n        "
-msgstr "Editar el color de un rol.\\n\\n        Usa comillas dobles si el rol contiene espacios.\\n        El color debe estar en formato hexadecimal.\\n        [Selector de colores en línea](http://www.w3schools.com/colors/colors_picker.asp)\\n\\n        Ejemplos:\\n            `[p]color de papel de edición \\\"The Transistor\\\" #ff0000`\\n            `[p]edición role colour Test #ff9900`\\n        \\n        "
+msgid "\\n        Edit a role's colour.\\n\\n        Use double quotes if the role contains spaces.\\n        Colour must be in hexadecimal format.\\n        [Online colour picker](http://www.w3schools.com/colors/colors_picker.asp)\\n\\n        Examples:\\n            `[p]editrole colour \\\"The Transistor\\\" #ff0000`\\n            `[p]editrole colour Test #ff9900`\\n        "
+msgstr "\\n        Edita el color de un rol.\\n\\n        Usar comillas dobles si el rol contiene espacios.\\n        El color debe estar en formato hexadecimal.\\n        [Selector de color en línea](http://www.w3schools.com/colors/colors_picker.asp)\\n\\n        Ejemplos:\\n            `[p]color editrole \\\"The Transistor\\\" #ff0000`\\n            `[p]editrole colour Test #ff9900`\\n        "
 
-#: redbot/cogs/admin/admin.py:217 redbot/cogs/admin/admin.py:245
+#: redbot/cogs/admin/admin.py:289 redbot/cogs/admin/admin.py:322
 msgid "Done."
 msgstr "Listo."
 
-#: redbot/cogs/admin/admin.py:222
+#: redbot/cogs/admin/admin.py:293
 #, docstring
-msgid "Edit a role's name.\\n\\n        Use double quotes if the role or the name contain spaces.\\n\\n        Examples:\\n            `[p]editrole name \\\"The Transistor\\\" Test`\\n        "
-msgstr "Editar el nombre de un rol.\\n\\n        Usa comillas si el rol o el nombre contienen espacios.\\n\\n        Ejemplos:\\n            `[p]editrole name \\\"El Transistor\\\" Prueba`\\n        "
+msgid "\\n        Edit a role's name.\\n\\n        Use double quotes if the role or the name contain spaces.\\n\\n        Example:\\n            `[p]editrole name \\\"The Transistor\\\" Test`\\n        "
+msgstr "\\n        Edita el nombre de un rol.\\n\\n        Utilice comillas dobles si el rol o el nombre contiene espacios.\\n\\n        Ejemplo:\\n            `[p]nombre editrole \\\"The Transistor\\\" Test`\\n        "
 
-#: redbot/cogs/admin/admin.py:250
+#: redbot/cogs/admin/admin.py:327
 #, docstring
 msgid "Announce a message to all servers the bot is in."
-msgstr "Anunciar un mensaje a todos los servidores en los que está el bot."
+msgstr "Anunciar un mensaje a todos los servidores en que el bot está."
 
-#: redbot/cogs/admin/admin.py:257
+#: redbot/cogs/admin/admin.py:334
 msgid "The announcement has begun."
 msgstr "El anuncio ha comenzado."
 
-#: redbot/cogs/admin/admin.py:265
+#: redbot/cogs/admin/admin.py:341
 #, docstring
 msgid "Cancel a running announce."
-msgstr "Cancelar un anuncio en ejecución."
+msgstr "Cancela un anuncio en ejecución."
 
-#: redbot/cogs/admin/admin.py:271
+#: redbot/cogs/admin/admin.py:343
+msgid "There is no currently running announcement."
+msgstr "No hay ningún anuncio en ejecución."
+
+#: redbot/cogs/admin/admin.py:346
 msgid "The current announcement has been cancelled."
-msgstr "El anuncio fue cancelado."
+msgstr "El anuncio actual ha sido cancelado."
 
-#: redbot/cogs/admin/admin.py:277
+#: redbot/cogs/admin/admin.py:352
 #, docstring
-msgid "Change the channel to which the bot makes announcements."
-msgstr "Cambia el canal al que el bot hace anuncios."
+msgid "Change how announcements are sent in this guild."
+msgstr "Cambia cómo son enviados los anuncios en este servidor."
 
-#: redbot/cogs/admin/admin.py:283
+#: redbot/cogs/admin/admin.py:357
+#, docstring
+msgid "\\n        Change the channel where the bot will send announcements.\\n\\n        If channel is left blank it defaults to the current channel.\\n        "
+msgstr "\\n        Cambia el canal donde el bot enviará anuncios.\\n\\n        Si el canal se deja en blanco el canal por defecto es el canal actual.\\n        "
+
+#: redbot/cogs/admin/admin.py:366
 msgid "The announcement channel has been set to {channel.mention}"
-msgstr "El canal de anuncio se ha establecido en {channel.mention}"
-
-#: redbot/cogs/admin/admin.py:290
-#, docstring
-msgid "Toggle announcements being enabled this server."
-msgstr "Alternar anuncios habilitados en este servidor."
-
-#: redbot/cogs/admin/admin.py:296
-msgid "The server {guild.name} will receive announcements."
-msgstr "El servidor {guild.name} recibirá anuncios."
-
-#: redbot/cogs/admin/admin.py:300
-msgid "The server {guild.name} will not receive announcements."
-msgstr "El servidor {guild.name} no recibirá anuncios."
-
-#: redbot/cogs/admin/admin.py:326
-#, docstring
-msgid "Add a role to yourself.\\n\\n        Server admins must have configured the role as user settable.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr "Añadir un rol a ti mismo.\\n\\n        Los administradores del servidor deben haber configurado el rol como usuario configurable.\\n\\n        NOTA: El rol es sensible a mayúsculas!\\n        "
-
-#: redbot/cogs/admin/admin.py:337
-#, docstring
-msgid "Remove a selfrole from yourself.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr "Eliminar un selfrole de ti mismo.\\n\\n        NOTA: El rol es sensible a las mayúsculas!\\n        "
-
-#: redbot/cogs/admin/admin.py:347
-#, docstring
-msgid "Add a role to the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr "Añade un rol a la lista de selfroles disponibles.\\n\\n        NOTA: El rol es sensible a las mayúsculas!\\n        "
-
-#: redbot/cogs/admin/admin.py:355 redbot/cogs/admin/admin.py:367
-msgid "The selfroles list has been successfully modified."
-msgstr "La lista de selfroles ha sido modificada con éxito."
-
-#: redbot/cogs/admin/admin.py:360
-#, docstring
-msgid "Remove a role from the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr "Eliminar un rol de la lista de las selfroles disponibles.\\n\\n        NOTA: El rol es sensible a mayúsculas!\\n        "
+msgstr "El canal de anuncios se ha establecido en {channel.mention}"
 
 #: redbot/cogs/admin/admin.py:371
 #, docstring
-msgid "\\n        Lists all available selfroles.\\n        "
-msgstr "\\n        Lista todos los selfroles disponibles.\\n        "
+msgid "Unsets the channel for announcements."
+msgstr "Quita el canal para los anuncios."
 
-#: redbot/cogs/admin/admin.py:377
+#: redbot/cogs/admin/admin.py:396
+#, docstring
+msgid "Apply selfroles."
+msgstr "Aplicar selfroles."
+
+#: redbot/cogs/admin/admin.py:401
+#, docstring
+msgid "\\n        Add a selfrole to yourself.\\n\\n        Server admins must have configured the role as user settable.\\n        NOTE: The role is case sensitive!\\n        "
+msgstr "\\n        Añade un rol a ti mismo.\\n\\n        Los administradores del servidor deben haber configurado el rol como usuario configurable.\\n        NOTA: El rol es sensible a mayúsculas!\\n        "
+
+#: redbot/cogs/admin/admin.py:412
+#, docstring
+msgid "\\n        Remove a selfrole from yourself.\\n\\n        Server admins must have configured the role as user settable.\\n        NOTE: The role is case sensitive!\\n        "
+msgstr "\\n        Elimina un rol de ti mismo.\\n\\n        Los administradores del servidor deben haber configurado el rol como usuario configurable.\\n        NOTA: El rol es sensible a mayúsculas!\\n        "
+
+#: redbot/cogs/admin/admin.py:423
+#, docstring
+msgid "\\n        Lists all available selfroles.\\n        "
+msgstr "\\n        Lista de todos los selfroles disponibles.\\n        "
+
+#: redbot/cogs/admin/admin.py:433
 msgid "Available Selfroles:\\n{selfroles}"
 msgstr "Selfroles disponibles:\\n{selfroles}"
 
-#: redbot/cogs/admin/admin.py:394
+#: redbot/cogs/admin/admin.py:439
+#, docstring
+msgid "Manage selfroles."
+msgstr "Gestionar selfroles."
+
+#: redbot/cogs/admin/admin.py:444
+#, docstring
+msgid "\\n        Add a role to the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
+msgstr "\\n        Añade un rol a la lista de selfroles disponibles.\\n\\n        NOTA: ¡El rol es sensible a mayúsculas\\n        "
+
+#: redbot/cogs/admin/admin.py:451
+msgid "I cannot let you add {role.name} as a selfrole because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr "No puedo permitir que añadas {role.name} como selfrole porque ese rol es mayor o igual a tu rol más alto en la jerarquía de Discord."
+
+#: redbot/cogs/admin/admin.py:459
+msgid "Added."
+msgstr "Añadido."
+
+#: redbot/cogs/admin/admin.py:462
+msgid "That role is already a selfrole."
+msgstr "Ese rol ya es un selfrole."
+
+#: redbot/cogs/admin/admin.py:466
+#, docstring
+msgid "\\n        Remove a role from the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
+msgstr "\\n        Quita un rol de la lista de selfroles disponibles.\\n\\n        NOTA: El rol es sensible a mayúsculas\\n        "
+
+#: redbot/cogs/admin/admin.py:473
+msgid "I cannot let you remove {role.name} from being a selfrole because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr "No puedo permitir que elimines a {role.name} de ser un selfrole porque ese rol es mayor o igual a tu rol más alto en la jerarquía de Discord."
+
+#: redbot/cogs/admin/admin.py:481
+msgid "Removed."
+msgstr "Eliminado."
+
+#: redbot/cogs/admin/admin.py:486
 #, docstring
 msgid "Lock a bot to its current servers only."
-msgstr "Bloquea un bot sólo a sus servidores actuales."
+msgstr "Bloquea el bot sólo a sus servidores actuales."
 
-#: redbot/cogs/admin/admin.py:399
+#: redbot/cogs/admin/admin.py:491
 msgid "The bot is no longer serverlocked."
 msgstr "El bot ya no está bloqueado por el servidor."
 
-#: redbot/cogs/admin/admin.py:401
+#: redbot/cogs/admin/admin.py:493
 msgid "The bot is now serverlocked."
 msgstr "El bot está bloqueado por el servidor."
 
-#: redbot/cogs/admin/announcer.py:70
-msgid "I could not announce to server: {server.id}"
-msgstr "No pude anunciar en servidor: {server.id}"
+#: redbot/cogs/admin/announcer.py:68
+msgid "I could not announce to the following server: "
+msgstr "No pude anunciar en el siguiente servidor: "
 
-#: redbot/cogs/admin/converters.py:25
+#: redbot/cogs/admin/announcer.py:70
+msgid "I could not announce to the following servers: "
+msgstr "No pude anunciar en los siguientes servidores: "
+
+#: redbot/cogs/admin/converters.py:12
 msgid "The Admin cog is not loaded."
 msgstr "El cog Admin no está cargado."
 
-#: redbot/cogs/admin/converters.py:34
+#: redbot/cogs/admin/converters.py:20
 msgid "The provided role is not a valid selfrole."
 msgstr "El rol proporcionado no es un selfrole válido."
 

redbot/cogs/admin/locales/fi-FI.po

@@ -1,9 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2019-07-14 04:24+0000\n"
-"PO-Revision-Date: 2020-01-07 21:48\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2020-09-03 12:24+0000\n"
+"Last-Translator: \n"
 "Language-Team: Finnish\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -11,175 +10,223 @@ msgstr ""
 "Generated-By: redgettext 3.1\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Crowdin-Project: red-discordbot\n"
+"X-Crowdin-Project-ID: 289505\n"
 "X-Crowdin-Language: fi\n"
-"X-Crowdin-File: /admin/locales/messages.pot\n"
+"X-Crowdin-File-ID: 42\n"
 "Language: fi_FI\n"
 
-#: redbot/cogs/admin/admin.py:17
+#: redbot/cogs/admin/admin.py:18
 msgid "I attempted to do something that Discord denied me permissions for. Your command failed to successfully complete."
 msgstr "Yritin tehdä jotain, jonka Discord kielsi minulle luvat. Komento epäonnistui onnistuneesti."
 
-#: redbot/cogs/admin/admin.py:22
-msgid "I tried to {verb} {role.name} to {member.display_name} but that role is higher than my highest role in the Discord hierarchy so I was unable to successfully add it. Please give me a higher role and try again."
-msgstr "Yritin {verb} {role.name} kohtaan {member.display_name}, mutta tämä rooli on suurempi kuin korkein roolini Discord-hierarkiassa, joten en voinut lisätä sitä onnistuneesti. Anna minulle suurempi rooli ja yritä uudelleen."
+#: redbot/cogs/admin/admin.py:23
+msgid "I can not give {role.name} to {member.display_name} because that role is higher than or equal to my highest role in the Discord hierarchy."
+msgstr ""
 
 #: redbot/cogs/admin/admin.py:29
-msgid "I tried to {verb} {role.name} to {member.display_name} but that role is higher than your highest role in the Discord hierarchy so I was unable to successfully add it. Please get a higher role and try again."
-msgstr "Yritin {verb} {role.name} kohtaan {member.display_name}, mutta tämä rooli on korkeampi kuin korkein rooli Discord-hierarkiassa, joten en voinut lisätä sitä onnistuneesti. Hanki suurempi rooli ja yritä uudelleen."
+msgid "I can not remove {role.name} from {member.display_name} because that role is higher than or equal to my highest role in the Discord hierarchy."
+msgstr ""
 
-#: redbot/cogs/admin/admin.py:36
-msgid "I tried to edit {role.name} but that role is higher than your highest role in the Discord hierarchy so I was unable to successfully add it. Please get a higher role and try again."
-msgstr "Yritin muokata {role.name}, mutta tämä rooli on korkeampi kuin korkein rooli Discord-hierarkiassa, joten en voinut lisätä sitä onnistuneesti. Hanki suurempi rooli ja yritä uudelleen."
+#: redbot/cogs/admin/admin.py:35
+msgid "I can not edit {role.name} because that role is higher than my or equal to highest role in the Discord hierarchy."
+msgstr ""
 
-#: redbot/cogs/admin/admin.py:43
+#: redbot/cogs/admin/admin.py:41
+msgid "I can not let you give {role.name} to {member.display_name} because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:47
+msgid "I can not let you remove {role.name} from {member.display_name} because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:53
+msgid "I can not let you edit {role.name} because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:59
+msgid "I need manage roles permission to do that."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:61
 msgid "I am already announcing something. If you would like to make a different announcement please use `{prefix}announce cancel` first."
 msgstr "Olen jo ilmoittanut jotain. Jos haluat tehdä toisen ilmoituksen, käytä ensin \"{prefix} announce cancel\"."
 
-#: redbot/cogs/admin/admin.py:53
+#: redbot/cogs/admin/admin.py:71
 #, docstring
 msgid "A collection of server administration utilities."
 msgstr "Kokoelma palvelinhallintaohjelmia."
 
-#: redbot/cogs/admin/admin.py:115 redbot/cogs/admin/admin.py:160
-msgid "add"
-msgstr "lisätä"
+#: redbot/cogs/admin/admin.py:162
+msgid "{member.display_name} already has the role {role.name}."
+msgstr ""
 
-#: redbot/cogs/admin/admin.py:121
+#: redbot/cogs/admin/admin.py:182
 msgid "I successfully added {role.name} to {member.display_name}"
 msgstr "Lisäsin {role.name} onnistuneesti {member.display_name}"
 
-#: redbot/cogs/admin/admin.py:132 redbot/cogs/admin/admin.py:180
-msgid "remove"
-msgstr "poistaa"
+#: redbot/cogs/admin/admin.py:192
+msgid "{member.display_name} does not have the role {role.name}."
+msgstr ""
 
-#: redbot/cogs/admin/admin.py:138
+#: redbot/cogs/admin/admin.py:212
 msgid "I successfully removed {role.name} from {member.display_name}"
 msgstr "Olen poistanut {role.name} onnistuneesti {member.display_name}"
 
-#: redbot/cogs/admin/admin.py:149
+#: redbot/cogs/admin/admin.py:223
 #, docstring
-msgid "Add a role to a user.\\n\\n        If user is left blank it defaults to the author of the command.\\n        "
+msgid "\\n        Add a role to a user.\\n\\n        Use double quotes if the role contains spaces.\\n        If user is left blank it defaults to the author of the command.\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:169
+#: redbot/cogs/admin/admin.py:239
 #, docstring
-msgid "Remove a role from a user.\\n\\n        If user is left blank it defaults to the author of the command.\\n        "
+msgid "\\n        Remove a role from a user.\\n\\n        Use double quotes if the role contains spaces.\\n        If user is left blank it defaults to the author of the command.\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:187
+#: redbot/cogs/admin/admin.py:253
 #, docstring
 msgid "Edit role settings."
 msgstr "Muokkaa rooliasetuksia."
 
-#: redbot/cogs/admin/admin.py:194
+#: redbot/cogs/admin/admin.py:260
 #, docstring
-msgid "Edit a role's colour.\\n\\n        Use double quotes if the role contains spaces.\\n        Colour must be in hexadecimal format.\\n        [Online colour picker](http://www.w3schools.com/colors/colors_picker.asp)\\n\\n        Examples:\\n            `[p]editrole colour \\\"The Transistor\\\" #ff0000`\\n            `[p]editrole colour Test #ff9900`\\n        "
+msgid "\\n        Edit a role's colour.\\n\\n        Use double quotes if the role contains spaces.\\n        Colour must be in hexadecimal format.\\n        [Online colour picker](http://www.w3schools.com/colors/colors_picker.asp)\\n\\n        Examples:\\n            `[p]editrole colour \\\"The Transistor\\\" #ff0000`\\n            `[p]editrole colour Test #ff9900`\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:217 redbot/cogs/admin/admin.py:245
+#: redbot/cogs/admin/admin.py:289 redbot/cogs/admin/admin.py:322
 msgid "Done."
-msgstr ""
+msgstr "Tehty."
 
-#: redbot/cogs/admin/admin.py:222
+#: redbot/cogs/admin/admin.py:293
 #, docstring
-msgid "Edit a role's name.\\n\\n        Use double quotes if the role or the name contain spaces.\\n\\n        Examples:\\n            `[p]editrole name \\\"The Transistor\\\" Test`\\n        "
+msgid "\\n        Edit a role's name.\\n\\n        Use double quotes if the role or the name contain spaces.\\n\\n        Example:\\n            `[p]editrole name \\\"The Transistor\\\" Test`\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:250
+#: redbot/cogs/admin/admin.py:327
 #, docstring
 msgid "Announce a message to all servers the bot is in."
 msgstr "Ilmoita viesti kaikille palvelimille, joihin botti on."
 
-#: redbot/cogs/admin/admin.py:257
+#: redbot/cogs/admin/admin.py:334
 msgid "The announcement has begun."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:265
+#: redbot/cogs/admin/admin.py:341
 #, docstring
 msgid "Cancel a running announce."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:271
+#: redbot/cogs/admin/admin.py:343
+msgid "There is no currently running announcement."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:346
 msgid "The current announcement has been cancelled."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:277
+#: redbot/cogs/admin/admin.py:352
 #, docstring
-msgid "Change the channel to which the bot makes announcements."
+msgid "Change how announcements are sent in this guild."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:283
+#: redbot/cogs/admin/admin.py:357
+#, docstring
+msgid "\\n        Change the channel where the bot will send announcements.\\n\\n        If channel is left blank it defaults to the current channel.\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:366
 msgid "The announcement channel has been set to {channel.mention}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:290
-#, docstring
-msgid "Toggle announcements being enabled this server."
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:296
-msgid "The server {guild.name} will receive announcements."
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:300
-msgid "The server {guild.name} will not receive announcements."
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:326
-#, docstring
-msgid "Add a role to yourself.\\n\\n        Server admins must have configured the role as user settable.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:337
-#, docstring
-msgid "Remove a selfrole from yourself.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:347
-#, docstring
-msgid "Add a role to the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:355 redbot/cogs/admin/admin.py:367
-msgid "The selfroles list has been successfully modified."
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:360
-#, docstring
-msgid "Remove a role from the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr ""
-
 #: redbot/cogs/admin/admin.py:371
 #, docstring
+msgid "Unsets the channel for announcements."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:396
+#, docstring
+msgid "Apply selfroles."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:401
+#, docstring
+msgid "\\n        Add a selfrole to yourself.\\n\\n        Server admins must have configured the role as user settable.\\n        NOTE: The role is case sensitive!\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:412
+#, docstring
+msgid "\\n        Remove a selfrole from yourself.\\n\\n        Server admins must have configured the role as user settable.\\n        NOTE: The role is case sensitive!\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:423
+#, docstring
 msgid "\\n        Lists all available selfroles.\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:377
+#: redbot/cogs/admin/admin.py:433
 msgid "Available Selfroles:\\n{selfroles}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:394
+#: redbot/cogs/admin/admin.py:439
+#, docstring
+msgid "Manage selfroles."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:444
+#, docstring
+msgid "\\n        Add a role to the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:451
+msgid "I cannot let you add {role.name} as a selfrole because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:459
+msgid "Added."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:462
+msgid "That role is already a selfrole."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:466
+#, docstring
+msgid "\\n        Remove a role from the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:473
+msgid "I cannot let you remove {role.name} from being a selfrole because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:481
+msgid "Removed."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:486
 #, docstring
 msgid "Lock a bot to its current servers only."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:399
+#: redbot/cogs/admin/admin.py:491
 msgid "The bot is no longer serverlocked."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:401
+#: redbot/cogs/admin/admin.py:493
 msgid "The bot is now serverlocked."
 msgstr ""
 
-#: redbot/cogs/admin/announcer.py:70
-msgid "I could not announce to server: {server.id}"
+#: redbot/cogs/admin/announcer.py:68
+msgid "I could not announce to the following server: "
 msgstr ""
 
-#: redbot/cogs/admin/converters.py:25
+#: redbot/cogs/admin/announcer.py:70
+msgid "I could not announce to the following servers: "
+msgstr ""
+
+#: redbot/cogs/admin/converters.py:12
 msgid "The Admin cog is not loaded."
 msgstr ""
 
-#: redbot/cogs/admin/converters.py:34
+#: redbot/cogs/admin/converters.py:20
 msgid "The provided role is not a valid selfrole."
 msgstr ""
 

redbot/cogs/admin/locales/fr-FR.po

@@ -1,9 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2019-07-14 04:24+0000\n"
-"PO-Revision-Date: 2020-01-07 21:47\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2020-09-03 12:24+0000\n"
+"Last-Translator: \n"
 "Language-Team: French\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -11,175 +10,223 @@ msgstr ""
 "Generated-By: redgettext 3.1\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Crowdin-Project: red-discordbot\n"
+"X-Crowdin-Project-ID: 289505\n"
 "X-Crowdin-Language: fr\n"
-"X-Crowdin-File: /admin/locales/messages.pot\n"
+"X-Crowdin-File-ID: 42\n"
 "Language: fr_FR\n"
 
-#: redbot/cogs/admin/admin.py:17
+#: redbot/cogs/admin/admin.py:18
 msgid "I attempted to do something that Discord denied me permissions for. Your command failed to successfully complete."
 msgstr "J'ai tenté de faire quelque chose que pour lequel Discord m'a refusé les permissions. La commande a échoué."
 
-#: redbot/cogs/admin/admin.py:22
-msgid "I tried to {verb} {role.name} to {member.display_name} but that role is higher than my highest role in the Discord hierarchy so I was unable to successfully add it. Please give me a higher role and try again."
-msgstr "J'ai essayé de {verb} {role.name} à {member.display_name} mais ce rôle est plus élevé que mon rôle le plus élevé dans la hiérarchie Discord, je n'ai donc pas réussi à l'ajouter. Donnez-moi un rôle plus élevé et réessayez."
+#: redbot/cogs/admin/admin.py:23
+msgid "I can not give {role.name} to {member.display_name} because that role is higher than or equal to my highest role in the Discord hierarchy."
+msgstr "Je ne peux pas donner {role.name} à {member.display_name} car ce rôle est supérieur ou égal à mon rôle le plus élevé dans la hiérarchie Discord."
 
 #: redbot/cogs/admin/admin.py:29
-msgid "I tried to {verb} {role.name} to {member.display_name} but that role is higher than your highest role in the Discord hierarchy so I was unable to successfully add it. Please get a higher role and try again."
-msgstr "J'ai essayé de {verb} {role.name} à {member.display_name} mais ce rôle est plus élevé que votre rôle le plus élevé dans la hiérarchie Discord donc je n'ai pas réussi à l'ajouter. Essayez à nouveau avec un rôle plus élevé."
+msgid "I can not remove {role.name} from {member.display_name} because that role is higher than or equal to my highest role in the Discord hierarchy."
+msgstr "Je ne peux pas supprimer {role.name} de {member.display_name} car ce rôle est supérieur ou égal à mon rôle le plus élevé dans la hiérarchie Discord."
 
-#: redbot/cogs/admin/admin.py:36
-msgid "I tried to edit {role.name} but that role is higher than your highest role in the Discord hierarchy so I was unable to successfully add it. Please get a higher role and try again."
-msgstr "J'ai essayé d'éditer {role.name} mais ce rôle est plus élevé que votre rôle le plus élevé dans la hiérarchie Discord et je n'ai donc pas réussi à l'ajouter. Essayez à nouveau avec un rôle plus élevé."
+#: redbot/cogs/admin/admin.py:35
+msgid "I can not edit {role.name} because that role is higher than my or equal to highest role in the Discord hierarchy."
+msgstr "Je ne peux pas modifier {role.name} parce que ce rôle est supérieur ou égal à mon rôle le plus élevé dans la hiérarchie Discord."
 
-#: redbot/cogs/admin/admin.py:43
+#: redbot/cogs/admin/admin.py:41
+msgid "I can not let you give {role.name} to {member.display_name} because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr "Je ne peux pas vous laisser donner {role.name} à {member.display_name} car ce rôle est supérieur ou égal à votre rôle le plus haut dans la hiérarchie Discord."
+
+#: redbot/cogs/admin/admin.py:47
+msgid "I can not let you remove {role.name} from {member.display_name} because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr "Je ne peux pas vous permettre de supprimer {role.name} de {member.display_name} car ce rôle est supérieur ou égal à votre rôle le plus élevé dans la hiérarchie Discord."
+
+#: redbot/cogs/admin/admin.py:53
+msgid "I can not let you edit {role.name} because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr "Je ne peux pas vous permettre de modifier {role.name} car ce rôle est supérieur ou égal à votre rôle le plus élevé dans la hiérarchie Discord."
+
+#: redbot/cogs/admin/admin.py:59
+msgid "I need manage roles permission to do that."
+msgstr "J’ai besoin de la permission de gérer les rôles pour faire cela."
+
+#: redbot/cogs/admin/admin.py:61
 msgid "I am already announcing something. If you would like to make a different announcement please use `{prefix}announce cancel` first."
 msgstr "Je suis déjà en train d'annoncer quelque chose. Si tu souhaites faire une annonce différente, tu dois d'abord utiliser la commande `{prefix}announce cancel`."
 
-#: redbot/cogs/admin/admin.py:53
+#: redbot/cogs/admin/admin.py:71
 #, docstring
 msgid "A collection of server administration utilities."
 msgstr "Un ensemble d'utilitaires d'administration du serveur."
 
-#: redbot/cogs/admin/admin.py:115 redbot/cogs/admin/admin.py:160
-msgid "add"
-msgstr "ajouter"
+#: redbot/cogs/admin/admin.py:162
+msgid "{member.display_name} already has the role {role.name}."
+msgstr "{member.display_name} a déjà le rôle {role.name}."
 
-#: redbot/cogs/admin/admin.py:121
+#: redbot/cogs/admin/admin.py:182
 msgid "I successfully added {role.name} to {member.display_name}"
 msgstr "J'ai bien ajouté le rôle {role.name} à {member.display_name}"
 
-#: redbot/cogs/admin/admin.py:132 redbot/cogs/admin/admin.py:180
-msgid "remove"
-msgstr "supprimer"
+#: redbot/cogs/admin/admin.py:192
+msgid "{member.display_name} does not have the role {role.name}."
+msgstr "{member.display_name} n'a pas le rôle {role.name}."
 
-#: redbot/cogs/admin/admin.py:138
+#: redbot/cogs/admin/admin.py:212
 msgid "I successfully removed {role.name} from {member.display_name}"
 msgstr "J'ai bien retiré le rôle {role.name} de {member.display_name}"
 
-#: redbot/cogs/admin/admin.py:149
+#: redbot/cogs/admin/admin.py:223
 #, docstring
-msgid "Add a role to a user.\\n\\n        If user is left blank it defaults to the author of the command.\\n        "
-msgstr "Ajouter un rôle à un utilisateur.\\n\\n        Si aucun utilisateur n'est mentionné dans la commande, celui-ci fera effet sur l'auteur.\\n        "
+msgid "\\n        Add a role to a user.\\n\\n        Use double quotes if the role contains spaces.\\n        If user is left blank it defaults to the author of the command.\\n        "
+msgstr "\\n        Ajouter un rôle à un utilisateur.\\n\\n        Utilisez des guillemets si le rôle contient des espaces.\\n        Si l'utilisateur est laissé vide, c'est par défaut l'auteur de la commande.\\n        "
 
-#: redbot/cogs/admin/admin.py:169
+#: redbot/cogs/admin/admin.py:239
 #, docstring
-msgid "Remove a role from a user.\\n\\n        If user is left blank it defaults to the author of the command.\\n        "
-msgstr "Retirer un rôle à un utilisateur.\\n\\n        Si aucun utilisateur n'est mentionné dans la commande, celui-ci fera effet sur l'auteur.\\n        "
+msgid "\\n        Remove a role from a user.\\n\\n        Use double quotes if the role contains spaces.\\n        If user is left blank it defaults to the author of the command.\\n        "
+msgstr "\\n        Retirer un rôle d'un utilisateur.\\n\\n        Utilisez des guillemets doubles si le rôle contient des espaces.\\n        Si l'utilisateur est laissé vide, c'est par défaut l'auteur de la commande.\\n        "
 
-#: redbot/cogs/admin/admin.py:187
+#: redbot/cogs/admin/admin.py:253
 #, docstring
 msgid "Edit role settings."
 msgstr "Modifier les paramètres d'un rôle."
 
-#: redbot/cogs/admin/admin.py:194
+#: redbot/cogs/admin/admin.py:260
 #, docstring
-msgid "Edit a role's colour.\\n\\n        Use double quotes if the role contains spaces.\\n        Colour must be in hexadecimal format.\\n        [Online colour picker](http://www.w3schools.com/colors/colors_picker.asp)\\n\\n        Examples:\\n            `[p]editrole colour \\\"The Transistor\\\" #ff0000`\\n            `[p]editrole colour Test #ff9900`\\n        "
-msgstr "Modifier la couleur d'un rôle.\\n\\n        Utilise des guillemets si le nom du rôle contient des espaces.\\n        La couleur doit être au format hexadécimal\\n        [Sélecteur de couleur en ligne](http://www.w3schools.com/colors/colors_picker.asp)\\n\\n        Exemples:\\n            `[p]editrole colour \\\"The Transistor\\\" #ff0000`\\n            `[p]editrole colour Test #ff9900`\\n        "
+msgid "\\n        Edit a role's colour.\\n\\n        Use double quotes if the role contains spaces.\\n        Colour must be in hexadecimal format.\\n        [Online colour picker](http://www.w3schools.com/colors/colors_picker.asp)\\n\\n        Examples:\\n            `[p]editrole colour \\\"The Transistor\\\" #ff0000`\\n            `[p]editrole colour Test #ff9900`\\n        "
+msgstr "\\n        Modifiez la couleur d'un rôle.\\n\\n        Utilisez des guillemets doubles si le rôle contient des espaces.\\n        La couleur doit être au format hexadécimal.\\n        [Sélecteur de couleurs en ligne](http://www.w3schools.com/colors/colors_picker.asp)\\n\\n        Exemples:\\n            `[p]editrole color \\\"The Transistor\\\" #ff0000`\\n            `[p]editrole colour Test #ff9900`\\n        "
 
-#: redbot/cogs/admin/admin.py:217 redbot/cogs/admin/admin.py:245
+#: redbot/cogs/admin/admin.py:289 redbot/cogs/admin/admin.py:322
 msgid "Done."
-msgstr "Terminé."
+msgstr "Fait."
 
-#: redbot/cogs/admin/admin.py:222
+#: redbot/cogs/admin/admin.py:293
 #, docstring
-msgid "Edit a role's name.\\n\\n        Use double quotes if the role or the name contain spaces.\\n\\n        Examples:\\n            `[p]editrole name \\\"The Transistor\\\" Test`\\n        "
-msgstr "Modifier le nom d'un rôle.\\n\\n        Utilise des guillemets si le nom du rôle contient des espaces.\\n\\n        Exemples:\\n            `[p]editrole name \\\"The Transistor\\\" Test`\\n        "
+msgid "\\n        Edit a role's name.\\n\\n        Use double quotes if the role or the name contain spaces.\\n\\n        Example:\\n            `[p]editrole name \\\"The Transistor\\\" Test`\\n        "
+msgstr "\\n        Modifier le nom d'un rôle.\\n\\n        Utiliser des guillemets si le rôle ou le nom contient des espaces.\\n\\n        Exemple:\\n            `[p]editrole name \\\"The Transistor\\\" Test`\\n        "
 
-#: redbot/cogs/admin/admin.py:250
+#: redbot/cogs/admin/admin.py:327
 #, docstring
 msgid "Announce a message to all servers the bot is in."
 msgstr "Faire une annonce à tous les serveurs dans lesquels le bot se trouve."
 
-#: redbot/cogs/admin/admin.py:257
+#: redbot/cogs/admin/admin.py:334
 msgid "The announcement has begun."
 msgstr "L’annonce a commencé."
 
-#: redbot/cogs/admin/admin.py:265
+#: redbot/cogs/admin/admin.py:341
 #, docstring
 msgid "Cancel a running announce."
 msgstr "Interrompre une annonce en cours."
 
-#: redbot/cogs/admin/admin.py:271
+#: redbot/cogs/admin/admin.py:343
+msgid "There is no currently running announcement."
+msgstr "Il n'y a aucune annonce en cours d'exécution."
+
+#: redbot/cogs/admin/admin.py:346
 msgid "The current announcement has been cancelled."
 msgstr "L'annonce actuelle a été interrompue."
 
-#: redbot/cogs/admin/admin.py:277
+#: redbot/cogs/admin/admin.py:352
 #, docstring
-msgid "Change the channel to which the bot makes announcements."
-msgstr "Changer le salon dans lequel le bot fait des annonces."
+msgid "Change how announcements are sent in this guild."
+msgstr "Change la façon dont les annonces sont envoyées dans ce serveur."
 
-#: redbot/cogs/admin/admin.py:283
+#: redbot/cogs/admin/admin.py:357
+#, docstring
+msgid "\\n        Change the channel where the bot will send announcements.\\n\\n        If channel is left blank it defaults to the current channel.\\n        "
+msgstr "\\n        Change le salon où le bot enverra les annonces.\\n\\n        Si le salon est laissé vide, c'est pas défaut le salon actuel.\\n        "
+
+#: redbot/cogs/admin/admin.py:366
 msgid "The announcement channel has been set to {channel.mention}"
 msgstr "Les annonces seront maintenant faites dans {channel.mention}"
 
-#: redbot/cogs/admin/admin.py:290
-#, docstring
-msgid "Toggle announcements being enabled this server."
-msgstr "Activer ou désactiver les annonces sur ce serveur."
-
-#: redbot/cogs/admin/admin.py:296
-msgid "The server {guild.name} will receive announcements."
-msgstr "Le serveur {guild.name} recevra maintenant les annonces."
-
-#: redbot/cogs/admin/admin.py:300
-msgid "The server {guild.name} will not receive announcements."
-msgstr "Le serveur {guild.name} ne recevra plus les annonces."
-
-#: redbot/cogs/admin/admin.py:326
-#, docstring
-msgid "Add a role to yourself.\\n\\n        Server admins must have configured the role as user settable.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr "S'ajouter un rôle à soi-même.\\n\\n        Les administrateurs du serveur doivent avoir configuré le rôle en tant qu'ajoutable par les utilisateurs.\\n\\n        NOTE : Le nom du rôle est sensible aux majuscules et minuscules !\\n        "
-
-#: redbot/cogs/admin/admin.py:337
-#, docstring
-msgid "Remove a selfrole from yourself.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr "Se supprimer un auto-rôle.\\n\\n        NOTE : Le rôle est sensible aux majuscules et minuscules !\\n        "
-
-#: redbot/cogs/admin/admin.py:347
-#, docstring
-msgid "Add a role to the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr "Ajouter un rôle à la liste des auto-rôles disponibles.\\n\\n        NOTE : Le nom du rôle est sensible aux majuscules et minuscules !\\n        "
-
-#: redbot/cogs/admin/admin.py:355 redbot/cogs/admin/admin.py:367
-msgid "The selfroles list has been successfully modified."
-msgstr "La liste des auto-rôles a été modifiée avec succès."
-
-#: redbot/cogs/admin/admin.py:360
-#, docstring
-msgid "Remove a role from the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr "Supprimer un rôle de la liste des auto-rôles.\\n\\n        NOTE : Le nom du rôle est sensible aux majuscules et minuscules !\\n        "
-
 #: redbot/cogs/admin/admin.py:371
 #, docstring
+msgid "Unsets the channel for announcements."
+msgstr "Désactive le salon pour les annonces."
+
+#: redbot/cogs/admin/admin.py:396
+#, docstring
+msgid "Apply selfroles."
+msgstr "Appliquer auto-rôles."
+
+#: redbot/cogs/admin/admin.py:401
+#, docstring
+msgid "\\n        Add a selfrole to yourself.\\n\\n        Server admins must have configured the role as user settable.\\n        NOTE: The role is case sensitive!\\n        "
+msgstr "\\n        Ajouter un auto-rôle à vous-même.\\n\\n        Les administrateurs du serveur doivent avoir configuré le rôle en tant qu'utilisable par les utilisateurs.\\n        NOTE : Le rôle est sensible aux majuscules et minuscules !\\n        "
+
+#: redbot/cogs/admin/admin.py:412
+#, docstring
+msgid "\\n        Remove a selfrole from yourself.\\n\\n        Server admins must have configured the role as user settable.\\n        NOTE: The role is case sensitive!\\n        "
+msgstr "\\n        Supprimez un auto-rôle de vous-même.\\n\\n        Les administrateurs du serveur doivent avoir configuré le rôle en tant qu'utilisable par les utilisateurs.\\n        NOTE : Le rôle est sensible aux majuscules et minuscules !\\n        "
+
+#: redbot/cogs/admin/admin.py:423
+#, docstring
 msgid "\\n        Lists all available selfroles.\\n        "
 msgstr "\\n        Liste de tous les auto-rôles disponibles.\\n        "
 
-#: redbot/cogs/admin/admin.py:377
+#: redbot/cogs/admin/admin.py:433
 msgid "Available Selfroles:\\n{selfroles}"
 msgstr "Auto-rôles disponibles :\\n{selfroles}"
 
-#: redbot/cogs/admin/admin.py:394
+#: redbot/cogs/admin/admin.py:439
+#, docstring
+msgid "Manage selfroles."
+msgstr "Gérer les auto-roles."
+
+#: redbot/cogs/admin/admin.py:444
+#, docstring
+msgid "\\n        Add a role to the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
+msgstr "\\nAjouter un rôle à la liste des auto-rôles disponibles.\\n\\n        NOTE : Le nom du rôle est sensible aux majuscules et minuscules !\\n        "
+
+#: redbot/cogs/admin/admin.py:451
+msgid "I cannot let you add {role.name} as a selfrole because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr "Je ne peux pas vous laisser ajouter {role.name} comme auto-rôle car ce rôle est supérieur ou égal à votre rôle le plus haut dans la hiérarchie Discord."
+
+#: redbot/cogs/admin/admin.py:459
+msgid "Added."
+msgstr "Ajouté."
+
+#: redbot/cogs/admin/admin.py:462
+msgid "That role is already a selfrole."
+msgstr "Ce rôle est déjà un selfrole."
+
+#: redbot/cogs/admin/admin.py:466
+#, docstring
+msgid "\\n        Remove a role from the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
+msgstr "\\n        Supprimer un rôle de la liste des auto-rôles.\\n\\n        REMARQUE : Le nom du rôle est sensible aux majuscules et minuscules !\\n        "
+
+#: redbot/cogs/admin/admin.py:473
+msgid "I cannot let you remove {role.name} from being a selfrole because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr "Je ne peux pas vous laisser ajouter {role.name} comme auto-rôle car ce rôle est supérieur ou égal à votre rôle le plus haut dans la hiérarchie Discord."
+
+#: redbot/cogs/admin/admin.py:481
+msgid "Removed."
+msgstr "Retiré."
+
+#: redbot/cogs/admin/admin.py:486
 #, docstring
 msgid "Lock a bot to its current servers only."
 msgstr "Verrouiller un bot sur ses serveurs actuels uniquement."
 
-#: redbot/cogs/admin/admin.py:399
+#: redbot/cogs/admin/admin.py:491
 msgid "The bot is no longer serverlocked."
 msgstr "Le bot n'est plus verrouillé sur ses serveurs actuels."
 
-#: redbot/cogs/admin/admin.py:401
+#: redbot/cogs/admin/admin.py:493
 msgid "The bot is now serverlocked."
 msgstr "Le bot est maintenant verrouillé sur ses serveurs actuels."
 
-#: redbot/cogs/admin/announcer.py:70
-msgid "I could not announce to server: {server.id}"
-msgstr "Je n'ai pas pu faire d'annonce dans le serveur: {server.id}"
+#: redbot/cogs/admin/announcer.py:68
+msgid "I could not announce to the following server: "
+msgstr "Je n'ai pas pu annoncer au serveur suivant : "
 
-#: redbot/cogs/admin/converters.py:25
+#: redbot/cogs/admin/announcer.py:70
+msgid "I could not announce to the following servers: "
+msgstr "Je n'ai pas pu annoncer aux serveurs suivants : "
+
+#: redbot/cogs/admin/converters.py:12
 msgid "The Admin cog is not loaded."
 msgstr "Le cog Admin n'est pas chargé."
 
-#: redbot/cogs/admin/converters.py:34
+#: redbot/cogs/admin/converters.py:20
 msgid "The provided role is not a valid selfrole."
 msgstr "Le rôle fourni n'est pas un auto-rôle valide."
 

redbot/cogs/admin/locales/he-IL.po

@@ -1,9 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2019-07-14 04:24+0000\n"
-"PO-Revision-Date: 2020-01-07 21:48\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2020-09-03 12:24+0000\n"
+"Last-Translator: \n"
 "Language-Team: Hebrew\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -11,175 +10,223 @@ msgstr ""
 "Generated-By: redgettext 3.1\n"
 "Plural-Forms: nplurals=4; plural=n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3;\n"
 "X-Crowdin-Project: red-discordbot\n"
+"X-Crowdin-Project-ID: 289505\n"
 "X-Crowdin-Language: he\n"
-"X-Crowdin-File: /admin/locales/messages.pot\n"
+"X-Crowdin-File-ID: 42\n"
 "Language: he_IL\n"
 
-#: redbot/cogs/admin/admin.py:17
+#: redbot/cogs/admin/admin.py:18
 msgid "I attempted to do something that Discord denied me permissions for. Your command failed to successfully complete."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:22
-msgid "I tried to {verb} {role.name} to {member.display_name} but that role is higher than my highest role in the Discord hierarchy so I was unable to successfully add it. Please give me a higher role and try again."
+#: redbot/cogs/admin/admin.py:23
+msgid "I can not give {role.name} to {member.display_name} because that role is higher than or equal to my highest role in the Discord hierarchy."
 msgstr ""
 
 #: redbot/cogs/admin/admin.py:29
-msgid "I tried to {verb} {role.name} to {member.display_name} but that role is higher than your highest role in the Discord hierarchy so I was unable to successfully add it. Please get a higher role and try again."
+msgid "I can not remove {role.name} from {member.display_name} because that role is higher than or equal to my highest role in the Discord hierarchy."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:36
-msgid "I tried to edit {role.name} but that role is higher than your highest role in the Discord hierarchy so I was unable to successfully add it. Please get a higher role and try again."
+#: redbot/cogs/admin/admin.py:35
+msgid "I can not edit {role.name} because that role is higher than my or equal to highest role in the Discord hierarchy."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:43
-msgid "I am already announcing something. If you would like to make a different announcement please use `{prefix}announce cancel` first."
+#: redbot/cogs/admin/admin.py:41
+msgid "I can not let you give {role.name} to {member.display_name} because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:47
+msgid "I can not let you remove {role.name} from {member.display_name} because that role is higher than or equal to your highest role in the Discord hierarchy."
 msgstr ""
 
 #: redbot/cogs/admin/admin.py:53
+msgid "I can not let you edit {role.name} because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:59
+msgid "I need manage roles permission to do that."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:61
+msgid "I am already announcing something. If you would like to make a different announcement please use `{prefix}announce cancel` first."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:71
 #, docstring
 msgid "A collection of server administration utilities."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:115 redbot/cogs/admin/admin.py:160
-msgid "add"
+#: redbot/cogs/admin/admin.py:162
+msgid "{member.display_name} already has the role {role.name}."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:121
+#: redbot/cogs/admin/admin.py:182
 msgid "I successfully added {role.name} to {member.display_name}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:132 redbot/cogs/admin/admin.py:180
-msgid "remove"
+#: redbot/cogs/admin/admin.py:192
+msgid "{member.display_name} does not have the role {role.name}."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:138
+#: redbot/cogs/admin/admin.py:212
 msgid "I successfully removed {role.name} from {member.display_name}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:149
+#: redbot/cogs/admin/admin.py:223
 #, docstring
-msgid "Add a role to a user.\\n\\n        If user is left blank it defaults to the author of the command.\\n        "
+msgid "\\n        Add a role to a user.\\n\\n        Use double quotes if the role contains spaces.\\n        If user is left blank it defaults to the author of the command.\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:169
+#: redbot/cogs/admin/admin.py:239
 #, docstring
-msgid "Remove a role from a user.\\n\\n        If user is left blank it defaults to the author of the command.\\n        "
+msgid "\\n        Remove a role from a user.\\n\\n        Use double quotes if the role contains spaces.\\n        If user is left blank it defaults to the author of the command.\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:187
+#: redbot/cogs/admin/admin.py:253
 #, docstring
 msgid "Edit role settings."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:194
+#: redbot/cogs/admin/admin.py:260
 #, docstring
-msgid "Edit a role's colour.\\n\\n        Use double quotes if the role contains spaces.\\n        Colour must be in hexadecimal format.\\n        [Online colour picker](http://www.w3schools.com/colors/colors_picker.asp)\\n\\n        Examples:\\n            `[p]editrole colour \\\"The Transistor\\\" #ff0000`\\n            `[p]editrole colour Test #ff9900`\\n        "
+msgid "\\n        Edit a role's colour.\\n\\n        Use double quotes if the role contains spaces.\\n        Colour must be in hexadecimal format.\\n        [Online colour picker](http://www.w3schools.com/colors/colors_picker.asp)\\n\\n        Examples:\\n            `[p]editrole colour \\\"The Transistor\\\" #ff0000`\\n            `[p]editrole colour Test #ff9900`\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:217 redbot/cogs/admin/admin.py:245
+#: redbot/cogs/admin/admin.py:289 redbot/cogs/admin/admin.py:322
 msgid "Done."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:222
+#: redbot/cogs/admin/admin.py:293
 #, docstring
-msgid "Edit a role's name.\\n\\n        Use double quotes if the role or the name contain spaces.\\n\\n        Examples:\\n            `[p]editrole name \\\"The Transistor\\\" Test`\\n        "
+msgid "\\n        Edit a role's name.\\n\\n        Use double quotes if the role or the name contain spaces.\\n\\n        Example:\\n            `[p]editrole name \\\"The Transistor\\\" Test`\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:250
+#: redbot/cogs/admin/admin.py:327
 #, docstring
 msgid "Announce a message to all servers the bot is in."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:257
+#: redbot/cogs/admin/admin.py:334
 msgid "The announcement has begun."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:265
+#: redbot/cogs/admin/admin.py:341
 #, docstring
 msgid "Cancel a running announce."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:271
+#: redbot/cogs/admin/admin.py:343
+msgid "There is no currently running announcement."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:346
 msgid "The current announcement has been cancelled."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:277
+#: redbot/cogs/admin/admin.py:352
 #, docstring
-msgid "Change the channel to which the bot makes announcements."
+msgid "Change how announcements are sent in this guild."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:283
+#: redbot/cogs/admin/admin.py:357
+#, docstring
+msgid "\\n        Change the channel where the bot will send announcements.\\n\\n        If channel is left blank it defaults to the current channel.\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:366
 msgid "The announcement channel has been set to {channel.mention}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:290
-#, docstring
-msgid "Toggle announcements being enabled this server."
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:296
-msgid "The server {guild.name} will receive announcements."
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:300
-msgid "The server {guild.name} will not receive announcements."
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:326
-#, docstring
-msgid "Add a role to yourself.\\n\\n        Server admins must have configured the role as user settable.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:337
-#, docstring
-msgid "Remove a selfrole from yourself.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:347
-#, docstring
-msgid "Add a role to the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:355 redbot/cogs/admin/admin.py:367
-msgid "The selfroles list has been successfully modified."
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:360
-#, docstring
-msgid "Remove a role from the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr ""
-
 #: redbot/cogs/admin/admin.py:371
 #, docstring
+msgid "Unsets the channel for announcements."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:396
+#, docstring
+msgid "Apply selfroles."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:401
+#, docstring
+msgid "\\n        Add a selfrole to yourself.\\n\\n        Server admins must have configured the role as user settable.\\n        NOTE: The role is case sensitive!\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:412
+#, docstring
+msgid "\\n        Remove a selfrole from yourself.\\n\\n        Server admins must have configured the role as user settable.\\n        NOTE: The role is case sensitive!\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:423
+#, docstring
 msgid "\\n        Lists all available selfroles.\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:377
+#: redbot/cogs/admin/admin.py:433
 msgid "Available Selfroles:\\n{selfroles}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:394
+#: redbot/cogs/admin/admin.py:439
+#, docstring
+msgid "Manage selfroles."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:444
+#, docstring
+msgid "\\n        Add a role to the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:451
+msgid "I cannot let you add {role.name} as a selfrole because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:459
+msgid "Added."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:462
+msgid "That role is already a selfrole."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:466
+#, docstring
+msgid "\\n        Remove a role from the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:473
+msgid "I cannot let you remove {role.name} from being a selfrole because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:481
+msgid "Removed."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:486
 #, docstring
 msgid "Lock a bot to its current servers only."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:399
+#: redbot/cogs/admin/admin.py:491
 msgid "The bot is no longer serverlocked."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:401
+#: redbot/cogs/admin/admin.py:493
 msgid "The bot is now serverlocked."
 msgstr ""
 
-#: redbot/cogs/admin/announcer.py:70
-msgid "I could not announce to server: {server.id}"
+#: redbot/cogs/admin/announcer.py:68
+msgid "I could not announce to the following server: "
 msgstr ""
 
-#: redbot/cogs/admin/converters.py:25
+#: redbot/cogs/admin/announcer.py:70
+msgid "I could not announce to the following servers: "
+msgstr ""
+
+#: redbot/cogs/admin/converters.py:12
 msgid "The Admin cog is not loaded."
 msgstr ""
 
-#: redbot/cogs/admin/converters.py:34
+#: redbot/cogs/admin/converters.py:20
 msgid "The provided role is not a valid selfrole."
 msgstr ""
 

redbot/cogs/admin/locales/hu-HU.po

@@ -1,9 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2019-07-14 04:24+0000\n"
-"PO-Revision-Date: 2020-01-07 21:48\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2020-09-03 12:24+0000\n"
+"Last-Translator: \n"
 "Language-Team: Hungarian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -11,175 +10,223 @@ msgstr ""
 "Generated-By: redgettext 3.1\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Crowdin-Project: red-discordbot\n"
+"X-Crowdin-Project-ID: 289505\n"
 "X-Crowdin-Language: hu\n"
-"X-Crowdin-File: /admin/locales/messages.pot\n"
+"X-Crowdin-File-ID: 42\n"
 "Language: hu_HU\n"
 
-#: redbot/cogs/admin/admin.py:17
+#: redbot/cogs/admin/admin.py:18
 msgid "I attempted to do something that Discord denied me permissions for. Your command failed to successfully complete."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:22
-msgid "I tried to {verb} {role.name} to {member.display_name} but that role is higher than my highest role in the Discord hierarchy so I was unable to successfully add it. Please give me a higher role and try again."
+#: redbot/cogs/admin/admin.py:23
+msgid "I can not give {role.name} to {member.display_name} because that role is higher than or equal to my highest role in the Discord hierarchy."
 msgstr ""
 
 #: redbot/cogs/admin/admin.py:29
-msgid "I tried to {verb} {role.name} to {member.display_name} but that role is higher than your highest role in the Discord hierarchy so I was unable to successfully add it. Please get a higher role and try again."
+msgid "I can not remove {role.name} from {member.display_name} because that role is higher than or equal to my highest role in the Discord hierarchy."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:36
-msgid "I tried to edit {role.name} but that role is higher than your highest role in the Discord hierarchy so I was unable to successfully add it. Please get a higher role and try again."
+#: redbot/cogs/admin/admin.py:35
+msgid "I can not edit {role.name} because that role is higher than my or equal to highest role in the Discord hierarchy."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:43
-msgid "I am already announcing something. If you would like to make a different announcement please use `{prefix}announce cancel` first."
+#: redbot/cogs/admin/admin.py:41
+msgid "I can not let you give {role.name} to {member.display_name} because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:47
+msgid "I can not let you remove {role.name} from {member.display_name} because that role is higher than or equal to your highest role in the Discord hierarchy."
 msgstr ""
 
 #: redbot/cogs/admin/admin.py:53
+msgid "I can not let you edit {role.name} because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:59
+msgid "I need manage roles permission to do that."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:61
+msgid "I am already announcing something. If you would like to make a different announcement please use `{prefix}announce cancel` first."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:71
 #, docstring
 msgid "A collection of server administration utilities."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:115 redbot/cogs/admin/admin.py:160
-msgid "add"
+#: redbot/cogs/admin/admin.py:162
+msgid "{member.display_name} already has the role {role.name}."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:121
+#: redbot/cogs/admin/admin.py:182
 msgid "I successfully added {role.name} to {member.display_name}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:132 redbot/cogs/admin/admin.py:180
-msgid "remove"
+#: redbot/cogs/admin/admin.py:192
+msgid "{member.display_name} does not have the role {role.name}."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:138
+#: redbot/cogs/admin/admin.py:212
 msgid "I successfully removed {role.name} from {member.display_name}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:149
+#: redbot/cogs/admin/admin.py:223
 #, docstring
-msgid "Add a role to a user.\\n\\n        If user is left blank it defaults to the author of the command.\\n        "
+msgid "\\n        Add a role to a user.\\n\\n        Use double quotes if the role contains spaces.\\n        If user is left blank it defaults to the author of the command.\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:169
+#: redbot/cogs/admin/admin.py:239
 #, docstring
-msgid "Remove a role from a user.\\n\\n        If user is left blank it defaults to the author of the command.\\n        "
+msgid "\\n        Remove a role from a user.\\n\\n        Use double quotes if the role contains spaces.\\n        If user is left blank it defaults to the author of the command.\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:187
+#: redbot/cogs/admin/admin.py:253
 #, docstring
 msgid "Edit role settings."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:194
+#: redbot/cogs/admin/admin.py:260
 #, docstring
-msgid "Edit a role's colour.\\n\\n        Use double quotes if the role contains spaces.\\n        Colour must be in hexadecimal format.\\n        [Online colour picker](http://www.w3schools.com/colors/colors_picker.asp)\\n\\n        Examples:\\n            `[p]editrole colour \\\"The Transistor\\\" #ff0000`\\n            `[p]editrole colour Test #ff9900`\\n        "
+msgid "\\n        Edit a role's colour.\\n\\n        Use double quotes if the role contains spaces.\\n        Colour must be in hexadecimal format.\\n        [Online colour picker](http://www.w3schools.com/colors/colors_picker.asp)\\n\\n        Examples:\\n            `[p]editrole colour \\\"The Transistor\\\" #ff0000`\\n            `[p]editrole colour Test #ff9900`\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:217 redbot/cogs/admin/admin.py:245
+#: redbot/cogs/admin/admin.py:289 redbot/cogs/admin/admin.py:322
 msgid "Done."
 msgstr "Kész."
 
-#: redbot/cogs/admin/admin.py:222
+#: redbot/cogs/admin/admin.py:293
 #, docstring
-msgid "Edit a role's name.\\n\\n        Use double quotes if the role or the name contain spaces.\\n\\n        Examples:\\n            `[p]editrole name \\\"The Transistor\\\" Test`\\n        "
+msgid "\\n        Edit a role's name.\\n\\n        Use double quotes if the role or the name contain spaces.\\n\\n        Example:\\n            `[p]editrole name \\\"The Transistor\\\" Test`\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:250
+#: redbot/cogs/admin/admin.py:327
 #, docstring
 msgid "Announce a message to all servers the bot is in."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:257
+#: redbot/cogs/admin/admin.py:334
 msgid "The announcement has begun."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:265
+#: redbot/cogs/admin/admin.py:341
 #, docstring
 msgid "Cancel a running announce."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:271
+#: redbot/cogs/admin/admin.py:343
+msgid "There is no currently running announcement."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:346
 msgid "The current announcement has been cancelled."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:277
+#: redbot/cogs/admin/admin.py:352
 #, docstring
-msgid "Change the channel to which the bot makes announcements."
+msgid "Change how announcements are sent in this guild."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:283
+#: redbot/cogs/admin/admin.py:357
+#, docstring
+msgid "\\n        Change the channel where the bot will send announcements.\\n\\n        If channel is left blank it defaults to the current channel.\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:366
 msgid "The announcement channel has been set to {channel.mention}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:290
-#, docstring
-msgid "Toggle announcements being enabled this server."
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:296
-msgid "The server {guild.name} will receive announcements."
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:300
-msgid "The server {guild.name} will not receive announcements."
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:326
-#, docstring
-msgid "Add a role to yourself.\\n\\n        Server admins must have configured the role as user settable.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:337
-#, docstring
-msgid "Remove a selfrole from yourself.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:347
-#, docstring
-msgid "Add a role to the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:355 redbot/cogs/admin/admin.py:367
-msgid "The selfroles list has been successfully modified."
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:360
-#, docstring
-msgid "Remove a role from the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr ""
-
 #: redbot/cogs/admin/admin.py:371
 #, docstring
+msgid "Unsets the channel for announcements."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:396
+#, docstring
+msgid "Apply selfroles."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:401
+#, docstring
+msgid "\\n        Add a selfrole to yourself.\\n\\n        Server admins must have configured the role as user settable.\\n        NOTE: The role is case sensitive!\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:412
+#, docstring
+msgid "\\n        Remove a selfrole from yourself.\\n\\n        Server admins must have configured the role as user settable.\\n        NOTE: The role is case sensitive!\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:423
+#, docstring
 msgid "\\n        Lists all available selfroles.\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:377
+#: redbot/cogs/admin/admin.py:433
 msgid "Available Selfroles:\\n{selfroles}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:394
+#: redbot/cogs/admin/admin.py:439
+#, docstring
+msgid "Manage selfroles."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:444
+#, docstring
+msgid "\\n        Add a role to the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:451
+msgid "I cannot let you add {role.name} as a selfrole because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:459
+msgid "Added."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:462
+msgid "That role is already a selfrole."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:466
+#, docstring
+msgid "\\n        Remove a role from the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:473
+msgid "I cannot let you remove {role.name} from being a selfrole because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:481
+msgid "Removed."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:486
 #, docstring
 msgid "Lock a bot to its current servers only."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:399
+#: redbot/cogs/admin/admin.py:491
 msgid "The bot is no longer serverlocked."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:401
+#: redbot/cogs/admin/admin.py:493
 msgid "The bot is now serverlocked."
 msgstr ""
 
-#: redbot/cogs/admin/announcer.py:70
-msgid "I could not announce to server: {server.id}"
+#: redbot/cogs/admin/announcer.py:68
+msgid "I could not announce to the following server: "
 msgstr ""
 
-#: redbot/cogs/admin/converters.py:25
+#: redbot/cogs/admin/announcer.py:70
+msgid "I could not announce to the following servers: "
+msgstr ""
+
+#: redbot/cogs/admin/converters.py:12
 msgid "The Admin cog is not loaded."
 msgstr ""
 
-#: redbot/cogs/admin/converters.py:34
+#: redbot/cogs/admin/converters.py:20
 msgid "The provided role is not a valid selfrole."
 msgstr ""
 

redbot/cogs/admin/locales/id-ID.po

@@ -1,9 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2019-07-14 04:24+0000\n"
-"PO-Revision-Date: 2020-01-07 21:49\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2020-09-03 12:24+0000\n"
+"Last-Translator: \n"
 "Language-Team: Indonesian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -11,175 +10,223 @@ msgstr ""
 "Generated-By: redgettext 3.1\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Crowdin-Project: red-discordbot\n"
+"X-Crowdin-Project-ID: 289505\n"
 "X-Crowdin-Language: id\n"
-"X-Crowdin-File: /admin/locales/messages.pot\n"
+"X-Crowdin-File-ID: 42\n"
 "Language: id_ID\n"
 
-#: redbot/cogs/admin/admin.py:17
+#: redbot/cogs/admin/admin.py:18
 msgid "I attempted to do something that Discord denied me permissions for. Your command failed to successfully complete."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:22
-msgid "I tried to {verb} {role.name} to {member.display_name} but that role is higher than my highest role in the Discord hierarchy so I was unable to successfully add it. Please give me a higher role and try again."
+#: redbot/cogs/admin/admin.py:23
+msgid "I can not give {role.name} to {member.display_name} because that role is higher than or equal to my highest role in the Discord hierarchy."
 msgstr ""
 
 #: redbot/cogs/admin/admin.py:29
-msgid "I tried to {verb} {role.name} to {member.display_name} but that role is higher than your highest role in the Discord hierarchy so I was unable to successfully add it. Please get a higher role and try again."
+msgid "I can not remove {role.name} from {member.display_name} because that role is higher than or equal to my highest role in the Discord hierarchy."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:36
-msgid "I tried to edit {role.name} but that role is higher than your highest role in the Discord hierarchy so I was unable to successfully add it. Please get a higher role and try again."
+#: redbot/cogs/admin/admin.py:35
+msgid "I can not edit {role.name} because that role is higher than my or equal to highest role in the Discord hierarchy."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:43
-msgid "I am already announcing something. If you would like to make a different announcement please use `{prefix}announce cancel` first."
+#: redbot/cogs/admin/admin.py:41
+msgid "I can not let you give {role.name} to {member.display_name} because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:47
+msgid "I can not let you remove {role.name} from {member.display_name} because that role is higher than or equal to your highest role in the Discord hierarchy."
 msgstr ""
 
 #: redbot/cogs/admin/admin.py:53
+msgid "I can not let you edit {role.name} because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:59
+msgid "I need manage roles permission to do that."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:61
+msgid "I am already announcing something. If you would like to make a different announcement please use `{prefix}announce cancel` first."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:71
 #, docstring
 msgid "A collection of server administration utilities."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:115 redbot/cogs/admin/admin.py:160
-msgid "add"
-msgstr "menambahkan"
+#: redbot/cogs/admin/admin.py:162
+msgid "{member.display_name} already has the role {role.name}."
+msgstr ""
 
-#: redbot/cogs/admin/admin.py:121
+#: redbot/cogs/admin/admin.py:182
 msgid "I successfully added {role.name} to {member.display_name}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:132 redbot/cogs/admin/admin.py:180
-msgid "remove"
-msgstr "menghapus"
+#: redbot/cogs/admin/admin.py:192
+msgid "{member.display_name} does not have the role {role.name}."
+msgstr ""
 
-#: redbot/cogs/admin/admin.py:138
+#: redbot/cogs/admin/admin.py:212
 msgid "I successfully removed {role.name} from {member.display_name}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:149
+#: redbot/cogs/admin/admin.py:223
 #, docstring
-msgid "Add a role to a user.\\n\\n        If user is left blank it defaults to the author of the command.\\n        "
+msgid "\\n        Add a role to a user.\\n\\n        Use double quotes if the role contains spaces.\\n        If user is left blank it defaults to the author of the command.\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:169
+#: redbot/cogs/admin/admin.py:239
 #, docstring
-msgid "Remove a role from a user.\\n\\n        If user is left blank it defaults to the author of the command.\\n        "
+msgid "\\n        Remove a role from a user.\\n\\n        Use double quotes if the role contains spaces.\\n        If user is left blank it defaults to the author of the command.\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:187
+#: redbot/cogs/admin/admin.py:253
 #, docstring
 msgid "Edit role settings."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:194
+#: redbot/cogs/admin/admin.py:260
 #, docstring
-msgid "Edit a role's colour.\\n\\n        Use double quotes if the role contains spaces.\\n        Colour must be in hexadecimal format.\\n        [Online colour picker](http://www.w3schools.com/colors/colors_picker.asp)\\n\\n        Examples:\\n            `[p]editrole colour \\\"The Transistor\\\" #ff0000`\\n            `[p]editrole colour Test #ff9900`\\n        "
+msgid "\\n        Edit a role's colour.\\n\\n        Use double quotes if the role contains spaces.\\n        Colour must be in hexadecimal format.\\n        [Online colour picker](http://www.w3schools.com/colors/colors_picker.asp)\\n\\n        Examples:\\n            `[p]editrole colour \\\"The Transistor\\\" #ff0000`\\n            `[p]editrole colour Test #ff9900`\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:217 redbot/cogs/admin/admin.py:245
+#: redbot/cogs/admin/admin.py:289 redbot/cogs/admin/admin.py:322
 msgid "Done."
 msgstr "Selesai."
 
-#: redbot/cogs/admin/admin.py:222
+#: redbot/cogs/admin/admin.py:293
 #, docstring
-msgid "Edit a role's name.\\n\\n        Use double quotes if the role or the name contain spaces.\\n\\n        Examples:\\n            `[p]editrole name \\\"The Transistor\\\" Test`\\n        "
+msgid "\\n        Edit a role's name.\\n\\n        Use double quotes if the role or the name contain spaces.\\n\\n        Example:\\n            `[p]editrole name \\\"The Transistor\\\" Test`\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:250
+#: redbot/cogs/admin/admin.py:327
 #, docstring
 msgid "Announce a message to all servers the bot is in."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:257
+#: redbot/cogs/admin/admin.py:334
 msgid "The announcement has begun."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:265
+#: redbot/cogs/admin/admin.py:341
 #, docstring
 msgid "Cancel a running announce."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:271
+#: redbot/cogs/admin/admin.py:343
+msgid "There is no currently running announcement."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:346
 msgid "The current announcement has been cancelled."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:277
+#: redbot/cogs/admin/admin.py:352
 #, docstring
-msgid "Change the channel to which the bot makes announcements."
+msgid "Change how announcements are sent in this guild."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:283
+#: redbot/cogs/admin/admin.py:357
+#, docstring
+msgid "\\n        Change the channel where the bot will send announcements.\\n\\n        If channel is left blank it defaults to the current channel.\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:366
 msgid "The announcement channel has been set to {channel.mention}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:290
-#, docstring
-msgid "Toggle announcements being enabled this server."
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:296
-msgid "The server {guild.name} will receive announcements."
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:300
-msgid "The server {guild.name} will not receive announcements."
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:326
-#, docstring
-msgid "Add a role to yourself.\\n\\n        Server admins must have configured the role as user settable.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:337
-#, docstring
-msgid "Remove a selfrole from yourself.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:347
-#, docstring
-msgid "Add a role to the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:355 redbot/cogs/admin/admin.py:367
-msgid "The selfroles list has been successfully modified."
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:360
-#, docstring
-msgid "Remove a role from the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr ""
-
 #: redbot/cogs/admin/admin.py:371
 #, docstring
+msgid "Unsets the channel for announcements."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:396
+#, docstring
+msgid "Apply selfroles."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:401
+#, docstring
+msgid "\\n        Add a selfrole to yourself.\\n\\n        Server admins must have configured the role as user settable.\\n        NOTE: The role is case sensitive!\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:412
+#, docstring
+msgid "\\n        Remove a selfrole from yourself.\\n\\n        Server admins must have configured the role as user settable.\\n        NOTE: The role is case sensitive!\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:423
+#, docstring
 msgid "\\n        Lists all available selfroles.\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:377
+#: redbot/cogs/admin/admin.py:433
 msgid "Available Selfroles:\\n{selfroles}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:394
+#: redbot/cogs/admin/admin.py:439
+#, docstring
+msgid "Manage selfroles."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:444
+#, docstring
+msgid "\\n        Add a role to the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:451
+msgid "I cannot let you add {role.name} as a selfrole because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:459
+msgid "Added."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:462
+msgid "That role is already a selfrole."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:466
+#, docstring
+msgid "\\n        Remove a role from the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:473
+msgid "I cannot let you remove {role.name} from being a selfrole because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:481
+msgid "Removed."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:486
 #, docstring
 msgid "Lock a bot to its current servers only."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:399
+#: redbot/cogs/admin/admin.py:491
 msgid "The bot is no longer serverlocked."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:401
+#: redbot/cogs/admin/admin.py:493
 msgid "The bot is now serverlocked."
 msgstr ""
 
-#: redbot/cogs/admin/announcer.py:70
-msgid "I could not announce to server: {server.id}"
+#: redbot/cogs/admin/announcer.py:68
+msgid "I could not announce to the following server: "
 msgstr ""
 
-#: redbot/cogs/admin/converters.py:25
+#: redbot/cogs/admin/announcer.py:70
+msgid "I could not announce to the following servers: "
+msgstr ""
+
+#: redbot/cogs/admin/converters.py:12
 msgid "The Admin cog is not loaded."
 msgstr ""
 
-#: redbot/cogs/admin/converters.py:34
+#: redbot/cogs/admin/converters.py:20
 msgid "The provided role is not a valid selfrole."
 msgstr ""
 

redbot/cogs/admin/locales/it-IT.po

@@ -1,9 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2019-07-14 04:24+0000\n"
-"PO-Revision-Date: 2020-01-07 21:48\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2020-09-03 12:24+0000\n"
+"Last-Translator: \n"
 "Language-Team: Italian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -11,175 +10,223 @@ msgstr ""
 "Generated-By: redgettext 3.1\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Crowdin-Project: red-discordbot\n"
+"X-Crowdin-Project-ID: 289505\n"
 "X-Crowdin-Language: it\n"
-"X-Crowdin-File: /admin/locales/messages.pot\n"
+"X-Crowdin-File-ID: 42\n"
 "Language: it_IT\n"
 
-#: redbot/cogs/admin/admin.py:17
+#: redbot/cogs/admin/admin.py:18
 msgid "I attempted to do something that Discord denied me permissions for. Your command failed to successfully complete."
 msgstr "Ho cercato di fare qualcosa ma Discord mi ha negato i permessi per farla. Il tuo comando non è stato completato con successo."
 
-#: redbot/cogs/admin/admin.py:22
-msgid "I tried to {verb} {role.name} to {member.display_name} but that role is higher than my highest role in the Discord hierarchy so I was unable to successfully add it. Please give me a higher role and try again."
-msgstr "Ho cercato di {verb} {role.name} al gruppo {member.display_name} ma quel ruolo è più elevato del mio livello nella gerarchia di Discord quindi non sono stato in grado di aggiungerlo. prova a darmi un ruolo più alto e riprova."
+#: redbot/cogs/admin/admin.py:23
+msgid "I can not give {role.name} to {member.display_name} because that role is higher than or equal to my highest role in the Discord hierarchy."
+msgstr ""
 
 #: redbot/cogs/admin/admin.py:29
-msgid "I tried to {verb} {role.name} to {member.display_name} but that role is higher than your highest role in the Discord hierarchy so I was unable to successfully add it. Please get a higher role and try again."
-msgstr "Ho cercato di {verb} {role.name} al gruppo {member.display_name} ma quel ruolo è più elevato del tuo livello nella gerarchia di Discord quindi non sono stato in grado di aggiungerlo. Raggiungi un ruolo più alto e riprova."
+msgid "I can not remove {role.name} from {member.display_name} because that role is higher than or equal to my highest role in the Discord hierarchy."
+msgstr ""
 
-#: redbot/cogs/admin/admin.py:36
-msgid "I tried to edit {role.name} but that role is higher than your highest role in the Discord hierarchy so I was unable to successfully add it. Please get a higher role and try again."
-msgstr "Ho cercato di modificare {role.name} ma quel ruolo è più elevato del tuo livello nella gerarchia di Discord quindi non sono stato in grado di aggiungerlo. Raggiungi un ruolo più alto e riprova."
+#: redbot/cogs/admin/admin.py:35
+msgid "I can not edit {role.name} because that role is higher than my or equal to highest role in the Discord hierarchy."
+msgstr ""
 
-#: redbot/cogs/admin/admin.py:43
+#: redbot/cogs/admin/admin.py:41
+msgid "I can not let you give {role.name} to {member.display_name} because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:47
+msgid "I can not let you remove {role.name} from {member.display_name} because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:53
+msgid "I can not let you edit {role.name} because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:59
+msgid "I need manage roles permission to do that."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:61
 msgid "I am already announcing something. If you would like to make a different announcement please use `{prefix}announce cancel` first."
 msgstr "Sto già annunciando qualcosa. Se desideri fare un annuncio diverso, usa prima `{prefix}announce cancel`."
 
-#: redbot/cogs/admin/admin.py:53
+#: redbot/cogs/admin/admin.py:71
 #, docstring
 msgid "A collection of server administration utilities."
 msgstr "Una collezione di servizi di amministrazione del server."
 
-#: redbot/cogs/admin/admin.py:115 redbot/cogs/admin/admin.py:160
-msgid "add"
-msgstr "aggiungere"
+#: redbot/cogs/admin/admin.py:162
+msgid "{member.display_name} already has the role {role.name}."
+msgstr ""
 
-#: redbot/cogs/admin/admin.py:121
+#: redbot/cogs/admin/admin.py:182
 msgid "I successfully added {role.name} to {member.display_name}"
 msgstr "Ho aggiunto con successo {role.name} al gruppo {member.display_name}"
 
-#: redbot/cogs/admin/admin.py:132 redbot/cogs/admin/admin.py:180
-msgid "remove"
-msgstr "rimuovere"
+#: redbot/cogs/admin/admin.py:192
+msgid "{member.display_name} does not have the role {role.name}."
+msgstr ""
 
-#: redbot/cogs/admin/admin.py:138
+#: redbot/cogs/admin/admin.py:212
 msgid "I successfully removed {role.name} from {member.display_name}"
 msgstr "Ho rimosso con successo {role.name} dal gruppo {member.display_name}"
 
-#: redbot/cogs/admin/admin.py:149
+#: redbot/cogs/admin/admin.py:223
 #, docstring
-msgid "Add a role to a user.\\n\\n        If user is left blank it defaults to the author of the command.\\n        "
+msgid "\\n        Add a role to a user.\\n\\n        Use double quotes if the role contains spaces.\\n        If user is left blank it defaults to the author of the command.\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:169
+#: redbot/cogs/admin/admin.py:239
 #, docstring
-msgid "Remove a role from a user.\\n\\n        If user is left blank it defaults to the author of the command.\\n        "
+msgid "\\n        Remove a role from a user.\\n\\n        Use double quotes if the role contains spaces.\\n        If user is left blank it defaults to the author of the command.\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:187
+#: redbot/cogs/admin/admin.py:253
 #, docstring
 msgid "Edit role settings."
 msgstr "Modifica impostazioni ruolo."
 
-#: redbot/cogs/admin/admin.py:194
+#: redbot/cogs/admin/admin.py:260
 #, docstring
-msgid "Edit a role's colour.\\n\\n        Use double quotes if the role contains spaces.\\n        Colour must be in hexadecimal format.\\n        [Online colour picker](http://www.w3schools.com/colors/colors_picker.asp)\\n\\n        Examples:\\n            `[p]editrole colour \\\"The Transistor\\\" #ff0000`\\n            `[p]editrole colour Test #ff9900`\\n        "
+msgid "\\n        Edit a role's colour.\\n\\n        Use double quotes if the role contains spaces.\\n        Colour must be in hexadecimal format.\\n        [Online colour picker](http://www.w3schools.com/colors/colors_picker.asp)\\n\\n        Examples:\\n            `[p]editrole colour \\\"The Transistor\\\" #ff0000`\\n            `[p]editrole colour Test #ff9900`\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:217 redbot/cogs/admin/admin.py:245
+#: redbot/cogs/admin/admin.py:289 redbot/cogs/admin/admin.py:322
 msgid "Done."
 msgstr "Fatto."
 
-#: redbot/cogs/admin/admin.py:222
+#: redbot/cogs/admin/admin.py:293
 #, docstring
-msgid "Edit a role's name.\\n\\n        Use double quotes if the role or the name contain spaces.\\n\\n        Examples:\\n            `[p]editrole name \\\"The Transistor\\\" Test`\\n        "
+msgid "\\n        Edit a role's name.\\n\\n        Use double quotes if the role or the name contain spaces.\\n\\n        Example:\\n            `[p]editrole name \\\"The Transistor\\\" Test`\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:250
+#: redbot/cogs/admin/admin.py:327
 #, docstring
 msgid "Announce a message to all servers the bot is in."
 msgstr "Invia un annuncio a tutti i server in cui si trova il bot."
 
-#: redbot/cogs/admin/admin.py:257
+#: redbot/cogs/admin/admin.py:334
 msgid "The announcement has begun."
 msgstr "L'annuncio è partito."
 
-#: redbot/cogs/admin/admin.py:265
+#: redbot/cogs/admin/admin.py:341
 #, docstring
 msgid "Cancel a running announce."
 msgstr "Cancella un annuncio in corso."
 
-#: redbot/cogs/admin/admin.py:271
+#: redbot/cogs/admin/admin.py:343
+msgid "There is no currently running announcement."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:346
 msgid "The current announcement has been cancelled."
 msgstr "L'annuncio in corso è stato cancellato."
 
-#: redbot/cogs/admin/admin.py:277
+#: redbot/cogs/admin/admin.py:352
 #, docstring
-msgid "Change the channel to which the bot makes announcements."
-msgstr "Modifica il canale in cui il bot invia gli annunci."
+msgid "Change how announcements are sent in this guild."
+msgstr ""
 
-#: redbot/cogs/admin/admin.py:283
+#: redbot/cogs/admin/admin.py:357
+#, docstring
+msgid "\\n        Change the channel where the bot will send announcements.\\n\\n        If channel is left blank it defaults to the current channel.\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:366
 msgid "The announcement channel has been set to {channel.mention}"
 msgstr "Il canale per gli annunci è stato impostato su {channel.mention}"
 
-#: redbot/cogs/admin/admin.py:290
-#, docstring
-msgid "Toggle announcements being enabled this server."
-msgstr "Attiva/disattiva gli annunci in questo server."
-
-#: redbot/cogs/admin/admin.py:296
-msgid "The server {guild.name} will receive announcements."
-msgstr "Il server {guild.name} riceverà gli annunci."
-
-#: redbot/cogs/admin/admin.py:300
-msgid "The server {guild.name} will not receive announcements."
-msgstr "Il server {guild.name} non riceverà gli annunci."
-
-#: redbot/cogs/admin/admin.py:326
-#, docstring
-msgid "Add a role to yourself.\\n\\n        Server admins must have configured the role as user settable.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:337
-#, docstring
-msgid "Remove a selfrole from yourself.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:347
-#, docstring
-msgid "Add a role to the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:355 redbot/cogs/admin/admin.py:367
-msgid "The selfroles list has been successfully modified."
-msgstr "La lista dei ruoli autoassegnabili e stata modificata."
-
-#: redbot/cogs/admin/admin.py:360
-#, docstring
-msgid "Remove a role from the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr ""
-
 #: redbot/cogs/admin/admin.py:371
 #, docstring
+msgid "Unsets the channel for announcements."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:396
+#, docstring
+msgid "Apply selfroles."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:401
+#, docstring
+msgid "\\n        Add a selfrole to yourself.\\n\\n        Server admins must have configured the role as user settable.\\n        NOTE: The role is case sensitive!\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:412
+#, docstring
+msgid "\\n        Remove a selfrole from yourself.\\n\\n        Server admins must have configured the role as user settable.\\n        NOTE: The role is case sensitive!\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:423
+#, docstring
 msgid "\\n        Lists all available selfroles.\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:377
+#: redbot/cogs/admin/admin.py:433
 msgid "Available Selfroles:\\n{selfroles}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:394
+#: redbot/cogs/admin/admin.py:439
+#, docstring
+msgid "Manage selfroles."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:444
+#, docstring
+msgid "\\n        Add a role to the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:451
+msgid "I cannot let you add {role.name} as a selfrole because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:459
+msgid "Added."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:462
+msgid "That role is already a selfrole."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:466
+#, docstring
+msgid "\\n        Remove a role from the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:473
+msgid "I cannot let you remove {role.name} from being a selfrole because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:481
+msgid "Removed."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:486
 #, docstring
 msgid "Lock a bot to its current servers only."
 msgstr "Blocca un bot ai suoi server attuali."
 
-#: redbot/cogs/admin/admin.py:399
+#: redbot/cogs/admin/admin.py:491
 msgid "The bot is no longer serverlocked."
 msgstr "Il bot non è più bloccato ai server."
 
-#: redbot/cogs/admin/admin.py:401
+#: redbot/cogs/admin/admin.py:493
 msgid "The bot is now serverlocked."
 msgstr "Il bot è bloccato ai server."
 
-#: redbot/cogs/admin/announcer.py:70
-msgid "I could not announce to server: {server.id}"
-msgstr "Non ho potuto annunciare al server: {server.id}"
+#: redbot/cogs/admin/announcer.py:68
+msgid "I could not announce to the following server: "
+msgstr ""
 
-#: redbot/cogs/admin/converters.py:25
+#: redbot/cogs/admin/announcer.py:70
+msgid "I could not announce to the following servers: "
+msgstr ""
+
+#: redbot/cogs/admin/converters.py:12
 msgid "The Admin cog is not loaded."
 msgstr "Il cog Admin non è caricato."
 
-#: redbot/cogs/admin/converters.py:34
+#: redbot/cogs/admin/converters.py:20
 msgid "The provided role is not a valid selfrole."
 msgstr "Il ruolo fornito non è un ruolo autoassegnabile valido."
 

redbot/cogs/admin/locales/ja-JP.po

@@ -1,9 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2019-07-14 04:24+0000\n"
-"PO-Revision-Date: 2020-01-07 21:48\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2020-09-03 12:24+0000\n"
+"Last-Translator: \n"
 "Language-Team: Japanese\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -11,175 +10,223 @@ msgstr ""
 "Generated-By: redgettext 3.1\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Crowdin-Project: red-discordbot\n"
+"X-Crowdin-Project-ID: 289505\n"
 "X-Crowdin-Language: ja\n"
-"X-Crowdin-File: /admin/locales/messages.pot\n"
+"X-Crowdin-File-ID: 42\n"
 "Language: ja_JP\n"
 
-#: redbot/cogs/admin/admin.py:17
+#: redbot/cogs/admin/admin.py:18
 msgid "I attempted to do something that Discord denied me permissions for. Your command failed to successfully complete."
 msgstr "私は不和が私に権限を拒否した何かをしようとしました。コマンドを正常に完了できませんでした。"
 
-#: redbot/cogs/admin/admin.py:22
-msgid "I tried to {verb} {role.name} to {member.display_name} but that role is higher than my highest role in the Discord hierarchy so I was unable to successfully add it. Please give me a higher role and try again."
+#: redbot/cogs/admin/admin.py:23
+msgid "I can not give {role.name} to {member.display_name} because that role is higher than or equal to my highest role in the Discord hierarchy."
 msgstr ""
 
 #: redbot/cogs/admin/admin.py:29
-msgid "I tried to {verb} {role.name} to {member.display_name} but that role is higher than your highest role in the Discord hierarchy so I was unable to successfully add it. Please get a higher role and try again."
+msgid "I can not remove {role.name} from {member.display_name} because that role is higher than or equal to my highest role in the Discord hierarchy."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:36
-msgid "I tried to edit {role.name} but that role is higher than your highest role in the Discord hierarchy so I was unable to successfully add it. Please get a higher role and try again."
+#: redbot/cogs/admin/admin.py:35
+msgid "I can not edit {role.name} because that role is higher than my or equal to highest role in the Discord hierarchy."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:43
-msgid "I am already announcing something. If you would like to make a different announcement please use `{prefix}announce cancel` first."
+#: redbot/cogs/admin/admin.py:41
+msgid "I can not let you give {role.name} to {member.display_name} because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:47
+msgid "I can not let you remove {role.name} from {member.display_name} because that role is higher than or equal to your highest role in the Discord hierarchy."
 msgstr ""
 
 #: redbot/cogs/admin/admin.py:53
+msgid "I can not let you edit {role.name} because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:59
+msgid "I need manage roles permission to do that."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:61
+msgid "I am already announcing something. If you would like to make a different announcement please use `{prefix}announce cancel` first."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:71
 #, docstring
 msgid "A collection of server administration utilities."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:115 redbot/cogs/admin/admin.py:160
-msgid "add"
+#: redbot/cogs/admin/admin.py:162
+msgid "{member.display_name} already has the role {role.name}."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:121
+#: redbot/cogs/admin/admin.py:182
 msgid "I successfully added {role.name} to {member.display_name}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:132 redbot/cogs/admin/admin.py:180
-msgid "remove"
+#: redbot/cogs/admin/admin.py:192
+msgid "{member.display_name} does not have the role {role.name}."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:138
+#: redbot/cogs/admin/admin.py:212
 msgid "I successfully removed {role.name} from {member.display_name}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:149
+#: redbot/cogs/admin/admin.py:223
 #, docstring
-msgid "Add a role to a user.\\n\\n        If user is left blank it defaults to the author of the command.\\n        "
+msgid "\\n        Add a role to a user.\\n\\n        Use double quotes if the role contains spaces.\\n        If user is left blank it defaults to the author of the command.\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:169
+#: redbot/cogs/admin/admin.py:239
 #, docstring
-msgid "Remove a role from a user.\\n\\n        If user is left blank it defaults to the author of the command.\\n        "
+msgid "\\n        Remove a role from a user.\\n\\n        Use double quotes if the role contains spaces.\\n        If user is left blank it defaults to the author of the command.\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:187
+#: redbot/cogs/admin/admin.py:253
 #, docstring
 msgid "Edit role settings."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:194
+#: redbot/cogs/admin/admin.py:260
 #, docstring
-msgid "Edit a role's colour.\\n\\n        Use double quotes if the role contains spaces.\\n        Colour must be in hexadecimal format.\\n        [Online colour picker](http://www.w3schools.com/colors/colors_picker.asp)\\n\\n        Examples:\\n            `[p]editrole colour \\\"The Transistor\\\" #ff0000`\\n            `[p]editrole colour Test #ff9900`\\n        "
+msgid "\\n        Edit a role's colour.\\n\\n        Use double quotes if the role contains spaces.\\n        Colour must be in hexadecimal format.\\n        [Online colour picker](http://www.w3schools.com/colors/colors_picker.asp)\\n\\n        Examples:\\n            `[p]editrole colour \\\"The Transistor\\\" #ff0000`\\n            `[p]editrole colour Test #ff9900`\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:217 redbot/cogs/admin/admin.py:245
+#: redbot/cogs/admin/admin.py:289 redbot/cogs/admin/admin.py:322
 msgid "Done."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:222
+#: redbot/cogs/admin/admin.py:293
 #, docstring
-msgid "Edit a role's name.\\n\\n        Use double quotes if the role or the name contain spaces.\\n\\n        Examples:\\n            `[p]editrole name \\\"The Transistor\\\" Test`\\n        "
+msgid "\\n        Edit a role's name.\\n\\n        Use double quotes if the role or the name contain spaces.\\n\\n        Example:\\n            `[p]editrole name \\\"The Transistor\\\" Test`\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:250
+#: redbot/cogs/admin/admin.py:327
 #, docstring
 msgid "Announce a message to all servers the bot is in."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:257
+#: redbot/cogs/admin/admin.py:334
 msgid "The announcement has begun."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:265
+#: redbot/cogs/admin/admin.py:341
 #, docstring
 msgid "Cancel a running announce."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:271
+#: redbot/cogs/admin/admin.py:343
+msgid "There is no currently running announcement."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:346
 msgid "The current announcement has been cancelled."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:277
+#: redbot/cogs/admin/admin.py:352
 #, docstring
-msgid "Change the channel to which the bot makes announcements."
+msgid "Change how announcements are sent in this guild."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:283
+#: redbot/cogs/admin/admin.py:357
+#, docstring
+msgid "\\n        Change the channel where the bot will send announcements.\\n\\n        If channel is left blank it defaults to the current channel.\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:366
 msgid "The announcement channel has been set to {channel.mention}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:290
-#, docstring
-msgid "Toggle announcements being enabled this server."
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:296
-msgid "The server {guild.name} will receive announcements."
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:300
-msgid "The server {guild.name} will not receive announcements."
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:326
-#, docstring
-msgid "Add a role to yourself.\\n\\n        Server admins must have configured the role as user settable.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:337
-#, docstring
-msgid "Remove a selfrole from yourself.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:347
-#, docstring
-msgid "Add a role to the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:355 redbot/cogs/admin/admin.py:367
-msgid "The selfroles list has been successfully modified."
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:360
-#, docstring
-msgid "Remove a role from the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr ""
-
 #: redbot/cogs/admin/admin.py:371
 #, docstring
+msgid "Unsets the channel for announcements."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:396
+#, docstring
+msgid "Apply selfroles."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:401
+#, docstring
+msgid "\\n        Add a selfrole to yourself.\\n\\n        Server admins must have configured the role as user settable.\\n        NOTE: The role is case sensitive!\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:412
+#, docstring
+msgid "\\n        Remove a selfrole from yourself.\\n\\n        Server admins must have configured the role as user settable.\\n        NOTE: The role is case sensitive!\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:423
+#, docstring
 msgid "\\n        Lists all available selfroles.\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:377
+#: redbot/cogs/admin/admin.py:433
 msgid "Available Selfroles:\\n{selfroles}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:394
+#: redbot/cogs/admin/admin.py:439
+#, docstring
+msgid "Manage selfroles."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:444
+#, docstring
+msgid "\\n        Add a role to the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:451
+msgid "I cannot let you add {role.name} as a selfrole because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:459
+msgid "Added."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:462
+msgid "That role is already a selfrole."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:466
+#, docstring
+msgid "\\n        Remove a role from the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:473
+msgid "I cannot let you remove {role.name} from being a selfrole because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:481
+msgid "Removed."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:486
 #, docstring
 msgid "Lock a bot to its current servers only."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:399
+#: redbot/cogs/admin/admin.py:491
 msgid "The bot is no longer serverlocked."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:401
+#: redbot/cogs/admin/admin.py:493
 msgid "The bot is now serverlocked."
 msgstr ""
 
-#: redbot/cogs/admin/announcer.py:70
-msgid "I could not announce to server: {server.id}"
+#: redbot/cogs/admin/announcer.py:68
+msgid "I could not announce to the following server: "
 msgstr ""
 
-#: redbot/cogs/admin/converters.py:25
+#: redbot/cogs/admin/announcer.py:70
+msgid "I could not announce to the following servers: "
+msgstr ""
+
+#: redbot/cogs/admin/converters.py:12
 msgid "The Admin cog is not loaded."
 msgstr ""
 
-#: redbot/cogs/admin/converters.py:34
+#: redbot/cogs/admin/converters.py:20
 msgid "The provided role is not a valid selfrole."
 msgstr ""
 

redbot/cogs/admin/locales/ko-KR.po

@@ -1,9 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2019-07-14 04:24+0000\n"
-"PO-Revision-Date: 2020-01-07 21:48\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2020-09-03 12:24+0000\n"
+"Last-Translator: \n"
 "Language-Team: Korean\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -11,175 +10,223 @@ msgstr ""
 "Generated-By: redgettext 3.1\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Crowdin-Project: red-discordbot\n"
+"X-Crowdin-Project-ID: 289505\n"
 "X-Crowdin-Language: ko\n"
-"X-Crowdin-File: /admin/locales/messages.pot\n"
+"X-Crowdin-File-ID: 42\n"
 "Language: ko_KR\n"
 
-#: redbot/cogs/admin/admin.py:17
+#: redbot/cogs/admin/admin.py:18
 msgid "I attempted to do something that Discord denied me permissions for. Your command failed to successfully complete."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:22
-msgid "I tried to {verb} {role.name} to {member.display_name} but that role is higher than my highest role in the Discord hierarchy so I was unable to successfully add it. Please give me a higher role and try again."
+#: redbot/cogs/admin/admin.py:23
+msgid "I can not give {role.name} to {member.display_name} because that role is higher than or equal to my highest role in the Discord hierarchy."
 msgstr ""
 
 #: redbot/cogs/admin/admin.py:29
-msgid "I tried to {verb} {role.name} to {member.display_name} but that role is higher than your highest role in the Discord hierarchy so I was unable to successfully add it. Please get a higher role and try again."
+msgid "I can not remove {role.name} from {member.display_name} because that role is higher than or equal to my highest role in the Discord hierarchy."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:36
-msgid "I tried to edit {role.name} but that role is higher than your highest role in the Discord hierarchy so I was unable to successfully add it. Please get a higher role and try again."
+#: redbot/cogs/admin/admin.py:35
+msgid "I can not edit {role.name} because that role is higher than my or equal to highest role in the Discord hierarchy."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:43
-msgid "I am already announcing something. If you would like to make a different announcement please use `{prefix}announce cancel` first."
+#: redbot/cogs/admin/admin.py:41
+msgid "I can not let you give {role.name} to {member.display_name} because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:47
+msgid "I can not let you remove {role.name} from {member.display_name} because that role is higher than or equal to your highest role in the Discord hierarchy."
 msgstr ""
 
 #: redbot/cogs/admin/admin.py:53
+msgid "I can not let you edit {role.name} because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:59
+msgid "I need manage roles permission to do that."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:61
+msgid "I am already announcing something. If you would like to make a different announcement please use `{prefix}announce cancel` first."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:71
 #, docstring
 msgid "A collection of server administration utilities."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:115 redbot/cogs/admin/admin.py:160
-msgid "add"
+#: redbot/cogs/admin/admin.py:162
+msgid "{member.display_name} already has the role {role.name}."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:121
+#: redbot/cogs/admin/admin.py:182
 msgid "I successfully added {role.name} to {member.display_name}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:132 redbot/cogs/admin/admin.py:180
-msgid "remove"
+#: redbot/cogs/admin/admin.py:192
+msgid "{member.display_name} does not have the role {role.name}."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:138
+#: redbot/cogs/admin/admin.py:212
 msgid "I successfully removed {role.name} from {member.display_name}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:149
+#: redbot/cogs/admin/admin.py:223
 #, docstring
-msgid "Add a role to a user.\\n\\n        If user is left blank it defaults to the author of the command.\\n        "
+msgid "\\n        Add a role to a user.\\n\\n        Use double quotes if the role contains spaces.\\n        If user is left blank it defaults to the author of the command.\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:169
+#: redbot/cogs/admin/admin.py:239
 #, docstring
-msgid "Remove a role from a user.\\n\\n        If user is left blank it defaults to the author of the command.\\n        "
+msgid "\\n        Remove a role from a user.\\n\\n        Use double quotes if the role contains spaces.\\n        If user is left blank it defaults to the author of the command.\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:187
+#: redbot/cogs/admin/admin.py:253
 #, docstring
 msgid "Edit role settings."
-msgstr ""
+msgstr "역할 설정을 변경했어요."
 
-#: redbot/cogs/admin/admin.py:194
+#: redbot/cogs/admin/admin.py:260
 #, docstring
-msgid "Edit a role's colour.\\n\\n        Use double quotes if the role contains spaces.\\n        Colour must be in hexadecimal format.\\n        [Online colour picker](http://www.w3schools.com/colors/colors_picker.asp)\\n\\n        Examples:\\n            `[p]editrole colour \\\"The Transistor\\\" #ff0000`\\n            `[p]editrole colour Test #ff9900`\\n        "
+msgid "\\n        Edit a role's colour.\\n\\n        Use double quotes if the role contains spaces.\\n        Colour must be in hexadecimal format.\\n        [Online colour picker](http://www.w3schools.com/colors/colors_picker.asp)\\n\\n        Examples:\\n            `[p]editrole colour \\\"The Transistor\\\" #ff0000`\\n            `[p]editrole colour Test #ff9900`\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:217 redbot/cogs/admin/admin.py:245
+#: redbot/cogs/admin/admin.py:289 redbot/cogs/admin/admin.py:322
 msgid "Done."
 msgstr "다 했어요."
 
-#: redbot/cogs/admin/admin.py:222
+#: redbot/cogs/admin/admin.py:293
 #, docstring
-msgid "Edit a role's name.\\n\\n        Use double quotes if the role or the name contain spaces.\\n\\n        Examples:\\n            `[p]editrole name \\\"The Transistor\\\" Test`\\n        "
+msgid "\\n        Edit a role's name.\\n\\n        Use double quotes if the role or the name contain spaces.\\n\\n        Example:\\n            `[p]editrole name \\\"The Transistor\\\" Test`\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:250
+#: redbot/cogs/admin/admin.py:327
 #, docstring
 msgid "Announce a message to all servers the bot is in."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:257
+#: redbot/cogs/admin/admin.py:334
 msgid "The announcement has begun."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:265
+#: redbot/cogs/admin/admin.py:341
 #, docstring
 msgid "Cancel a running announce."
+msgstr "실행 중인 공지사항을 취소했어요."
+
+#: redbot/cogs/admin/admin.py:343
+msgid "There is no currently running announcement."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:271
+#: redbot/cogs/admin/admin.py:346
 msgid "The current announcement has been cancelled."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:277
+#: redbot/cogs/admin/admin.py:352
 #, docstring
-msgid "Change the channel to which the bot makes announcements."
+msgid "Change how announcements are sent in this guild."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:283
+#: redbot/cogs/admin/admin.py:357
+#, docstring
+msgid "\\n        Change the channel where the bot will send announcements.\\n\\n        If channel is left blank it defaults to the current channel.\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:366
 msgid "The announcement channel has been set to {channel.mention}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:290
-#, docstring
-msgid "Toggle announcements being enabled this server."
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:296
-msgid "The server {guild.name} will receive announcements."
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:300
-msgid "The server {guild.name} will not receive announcements."
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:326
-#, docstring
-msgid "Add a role to yourself.\\n\\n        Server admins must have configured the role as user settable.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:337
-#, docstring
-msgid "Remove a selfrole from yourself.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:347
-#, docstring
-msgid "Add a role to the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:355 redbot/cogs/admin/admin.py:367
-msgid "The selfroles list has been successfully modified."
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:360
-#, docstring
-msgid "Remove a role from the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr ""
-
 #: redbot/cogs/admin/admin.py:371
 #, docstring
+msgid "Unsets the channel for announcements."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:396
+#, docstring
+msgid "Apply selfroles."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:401
+#, docstring
+msgid "\\n        Add a selfrole to yourself.\\n\\n        Server admins must have configured the role as user settable.\\n        NOTE: The role is case sensitive!\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:412
+#, docstring
+msgid "\\n        Remove a selfrole from yourself.\\n\\n        Server admins must have configured the role as user settable.\\n        NOTE: The role is case sensitive!\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:423
+#, docstring
 msgid "\\n        Lists all available selfroles.\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:377
+#: redbot/cogs/admin/admin.py:433
 msgid "Available Selfroles:\\n{selfroles}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:394
+#: redbot/cogs/admin/admin.py:439
+#, docstring
+msgid "Manage selfroles."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:444
+#, docstring
+msgid "\\n        Add a role to the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:451
+msgid "I cannot let you add {role.name} as a selfrole because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:459
+msgid "Added."
+msgstr "추가됐어요."
+
+#: redbot/cogs/admin/admin.py:462
+msgid "That role is already a selfrole."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:466
+#, docstring
+msgid "\\n        Remove a role from the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:473
+msgid "I cannot let you remove {role.name} from being a selfrole because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:481
+msgid "Removed."
+msgstr "제거됐어요."
+
+#: redbot/cogs/admin/admin.py:486
 #, docstring
 msgid "Lock a bot to its current servers only."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:399
+#: redbot/cogs/admin/admin.py:491
 msgid "The bot is no longer serverlocked."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:401
+#: redbot/cogs/admin/admin.py:493
 msgid "The bot is now serverlocked."
 msgstr ""
 
+#: redbot/cogs/admin/announcer.py:68
+msgid "I could not announce to the following server: "
+msgstr ""
+
 #: redbot/cogs/admin/announcer.py:70
-msgid "I could not announce to server: {server.id}"
-msgstr ""
+msgid "I could not announce to the following servers: "
+msgstr "다음과 같은 서버에 알릴 수 없어요. : "
 
-#: redbot/cogs/admin/converters.py:25
+#: redbot/cogs/admin/converters.py:12
 msgid "The Admin cog is not loaded."
-msgstr ""
+msgstr "관리자 cog가 로드되지 않았어요."
 
-#: redbot/cogs/admin/converters.py:34
+#: redbot/cogs/admin/converters.py:20
 msgid "The provided role is not a valid selfrole."
 msgstr ""
 

redbot/cogs/admin/locales/nb-NO.po

@@ -0,0 +1,232 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: red-discordbot\n"
+"POT-Creation-Date: 2020-09-03 12:24+0000\n"
+"Last-Translator: \n"
+"Language-Team: Norwegian Bokmal\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: redgettext 3.1\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Crowdin-Project: red-discordbot\n"
+"X-Crowdin-Project-ID: 289505\n"
+"X-Crowdin-Language: nb\n"
+"X-Crowdin-File-ID: 42\n"
+"Language: nb_NO\n"
+
+#: redbot/cogs/admin/admin.py:18
+msgid "I attempted to do something that Discord denied me permissions for. Your command failed to successfully complete."
+msgstr "Jeg forsøkte å gjøre noe som Discord nektet meg tillatelser til. Kommandoen din kunne ikke fullføre."
+
+#: redbot/cogs/admin/admin.py:23
+msgid "I can not give {role.name} to {member.display_name} because that role is higher than or equal to my highest role in the Discord hierarchy."
+msgstr "Jeg kan ikke gi {role.name} til {member.display_name} fordi den rollen er høyere enn eller lik min høyeste rolle i Discord-hierarkiet."
+
+#: redbot/cogs/admin/admin.py:29
+msgid "I can not remove {role.name} from {member.display_name} because that role is higher than or equal to my highest role in the Discord hierarchy."
+msgstr "Jeg kan ikke fjerne {role.name} fra {member.display_name} fordi den rollen er høyere enn eller lik min høyeste rolle i Discord-hierarkiet."
+
+#: redbot/cogs/admin/admin.py:35
+msgid "I can not edit {role.name} because that role is higher than my or equal to highest role in the Discord hierarchy."
+msgstr "Jeg kan ikke redigere {role.name} fordi den rollen er høyere enn min eller lik den høyeste rollen i Discord-hierarkiet."
+
+#: redbot/cogs/admin/admin.py:41
+msgid "I can not let you give {role.name} to {member.display_name} because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr "Jeg kan ikke la deg gi {role.name} til {member.display_name} fordi den rollen er høyere enn eller lik din høyeste rolle i Discord-hierarkiet."
+
+#: redbot/cogs/admin/admin.py:47
+msgid "I can not let you remove {role.name} from {member.display_name} because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr "Jeg kan ikke la deg fjerne {role.name} fra {member.display_name} fordi den rollen er høyere enn eller lik din høyeste rolle i Discord-hierarkiet."
+
+#: redbot/cogs/admin/admin.py:53
+msgid "I can not let you edit {role.name} because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr "Jeg kan ikke la deg redigere {role.name} fordi den rollen er høyere enn eller lik din høyeste rolle i Discord-hierarkiet."
+
+#: redbot/cogs/admin/admin.py:59
+msgid "I need manage roles permission to do that."
+msgstr "Jeg trenger tillatelse til å styre roller for å gjøre det."
+
+#: redbot/cogs/admin/admin.py:61
+msgid "I am already announcing something. If you would like to make a different announcement please use `{prefix}announce cancel` first."
+msgstr "Jeg kunngjør allerede noe. Hvis du vil gi en annen kunngjøring, bruk først `{prefix}announce cancel`."
+
+#: redbot/cogs/admin/admin.py:71
+#, docstring
+msgid "A collection of server administration utilities."
+msgstr "En samling av serveradministrasjonsverktøy."
+
+#: redbot/cogs/admin/admin.py:162
+msgid "{member.display_name} already has the role {role.name}."
+msgstr "{member.display_name} har allerede rollen {role.name}."
+
+#: redbot/cogs/admin/admin.py:182
+msgid "I successfully added {role.name} to {member.display_name}"
+msgstr "Jeg har lagt til {role.name} til {member.display_name}"
+
+#: redbot/cogs/admin/admin.py:192
+msgid "{member.display_name} does not have the role {role.name}."
+msgstr "{member.display_name} har ikke rollen {role.name}."
+
+#: redbot/cogs/admin/admin.py:212
+msgid "I successfully removed {role.name} from {member.display_name}"
+msgstr "Jeg har fjernet {role.name} fra {member.display_name}"
+
+#: redbot/cogs/admin/admin.py:223
+#, docstring
+msgid "\\n        Add a role to a user.\\n\\n        Use double quotes if the role contains spaces.\\n        If user is left blank it defaults to the author of the command.\\n        "
+msgstr "\\n  Legg til en rolle for en bruker.\\n \\n Bruk doble anførselstegn hvis rollen inneholder mellomrom.\\n  Hvis brukeren er tom, er den standard for forfatteren av kommandoen.\\n        "
+
+#: redbot/cogs/admin/admin.py:239
+#, docstring
+msgid "\\n        Remove a role from a user.\\n\\n        Use double quotes if the role contains spaces.\\n        If user is left blank it defaults to the author of the command.\\n        "
+msgstr "\\n  Fjern en rolle fra en bruker.\\n\\n   Bruk doble anførselstegn hvis rollen inneholder mellomrom.\\n   Hvis brukeren er tom, er den standard for forfatteren av kommandoen.\\n        "
+
+#: redbot/cogs/admin/admin.py:253
+#, docstring
+msgid "Edit role settings."
+msgstr "Endre rolle innsillinger."
+
+#: redbot/cogs/admin/admin.py:260
+#, docstring
+msgid "\\n        Edit a role's colour.\\n\\n        Use double quotes if the role contains spaces.\\n        Colour must be in hexadecimal format.\\n        [Online colour picker](http://www.w3schools.com/colors/colors_picker.asp)\\n\\n        Examples:\\n            `[p]editrole colour \\\"The Transistor\\\" #ff0000`\\n            `[p]editrole colour Test #ff9900`\\n        "
+msgstr "\\n   Rediger en rollefarge.\\n\\n Bruk doble anførselstegn hvis rollen inneholder mellomrom.\\n  Farge må være i heksadesimal format.\\n [Online fargevalg] (http://www.w3schools.com/colors/colors_picker.asp)\\n\\n Eksempler: \\n `[p] redigeringsrollefarge \" Transistoren \"# ff0000` \\n` [p] redigeringsrollefarge Test # ff9900` \\n        "
+
+#: redbot/cogs/admin/admin.py:289 redbot/cogs/admin/admin.py:322
+msgid "Done."
+msgstr "Ferdig."
+
+#: redbot/cogs/admin/admin.py:293
+#, docstring
+msgid "\\n        Edit a role's name.\\n\\n        Use double quotes if the role or the name contain spaces.\\n\\n        Example:\\n            `[p]editrole name \\\"The Transistor\\\" Test`\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:327
+#, docstring
+msgid "Announce a message to all servers the bot is in."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:334
+msgid "The announcement has begun."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:341
+#, docstring
+msgid "Cancel a running announce."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:343
+msgid "There is no currently running announcement."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:346
+msgid "The current announcement has been cancelled."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:352
+#, docstring
+msgid "Change how announcements are sent in this guild."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:357
+#, docstring
+msgid "\\n        Change the channel where the bot will send announcements.\\n\\n        If channel is left blank it defaults to the current channel.\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:366
+msgid "The announcement channel has been set to {channel.mention}"
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:371
+#, docstring
+msgid "Unsets the channel for announcements."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:396
+#, docstring
+msgid "Apply selfroles."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:401
+#, docstring
+msgid "\\n        Add a selfrole to yourself.\\n\\n        Server admins must have configured the role as user settable.\\n        NOTE: The role is case sensitive!\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:412
+#, docstring
+msgid "\\n        Remove a selfrole from yourself.\\n\\n        Server admins must have configured the role as user settable.\\n        NOTE: The role is case sensitive!\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:423
+#, docstring
+msgid "\\n        Lists all available selfroles.\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:433
+msgid "Available Selfroles:\\n{selfroles}"
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:439
+#, docstring
+msgid "Manage selfroles."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:444
+#, docstring
+msgid "\\n        Add a role to the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:451
+msgid "I cannot let you add {role.name} as a selfrole because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:459
+msgid "Added."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:462
+msgid "That role is already a selfrole."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:466
+#, docstring
+msgid "\\n        Remove a role from the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:473
+msgid "I cannot let you remove {role.name} from being a selfrole because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:481
+msgid "Removed."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:486
+#, docstring
+msgid "Lock a bot to its current servers only."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:491
+msgid "The bot is no longer serverlocked."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:493
+msgid "The bot is now serverlocked."
+msgstr ""
+
+#: redbot/cogs/admin/announcer.py:68
+msgid "I could not announce to the following server: "
+msgstr ""
+
+#: redbot/cogs/admin/announcer.py:70
+msgid "I could not announce to the following servers: "
+msgstr ""
+
+#: redbot/cogs/admin/converters.py:12
+msgid "The Admin cog is not loaded."
+msgstr ""
+
+#: redbot/cogs/admin/converters.py:20
+msgid "The provided role is not a valid selfrole."
+msgstr ""
+

redbot/cogs/admin/locales/nl-NL.po

@@ -1,9 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2019-07-14 04:24+0000\n"
-"PO-Revision-Date: 2020-01-07 21:48\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2020-09-03 12:24+0000\n"
+"Last-Translator: \n"
 "Language-Team: Dutch\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -11,175 +10,223 @@ msgstr ""
 "Generated-By: redgettext 3.1\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Crowdin-Project: red-discordbot\n"
+"X-Crowdin-Project-ID: 289505\n"
 "X-Crowdin-Language: nl\n"
-"X-Crowdin-File: /admin/locales/messages.pot\n"
+"X-Crowdin-File-ID: 42\n"
 "Language: nl_NL\n"
 
-#: redbot/cogs/admin/admin.py:17
+#: redbot/cogs/admin/admin.py:18
 msgid "I attempted to do something that Discord denied me permissions for. Your command failed to successfully complete."
-msgstr "Ik probeerde iets te doen, maar Discord weigerde mij toestemming te geven. Je command is geslaagd te mislukken."
+msgstr "Ik probeerde iets te doen waarvoor Discord me geen toestemming heeft gegeven. Je commando kon niet worden voltooid."
 
-#: redbot/cogs/admin/admin.py:22
-msgid "I tried to {verb} {role.name} to {member.display_name} but that role is higher than my highest role in the Discord hierarchy so I was unable to successfully add it. Please give me a higher role and try again."
-msgstr ""
+#: redbot/cogs/admin/admin.py:23
+msgid "I can not give {role.name} to {member.display_name} because that role is higher than or equal to my highest role in the Discord hierarchy."
+msgstr "Ik kan {role.name} niet aan {member.display_name} geven omdat die rol hoger of gelijk is aan mijn hoogste rol in de Discord hiërarchie."
 
 #: redbot/cogs/admin/admin.py:29
-msgid "I tried to {verb} {role.name} to {member.display_name} but that role is higher than your highest role in the Discord hierarchy so I was unable to successfully add it. Please get a higher role and try again."
-msgstr ""
+msgid "I can not remove {role.name} from {member.display_name} because that role is higher than or equal to my highest role in the Discord hierarchy."
+msgstr "Ik kan {role.name} niet van {member.display_name} verwijderen omdat die rol hoger dan of gelijk is aan mijn hoogste rol in de Discord hiërarchie."
 
-#: redbot/cogs/admin/admin.py:36
-msgid "I tried to edit {role.name} but that role is higher than your highest role in the Discord hierarchy so I was unable to successfully add it. Please get a higher role and try again."
-msgstr ""
+#: redbot/cogs/admin/admin.py:35
+msgid "I can not edit {role.name} because that role is higher than my or equal to highest role in the Discord hierarchy."
+msgstr "Ik kan {role.name} niet bewerken omdat die rol hoger is dan mijn of de hoogste rol in de Discord hiërarchie."
 
-#: redbot/cogs/admin/admin.py:43
+#: redbot/cogs/admin/admin.py:41
+msgid "I can not let you give {role.name} to {member.display_name} because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr "Ik kan je {role.name} niet aan {member.display_name} laten geven omdat die rol hoger is dan of gelijk is aan je hoogste rol in de Discord hiërarchie."
+
+#: redbot/cogs/admin/admin.py:47
+msgid "I can not let you remove {role.name} from {member.display_name} because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr "Ik kan je {role.name} niet van {member.display_name} laten verwijderen omdat die rol hoger dan of gelijk is aan je hoogste rol in de Discord hiërarchie."
+
+#: redbot/cogs/admin/admin.py:53
+msgid "I can not let you edit {role.name} because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr "Ik kan je {role.name} niet laten bewerken omdat die rol hoger of gelijk is aan je hoogste rol in de Discord hiërarchie."
+
+#: redbot/cogs/admin/admin.py:59
+msgid "I need manage roles permission to do that."
+msgstr "Ik heb de 'rollen beheren' permissie nodig om dat te doen."
+
+#: redbot/cogs/admin/admin.py:61
 msgid "I am already announcing something. If you would like to make a different announcement please use `{prefix}announce cancel` first."
 msgstr "Ik ben al iets aan het aankondigen. Als je iets anders wilt aankondigen, voer dan eerst deze command uit: '{prefix}announce cancel'."
 
-#: redbot/cogs/admin/admin.py:53
+#: redbot/cogs/admin/admin.py:71
 #, docstring
 msgid "A collection of server administration utilities."
 msgstr "Een collectie van de server administratie voorzieningen."
 
-#: redbot/cogs/admin/admin.py:115 redbot/cogs/admin/admin.py:160
-msgid "add"
-msgstr ""
+#: redbot/cogs/admin/admin.py:162
+msgid "{member.display_name} already has the role {role.name}."
+msgstr "{member.display_name} heeft de rol {role.name} al."
 
-#: redbot/cogs/admin/admin.py:121
+#: redbot/cogs/admin/admin.py:182
 msgid "I successfully added {role.name} to {member.display_name}"
 msgstr "Ik heb succesvol {role.name} toegevoegd aan {member.display_name}"
 
-#: redbot/cogs/admin/admin.py:132 redbot/cogs/admin/admin.py:180
-msgid "remove"
-msgstr ""
+#: redbot/cogs/admin/admin.py:192
+msgid "{member.display_name} does not have the role {role.name}."
+msgstr "{member.display_name} heeft de rol {role.name} niet."
 
-#: redbot/cogs/admin/admin.py:138
+#: redbot/cogs/admin/admin.py:212
 msgid "I successfully removed {role.name} from {member.display_name}"
 msgstr "Ik heb succesvol {role.name} verwijderd van {member.display_name}"
 
-#: redbot/cogs/admin/admin.py:149
+#: redbot/cogs/admin/admin.py:223
 #, docstring
-msgid "Add a role to a user.\\n\\n        If user is left blank it defaults to the author of the command.\\n        "
-msgstr ""
+msgid "\\n        Add a role to a user.\\n\\n        Use double quotes if the role contains spaces.\\n        If user is left blank it defaults to the author of the command.\\n        "
+msgstr "\\n        Voeg een rol toe aan een gebruiker.\\n\\n        Gebruik dubbele aanhalingstekens als de rol spaties bevat.\\n        Als de gebruiker leeg gelaten wordt, is het standaard ingesteld op de auteur van het commando.\\n        "
 
-#: redbot/cogs/admin/admin.py:169
+#: redbot/cogs/admin/admin.py:239
 #, docstring
-msgid "Remove a role from a user.\\n\\n        If user is left blank it defaults to the author of the command.\\n        "
-msgstr ""
+msgid "\\n        Remove a role from a user.\\n\\n        Use double quotes if the role contains spaces.\\n        If user is left blank it defaults to the author of the command.\\n        "
+msgstr "\\n        Verwijder een rol van een gebruiker.\\n\\n        Gebruik dubbele aanhalingstekens als de rol spaties bevat.\\n        Als de gebruiker leeg gelaten wordt, is het standaard ingesteld op de auteur van het commando.\\n        "
 
-#: redbot/cogs/admin/admin.py:187
+#: redbot/cogs/admin/admin.py:253
 #, docstring
 msgid "Edit role settings."
 msgstr "Rol instellingen bewerken."
 
-#: redbot/cogs/admin/admin.py:194
+#: redbot/cogs/admin/admin.py:260
 #, docstring
-msgid "Edit a role's colour.\\n\\n        Use double quotes if the role contains spaces.\\n        Colour must be in hexadecimal format.\\n        [Online colour picker](http://www.w3schools.com/colors/colors_picker.asp)\\n\\n        Examples:\\n            `[p]editrole colour \\\"The Transistor\\\" #ff0000`\\n            `[p]editrole colour Test #ff9900`\\n        "
-msgstr ""
+msgid "\\n        Edit a role's colour.\\n\\n        Use double quotes if the role contains spaces.\\n        Colour must be in hexadecimal format.\\n        [Online colour picker](http://www.w3schools.com/colors/colors_picker.asp)\\n\\n        Examples:\\n            `[p]editrole colour \\\"The Transistor\\\" #ff0000`\\n            `[p]editrole colour Test #ff9900`\\n        "
+msgstr "\\n        Bewerk een rolkleur.\\n\\n        Gebruik dubbele aanhalingstekens als de rol spaties bevat.\\n        Kleur moet in hexadecimaal formaat zijn.\\n        [Online kleur kiezer](http://www.w3schools. om/colors/colors_picker. sp)\\n\\n        Voorbeelden:\\n            `[p]editrole colour \\\"The Transistor\\\" #ff0000`\\n            `[p]editrole colour Test #ff9900`\\n        "
 
-#: redbot/cogs/admin/admin.py:217 redbot/cogs/admin/admin.py:245
+#: redbot/cogs/admin/admin.py:289 redbot/cogs/admin/admin.py:322
 msgid "Done."
 msgstr "Klaar."
 
-#: redbot/cogs/admin/admin.py:222
+#: redbot/cogs/admin/admin.py:293
 #, docstring
-msgid "Edit a role's name.\\n\\n        Use double quotes if the role or the name contain spaces.\\n\\n        Examples:\\n            `[p]editrole name \\\"The Transistor\\\" Test`\\n        "
-msgstr ""
+msgid "\\n        Edit a role's name.\\n\\n        Use double quotes if the role or the name contain spaces.\\n\\n        Example:\\n            `[p]editrole name \\\"The Transistor\\\" Test`\\n        "
+msgstr "\\n        Bewerk de rolnaam.\\n\\n        Gebruik dubbele aanhalingstekens als de rol of de naam spaties bevat.\\n\\n        Voorbeeld:\\n            `[p]bewerkrole naam \\\"The Transistor\\\" Test`\\n        "
 
-#: redbot/cogs/admin/admin.py:250
+#: redbot/cogs/admin/admin.py:327
 #, docstring
 msgid "Announce a message to all servers the bot is in."
 msgstr "Kondig een bericht aan in alle servers."
 
-#: redbot/cogs/admin/admin.py:257
+#: redbot/cogs/admin/admin.py:334
 msgid "The announcement has begun."
 msgstr "De aankondiging is begonnen."
 
-#: redbot/cogs/admin/admin.py:265
+#: redbot/cogs/admin/admin.py:341
 #, docstring
 msgid "Cancel a running announce."
 msgstr "Annuleer een huidige aankondiging."
 
-#: redbot/cogs/admin/admin.py:271
+#: redbot/cogs/admin/admin.py:343
+msgid "There is no currently running announcement."
+msgstr "Er is momenteel geen lopende aankondiging."
+
+#: redbot/cogs/admin/admin.py:346
 msgid "The current announcement has been cancelled."
 msgstr "De huidige aankondiging is geannuleerd."
 
-#: redbot/cogs/admin/admin.py:277
+#: redbot/cogs/admin/admin.py:352
 #, docstring
-msgid "Change the channel to which the bot makes announcements."
-msgstr "Bewerk het kanaal waar de bot aankondigingen maakt."
+msgid "Change how announcements are sent in this guild."
+msgstr "Verander hoe aankondigingen worden verzonden in deze gilde."
 
-#: redbot/cogs/admin/admin.py:283
+#: redbot/cogs/admin/admin.py:357
+#, docstring
+msgid "\\n        Change the channel where the bot will send announcements.\\n\\n        If channel is left blank it defaults to the current channel.\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:366
 msgid "The announcement channel has been set to {channel.mention}"
 msgstr "Het aankondigingskanaal is aangepast naar {channel.mention}"
 
-#: redbot/cogs/admin/admin.py:290
-#, docstring
-msgid "Toggle announcements being enabled this server."
-msgstr "Aankondigingen zijn geactiveerd in deze server."
-
-#: redbot/cogs/admin/admin.py:296
-msgid "The server {guild.name} will receive announcements."
-msgstr "De server {guild.name} ontvangt aankondigingen."
-
-#: redbot/cogs/admin/admin.py:300
-msgid "The server {guild.name} will not receive announcements."
-msgstr "De server {guild.name} ontvangt geen aankondigingen."
-
-#: redbot/cogs/admin/admin.py:326
-#, docstring
-msgid "Add a role to yourself.\\n\\n        Server admins must have configured the role as user settable.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:337
-#, docstring
-msgid "Remove a selfrole from yourself.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:347
-#, docstring
-msgid "Add a role to the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:355 redbot/cogs/admin/admin.py:367
-msgid "The selfroles list has been successfully modified."
-msgstr "De selfroles lijst is succesvol aangepast."
-
-#: redbot/cogs/admin/admin.py:360
-#, docstring
-msgid "Remove a role from the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr ""
-
 #: redbot/cogs/admin/admin.py:371
 #, docstring
+msgid "Unsets the channel for announcements."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:396
+#, docstring
+msgid "Apply selfroles."
+msgstr "Zelfrollen toepassen."
+
+#: redbot/cogs/admin/admin.py:401
+#, docstring
+msgid "\\n        Add a selfrole to yourself.\\n\\n        Server admins must have configured the role as user settable.\\n        NOTE: The role is case sensitive!\\n        "
+msgstr "\\n        Voeg een zelfrol toe aan jezelf.\\n\\n        Server beheerders moeten de rol gebruiker instelbaar configureren.\\n        Let op: De rol is hoofdlettergevoelig!\\n        "
+
+#: redbot/cogs/admin/admin.py:412
+#, docstring
+msgid "\\n        Remove a selfrole from yourself.\\n\\n        Server admins must have configured the role as user settable.\\n        NOTE: The role is case sensitive!\\n        "
+msgstr "\\n        Verwijder een zelfrol van jezelf.\\n\\n        Server beheerders moeten de rol als gebruiker instelbaar configureren.\\n        Let op: De rol is hoofdlettergevoelig!\\n        "
+
+#: redbot/cogs/admin/admin.py:423
+#, docstring
 msgid "\\n        Lists all available selfroles.\\n        "
-msgstr ""
+msgstr "\\n        Toont alle beschikbare zelfrollen.\\n        "
 
-#: redbot/cogs/admin/admin.py:377
+#: redbot/cogs/admin/admin.py:433
 msgid "Available Selfroles:\\n{selfroles}"
-msgstr ""
+msgstr "Beschikbare zelfrollen:\\n{selfroles}"
 
-#: redbot/cogs/admin/admin.py:394
+#: redbot/cogs/admin/admin.py:439
+#, docstring
+msgid "Manage selfroles."
+msgstr "Beheer zelfrollen."
+
+#: redbot/cogs/admin/admin.py:444
+#, docstring
+msgid "\\n        Add a role to the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
+msgstr "\\n        Voeg een rol toe aan de lijst van beschikbare zelfrollen.\\n\\n        Let op: hoofdlettergevoelig!\\n        "
+
+#: redbot/cogs/admin/admin.py:451
+msgid "I cannot let you add {role.name} as a selfrole because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr "Ik kan je {role.name} niet als zelfrol toe laten voegen omdat die rol hoger dan of gelijk is aan je hoogste rol in de Discord hiërarchie."
+
+#: redbot/cogs/admin/admin.py:459
+msgid "Added."
+msgstr "Toegevoegd."
+
+#: redbot/cogs/admin/admin.py:462
+msgid "That role is already a selfrole."
+msgstr "Die rol is al een zelfrol."
+
+#: redbot/cogs/admin/admin.py:466
+#, docstring
+msgid "\\n        Remove a role from the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
+msgstr "\\n        Verwijder een rol van de lijst van beschikbare zelfrollen.\\n\\n        OPMERKING: De rol is hoofdlettergevoelig!\\n        "
+
+#: redbot/cogs/admin/admin.py:473
+msgid "I cannot let you remove {role.name} from being a selfrole because that role is higher than or equal to your highest role in the Discord hierarchy."
+msgstr "Ik kan je {role.name} niet uit zelfrol laten verwijderen omdat die rol hoger dan of gelijk is aan je hoogste rol in de Discord-hiërarchie."
+
+#: redbot/cogs/admin/admin.py:481
+msgid "Removed."
+msgstr "Verwijderd."
+
+#: redbot/cogs/admin/admin.py:486
 #, docstring
 msgid "Lock a bot to its current servers only."
 msgstr "Vergrendel de bot voor alleen deze server."
 
-#: redbot/cogs/admin/admin.py:399
+#: redbot/cogs/admin/admin.py:491
 msgid "The bot is no longer serverlocked."
 msgstr "De bot is niet langer vergrendeld."
 
-#: redbot/cogs/admin/admin.py:401
+#: redbot/cogs/admin/admin.py:493
 msgid "The bot is now serverlocked."
 msgstr "De bot is vergrendeld."
 
-#: redbot/cogs/admin/announcer.py:70
-msgid "I could not announce to server: {server.id}"
-msgstr "Ik kan geen bericht aankondigen in: {server.id}"
+#: redbot/cogs/admin/announcer.py:68
+msgid "I could not announce to the following server: "
+msgstr "Ik kan de volgende server niet aankondigen: "
 
-#: redbot/cogs/admin/converters.py:25
+#: redbot/cogs/admin/announcer.py:70
+msgid "I could not announce to the following servers: "
+msgstr "Ik kon de volgende servers niet aankondigen: "
+
+#: redbot/cogs/admin/converters.py:12
 msgid "The Admin cog is not loaded."
 msgstr "De admin cog is niet geladen."
 
-#: redbot/cogs/admin/converters.py:34
+#: redbot/cogs/admin/converters.py:20
 msgid "The provided role is not a valid selfrole."
 msgstr "De ingevulde rol is geen beschikbare selfrole."
 

redbot/cogs/admin/locales/no-NO.po

@@ -1,185 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2019-07-14 04:24+0000\n"
-"PO-Revision-Date: 2020-01-07 21:48\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Norwegian\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: redgettext 3.1\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Crowdin-Project: red-discordbot\n"
-"X-Crowdin-Language: no\n"
-"X-Crowdin-File: /admin/locales/messages.pot\n"
-"Language: no_NO\n"
-
-#: redbot/cogs/admin/admin.py:17
-msgid "I attempted to do something that Discord denied me permissions for. Your command failed to successfully complete."
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:22
-msgid "I tried to {verb} {role.name} to {member.display_name} but that role is higher than my highest role in the Discord hierarchy so I was unable to successfully add it. Please give me a higher role and try again."
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:29
-msgid "I tried to {verb} {role.name} to {member.display_name} but that role is higher than your highest role in the Discord hierarchy so I was unable to successfully add it. Please get a higher role and try again."
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:36
-msgid "I tried to edit {role.name} but that role is higher than your highest role in the Discord hierarchy so I was unable to successfully add it. Please get a higher role and try again."
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:43
-msgid "I am already announcing something. If you would like to make a different announcement please use `{prefix}announce cancel` first."
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:53
-#, docstring
-msgid "A collection of server administration utilities."
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:115 redbot/cogs/admin/admin.py:160
-msgid "add"
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:121
-msgid "I successfully added {role.name} to {member.display_name}"
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:132 redbot/cogs/admin/admin.py:180
-msgid "remove"
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:138
-msgid "I successfully removed {role.name} from {member.display_name}"
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:149
-#, docstring
-msgid "Add a role to a user.\\n\\n        If user is left blank it defaults to the author of the command.\\n        "
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:169
-#, docstring
-msgid "Remove a role from a user.\\n\\n        If user is left blank it defaults to the author of the command.\\n        "
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:187
-#, docstring
-msgid "Edit role settings."
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:194
-#, docstring
-msgid "Edit a role's colour.\\n\\n        Use double quotes if the role contains spaces.\\n        Colour must be in hexadecimal format.\\n        [Online colour picker](http://www.w3schools.com/colors/colors_picker.asp)\\n\\n        Examples:\\n            `[p]editrole colour \\\"The Transistor\\\" #ff0000`\\n            `[p]editrole colour Test #ff9900`\\n        "
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:217 redbot/cogs/admin/admin.py:245
-msgid "Done."
-msgstr "Ferdig."
-
-#: redbot/cogs/admin/admin.py:222
-#, docstring
-msgid "Edit a role's name.\\n\\n        Use double quotes if the role or the name contain spaces.\\n\\n        Examples:\\n            `[p]editrole name \\\"The Transistor\\\" Test`\\n        "
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:250
-#, docstring
-msgid "Announce a message to all servers the bot is in."
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:257
-msgid "The announcement has begun."
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:265
-#, docstring
-msgid "Cancel a running announce."
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:271
-msgid "The current announcement has been cancelled."
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:277
-#, docstring
-msgid "Change the channel to which the bot makes announcements."
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:283
-msgid "The announcement channel has been set to {channel.mention}"
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:290
-#, docstring
-msgid "Toggle announcements being enabled this server."
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:296
-msgid "The server {guild.name} will receive announcements."
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:300
-msgid "The server {guild.name} will not receive announcements."
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:326
-#, docstring
-msgid "Add a role to yourself.\\n\\n        Server admins must have configured the role as user settable.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:337
-#, docstring
-msgid "Remove a selfrole from yourself.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:347
-#, docstring
-msgid "Add a role to the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:355 redbot/cogs/admin/admin.py:367
-msgid "The selfroles list has been successfully modified."
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:360
-#, docstring
-msgid "Remove a role from the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:371
-#, docstring
-msgid "\\n        Lists all available selfroles.\\n        "
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:377
-msgid "Available Selfroles:\\n{selfroles}"
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:394
-#, docstring
-msgid "Lock a bot to its current servers only."
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:399
-msgid "The bot is no longer serverlocked."
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:401
-msgid "The bot is now serverlocked."
-msgstr ""
-
-#: redbot/cogs/admin/announcer.py:70
-msgid "I could not announce to server: {server.id}"
-msgstr ""
-
-#: redbot/cogs/admin/converters.py:25
-msgid "The Admin cog is not loaded."
-msgstr ""
-
-#: redbot/cogs/admin/converters.py:34
-msgid "The provided role is not a valid selfrole."
-msgstr ""
-