Merge pull request #4008 from Drapersniper/node-managing

Another tiny PR :awesome:

.bandit.yml

@@ -0,0 +1,396 @@
+
+### Bandit config file generated
+
+### This config may optionally select a subset of tests to run or skip by
+### filling out the 'tests' and 'skips' lists given below. If no tests are
+### specified for inclusion then it is assumed all tests are desired. The skips
+### set will remove specific tests from the include set. This can be controlled
+### using the -t/-s CLI options. Note that the same test ID should not appear
+### in both 'tests' and 'skips', this would be nonsensical and is detected by
+### Bandit at runtime.
+
+# Available tests:
+# B101 : assert_used
+# B102 : exec_used
+# B103 : set_bad_file_permissions
+# B104 : hardcoded_bind_all_interfaces
+# B105 : hardcoded_password_string
+# B106 : hardcoded_password_funcarg
+# B107 : hardcoded_password_default
+# B108 : hardcoded_tmp_directory
+# B110 : try_except_pass
+# B112 : try_except_continue
+# B201 : flask_debug_true
+# B301 : pickle
+# B302 : marshal
+# B303 : md5
+# B304 : ciphers
+# B305 : cipher_modes
+# B306 : mktemp_q
+# B307 : eval
+# B308 : mark_safe
+# B309 : httpsconnection
+# B310 : urllib_urlopen
+# B311 : random
+# B312 : telnetlib
+# B313 : xml_bad_cElementTree
+# B314 : xml_bad_ElementTree
+# B315 : xml_bad_expatreader
+# B316 : xml_bad_expatbuilder
+# B317 : xml_bad_sax
+# B318 : xml_bad_minidom
+# B319 : xml_bad_pulldom
+# B320 : xml_bad_etree
+# B321 : ftplib
+# B322 : input
+# B323 : unverified_context
+# B324 : hashlib_new_insecure_functions
+# B325 : tempnam
+# B401 : import_telnetlib
+# B402 : import_ftplib
+# B403 : import_pickle
+# B404 : import_subprocess
+# B405 : import_xml_etree
+# B406 : import_xml_sax
+# B407 : import_xml_expat
+# B408 : import_xml_minidom
+# B409 : import_xml_pulldom
+# B410 : import_lxml
+# B411 : import_xmlrpclib
+# B412 : import_httpoxy
+# B413 : import_pycrypto
+# B501 : request_with_no_cert_validation
+# B502 : ssl_with_bad_version
+# B503 : ssl_with_bad_defaults
+# B504 : ssl_with_no_version
+# B505 : weak_cryptographic_key
+# B506 : yaml_load
+# B507 : ssh_no_host_key_verification
+# B601 : paramiko_calls
+# B602 : subprocess_popen_with_shell_equals_true
+# B603 : subprocess_without_shell_equals_true
+# B604 : any_other_function_with_shell_equals_true
+# B605 : start_process_with_a_shell
+# B606 : start_process_with_no_shell
+# B607 : start_process_with_partial_path
+# B608 : hardcoded_sql_expressions
+# B609 : linux_commands_wildcard_injection
+# B610 : django_extra_used
+# B611 : django_rawsql_used
+# B701 : jinja2_autoescape_false
+# B702 : use_of_mako_templates
+# B703 : django_mark_safe
+
+# (optional) list included test IDs here, eg '[B101, B406]':
+tests:
+
+# (optional) list skipped test IDs here, eg '[B101, B406]':
+skips:  ['B322']
+
+### (optional) plugin settings - some test plugins require configuration data
+### that may be given here, per-plugin. All bandit test plugins have a built in
+### set of sensible defaults and these will be used if no configuration is
+### provided. It is not necessary to provide settings for every (or any) plugin
+### if the defaults are acceptable.
+
+any_other_function_with_shell_equals_true:
+  no_shell:
+  - os.execl
+  - os.execle
+  - os.execlp
+  - os.execlpe
+  - os.execv
+  - os.execve
+  - os.execvp
+  - os.execvpe
+  - os.spawnl
+  - os.spawnle
+  - os.spawnlp
+  - os.spawnlpe
+  - os.spawnv
+  - os.spawnve
+  - os.spawnvp
+  - os.spawnvpe
+  - os.startfile
+  shell:
+  - os.system
+  - os.popen
+  - os.popen2
+  - os.popen3
+  - os.popen4
+  - popen2.popen2
+  - popen2.popen3
+  - popen2.popen4
+  - popen2.Popen3
+  - popen2.Popen4
+  - commands.getoutput
+  - commands.getstatusoutput
+  subprocess:
+  - subprocess.Popen
+  - subprocess.call
+  - subprocess.check_call
+  - subprocess.check_output
+  - subprocess.run
+hardcoded_tmp_directory:
+  tmp_dirs:
+  - /tmp
+  - /var/tmp
+  - /dev/shm
+linux_commands_wildcard_injection:
+  no_shell:
+  - os.execl
+  - os.execle
+  - os.execlp
+  - os.execlpe
+  - os.execv
+  - os.execve
+  - os.execvp
+  - os.execvpe
+  - os.spawnl
+  - os.spawnle
+  - os.spawnlp
+  - os.spawnlpe
+  - os.spawnv
+  - os.spawnve
+  - os.spawnvp
+  - os.spawnvpe
+  - os.startfile
+  shell:
+  - os.system
+  - os.popen
+  - os.popen2
+  - os.popen3
+  - os.popen4
+  - popen2.popen2
+  - popen2.popen3
+  - popen2.popen4
+  - popen2.Popen3
+  - popen2.Popen4
+  - commands.getoutput
+  - commands.getstatusoutput
+  subprocess:
+  - subprocess.Popen
+  - subprocess.call
+  - subprocess.check_call
+  - subprocess.check_output
+  - subprocess.run
+ssl_with_bad_defaults:
+  bad_protocol_versions:
+  - PROTOCOL_SSLv2
+  - SSLv2_METHOD
+  - SSLv23_METHOD
+  - PROTOCOL_SSLv3
+  - PROTOCOL_TLSv1
+  - SSLv3_METHOD
+  - TLSv1_METHOD
+ssl_with_bad_version:
+  bad_protocol_versions:
+  - PROTOCOL_SSLv2
+  - SSLv2_METHOD
+  - SSLv23_METHOD
+  - PROTOCOL_SSLv3
+  - PROTOCOL_TLSv1
+  - SSLv3_METHOD
+  - TLSv1_METHOD
+start_process_with_a_shell:
+  no_shell:
+  - os.execl
+  - os.execle
+  - os.execlp
+  - os.execlpe
+  - os.execv
+  - os.execve
+  - os.execvp
+  - os.execvpe
+  - os.spawnl
+  - os.spawnle
+  - os.spawnlp
+  - os.spawnlpe
+  - os.spawnv
+  - os.spawnve
+  - os.spawnvp
+  - os.spawnvpe
+  - os.startfile
+  shell:
+  - os.system
+  - os.popen
+  - os.popen2
+  - os.popen3
+  - os.popen4
+  - popen2.popen2
+  - popen2.popen3
+  - popen2.popen4
+  - popen2.Popen3
+  - popen2.Popen4
+  - commands.getoutput
+  - commands.getstatusoutput
+  subprocess:
+  - subprocess.Popen
+  - subprocess.call
+  - subprocess.check_call
+  - subprocess.check_output
+  - subprocess.run
+start_process_with_no_shell:
+  no_shell:
+  - os.execl
+  - os.execle
+  - os.execlp
+  - os.execlpe
+  - os.execv
+  - os.execve
+  - os.execvp
+  - os.execvpe
+  - os.spawnl
+  - os.spawnle
+  - os.spawnlp
+  - os.spawnlpe
+  - os.spawnv
+  - os.spawnve
+  - os.spawnvp
+  - os.spawnvpe
+  - os.startfile
+  shell:
+  - os.system
+  - os.popen
+  - os.popen2
+  - os.popen3
+  - os.popen4
+  - popen2.popen2
+  - popen2.popen3
+  - popen2.popen4
+  - popen2.Popen3
+  - popen2.Popen4
+  - commands.getoutput
+  - commands.getstatusoutput
+  subprocess:
+  - subprocess.Popen
+  - subprocess.call
+  - subprocess.check_call
+  - subprocess.check_output
+  - subprocess.run
+start_process_with_partial_path:
+  no_shell:
+  - os.execl
+  - os.execle
+  - os.execlp
+  - os.execlpe
+  - os.execv
+  - os.execve
+  - os.execvp
+  - os.execvpe
+  - os.spawnl
+  - os.spawnle
+  - os.spawnlp
+  - os.spawnlpe
+  - os.spawnv
+  - os.spawnve
+  - os.spawnvp
+  - os.spawnvpe
+  - os.startfile
+  shell:
+  - os.system
+  - os.popen
+  - os.popen2
+  - os.popen3
+  - os.popen4
+  - popen2.popen2
+  - popen2.popen3
+  - popen2.popen4
+  - popen2.Popen3
+  - popen2.Popen4
+  - commands.getoutput
+  - commands.getstatusoutput
+  subprocess:
+  - subprocess.Popen
+  - subprocess.call
+  - subprocess.check_call
+  - subprocess.check_output
+  - subprocess.run
+subprocess_popen_with_shell_equals_true:
+  no_shell:
+  - os.execl
+  - os.execle
+  - os.execlp
+  - os.execlpe
+  - os.execv
+  - os.execve
+  - os.execvp
+  - os.execvpe
+  - os.spawnl
+  - os.spawnle
+  - os.spawnlp
+  - os.spawnlpe
+  - os.spawnv
+  - os.spawnve
+  - os.spawnvp
+  - os.spawnvpe
+  - os.startfile
+  shell:
+  - os.system
+  - os.popen
+  - os.popen2
+  - os.popen3
+  - os.popen4
+  - popen2.popen2
+  - popen2.popen3
+  - popen2.popen4
+  - popen2.Popen3
+  - popen2.Popen4
+  - commands.getoutput
+  - commands.getstatusoutput
+  subprocess:
+  - subprocess.Popen
+  - subprocess.call
+  - subprocess.check_call
+  - subprocess.check_output
+  - subprocess.run
+subprocess_without_shell_equals_true:
+  no_shell:
+  - os.execl
+  - os.execle
+  - os.execlp
+  - os.execlpe
+  - os.execv
+  - os.execve
+  - os.execvp
+  - os.execvpe
+  - os.spawnl
+  - os.spawnle
+  - os.spawnlp
+  - os.spawnlpe
+  - os.spawnv
+  - os.spawnve
+  - os.spawnvp
+  - os.spawnvpe
+  - os.startfile
+  shell:
+  - os.system
+  - os.popen
+  - os.popen2
+  - os.popen3
+  - os.popen4
+  - popen2.popen2
+  - popen2.popen3
+  - popen2.popen4
+  - popen2.Popen3
+  - popen2.Popen4
+  - commands.getoutput
+  - commands.getstatusoutput
+  subprocess:
+  - subprocess.Popen
+  - subprocess.call
+  - subprocess.check_call
+  - subprocess.check_output
+  - subprocess.run
+try_except_continue:
+  check_typed_exception: false
+try_except_pass:
+  check_typed_exception: false
+weak_cryptographic_key:
+  weak_key_size_dsa_high: 1024
+  weak_key_size_dsa_medium: 2048
+  weak_key_size_ec_high: 160
+  weak_key_size_ec_medium: 224
+  weak_key_size_rsa_high: 1024
+  weak_key_size_rsa_medium: 2048
+

.codeclimate.yml

@@ -0,0 +1,52 @@
+version: "2"  # required to adjust maintainability checks
+checks:
+  argument-count:
+    config:
+      threshold: 8  # work on this later
+  complex-logic:
+    enabled: false  # Disabled in favor of using Radon for this
+    config:
+      threshold: 4
+  file-lines:
+    enabled: false  # enable after audio stuff...
+    config:
+      threshold: 2000  # I would set this lower if not for cogs as command containers.
+  method-complexity:
+    enabled: false  # Disabled in favor of using Radon for this
+    config:
+      threshold: 5
+  method-count:
+    enabled: false  # I would set this lower if not for cogs as command containers.
+    config:
+      threshold: 20
+  method-lines:
+    enabled: false
+    config:
+      threshold: 25  # I'm fine with long methods, cautious about the complexity of a single method.
+  nested-control-flow:
+    config:
+      threshold: 6
+  return-statements:
+    config:
+      threshold: 6
+  similar-code:
+    enabled: false
+    config:
+      threshold: # language-specific defaults. an override will affect all languages.
+  identical-code:
+    enabled: false
+    config:
+      threshold: # language-specific defaults. an override will affect all languages.
+plugins:
+  bandit:
+    enabled: false
+  radon: 
+    enabled: false
+    config: 
+      threshold: "D"
+  duplication:
+    enabled: false
+    config:
+      languages:
+        python:
+          python_version: 3

.github/CODEOWNERS

@@ -1,7 +1,5 @@
-# Default
-*                                   @Twentysix26
-
 # Core
+redbot/core/apis/audio/**                @aikaterna @Drapersniper
 redbot/core/bank.py                      @palmtree5
 redbot/core/checks.py                    @tekulvw
 redbot/core/cli.py                       @tekulvw
@@ -25,15 +23,16 @@ 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
+redbot/cogs/audio/**                @aikaterna @Drapersniper
 redbot/cogs/bank/*                  @tekulvw
 redbot/cogs/cleanup/*               @palmtree5
 redbot/cogs/customcom/*             @palmtree5
-redbot/cogs/downloader/*            @tekulvw
+redbot/cogs/downloader/*            @tekulvw @jack1142
 redbot/cogs/economy/*               @palmtree5
 redbot/cogs/filter/*                @palmtree5
 redbot/cogs/general/*               @palmtree5
@@ -49,12 +48,16 @@ redbot/cogs/warnings/*              @palmtree5
 # Docs
 docs/*                              @tekulvw @palmtree5
 
+# Tests
+tests/cogs/downloader/*             @jack1142
+
 # Setup, instance setup, and running the bot
 setup.py                            @tekulvw
 redbot/__init__.py                  @tekulvw
-redbot/__main__.py                  @tekulvw
+redbot/__main__.py                  @tekulvw @mikeshardmind
 redbot/setup.py                     @tekulvw
 
 # Others
 .travis.yml                         @Kowlin
 crowdin.yml                         @Kowlin
+.github/workflows/*                 @Kowlin

.github/ISSUE_TEMPLATE/command_bug.md

@@ -1,6 +1,9 @@
 ---
 name: Bug reports for commands
 about: For bugs that involve commands found within Red
+title: ''
+labels: 'Type: Bug'
+assignees: ''
 
 ---
 

.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/ISSUE_TEMPLATE/feature_req.md

@@ -1,6 +1,9 @@
 ---
 name: Feature request
 about: For feature requests regarding Red itself.
+title: ''
+labels: 'Type: Feature'
+assignees: ''
 
 ---
 

.github/ISSUE_TEMPLATE/other_bug.md

@@ -1,6 +1,9 @@
 ---
 name: Bug report
 about: For bugs that don't involve a command.
+title: ''
+labels: 'Type: Bug'
+assignees: ''
 
 ---
 

.github/workflows/auto_labeler.yml

@@ -0,0 +1,26 @@
+name: Auto Labeler
+on:
+  issues:
+    types: [opened]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    steps:
+      - name: Apply Triage Label
+        uses: actions/github-script@0.4.0
+        with:
+          github-token: ${{secrets.GITHUB_TOKEN}}
+          script: |
+            const is_status_label = (label) => label.name.startsWith('Status: ');
+            if (context.payload.issue.labels.some(is_status_label)) {
+                console.log('Issue already has Status label, skipping...');
+                return;
+            }
+            github.issues.addLabels({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              labels: ['Status: Needs Triage']
+            });

.github/workflows/lint_python.yaml

@@ -0,0 +1,26 @@
+name: Lint Python
+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@v2
+        with:
+          ref: ${{ env.ref }}
+      - uses: actions/setup-python@v1
+        with:
+          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

@@ -0,0 +1,48 @@
+name: Publish to Crowdin
+on:
+  schedule:
+    - cron: '0 12 * * THU'
+  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
+    - name: Set up Python
+      uses: actions/setup-python@v1
+      with:
+        python-version: '3.8'
+    - name: Install dependencies
+      run: |
+        curl https://artifacts.crowdin.com/repo/GPG-KEY-crowdin | sudo apt-key add -
+        echo "deb https://artifacts.crowdin.com/repo/deb/ /" | sudo tee -a /etc/apt/sources.list
+        sudo apt-get update -qq
+        sudo apt-get install -y crowdin
+        pip install redgettext==3.1
+    - 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

@@ -0,0 +1,27 @@
+name: Publish to PyPI
+on:
+  push:
+    tags:
+     - "*"
+
+jobs:
+  deploy:
+    if: github.repository == 'Cog-Creators/Red-DiscordBot'
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python
+      uses: actions/setup-python@v1
+      with:
+        python-version: '3.8'
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install setuptools wheel twine
+    - name: Build and publish
+      env:
+        TWINE_USERNAME: __token__
+        TWINE_PASSWORD: ${{ secrets.pypi_token }}
+      run: |
+        python setup.py sdist bdist_wheel
+        twine upload dist/*

.github/workflows/tests.yml

@@ -0,0 +1,85 @@
+name: Tests
+on:
+  pull_request:
+  push:
+  repository_dispatch:
+    types:
+      - dispatched_test
+
+env:
+  ref: ${{ github.event.client_payload.ref || '' }}
+
+jobs:
+    tox:
+      runs-on: ubuntu-latest
+      strategy:
+        matrix:
+          python_version:
+            - "3.8"
+          tox_env:
+            - py
+            - style
+            - docs
+          include:
+            - tox_env: py
+              friendly_name: Tests
+            - tox_env: style
+              friendly_name: Style
+            - tox_env: docs
+              friendly_name: Docs
+        fail-fast: false
+      name: Tox - ${{ matrix.friendly_name }}
+      steps:
+        - uses: actions/checkout@v2
+          with:
+            ref: ${{ env.ref }}
+        - name: Set up Python
+          uses: actions/setup-python@v1
+          with:
+            python-version: ${{ matrix.python_version }}
+        - name: Install tox
+          run: |
+            python -m pip install --upgrade pip
+            pip install tox
+        - name: Tox test
+          env:
+            TOXENV: ${{ matrix.tox_env }}
+          run: tox
+
+    tox-postgres:
+      runs-on: ubuntu-latest
+      strategy:
+        matrix:
+          python_version:
+            - "3.8"
+        fail-fast: false
+      name: Tox - Postgres
+      services:
+        postgresql:
+          image: postgres:10
+          ports:
+            - 5432:5432
+          env:
+            POSTGRES_DB: red_db
+            POSTGRES_PASSWORD: postgres
+            POSTGRES_USER: postgres
+      steps:
+        - uses: actions/checkout@v2
+          with:
+            ref: ${{ env.ref }}
+        - name: Set up Python
+          uses: actions/setup-python@v1
+          with:
+            python-version: ${{ matrix.python_version }}
+        - name: Install tox
+          run: |
+            python -m pip install --upgrade pip
+            pip install tox
+        - name: Tox test
+          env:
+            TOXENV: postgres
+            PGDATABASE: red_db
+            PGUSER: postgres
+            PGPASSWORD: postgres
+            PGPORT: 5432
+          run: tox

.gitignore

@@ -6,6 +6,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
@@ -57,6 +58,7 @@ parts/
 sdist/
 var/
 wheels/
+pip-wheel-metadata/
 *.egg-info/
 .installed.cfg
 *.egg
@@ -136,3 +138,6 @@ ENV/
 
 # pytest
 .pytest_cache/
+
+# Pre-commit hooks
+/.pre-commit-config.yaml

.readthedocs.yml

@@ -7,11 +7,10 @@ build:
   image: latest
 
 python:
-  version: 3.7
+  version: 3.8
   install:
     - requirements: docs/requirements.txt
     - method: pip
       path: .
       extra_requirements:
         - docs
-        - mongo

.travis.yml

@@ -5,14 +5,10 @@ notifications:
   email: false
 
 python:
-- 3.7.2
+- 3.8.1
 env:
   global:
     - PIPENV_IGNORE_VIRTUALENVS=1
-  matrix:
-    - TOXENV=py
-    - TOXENV=docs
-    - TOXENV=style
 
 install:
 - pip install --upgrade pip tox
@@ -22,13 +18,22 @@ script:
 
 jobs:
   include:
+    - env: TOXENV=py
+    - env: TOXENV=docs
+    - env: TOXENV=style
+    - env: TOXENV=postgres
+      services: postgresql
+      addons:
+        postgresql: "10"
+      before_script:
+        - psql -c 'create database red_db;' -U postgres
     # These jobs only occur on tag creation if the prior ones succeed
     - stage: PyPi Deployment
       if: tag IS present
-      python: 3.7.2
+      python: 3.8.1
       env:
         - DEPLOYING=true
-        - TOXENV=py36
+        - TOXENV=py38
       deploy:
         - provider: pypi
           distributions: sdist bdist_wheel
@@ -40,11 +45,11 @@ jobs:
             repo: Cog-Creators/Red-DiscordBot
             tags: true
     - stage: Crowdin Deployment
-      if: tag IS present
-      python: 3.7.2
+      if: tag IS present OR ENV(BUILD_CROWDIN)
+      python: 3.8.1
       env:
         - DEPLOYING=true
-        - TOXENV=py36
+        - TOXENV=py38
       before_deploy:
       - curl https://artifacts.crowdin.com/repo/GPG-KEY-crowdin | sudo apt-key add -
       - echo "deb https://artifacts.crowdin.com/repo/deb/ /" | sudo tee -a /etc/apt/sources.list

CONTRIBUTING.md

@@ -29,9 +29,8 @@ Red is an open source project. This means that each and every one of the develop
 We love receiving contributions from our community. Any assistance you can provide with regards to bug fixes, feature enhancements, and documentation is more than welcome.
 
 # 2. Ground Rules
-We've made a point to use [ZenHub](https://www.zenhub.com/) (a plugin for GitHub) as our main source of collaboration and coordination. Your experience contributing to Red will be greatly improved if you go get that plugin.
 1. Ensure cross compatibility for Windows, Mac OS and Linux.
-2. Ensure all Python features used in contributions exist and work in Python 3.7 and above.
+2. Ensure all Python features used in contributions exist and work in Python 3.8.1 and above.
 3. Create new tests for code you add or bugs you fix. It helps us help you by making sure we don't accidentally break anything :grinning:
 4. Create any issues for new features you'd like to implement and explain why this feature is useful to everyone and not just you personally.
 5. Don't add new cogs unless specifically given approval in an issue discussing said cog idea.
@@ -53,7 +52,7 @@ Red's repository is configured to follow a particular development workflow, usin
 
 ### 4.1 Setting up your development environment
 The following requirements must be installed prior to setting up:
- - Python 3.7.0 or greater
+ - Python 3.8.1 or greater
  - git
  - pip
  
@@ -79,10 +78,10 @@ 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.7 (test environment `py37`)
+- Runs all of our unit tests with [pytest](https://github.com/pytest-dev/pytest) on python 3.8 (test environment `py38`)
 - Ensures documentation builds without warnings, and all hyperlinks have a valid destination (test environment `docs`)
 - Ensures that the code meets our style guide with [black](https://github.com/ambv/black) (test environment `style`)
 
@@ -95,15 +94,19 @@ 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 three things with them:
+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:
 1. `make reformat`: Reformat all python files in the project with Black
 2. `make stylecheck`: Check if any `.py` files in the project need reformatting
 3. `make newenv`: Set up a new virtual environment in the `.venv` subdirectory, and install Red and its dependencies. If one already exists, it is cleared out and replaced.
 4. `make syncenv`: Sync your environment with Red's latest dependencies.
 
+The other make recipes are most likely for project maintainers rather than contributors.
+
+You can specify the Python executable used in the make recipes with the `PYTHON` environment variable, e.g. `make PYTHON=/usr/bin/python3.8 newenv`.
+
 ### 4.5 Keeping your dependencies up to date
 Whenever you pull from upstream (V3/develop on the main repository) and you notice either of the files `setup.cfg` or `tools/dev-requirements.txt` have been changed, it can often mean some package dependencies have been updated, added or removed. To make sure you're testing and formatting with the most up-to-date versions of our dependencies, run `make syncenv`. You could also simply do `make newenv` to install them to a clean new virtual environment.
 
@@ -114,6 +117,10 @@ Whenever you pull from upstream (V3/develop on the main repository) and you noti
 3. If you like the changes and think the main Red project could use it:
     * 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 How To Report A Bug
 Please see our **ISSUES.MD** for more information.
@@ -137,7 +144,7 @@ Pull requests are evaluated by their quality and how effectively they solve thei
 
 1. A pull request is submitted
 2. Core team members will review and test the pull request (usually within a week)
-3. After a majority of the core team approves your pull request:
+3. After a member of the core team approves your pull request:
     * If your pull request is considered an improvement or enhancement the project owner will have 1 day to veto or approve your pull request.
     * If your pull request is considered a new feature the project owner will have 1 week to veto or approve your pull request.
 4. If any feedback is given we expect a response within 1 week or we may decide to close the PR.

LICENSE

@@ -632,7 +632,7 @@ 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-2019  Twentysix
+    Copyright (C) 2015-2020  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 +652,7 @@ 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-2019  Twentysix
+    Red-DiscordBot  Copyright (C) 2015-2020  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.

Makefile

@@ -1,25 +1,28 @@
+PYTHON ?= python3.8
+
 # Python Code Style
 reformat:
-	black -l 99 `git ls-files "*.py"`
+	$(PYTHON) -m black `git ls-files "*.py"`
 stylecheck:
-	black --check -l 99 `git ls-files "*.py"`
+	$(PYTHON) -m black --check `git ls-files "*.py"`
+stylediff:
+	$(PYTHON) -m black --check --diff `git ls-files "*.py"`
 
 # Translations
 gettext:
-	redgettext --command-docstrings --verbose --recursive redbot --exclude-files "redbot/pytest/**/*"
+	$(PYTHON) -m redgettext --command-docstrings --verbose --recursive redbot --exclude-files "redbot/pytest/**/*"
 upload_translations:
-	$(MAKE) gettext
 	crowdin upload sources
 download_translations:
 	crowdin download
 
 # Dependencies
 bumpdeps:
-	python tools/bumpdeps.py
+	$(PYTHON) tools/bumpdeps.py
 
 # Development environment
 newenv:
-	python3.7 -m venv --clear .venv
+	$(PYTHON) -m venv --clear .venv
 	.venv/bin/pip install -U pip setuptools
 	$(MAKE) syncenv
 syncenv:

README.md

@@ -16,7 +16,7 @@
     <img src="https://img.shields.io/badge/Support-Red!-yellow.svg" alt="Support Red on Patreon!">
   </a>
   <a href="https://www.python.org/downloads/">
-    <img src="https://img.shields.io/badge/Made%20With-Python%203.7-blue.svg?style=for-the-badge" alt="Made with Python 3.7">
+    <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">
@@ -26,8 +26,8 @@
   </a>
 </p>
 <p align="center">
-  <a href="https://travis-ci.com/Cog-Creators/Red-DiscordBot">
-    <img src="https://api.travis-ci.com/Cog-Creators/Red-DiscordBot.svg?branch=V3/develop" alt="Travis CI">
+  <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">
   </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">
@@ -85,12 +85,7 @@ community of cog repositories.**
 
 - [Windows](https://red-discordbot.readthedocs.io/en/stable/install_windows.html)
 - [MacOS](https://red-discordbot.readthedocs.io/en/stable/install_linux_mac.html)
-- [Ubuntu](https://red-discordbot.readthedocs.io/en/stable/install_linux_mac.html)
-- [Debian Stretch](https://red-discordbot.readthedocs.io/en/stable/install_linux_mac.html)
-- [CentOS 7](https://red-discordbot.readthedocs.io/en/stable/install_linux_mac.html)
-- [Arch Linux](https://red-discordbot.readthedocs.io/en/stable/install_linux_mac.html)
-- [Raspbian Stretch](https://red-discordbot.readthedocs.io/en/stable/install_linux_mac.html)
-
+- [Most major linux distributions](https://red-discordbot.readthedocs.io/en/stable/install_linux_mac.html)
 
 If after reading the guide you are still experiencing issues, feel free to join the
 [Official Discord Server](https://discord.gg/red) and ask in the **#support** channel for help.

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/Makefile

@@ -3,7 +3,7 @@
 
 # You can set these variables from the command line.
 SPHINXOPTS    =
-SPHINXBUILD   = python -msphinx
+SPHINXBUILD   = python3 -msphinx
 SPHINXPROJ    = Red-DiscordBot
 SOURCEDIR     = .
 BUILDDIR      = _build
@@ -17,4 +17,4 @@ help:
 # Catch-all target: route all unknown targets to Sphinx using the new
 # "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
 %: Makefile
-	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)

docs/_templates/layout.html

@@ -0,0 +1,18 @@
+{% 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;"
+    src="https://github.blog/wp-content/uploads/2008/12/forkme_right_darkblue_121621.png?resize=149%2C149"
+    class="attachment-full size-full" alt="Fork me on GitHub">
+</a>
+{% endblock %}

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_pm2.rst

@@ -0,0 +1,44 @@
+.. pm2 service guide
+
+==============================================
+Setting up auto-restart using pm2 on Linux
+==============================================
+
+.. note:: This guide is for setting up PM2 on a Linux environment. This guide assumes that you already have a working Red instance.
+
+--------------
+Installing PM2
+--------------
+
+Start by installing Node.JS and NPM via your favorite package distributor. From there run the following command:
+
+:code:`npm install pm2 -g`
+
+After PM2 is installed, run the following command to enable your Red instance to be managed by PM2. Replace the brackets with the required information.
+You can add additional Red based arguments after the instance, such as :code:`--dev`.
+
+.. code-block:: none
+
+    pm2 start redbot --name "<Insert a name here>" --interpreter "<Location to your Python Interpreter>" --interpreter-args "-O" -- <Red Instance> --no-prompt
+
+.. code-block:: none
+
+    Arguments to replace.
+
+    <Insert a name here>
+    A name to identify the bot within pm2, this is not your Red instance.
+
+    <Location to your Python Interpreter>
+    The location of your Python interpreter, to find out where that is use the following command inside activated venv:
+    which python
+
+    <Red Instance>
+    The name of your Red instance.
+
+------------------------------
+Ensuring that PM2 stays online
+------------------------------
+
+To make sure that PM2 stays online and persistence between machine restarts, run the following commands:
+
+:code:`pm2 save` & :code:`pm2 startup`

docs/autostart_systemd.rst

@@ -1,4 +1,4 @@
-.. systemd service guide
+.. _systemd-service-guide:
 
 ==============================================
 Setting up auto-restart using systemd on Linux
@@ -8,20 +8,42 @@ Setting up auto-restart using systemd on Linux
 Creating the service file
 -------------------------
 
-Create the new service file:
+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
+
+    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 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 your bot is running under (hopefully not root):
+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=/home/username/.local/bin/redbot %I --no-prompt
+    ExecStart=path -O -m redbot %I --no-prompt
     User=username
     Group=username
     Type=idle
@@ -59,4 +81,4 @@ type the following command in the terminal, still by adding the instance name af
 
 To view Red’s log, you can acccess through journalctl:
 
-:code:`sudo journalctl -u red@instancename`
+:code:`sudo journalctl -eu red@instancename`

docs/changelog_3_1_0.rst

@@ -110,7 +110,7 @@ Downloader
  * ``[p]cog uninstall`` allows to uninstall multiple cogs now (`#2592`_)
  * ``[p]cog uninstall`` will now remove cog from installed cogs even if it can't find the cog in install path anymore (`#2595`_)
  * ``[p]cog install`` will not allow to install cogs which aren't suitable for installed version of Red anymore (`#2605`_)
- * Cog Developers now have to use ``min_bot_version`` in form of version string instead of ``bot_version`` in info.json and they can also use ``max_bot_version`` to specify maximum version of Red, more in :doc:`framework_downloader`. (`#2605`_)
+ * Cog Developers now have to use ``min_bot_version`` in form of version string instead of ``bot_version`` in info.json and they can also use ``max_bot_version`` to specify maximum version of Red, more in :ref:`info-json-format`. (`#2605`_)
 
 ------
 Filter

docs/changelog_3_2_0.rst

@@ -0,0 +1,565 @@
+.. 3.2.x Changelogs
+
+Redbot 3.2.3 (2020-01-17)
+=========================
+
+Core Bot Changes
+----------------
+
+- Further improvements have been made to bot startup and shutdown.
+- Prefixes are now cached for performance.
+- Added the means for cog creators to use a global preinvoke hook.
+- The bot now ensures it has at least the bare neccessary permissions before running commands.
+- Deleting instances works as intended again.
+- Sinbad stopped fighting it and embraced the entrypoint madness.
+
+Core Commands
+-------------
+
+- The servers command now also shows the ids.
+
+Admin Cog
+---------
+
+- The selfrole command now has reasonable expectations about hierarchy.
+
+Help Formatter
+--------------
+
+- ``[botname]`` is now replaced with the bot's display name in help text.
+- New features added for cog creators to further customize help behavior.
+  
+  - Check out our command reference for details on new ``format_help_for_context`` method.
+- Embed settings are now consistent.
+
+Downloader
+----------
+
+- Improved a few user facing messages.
+- Added pagination of output on cog update.
+- Added logging of failures.
+
+Docs
+----
+
+There's more detail to the below changes, so go read the docs.
+For some reason, documenting documentation changes is hard.
+
+- Added instructions about git version.
+- Clarified instructions for installation and update.
+- Added more details to the API key reference.
+- Fixed some typos and versioning mistakes.
+
+
+Audio
+-----
+
+Draper did things.
+
+- No seriously, Draper did things.
+- Wait you wanted details? Ok, I guess we can share those.
+- Audio properly disconnects with autodisconnect, even if notify is being used.
+- Symbolic links now work as intended for local tracks.
+- Bump play now shows the correct time till next track.
+- Multiple user facing messages have been made more correct.
+
+Redbot 3.2.2 (2020-01-10)
+=========================
+
+Hotfixes
+--------
+
+- Fix Help Pagination issue
+
+Docs
+----
+
+- Correct venv docs
+
+
+Redbot 3.2.1 (2020-01-10)
+=========================
+
+Hotfixes
+--------
+
+- Fix Mongo conversion from being incorrectly blocked
+- Fix announcer not creating a message for success feedback
+- Log an error with creating case types rather than crash
+
+
+Redbot 3.2.0 (2020-01-09)
+=========================
+Core Bot Changes
+----------------
+
+Breaking Changes
+~~~~~~~~~~~~~~~~
+
+- Modlog casetypes no longer have an attribute for auditlog action type. (`#2897 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2897>`_)
+- Removed ``redbot.core.modlog.get_next_case_number()``. (`#2908 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2908>`_)
+- Removed ``bank.MAX_BALANCE``, use ``bank.get_max_balance()`` from now on. (`#2926 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2926>`_)
+- The main bot config is no longer directly accessible to cogs. New methods have been added for use where this is concerned.
+  New methods for this include
+
+    - ``bot.get_shared_api_tokens``
+    - ``bot.set_shared_api_tokens``
+    - ``bot.get_embed_color``
+    - ``bot.get_embed_colour``
+    - ``bot.get_admin_roles``
+    - ``bot.get_admin_role_ids``
+    - ``bot.get_mod_roles``
+    - ``bot.get_mod_role_ids`` (`#2967 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2967>`_)
+- Reserved some command names for internal Red use. These are available programatically as ``redbot.core.commands.RESERVED_COMMAND_NAMES``. (`#2973 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2973>`_)
+- Removed ``bot._counter``, Made a few more attrs private (``cog_mgr``, ``main_dir``). (`#2976 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2976>`_)
+- Extension's ``setup()`` function should no longer assume that we are, or even will be connected to Discord.
+  This also means that cog creators should no longer use ``bot.wait_until_ready()`` inside it. (`#3073 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3073>`_)
+- Removed the mongo driver. (`#3099 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3099>`_)
+
+
+Bug Fixes
+~~~~~~~~~
+
+- Help now properly hides disabled commands. (`#2863 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2863>`_)
+- Fixed ``bot.remove_command`` throwing an error when trying to remove a non-existent command. (`#2888 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2888>`_)
+- ``Command.can_see`` now works as intended for disabled commands. (`#2892 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2892>`_)
+- Modlog entries now show up properly without the mod cog loaded. (`#2897 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2897>`_)
+- Fixed an error in ``[p]reason`` when setting the reason for a case without a moderator. (`#2908 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2908>`_)
+- Bank functions now check the recipient balance before transferring and stop the transfer if the recipient's balance will go above the maximum allowed balance. (`#2923 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2923>`_)
+- Removed potential for additional bad API calls per ban/unban. (`#2945 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2945>`_)
+- The ``[p]invite`` command no longer errors when a user has the bot blocked or DMs disabled in the server. (`#2948 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2948>`_)
+- Stopped using the ``:`` character in backup's filename - Windows doesn't accept it. (`#2954 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2954>`_)
+- ``redbot-setup delete`` no longer errors with "unexpected keyword argument". (`#2955 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2955>`_)
+- ``redbot-setup delete`` no longer prompts about backup when the user passes the option ``--no-prompt``. (`#2956 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2956>`_)
+- Cleaned up the ``[p]inviteset public`` and ``[p]inviteset perms`` help strings.  (`#2963 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2963>`_)
+- ```[p]embedset user`` now only affects DM's. (`#2966 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2966>`_)
+- Fixed an unfriendly error when the provided instance name doesn't exist. (`#2968 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2968>`_)
+- Fixed the help text and response of ``[p]set usebotcolor`` to accurately reflect what the command is doing. (`#2974 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2974>`_)
+- Red no longer types infinitely when a command with a cooldown is called within the last second of a cooldown. (`#2985 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2985>`_)
+- Removed f-string usage in the launcher to prevent our error handling from causing an error. (`#3002 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3002>`_)
+- Fixed ``MessagePredicate.greater`` and ``MessagePredicate.less`` allowing any valid int instead of only valid ints/floats that are greater/less than the given value. (`#3004 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3004>`_)
+- Fixed an error in ``[p]uptime`` when the uptime is under a second. (`#3009 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3009>`_)
+- Added quotation marks to the response of ``[p]helpset tagline`` so that two consecutive full stops do not appear. (`#3010 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3010>`_)
+- Fixed an issue with clearing rules in permissions. (`#3014 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3014>`_)
+- Lavalink will now be restarted after an unexpected shutdown. (`#3033 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3033>`_)
+- Added a 3rd-party lib folder to ``sys.path`` before loading cogs. This prevents issues with 3rd-party cogs failing to load when Downloader is not loaded to install requirements. (`#3036 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3036>`_)
+- Escaped track descriptions so that they do not break markdown. (`#3047 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3047>`_)
+- Red will now properly send a message when the invoked command is guild-only. (`#3057 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3057>`_)
+- Arguments ``--co-owner`` and ``--load-cogs`` now properly require at least one argument to be passed. (`#3060 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3060>`_)
+- Now always appends the 3rd-party lib folder to the end of ``sys.path`` to avoid shadowing Red's dependencies. (`#3062 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3062>`_)
+- Fixed ``is_automod_immune``'s handling of the guild check and added support for checking webhooks. (`#3100 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3100>`_)
+- Fixed the generation of the ``repos.json`` file in the backup process. (`#3114 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3114>`_)
+- Fixed an issue where calling audio commands when not in a voice channel could result in a crash. (`#3120 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3120>`_)
+- Added handling for invalid folder names in the data path gracefully in ``redbot-setup`` and ``redbot --edit``. (`#3171 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3171>`_)
+- ``--owner`` and ``-p`` cli flags now work when added from launcher. (`#3174 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3174>`_)
+- Red will now prevent users from locking themselves out with localblacklist. (`#3207 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3207>`_)
+- Fixed help ending up a little too large for discord embed limits. (`#3208 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3208>`_)
+- Fixed formatting issues in commands that list whitelisted/blacklisted users/roles when the list is empty. (`#3219 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3219>`_)
+- Red will now prevent users from locking the guild owner out with localblacklist (unless the command caller is bot owner). (`#3221 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3221>`_)
+- Guild owners are no longer affected by the local whitelist and blacklist. (`#3221 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3221>`_)
+- Fixed an attribute error that can be raised in ``humanize_timedelta`` if ``seconds = 0``. (`#3231 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3231>`_)
+- Fixed ``ctx.clean_prefix`` issues resulting from undocumented changes from discord. (`#3249 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3249>`_)
+- ``redbot.core.bot.Bot.owner_id`` is now set in the post connection startup. (`#3273 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3273>`_)
+- ``redbot.core.bot.Bot.send_to_owners()`` and ``redbot.core.bot.Bot.get_owner_notification_destinations()`` now wait until Red is done with post connection startup to ensure owner ID is available. (`#3273 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3273>`_)
+
+
+Enhancements
+~~~~~~~~~~~~
+
+- Added the option to modify the RPC port with the ``--rpc-port`` flag. (`#2429 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2429>`_)
+- Slots now has a 62.5% expected payout and will not inflate economy when spammed. (`#2875 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2875>`_)
+- Allowed passing ``cls`` in the ``redbot.core.commands.group()`` decorator. (`#2881 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2881>`_)
+- Red's Help Formatter is now considered to have a stable API. (`#2892 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2892>`_)
+- Modlog no longer generates cases without being told to for actions the bot did. (`#2897 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2897>`_)
+- Some generic modlog casetypes are now pre-registered for cog creator use. (`#2897 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2897>`_)
+- ModLog is now much faster at creating cases, especially in large servers. (`#2908 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2908>`_)
+- JSON config files are now stored without indentation, this is to reduce the file size and increase the performance of write operations. (`#2921 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2921>`_)
+- ``--[no-]backup``, ``--[no-]drop-db`` and ``--[no-]remove-datapath`` in the ``redbot-setup delete`` command are now on/off flags. (`#2958 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2958>`_)
+- The confirmation prompts in ``redbot-setup`` now have default values for user convenience. (`#2958 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2958>`_)
+- ``redbot-setup delete`` now has the option to leave Red's data untouched on database backends. (`#2962 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2962>`_)
+- Red now takes less time to fetch cases, unban members, and list warnings. (`#2964 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2964>`_)
+- Red now handles more things prior to connecting to discord to reduce issues during the initial load. (`#3045 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3045>`_)
+- ``bot.send_filtered`` now returns the message that is sent. (`#3052 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3052>`_)
+- Red will now send a message when the invoked command is DM-only. (`#3057 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3057>`_)
+- All ``y/n`` confirmations in cli commands are now unified. (`#3060 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3060>`_)
+- Changed ``[p]info`` to say "This bot is an..." instead of "This is an..." for clarity. (`#3121 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3121>`_)
+- ``redbot-setup`` will now use the instance name in default data paths to avoid creating a second instance with the same data path. (`#3171 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3171>`_)
+- Instance names can now only include characters A-z, numbers, underscores, and hyphens. Old instances are unaffected by this change. (`#3171 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3171>`_)
+- Clarified that ``[p]backup`` saves the **bot's** data in the help text. (`#3172 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3172>`_)
+- Added ``redbot --debuginfo`` flag which shows useful information for debugging. (`#3183 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3183>`_)
+- Added the Python executable field to ``[p]debuginfo``. (`#3184 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3184>`_)
+- When Red prompts for a token, it will now print a link to the guide explaining how to obtain a token. (`#3204 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3204>`_)
+- ``redbot-setup`` will no longer log to disk. (`#3269 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3269>`_)
+- ``redbot.core.bot.Bot.send_to_owners()`` and ``redbot.core.bot.Bot.get_owner_notification_destinations()`` now log when they are not able to find the owner notification destination. (`#3273 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3273>`_)
+- The lib folder is now cleared on minor Python version changes. ``[p]cog reinstallreqs`` in Downloader can be used to regenerate the lib folder for a new Python version. (`#3274 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3274>`_)
+- If Red detects operating system or architecture change, it will now warn the owner about possible problems with the lib folder. (`#3274 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3274>`_)
+- ``[p]playlist download`` will now compress playlists larger than the server attachment limit and attempt to send that. (`#3279 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3279>`_)
+
+
+New Features
+~~~~~~~~~~~~
+
+- Added functions to acquire locks on Config groups and values. These locks are acquired by default when calling a value as a context manager. See ``Value.get_lock`` for details. (`#2654 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2654>`_)
+- Added a config driver for PostgreSQL. (`#2723 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2723>`_)
+- Added methods to Config for accessing things by id without mocked objects
+
+    - ``Config.guild_from_id``
+    - ``Config.user_from_id``
+    - ``Config.role_from_id``
+    - ``Config.channel_from_id``
+    - ``Config.member_from_ids``
+      - This one requires multiple ids, one for the guild, one for the user
+      - Consequence of discord's object model (`#2804 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2804>`_)
+- New method ``humanize_number`` in ``redbot.core.utils.chat_formatting`` to convert numbers into text that respects the current locale. (`#2836 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2836>`_)
+- Added new commands to Economy
+
+  - ``[p]bank prune user`` - This will delete a user's bank account.
+  - ``[p]bank prune local`` - This will prune the bank of accounts for users who are no longer in the server.
+  - ``[p]bank prune global`` - This will prune the global bank of accounts for users who do not share any servers with the bot. (`#2845 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2845>`_)
+- Red now uses towncrier for changelog generation. (`#2872 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2872>`_)
+- Added ``redbot.core.modlog.get_latest_case`` to fetch the case object for the most recent ModLog case. (`#2908 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2908>`_)
+- Added ``[p]bankset maxbal`` to set the maximum bank balance. (`#2926 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2926>`_)
+- Added a few methods and classes replacing direct config access (which is no longer supported)
+
+   - ``redbot.core.Red.allowed_by_whitelist_blacklist``
+   - ``redbot.core.Red.get_valid_prefixes``
+   - ``redbot.core.Red.clear_shared_api_tokens``
+   - ``redbot.core.commands.help.HelpSettings`` (`#2976 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2976>`_)
+- Added the cli flag ``redbot --edit`` which is used to edit the instance name, token, owner, and datapath. (`#3060 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3060>`_)
+- Added ``[p]licenseinfo``. (`#3090 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3090>`_)
+- Ensured that people can migrate from MongoDB. (`#3108 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3108>`_)
+- Added a command to list disabled commands globally or per guild. (`#3118 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3118>`_)
+- New event ``on_red_api_tokens_update`` is now dispatched when shared api keys for a service are updated. (`#3134 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3134>`_)
+- Added ``redbot-setup backup``. (`#3235 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3235>`_)
+- Added the method ``redbot.core.bot.Bot.wait_until_red_ready()`` that waits until Red's post connection startup is done. (`#3273 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3273>`_)
+
+
+Removals
+~~~~~~~~
+
+- ``[p]set owner`` and ``[p]set token`` have been removed in favor of managing server side. (`#2928 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2928>`_)
+- Shared libraries are marked for removal in Red 3.4. (`#3106 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3106>`_)
+- Removed ``[p]backup``. Use the cli command ``redbot-setup backup`` instead. (`#3235 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3235>`_)
+- Removed the functions ``safe_delete``, ``fuzzy_command_search``, ``format_fuzzy_results`` and ``create_backup`` from ``redbot.core.utils``. (`#3240 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3240>`_)
+- Removed a lot of the launcher's handled behavior. (`#3289 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3289>`_)
+
+
+Miscellaneous changes
+~~~~~~~~~~~~~~~~~~~~~
+
+- `#2527 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2527>`_, `#2571 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2571>`_, `#2723 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2723>`_, `#2836 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2836>`_, `#2849 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2849>`_, `#2861 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2861>`_, `#2885 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2885>`_, `#2890 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2890>`_, `#2897 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2897>`_, `#2904 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2904>`_, `#2924 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2924>`_, `#2939 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2939>`_, `#2940 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2940>`_, `#2941 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2941>`_, `#2949 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2949>`_, `#2953 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2953>`_, `#2964 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2964>`_, `#2986 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2986>`_, `#2993 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2993>`_, `#2997 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2997>`_, `#3008 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3008>`_, `#3017 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3017>`_, `#3048 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3048>`_, `#3059 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3059>`_, `#3080 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3080>`_, `#3089 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3089>`_, `#3104 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3104>`_, `#3106 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3106>`_, `#3129 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3129>`_, `#3152 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3152>`_, `#3160 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3160>`_, `#3168 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3168>`_, `#3173 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3173>`_, `#3176 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3176>`_, `#3186 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3186>`_, `#3192 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3192>`_, `#3193 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3193>`_, `#3195 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3195>`_, `#3202 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3202>`_, `#3214 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3214>`_, `#3223 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3223>`_, `#3229 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3229>`_, `#3245 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3245>`_, `#3247 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3247>`_, `#3248 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3248>`_, `#3250 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3250>`_, `#3254 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3254>`_, `#3255 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3255>`_, `#3256 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3256>`_, `#3258 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3258>`_, `#3261 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3261>`_, `#3275 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3275>`_, `#3276 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3276>`_, `#3293 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3293>`_, `#3278 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3278>`_, `#3285 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3285>`_, `#3296 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3296>`_,
+
+
+Dependency changes
+~~~~~~~~~~~~~~~~~~~~~~~
+
+- Added ``pytest-mock`` requirement to ``tests`` extra. (`#2571 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2571>`_)
+- Updated the python minimum requirement to 3.8.1, updated JRE to Java 11. (`#3245 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3245>`_)
+- Bumped dependency versions. (`#3288 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3288>`_)
+- Bumped red-lavalink version. (`#3290 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3290>`_)
+
+
+Documentation Changes
+~~~~~~~~~~~~~~~~~~~~~
+
+- Started the user guides covering cogs and the user interface of the bot. This includes, for now, a "Getting started" guide. (`#1734 <https://github.com/Cog-Creators/Red-DiscordBot/issues/1734>`_)
+- Added documentation for PM2 support. (`#2105 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2105>`_)
+- Updated linux install docs, adding sections for Fedora Linux, Debian/Raspbian Buster, and openSUSE. (`#2558 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2558>`_)
+- Created documentation covering what we consider a developer facing breaking change and the guarantees regarding them. (`#2882 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2882>`_)
+- Fixed the user parameter being labeled as ``discord.TextChannel`` instead of ``discord.abc.User`` in ``redbot.core.utils.predicates``. (`#2914 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2914>`_)
+- Updated towncrier info in the contribution guidelines to explain how to create a changelog for a standalone PR. (`#2915 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2915>`_)
+- Reworded the virtual environment guide to make it sound less scary. (`#2920 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2920>`_)
+- Driver docs no longer show twice. (`#2972 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2972>`_)
+- Added more information about ``redbot.core.utils.humanize_timedelta`` into the docs. (`#2986 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2986>`_)
+- Added a direct link to the "Installing Red" section in "Installing using powershell and chocolatey". (`#2995 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2995>`_)
+- Updated Git PATH install (Windows), capitalized some words, stopped mentioning the launcher. (`#2998 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2998>`_)
+- Added autostart documentation for Red users who installed Red inside of a virtual environment. (`#3005 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3005>`_)
+- Updated the Cog Creation guide with a note regarding the Develop version as well as the folder layout for local cogs. (`#3021 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3021>`_)
+- Added links to the getting started guide at the end of installation guides. (`#3025 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3025>`_)
+- Added proper docstrings to enums that show in drivers docs. (`#3035 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3035>`_)
+- Discord.py doc links will now always use the docs for the currently used version of discord.py. (`#3053 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3053>`_)
+- Added ``|DPY_VERSION|`` substitution that will automatically get replaced by the current discord.py version. (`#3053 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3053>`_)
+- Added missing descriptions for function returns. (`#3054 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3054>`_)
+- Stopped overwriting the ``docs/prolog.txt`` file in ``conf.py``. (`#3082 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3082>`_)
+- Fixed some typos and wording, added MS Azure to the host list. (`#3083 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3083>`_)
+- Updated the docs footer copyright to 2019. (`#3105 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3105>`_)
+- Added a deprecation note about shared libraries in the Downloader Framework docs. (`#3106 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3106>`_)
+- Updated the apikey framework documentation. Changed ``bot.get_shared_api_keys()`` to ``bot.get_shared_api_tokens()``. (`#3110 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3110>`_)
+- Added information about ``info.json``'s ``min_python_version`` key in Downloader Framework docs. (`#3124 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3124>`_)
+- Added an event reference for the ``on_red_api_tokens_update`` event in the Shared API Keys docs. (`#3134 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3134>`_)
+- Added notes explaining the best practices with config. (`#3149 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3149>`_)
+- Documented additional attributes in Context. (`#3151 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3151>`_)
+- Updated Windows docs with up to date dependency instructions. (`#3188 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3188>`_)
+- Added a "Publishing cogs for V3" document explaining how to make user's cogs work with Downloader. (`#3234 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3234>`_)
+- Fixed broken docs for ``redbot.core.commands.Context.react_quietly``. (`#3257 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3257>`_)
+- Updated copyright notices on License and RTD config to 2020. (`#3259 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3259>`_)
+- Added a line about setuptools and wheel. (`#3262 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3262>`_)
+- Ensured development builds are not advertised to the wrong audience. (`#3292 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3292>`_)
+- Clarified the usage intent of some of the chat formatting functions. (`#3292 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3292>`_)
+
+
+Admin
+-----
+
+Breaking Changes
+~~~~~~~~~~~~~~~~
+
+- Changed ``[p]announce ignore`` and ``[p]announce channel`` to ``[p]announceset ignore`` and ``[p]announceset channel``. (`#3250 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3250>`_)
+- Changed ``[p]selfrole <role>`` to ``[p]selfrole add <role>``, changed ``[p]selfrole add`` to ``[p]selfroleset add`` , and changed ``[p]selfrole delete`` to ``[p]selfroleset remove``. (`#3250 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3250>`_)
+
+
+Bug Fixes
+~~~~~~~~~
+
+- Fixed ``[p]announce`` failing after encountering an error attempting to message the bot owner. (`#3166 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3166>`_)
+- Improved the clarity of user facing messages when the user is not allowed to do something due to Discord hierarchy rules. (`#3250 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3250>`_)
+- Fixed some role managing commands not properly checking if Red had ``manage_roles`` perms before attempting to manage roles. (`#3250 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3250>`_)
+- Fixed ``[p]editrole`` commands not checking if roles to be edited are higher than Red's highest role before trying to edit them. (`#3250 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3250>`_)
+- Fixed ``[p]announce ignore`` and ``[p]announce channel`` not being able to be used by guild owners and administrators. (`#3250 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3250>`_)
+
+
+Enhancements
+~~~~~~~~~~~~
+
+- Added custom issue messages for adding and removing roles, this makes it easier to create translations. (`#3016 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3016>`_)
+
+
+Audio
+-----
+
+Bug Fixes
+~~~~~~~~~
+
+- ``[p]playlist remove`` now removes the playlist url if the playlist was created through ``[p]playlist save``. (`#2861 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2861>`_)
+- Users are no longer able to accidentally overwrite existing playlist if a new one with the same name is created/renamed. (`#2861 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2861>`_)
+- ``[p]audioset settings`` no longer shows lavalink JAR version. (`#2904 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2904>`_)
+- Fixed a ``KeyError: loadType`` when trying to play tracks. (`#2904 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2904>`_)
+- ``[p]audioset settings`` now uses ``ctx.is_owner()`` to check if the context author is the bot owner. (`#2904 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2904>`_)
+- Fixed track indexs being off by 1 in ``[p]search``. (`#2940 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2940>`_)
+- Fixed an issue where updating your Spotify and YouTube Data API tokens did not refresh them. (`#3047 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3047>`_)
+- Fixed an issue where the blacklist was not being applied correctly. (`#3047 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3047>`_)
+- Fixed an issue in ``[p]audioset restrictions blacklist list`` where it would call the list a ``Whitelist``. (`#3047 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3047>`_)
+- Red's status is now properly cleared on emptydisconnect. (`#3050 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3050>`_)
+- Fixed a console spam caused sometimes when auto disconnect and auto pause are used. (`#3123 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3123>`_)
+- Fixed an error that was thrown when running ``[p]audioset dj``. (`#3165 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3165>`_)
+- Fixed a crash that could happen when the bot can't connect to the lavalink node. (`#3238 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3238>`_)
+- Restricted the number of songs shown in the queue to first 500 to avoid heartbeats. (`#3279 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3279>`_)
+- Added more cooldowns to playlist commands and restricted the queue and playlists to 10k songs to avoid bot errors. (`#3286 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3286>`_)
+
+
+Enhancements
+~~~~~~~~~~~~
+
+- ``[p]playlist upload`` will now load playlists generated via ``[p]playlist download`` much faster if the playlist uses the new scheme. (`#2861 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2861>`_)
+- ``[p]playlist`` commands now can be used by everyone regardless of DJ settings, however it will respect DJ settings when creating/modifying playlists in the server scope. (`#2861 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2861>`_)
+- Spotify, Youtube Data, and Lavalink API calls can be cached to avoid repeated calls in the future, see ``[p]audioset cache``. (`#2890 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2890>`_)
+- Playlists will now start playing as soon as first track is loaded. (`#2890 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2890>`_)
+- ``[p]audioset localpath`` can set a path anywhere in your machine now. Note: This path needs to be visible by ``Lavalink.jar``. (`#2904 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2904>`_)
+- ``[p]queue`` now works when there are no tracks in the queue, showing the track currently playing. (`#2904 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2904>`_)
+- ``[p]audioset settings`` now reports Red Lavalink version. (`#2904 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2904>`_)
+- Adding and removing reactions in Audio is no longer a blocking action. (`#2904 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2904>`_)
+- When shuffle is on, queue now shows the correct play order. (`#2904 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2904>`_)
+- ``[p]seek`` and ``[p]skip`` can be used by user if they are the song requester while DJ mode is enabled and votes are disabled. (`#2904 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2904>`_)
+- Adding a playlist and an album to a saved playlist skips tracks already in the playlist. (`#2904 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2904>`_)
+- DJ mode is now turned off if the DJ role is deleted. (`#2904 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2904>`_)
+- When playing a localtrack, ``[p]play`` and ``[p]bumpplay`` no longer require the use of the prefix "localtracks\\".
+
+  Before: ``[p]bumpplay localtracks\\ENM\\501 - Inside The Machine.mp3``
+  Now: ``[p]bumpplay ENM\\501 - Inside The Machine.mp3``
+  Now nested folders: ``[p]bumpplay Parent Folder\\Nested Folder\\track.mp3`` (`#2904 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2904>`_)
+- Removed commas in explanations about how to set API keys. (`#2905 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2905>`_)
+- Expanded local track support to all file formats (m3u, m4a, mp4, etc). (`#2940 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2940>`_)
+- Cooldowns are now reset upon failure of commands that have a cooldown timer. (`#2940 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2940>`_)
+- Improved the explanation in the help string for ``[p]audioset emptydisconnect``. (`#3051 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3051>`_)
+- Added a typing indicator to playlist dedupe. (`#3058 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3058>`_)
+- Exposed clearer errors to users in the play commands. (`#3085 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3085>`_)
+- Better error handling when the player is unable to play multiple tracks in the sequence. (`#3165 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3165>`_)
+
+
+New Features
+~~~~~~~~~~~~
+
+- Added support for nested folders in the localtrack folder. (`#270 <https://github.com/Cog-Creators/Red-DiscordBot/issues/270>`_)
+- Now auto pauses the queue when the voice channel is empty. (`#721 <https://github.com/Cog-Creators/Red-DiscordBot/issues/721>`_)
+- All Playlist commands now accept optional arguments, use ``[p]help playlist <subcommand>`` for more details. (`#2861 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2861>`_)
+- ``[p]playlist rename`` will now allow users to rename existing playlists. (`#2861 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2861>`_)
+- ``[p]playlist update`` will now allow users to update non-custom Playlists to the latest available tracks. (`#2861 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2861>`_)
+- There are now 3 different scopes of playlist. To define them, use the ``--scope`` argument.
+
+      ``Global Playlist``
+
+      - These playlists will be available in all servers the bot is in.
+      - These can be managed by the Bot Owner only.
+
+      ``Server Playlist``
+
+      - These playlists will only be available in the server they were created in.
+      - These can be managed by the Bot Owner, Guild Owner, Mods, Admins, DJs, and the Creator (if the DJ role is disabled).
+
+      ``User Playlist``
+
+      - These playlists will be available in all servers both the bot and the creator are in.
+      - These can be managed by the Bot Owner and Creator only. (`#2861 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2861>`_)
+- ``[p]audioset cache`` can be used to set the cache level. **It's off by default**. (`#2904 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2904>`_)
+- ``[p]genre`` can be used to play spotify playlists. (`#2904 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2904>`_)
+- ``[p]audioset cacheage`` can be used to set the maximum age of an entry in the cache. **Default is 365 days**. (`#2904 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2904>`_)
+- ``[p]audioset autoplay`` can be used to enable auto play once the queue runs out. (`#2904 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2904>`_)
+- New events dispatched by Audio.
+
+   - ``on_red_audio_track_start(guild: discord.Guild, track: lavalink.Track, requester: discord.Member)``
+   - ``on_red_audio_track_end(guild: discord.Guild, track: lavalink.Track, requester: discord.Member)``
+   - ``on_red_audio_track_enqueue(guild: discord.Guild, track: lavalink.Track, requester: discord.Member)``
+   - ``on_red_audio_track_auto_play(guild: discord.Guild, track: lavalink.Track, requester: discord.Member)``
+   - ``on_red_audio_queue_end(guild: discord.Guild, track: lavalink.Track, requester: discord.Member)``
+   - ``on_red_audio_audio_disconnect(guild: discord.Guild)``
+   - ``on_red_audio_skip_track(guild: discord.Guild, track: lavalink.Track, requester: discord.Member)`` (`#2904 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2904>`_)
+- ``[p]queue shuffle`` can be used to shuffle the queue manually. (`#2904 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2904>`_)
+- ``[p]queue clean self`` can be used to remove all songs you requested from the queue. (`#2904 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2904>`_)
+- ``[p]audioset restrictions`` can be used to add or remove keywords which songs must have or are not allowed to have. (`#2904 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2904>`_)
+- ``[p]playlist dedupe`` can be used to remove duplicated tracks from a playlist. (`#2904 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2904>`_)
+- ``[p]autoplay`` can be used to play a random song. (`#2904 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2904>`_)
+- ``[p]bumpplay`` can be used to add a song to the front of the queue. (`#2940 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2940>`_)
+- ``[p]shuffle`` has an additional argument to tell the bot whether it should shuffle bumped tracks. (`#2940 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2940>`_)
+- Added global whitelist/blacklist commands. (`#3047 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3047>`_)
+- Added self-managed daily playlists in the GUILD scope, these are called "Daily playlist - YYYY-MM-DD" and auto delete after 7 days. (`#3199 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3199>`_)
+
+
+CustomCom
+---------
+
+Enhancements
+~~~~~~~~~~~~
+
+- The group command ``[p]cc create`` can now be used to create simple CCs without specifying "simple". (`#1767 <https://github.com/Cog-Creators/Red-DiscordBot/issues/1767>`_)
+- Added a query option for CC typehints for URL-based CCs. (`#3228 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3228>`_)
+- Now uses the ``humanize_list`` utility for iterable parameter results, e.g. ``{#:Role.members}``. (`#3277 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3277>`_)
+
+
+Downloader
+----------
+
+Bug Fixes
+~~~~~~~~~
+
+- Made the regex for repo names use raw strings to stop causing a ``DeprecationWarning`` for invalid escape sequences. (`#2571 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2571>`_)
+- Downloader will no longer attempt to install cogs that are already installed. (`#2571 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2571>`_)
+- Repo names can now only contain the characters listed in the help text (A-Z, 0-9, underscores, and hyphens). (`#2827 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2827>`_)
+- ``[p]findcog`` no longer attempts to find a cog for commands without a cog. (`#2902 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2902>`_)
+- Downloader will no longer attempt to install a cog with same name as another cog that is already installed. (`#2927 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2927>`_)
+- Added error handling for when a remote repository or branch is deleted, now notifies the which repository failed and continues to update the others. (`#2936 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2936>`_)
+- ``[p]cog install`` will no longer error if a cog has an empty install message. (`#3024 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3024>`_)
+- Made ``redbot.cogs.downloader.repo_manager.Repo.clean_url`` work with relative urls. This property is ``str`` type now. (`#3141 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3141>`_)
+- Fixed an error on repo add from empty string values for the ``install_msg`` info.json field. (`#3153 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3153>`_)
+- Disabled all git auth prompts when adding/updating a repo with Downloader. (`#3159 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3159>`_)
+- ``[p]findcog`` now properly works for cogs with less typical folder structure. (`#3177 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3177>`_)
+- ``[p]cog uninstall`` now fully unloads cog - the bot will not try to load it on next startup. (`#3179 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3179>`_)
+
+
+Enhancements
+~~~~~~~~~~~~
+
+- Downloader will now check if the Python and bot versions match requirements in ``info.json`` during update. (`#1866 <https://github.com/Cog-Creators/Red-DiscordBot/issues/1866>`_)
+- ``[p]cog install`` now accepts multiple cog names. (`#2527 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2527>`_)
+- When passing cogs to ``[p]cog update``, it will now only update those cogs, not all cogs from the repo those cogs are from. (`#2527 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2527>`_)
+- Added error messages for failures when installing/reinstalling requirements and copying cogs and shared libraries. (`#2571 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2571>`_)
+- ``[p]findcog`` now uses sanitized urls (without HTTP Basic Auth fragments). (`#3129 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3129>`_)
+- ``[p]repo info`` will now show the repo's url, branch, and authors. (`#3225 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3225>`_)
+- ``[p]cog info`` will now show cog authors. (`#3225 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3225>`_)
+- ``[p]findcog`` will now show the repo's branch. (`#3225 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3225>`_)
+
+
+New Features
+~~~~~~~~~~~~
+
+- Added ``[p]repo update [repos]`` which updates repos without updating the cogs from them. (`#2527 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2527>`_)
+- Added ``[p]cog installversion <repo_name> <revision> <cogs>`` which installs cogs from a specified revision (commit, tag) of the given repo. When using this command, the cog will automatically be pinned. (`#2527 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2527>`_)
+- Added ``[p]cog pin <cogs>`` and ``[p]cog unpin <cogs>`` for pinning cogs. Cogs that are pinned will not be updated when using update commands. (`#2527 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2527>`_)
+- Added ``[p]cog checkforupdates`` that lists which cogs can be updated (including pinned cog) without updating them. (`#2527 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2527>`_)
+- Added ``[p]cog updateallfromrepos <repos>`` that updates all cogs from the given repos. (`#2527 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2527>`_)
+- Added ``[p]cog updatetoversion <repo_name> <revision> [cogs]`` that updates all cogs or ones of user's choosing to chosen revision of the given repo. (`#2527 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2527>`_)
+- Added ``[p]cog reinstallreqs`` that reinstalls cog requirements and shared libraries for all installed cogs. (`#3167 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3167>`_)
+
+
+Documentation Changes
+~~~~~~~~~~~~~~~~~~~~~
+
+- Added ``redbot.cogs.downloader.installable.InstalledModule`` to Downloader's framework docs. (`#2527 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2527>`_)
+- Removed API References for Downloader. (`#3234 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3234>`_)
+
+
+Image
+-----
+
+Enhancements
+~~~~~~~~~~~~
+
+- Updated the giphycreds command to match the formatting of the other API commands. (`#2905 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2905>`_)
+- Removed commas from explanations about how to set API keys. (`#2905 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2905>`_)
+
+
+Mod
+---
+
+Bug Fixes
+~~~~~~~~~
+
+- ``[p]userinfo`` no longer breaks when a user has an absurd numbers of roles. (`#2910 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2910>`_)
+- Fixed Mod cog not recording username changes for ``[p]names`` and ``[p]userinfo`` commands. (`#2918 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2918>`_)
+- Fixed ``[p]modset deletedelay`` deleting non-command messages. (`#2924 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2924>`_)
+- Fixed an error when reloading Mod. (`#2932 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2932>`_)
+
+
+Enhancements
+~~~~~~~~~~~~
+
+- Slowmode now accepts integer-only inputs as seconds. (`#2884 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2884>`_)
+
+
+Permissions
+-----------
+
+Bug Fixes
+~~~~~~~~~
+
+- Defaults are now cleared properly when clearing all rules. (`#3037 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3037>`_)
+
+
+Enhancements
+~~~~~~~~~~~~
+
+- Better explained the usage of commands with the ``<who_or_what>`` argument. (`#2991 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2991>`_)
+
+
+Streams
+-------
+
+Bug Fixes
+~~~~~~~~~
+
+- Fixed a ``TypeError`` in the ``TwitchStream`` class when calling Twitch client_id from Red shared APIs tokens. (`#3042 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3042>`_)
+- Changed the ``stream_alert`` function for Twitch alerts to make it work with how the ``TwitchStream`` class works now. (`#3042 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3042>`_)
+
+
+Enhancements
+~~~~~~~~~~~~
+
+- Removed commas from explanations about how to set API keys. (`#2905 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2905>`_)
+
+
+Trivia
+------
+
+Bug Fixes
+~~~~~~~~~
+
+- Fixed a typo in Ahsoka Tano's name in the Starwars trivia list. (`#2909 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2909>`_)
+- Fixed a bug where ``[p]trivia leaderboard`` failed to run. (`#2911 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2911>`_)
+- Fixed a typo in the Greek mythology trivia list regarding Hermes' staff. (`#2994 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2994>`_)
+- Fixed a question in the Overwatch trivia list that accepted blank responses. (`#2996 <https://github.com/Cog-Creators/Red-DiscordBot/issues/2996>`_)
+- Fixed questions and answers that were incorrect in the Clash Royale trivia list. (`#3236 <https://github.com/Cog-Creators/Red-DiscordBot/issues/3236>`_)
+
+
+Enhancements
+~~~~~~~~~~~~
+
+- Added trivia lists for Prince and Michael Jackson lyrics. (`#12 <https://github.com/Cog-Creators/Red-DiscordBot/issues/12>`_)

docs/changelog_3_3_0.rst

@@ -0,0 +1,730 @@
+.. 3.3.x Changelogs
+
+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 overriden 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)
+=========================
+
+
+Core Bot
+--------
+
+- Add a cli flag for setting a max size of message cache
+- Allow to edit prefix from command line using ``redbot --edit``.
+- Some functions have been changed to no longer use deprecated asyncio functions
+
+Core Commands
+-------------
+
+- The short help text for dm has been made more useful
+- dm no longer allows owners to have the bot attempt to DM itself
+
+Utils
+-----
+
+- Passing the event loop explicitly in utils is deprecated (Removal in 3.4)
+
+Mod Cog
+-------
+
+- Hackban now works properly without being provided a number of days
+
+Documentation Changes
+---------------------
+
+- Add ``-e`` flag to ``journalctl`` command in systemd guide so that it takes the user to the end of logs automatically.
+- Added section to install docs for CentOS 8
+- Improve usage of apt update in docs
+
+Redbot 3.3.0 (2020-01-26)
+=========================
+
+Core Bot
+--------
+
+- The bot's description is now configurable.
+- We now use discord.py 1.3.1, this comes with added teams support.
+- The commands module has been slightly restructured to provide more useful data to developers.
+- Help is now self consistent in the extra formatting used.
+
+Core Commands
+-------------
+
+- Slowmode should no longer error on nonsensical time quantities.
+- Embed use can be configured per channel as well.
+
+Documentation
+-------------
+
+- We've made some small fixes to inaccurate instructions about installing with pyenv.
+- Notes about deprecating in 3.3 have been altered to 3.4 to match the intended timeframe.
+
+Admin
+-----
+
+- Gives feedback when adding or removing a role doesn't make sense.
+
+Audio
+-----
+
+- Playlist finding is more intuitive.
+- disconnect and repeat commands no longer interfere with eachother.
+
+CustomCom
+---------
+
+- No longer errors when exiting an interactive menu.
+
+Cleanup
+-------
+
+- A rare edge case involving messages which are deleted during cleanup and are the only message was fixed.
+
+Downloader
+----------
+
+- Some user facing messages were improved.
+- Downloader's initialization can no longer time out at startup.
+
+General
+-------
+
+- Roll command will no longer attempt to roll obscenely large amounts.
+
+Mod
+---
+
+- You can set a default amount of days to clean up when banning.
+- Ban and hackban now use that default.
+- Users can now optionally be DMed their ban reason.
+
+Permissions
+-----------
+
+- Now has stronger enforcement of prioritizing botwide settings.

docs/cog_downloader.rst

@@ -1,9 +0,0 @@
-.. Downloader Cog Reference
-
-Downloader Cog Reference
-========================
-
-.. automodule:: redbot.cogs.downloader
-
-.. autoclass:: redbot.cogs.downloader.downloader.Downloader
-    :members:

docs/conf.py

@@ -36,6 +36,7 @@ os.environ["BUILDING_DOCS"] = "1"
 # ones.
 extensions = [
     "sphinx.ext.autodoc",
+    "sphinx.ext.extlinks",
     "sphinx.ext.intersphinx",
     "sphinx.ext.viewcode",
     "sphinx.ext.napoleon",
@@ -57,7 +58,7 @@ master_doc = "index"
 
 # General information about the project.
 project = "Red - Discord Bot"
-copyright = "2018, Cog Creators"
+copyright = "2018-2020, Cog Creators"
 author = "Cog Creators"
 
 # The version info for the project you're documenting, acts as replacement for
@@ -65,6 +66,7 @@ author = "Cog Creators"
 # built documents.
 #
 from redbot.core import __version__
+from discord import __version__ as dpy_version
 
 # The short X.Y version.
 version = __version__
@@ -92,6 +94,12 @@ todo_include_todos = False
 # Role which is assigned when you make a simple reference within backticks
 default_role = "any"
 
+# Includes substitutions for all files
+with open("prolog.txt", "r") as file:
+    rst_prolog = file.read()
+
+# Adds d.py version to available substitutions in all files
+rst_prolog += f"\n.. |DPY_VERSION| replace:: {dpy_version}"
 
 # -- Options for HTML output ----------------------------------------------
 
@@ -199,6 +207,7 @@ texinfo_documents = [
 # A list of regular expressions that match URIs that should not be
 # checked when doing a linkcheck build.
 linkcheck_ignore = [r"https://java.com*", r"https://chocolatey.org*"]
+linkcheck_retries = 3
 
 
 # -- Options for extensions -----------------------------------------------
@@ -206,8 +215,18 @@ linkcheck_ignore = [r"https://java.com*", r"https://chocolatey.org*"]
 # Intersphinx
 intersphinx_mapping = {
     "python": ("https://docs.python.org/3", None),
-    "dpy": ("https://discordpy.readthedocs.io/en/v1.0.1/", 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),
+    "issue": ("https://github.com/Cog-Creators/Red-DiscordBot/issues/%s", "#"),
+    "ghuser": ("https://github.com/%s", "@"),
 }
 
 # Doctest
@@ -216,5 +235,5 @@ intersphinx_mapping = {
 doctest_test_doctest_blocks = ""
 
 # Autodoc options
-autodoc_default_flags = ["show-inheritance"]
+autodoc_default_options = {"show-inheritance": True}
 autodoc_typehints = "none"

docs/framework_apikeys.rst

@@ -6,7 +6,7 @@ Shared API Keys
 
 Red has a central API key storage utilising the core bots config. This allows cog creators to add a single location to store API keys for their cogs which may be shared between other cogs.
 
-There needs to be some consistency between cog creators when using shared API keys between cogs. To help make this easier service should be all **lowercase** and the key names should match the naming convetion of the API being accessed. 
+There needs to be some consistency between cog creators when using shared API keys between cogs. To help make this easier service should be all **lowercase** and the key names should match the naming convention of the API being accessed.
 
 Example:
 
@@ -18,7 +18,7 @@ and when accessed in the code it should be done by
 
 .. code-block:: python
 
-    await self.bot.db.api_tokens.get_raw("twitch", default={"client_id": None, "client_secret": None})
+    await self.bot.get_shared_api_tokens("twitch")
 
 Each service has its own dict of key, value pairs for each required key type. If there's only one key required then a name for the key is still required for storing and accessing.
 
@@ -30,7 +30,7 @@ and when accessed in the code it should be done by
 
 .. code-block:: python
 
-    await self.bot.db.api_tokens.get_raw("youtube", default={"api_key": None})
+    await self.bot.get_shared_api_tokens("youtube")
 
 
 ***********
@@ -42,7 +42,34 @@ Basic Usage
     class MyCog:
         @commands.command()
         async def youtube(self, ctx, user: str):
-            apikey = await self.bot.db.api_tokens.get_raw("youtube", default={"api_key": None})
-            if apikey["api_key"] is None:
+            youtube_keys = await self.bot.get_shared_api_tokens("youtube")
+            if youtube_keys.get("api_key") is None:
                 return await ctx.send("The YouTube API key has not been set.")
             # Use the API key to access content as you normally would
+
+
+***************
+Event Reference
+***************
+
+.. function:: on_red_api_tokens_update(service_name, api_tokens)
+
+    Dispatched when service's api keys are updated.
+
+    :param service_name: Name of the service.
+    :type service_name: :class:`str`
+    :param api_tokens: New Mapping of token names to tokens. This contains api tokens that weren't changed too.
+    :type api_tokens: Mapping[:class:`str`, :class:`str`]
+
+
+*********************
+Additional References
+*********************
+
+.. py:currentmodule:: redbot.core.bot
+
+.. automethod:: Red.get_shared_api_tokens
+
+.. automethod:: Red.set_shared_api_tokens
+
+.. automethod:: Red.remove_shared_api_tokens

docs/framework_commands.rst

@@ -7,7 +7,7 @@ Commands Package
 This package acts almost identically to :doc:`discord.ext.commands <dpy:ext/commands/api>`; i.e.
 all of the attributes from discord.py's are also in ours. 
 Some of these attributes, however, have been slightly modified, while others have been added to
-extend functionlities used throughout the bot, as outlined below.
+extend functionalities used throughout the bot, as outlined below.
 
 .. autofunction:: redbot.core.commands.command
 
@@ -15,6 +15,7 @@ extend functionlities used throughout the bot, as outlined below.
 
 .. autoclass:: redbot.core.commands.Command
     :members:
+    :inherited-members: format_help_for_context
 
 .. autoclass:: redbot.core.commands.Group
     :members:
@@ -22,5 +23,16 @@ extend functionlities used throughout the bot, as outlined below.
 .. autoclass:: redbot.core.commands.Context
     :members:
 
+.. autoclass:: redbot.core.commands.GuildContext
+
+.. autoclass:: redbot.core.commands.DMContext
+
 .. automodule:: redbot.core.commands.requires
     :members: PrivilegeLevel, PermState, Requires
+
+.. automodule:: redbot.core.commands.converter
+    :members:
+    :exclude-members: convert
+    :no-undoc-members:
+
+    .. autoclass:: APIToken

docs/framework_config.rst

@@ -11,6 +11,9 @@ Config was introduced in V3 as a way to make data storage easier and safer for a
 It will take some getting used to as the syntax is entirely different from what Red has used before, but we believe
 Config will be extremely beneficial to both cog developers and end users in the long run.
 
+.. note:: While config is great for storing data safely, there are some caveats to writing performant code which uses it.
+          Make sure to read the section on best practices for more of these details.
+
 ***********
 Basic Usage
 ***********
@@ -199,15 +202,15 @@ the built-in Economy credits::
 
     class Pets:
         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={}
             )
 
@@ -226,7 +229,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.
@@ -238,15 +241,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::
 
@@ -254,7 +257,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.
@@ -271,7 +274,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!")
@@ -282,12 +285,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)
 
@@ -297,7 +300,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
@@ -307,15 +310,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."
@@ -348,15 +351,15 @@ much the same way they would in V2. The following examples will demonstrate how
 
     class ExampleCog:
         def __init__(self):
-            self.conf = Config.get_conf(self, 1234567890)
+            self.config = Config.get_conf(self, 1234567890)
 
             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):
@@ -364,6 +367,30 @@ much the same way they would in V2. The following examples will demonstrate how
         await cog.load_data()
         bot.add_cog(cog)
 
+************************************
+Best practices and performance notes
+************************************
+
+Config prioritizes being a safe data store without developers needing to
+know how end users have configured their bot. 
+
+This does come with some performance costs, so keep the following in mind when choosing to
+develop using config
+
+* Config use in events should be kept minimal and should only occur
+  after confirming the event needs to interact with config
+
+* Caching frequently used things, especially things used by events, 
+  results in faster and less event loop blocking code.
+
+* Only use config's context managers when you intend to modify data.
+
+* While config is a great general use option, it may not always be the right one for you. 
+  As a cog developer, even though config doesn't require one,
+  you can choose to require a database or store to something such as an sqlite
+  database stored within your cog's datapath.
+
+
 *************
 API Reference
 *************
@@ -380,13 +407,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
@@ -416,20 +443,25 @@ Value
 Driver Reference
 ****************
 
-.. automodule:: redbot.core.drivers
+.. autofunction:: redbot.core.drivers.get_driver
+
+.. autoclass:: redbot.core.drivers.BackendType
+    :members:
+
+.. autoclass:: redbot.core.drivers.ConfigCategory
     :members:
 
 Base Driver
 ^^^^^^^^^^^
-.. autoclass:: redbot.core.drivers.red_base.BaseDriver
+.. autoclass:: redbot.core.drivers.BaseDriver
     :members:
 
 JSON Driver
 ^^^^^^^^^^^
-.. autoclass:: redbot.core.drivers.red_json.JSON
+.. autoclass:: redbot.core.drivers.JsonDriver
     :members:
 
-Mongo Driver
-^^^^^^^^^^^^
-.. autoclass:: redbot.core.drivers.red_mongo.Mongo
+Postgres Driver
+^^^^^^^^^^^^^^^
+.. autoclass:: redbot.core.drivers.PostgresDriver
     :members:

docs/framework_modlog.rst

@@ -25,7 +25,7 @@ Basic Usage
         async def ban(self, ctx, user: discord.Member, reason: str = None):
             await ctx.guild.ban(user)
             case = await modlog.create_case(
-                ctx.bot, ctx.guild, ctx.message.created_at, action="ban",
+                ctx.bot, ctx.guild, ctx.message.created_at, action_type="ban",
                 user=user, moderator=ctx.author, reason=reason
             )
             await ctx.send("Done. It was about time.")
@@ -57,9 +57,6 @@ it from your setup function:
                 "default_setting": True,
                 "image": "\N{HAMMER}",
                 "case_str": "Ban",
-                # audit_type should be omitted if the action doesn't show
-                # up in the audit log.
-                "audit_type": "ban",
             }
             try:
                 await modlog.register_casetype(**ban_case)
@@ -73,14 +70,12 @@ it from your setup function:
                     "default_setting": True,
                     "image": "\N{BUST IN SILHOUETTE}\N{HAMMER}",
                     "case_str": "Hackban",
-                    "audit_type": "ban",
                 },
                 {
                     "name": "kick",
                     "default_setting": True,
                     "image": "\N{WOMANS BOOTS}",
                     "case_str": "Kick",
-                    "audit_type": "kick"
                 }
             ]
             await modlog.register_casetypes(new_types)

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

@@ -10,6 +10,18 @@ General Utility
 .. automodule:: redbot.core.utils
     :members: deduplicate_iterables, bounded_gather, bounded_gather_iter
 
+.. 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

@@ -0,0 +1,365 @@
+.. don't forget to set permissions hyperlink
+  + commands links + guide links
+
+.. _getting-started:
+
+===============
+Getting started
+===============
+
+If you recently installed Red, you should read this.
+This is a quick start guide for a general usage.
+
+.. note::
+
+    If you haven't installed Red, please do it by following
+    the :ref:`installation guides <main>`.
+
+Assuming you correctly installed Red, you should have a
+window like this:
+
+.. image:: .resources/red-console.png
+
+.. _gettings-started-invite:
+
+-------------------------
+Invite Red to your server
+-------------------------
+
+When started, the console will show you ``Invite URL`` (here at
+the bottom of the screenshot).
+Paste the link into your browser and select the server you want
+to invite the bot in, like any other bot.
+
+.. note:: You need the ``Manage server`` permission to add bots.
+
+Complete the captcha, it should tell you ``Authorized!`` and you
+should see your bot in the members list.
+
+.. attention::
+    If Discord shows ``Bot requires code grant``, please untick this
+    option in your token settings
+
+    .. image:: .resources/code-grant.png
+
+.. _getting-started-interact:
+
+-----------------
+Interact with Red
+-----------------
+
+As a chatbot, you interact with Red via the Discord text channels
+(not from the command prompt). To send commands to the bot, you will have to
+use the prefix you set before, followed by the command you want to use. For
+example, if your prefix is ``!``, you will execute your command like this:
+``!ping``.
+
+.. note:: Since the prefix can be anything, it'll be referenced as ``[p]``
+    in documentations.
+
+.. _getting-started-commands:
+
+~~~~~~~~~~~~
+The commands
+~~~~~~~~~~~~
+
+The command you're going to use the most is help. That command will
+show you **all of the available commands** of the bot with a small description.
+
+.. code-block:: none
+
+    [p]help
+
+.. tip:: The message is generated dynamically and users will only see the
+    commands they can use. You can change what commands users can use with the
+    permissions cog.
+
+You can also pick a command to get its detailed description and the
+parameters.
+
+.. code-block:: none
+
+    [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]``
+
+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.
+
+You can use help to show the **categories** too, generally called cogs.
+Just do something like this (notice the capitalization):
+
+.. code-block:: none
+
+    [p]help YourCategory
+
+Help also shows **command groups**. They are group of commands.
+To get the description of a subcommand, type this:
+
+.. code-block:: none
+
+    [p]help commandgroup subcommand
+
+When using subcommands, you also need to specify the command group.
+As an example, ``cleanup`` has 6 subcommands. If you want
+to use one, do it like this: ``[p]cleanup messages 10``
+
+.. _getting-started-cogs:
+
+----
+Cogs
+----
+
+Red is built with cogs, a fancy term for plugins. They are
+modules that add functionality to Red. They contain
+commands to use.
+
+Red comes with 19 cogs containing the basic features, such
+as moderation, utility, music, streams...
+
+You can see your loaded and unloaded cogs with the ``[p]cogs``
+command. By default, all cogs will be unloaded.
+
+You can load or unload a cog by using the load or unload command
+
+.. code-block:: none
+
+    [p]load cogname
+    [p]unload cogname
+
+.. tip:: You can load and unload multiple cogs at once:
+
+    .. code-block:: none
+
+        [p]load cog1 cog2 ...
+
+You can enable and disable everything you want, which means you can
+customize Red how you want!
+
+.. _getting-started-community-cogs:
+
+~~~~~~~~~~~~~~
+Community cogs
+~~~~~~~~~~~~~~
+
+There's an entire `community <https://discord.gg/red>`_ that contributes
+to Red. Those contributors make additional cogs for you to use. You can
+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,
+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
+
+Cogs come in repositories. A repository is a container of cogs
+that you can install. Let's suppose you want to install the ``say``
+cog from the repository ``Laggrons-Dumb-Cogs``. You'll first need
+to add the repository.
+
+.. code-block:: none
+
+    [p]repo add Laggrons-Dumb-Cogs https://github.com/retke/Laggrons-Dumb-Cogs
+
+.. note:: You may need to specify a branch. If so, add its name after the link.
+
+Then you can install the cog
+
+.. code-block:: none
+
+    [p]cog install Laggrons-Dumb-Cogs say
+
+Now the cog is installed, but not loaded. You can load it using the ``[p]load``
+command we talked about before.
+
+.. _getting-started-permissions:
+
+-----------
+Permissions
+-----------
+
+Red works with different levels of permissions. Every cog defines
+the level of permission needed for a command.
+
+~~~~~~~~~
+Bot owner
+~~~~~~~~~
+
+The bot owner can access all commands on every guild. They can also use
+exclusive commands that can interact with the global settings
+or system files.
+
+*You* are the owner by default.
+
+~~~~~~~~~~~~
+Server owner
+~~~~~~~~~~~~
+
+The server owner can access all commands on his guild, except the global
+ones or those who can interact with system files (available for the
+bot owner).
+
+~~~~~~~~~~~~~
+Administrator
+~~~~~~~~~~~~~
+
+The administrator is defined by its roles. You can set multiple admin roles
+with the ``[p]set addadminrole`` and ``[p]set removeadminrole`` commands.
+
+For example, in the mod cog, an admin can use the ``[p]modset`` command
+which defines the cog settings.
+
+~~~~~~~~~
+Moderator
+~~~~~~~~~
+
+A moderator is a step above the average users. You can set multiple moderator
+roles with the ``[p]set addmodrole`` and ``[p]set removemodrole`` commands.
+
+For example, in the mod cog (again), a mod will be able to mute, kick and ban;
+but he won't be able to modify the cog settings with the ``[p]modset`` command.
+
+.. tip::
+    If you don't like the default permission settings for some commands or
+    if want to restrict a cog or a command to a channel/member, you can use
+    the permissions cog.
+
+.. _getting-started-hosting:
+
+-------
+Hosting
+-------
+
+If you are hosting Red on your personal computer, you will soon notice that
+if you close the window or if you shut down you computer, Red will be offline.
+She needs an environment to work and respond.
+
+You can try to host Red somewhere she will always be online, like on a virtual
+private server (VPS) or on a personal server (e.g. Raspberry Pi).
+
+If you want to do it, follow these steps.
+
+.. warning::
+    Before trying to host Red on a Linux environment, you need to know the
+    basics of the Unix commands, such as navigating the system files or use
+    a terminal text editor.
+
+    You should follow `this guide
+    <https://www.digitalocean.com/community/tutorials/an-introduction-to-linux-basics>`_
+    from DigitalOcean which will introduce you to the Linux basics.
+
+1. **Find a host**
+
+  You need to find a server to host Red. You can rent a VPS (it can be free)
+  on an online service. Please check :ref:`this list <host-list>` for
+  quality VPS providers.
+
+  You can also buy a Raspberry Pi (~$20), which is a micro-computer that will
+  be able to host Red. The model 3 or above is recommended.
+
+2. **Install Linux**
+
+  Most of the VPS providers have tools for installing Linux automatically. If
+  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.
+
+2.1. **Log in**
+
+  .. note:: This section is for those who have an online server. If you have
+    a local Linux machine, just open the terminal and skip to the next part.
+
+  As we said before, a VPS is controlled through command line. You will have to
+  connect to your VPS through a protocol called SSH.
+
+  .. image:: .resources/instances-ssh-button.png
+
+  On your host page (here, it is Google Cloud), find the SSH button and click on
+  it. You will be connected to your server with command line. You should see
+  something like this.
+
+  .. image:: .resources/ssh-output.png
+
+  .. note:: Don't forget to type the command ``logout`` to close the SSH properly.
+
+3. **Install and set up Red**
+
+  Just follow one of the Linux installation guide. We provide guides for the
+  most used distributions. Check the :ref:`home page <main>` and search for
+  your distribution.
+
+4. **Set up an auto-restart**
+
+  Once you got Red running on your server, it will still shut down if you close
+  the window. You can set up an auto-restarting system that will create a
+  side task and handle fatal errors, so you can just leave your server running
+  and enjoy Red!
+
+  For that, just follow :ref:`this guide <systemd-service-guide>`.
+
+.. _getting-started-userdocs:
+
+------------------
+User documentation
+------------------
+
+You will soon start using the Red core cogs. A detailed documentation is
+available for every core cog, under the :ref:`How to use <main>` section.
+
+The cog guides are formatted the same. They're divided into 3 sections:
+
+* **Guide**
+
+  This will introduce you to the cog and explain you how it works.
+
+* **Commands**
+
+  A list of the available commands, with details and arguments.
+  Each command guide will be formatted like this:
+
+  * **Syntax**
+
+    A line that will show how the command must be invoked, with the arguments.
+
+    .. tip:: If the command show something like ``[lavalinkset|llset]``, that means
+        you can invoke the command with ``lavalinkset`` or with ``llset``, this is
+        called an alias.
+
+  * **Description**
+
+    A detailed description of what the command does, with details about how
+    it must be used.
+
+  * **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.
+        
+        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 ``=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

@@ -3,9 +3,9 @@
 .. role:: python(code)
     :language: python
 
-====================
-Creating cogs for V3
-====================
+========================
+Creating cogs for Red V3
+========================
 
 This guide serves as a tutorial on creating cogs for Red V3.
 It will cover the basics of setting up a package for your
@@ -17,10 +17,33 @@ you in the process.
 Getting started
 ---------------
 
-To start off, be sure that you have installed Python 3.7.
-Open a terminal or command prompt and type :code:`pip install -U git+https://github.com/Cog-Creators/Red-DiscordBot@V3/develop#egg=redbot[test]`
-(note that if you get an error with this, try again but put :code:`python -m` in front of the command
-This will install the latest version of V3.
+To start off, be sure that you have installed Python 3.8.
+Next, you need to decide if you want to develop against the Stable or Develop version of Red.
+Depending on what your goal is should help determine which version you need.
+
+.. attention::
+    The Develop version may have changes on it which break compatibility with the Stable version and other cogs.
+    If your goal is to support both versions, make sure you build compatibility layers or use separate branches to keep compatibility until the next Red release
+
+Open a terminal or command prompt and type one of the following
+    Stable Version: :code:`python3.8 -m pip install -U Red-DiscordBot`
+
+.. note::
+
+  To install the development version, replace ``Red-DiscordBot`` in the above commands with the
+  link below. **The development version of the bot contains experimental changes. It is not
+  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.
+
+  .. code-block:: none
+
+      git+https://github.com/Cog-Creators/Red-DiscordBot@V3/develop#egg=Red-DiscordBot
+
+
+(Windows users may need to use :code:`py -3.8` or :code:`python` instead of :code:`python3.8`)
 
 --------------------
 Setting up a package
@@ -35,6 +58,20 @@ a text editor or IDE (examples include `Sublime Text 3 <https://www.sublimetext.
 `Visual Studio Code <https://code.visualstudio.com/>`_, `Atom <https://atom.io/>`_, and
 `PyCharm <http://www.jetbrains.com/pycharm/>`_).
 
+.. attention:: 
+    While you can intentionally override Red's cogs/extensions, this may break things.
+    We would prefer if people wanted custom behavior
+    for any core cog/extension, an issue and/or PR is made
+    Overriding Permissions specifically is dangerous.
+
+    Subclassing to make changes to Red's cogs/extensions
+    may not be a safe way to stay up to date either,
+    as changes to cogs and their interactions with red
+    are not guaranteed to not be breaking.
+
+    Any cogs doing this are doing so at their own risk,
+    and should also inform users of associated risks.
+
 --------------
 Creating a cog
 --------------
@@ -74,7 +111,7 @@ To test your cog, you will need a running instance of V3.
 Assuming you installed V3 as outlined above, run :code:`redbot-setup`
 and provide the requested information. Once that's done, run Red
 by doing :code:`redbot <instance name> --dev` to start Red.
-Complete the inital setup by providing a valid token and setting a
+Complete the initial setup by providing a valid token and setting a
 prefix. Once the bot has started up, use the link provided in the
 console to add it to a server (note that you must have the
 :code:`Manage Server` (or :code:`Administrator`) permission to add bots
@@ -85,6 +122,39 @@ to the directory where your cog package is located. In Discord, do
 The bot should respond with :code:`I can do stuff!`. If it did, you
 have successfully created a cog!
 
+.. note:: **Package/Folder layout**
+
+    You must make sure you structure your local path correctly or 
+    you get an error about missing the setup function. As cogs are 
+    considered packages, they are each contained within separate folders.
+    The folder you need to add using :code:`[p]addpath` is the parent
+    folder of these package folders. Below is an example
+
+    .. code-block:: none
+
+        - D:\
+        -- red-env
+        -- red-data
+        -- red-cogs
+        ---- mycog
+        ------ __init__.py
+        ------ mycog.py
+        ---- coolcog
+        ------ __init__.py
+        ------ coolcog.py
+    
+    You would then use :code:`[p]addpath D:\red-cogs` to add the path
+    and then you can use :code:`[p]load mycog` or :code:`[p]load coolcog`
+    to load them
+    
+    You can also take a look at `our cookiecutter <https://github.com/Cog-Creators/cog-cookiecutter>`_, for help creating the right structure.
+
+-------------------
+Publishing your cog
+-------------------
+
+Go to :doc:`/guide_publish_cogs`
+
 --------------------
 Additional resources
 --------------------
@@ -92,3 +162,70 @@ 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
+---------------------------
+
+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.

docs/guide_migration.rst

@@ -3,11 +3,11 @@
 .. role:: python(code)
     :language: python
 
-====================
-Migrating Cogs to V3
-====================
+==========================
+Migrating cogs from Red V2
+==========================
 
-First, be sure to read `discord.py's migration guide <https://discordpy.readthedocs.io/en/v1.0.1/migrating.html>`_
+First, be sure to read :dpy_docs:`discord.py's migration guide <migrating.html>`
 as that covers all of the changes to discord.py that will affect the migration process
 
 ----------------

docs/guide_publish_cogs.rst

@@ -1,10 +1,35 @@
-.. downloader framework reference
+.. Publishing cogs for V3
 
-Downloader Framework
-====================
+Publishing cogs for Red V3
+==========================
 
-Info.json
-*********
+Users of Red install 3rd-party cogs using Downloader cog. To make your cog available
+to install for others, you will have to create a git repository
+and publish it on git repository hosting (for example `GitHub <https://github.com>`_)
+
+Repository Template
+-------------------
+
+We have standardized what a repository's structure should look like to better assist
+our Downloader system and provide essential information to the Red portal.
+
+The main repository should contain at a minimum:
+
+ - :ref:`An info.json file <info-json-format>`
+ - One folder for each cog package in the repository
+
+   - refer to :doc:`/guide_cog_creation` for information on how to create a valid cog package
+   - you should also put :ref:`info.json file <info-json-format>` inside each cog folder
+
+We also recommend adding a license and README file with general information about the repository.
+
+For a simple example of what this might look like when finished,
+take a look at `our example template <https://github.com/Cog-Creators/Applications>`_.
+
+.. _info-json-format:
+
+Info.json format
+----------------
 
 The optional info.json file may exist inside every package folder in the repo, 
 as well as in the root of the repo. The following sections describe the valid 
@@ -16,7 +41,7 @@ Keys common to both repo and cog info.json (case sensitive)
 - ``author`` (list of strings) - list of names of authors of the cog or repo.
 
 - ``description`` (string) - A long description of the cog or repo. For cogs, this 
-  is displayed when a user executes ``!cog info``.
+  is displayed when a user executes ``[p]cog info``.
 
 - ``install_msg`` (string) - The message that gets displayed when a cog 
   is installed or a repo is added
@@ -25,7 +50,7 @@ Keys common to both repo and cog info.json (case sensitive)
       used for installing.
 
 - ``short`` (string) - A short description of the cog or repo. For cogs, this info 
-  is displayed when a user executes ``!cog list``
+  is displayed when a user executes ``[p]cog list``
 
 Keys specific to the cog info.json (case sensitive)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -35,11 +60,15 @@ Keys specific to the cog info.json (case sensitive)
 - ``max_bot_version`` (string) - Max version number of Red in the format ``MAJOR.MINOR.MICRO``,
   if ``min_bot_version`` is newer than ``max_bot_version``, ``max_bot_version`` will be ignored
 
+- ``min_python_version`` (list of integers) - Min version number of Python
+  in the format ``[MAJOR, MINOR, PATCH]``
+
 - ``hidden`` (bool) - Determines if a cog is visible in the cog list for a repo.
 
 - ``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
@@ -52,39 +81,6 @@ Keys specific to the cog info.json (case sensitive)
 - ``type`` (string) - Optional, defaults to ``COG``. Must be either ``COG`` or
   ``SHARED_LIBRARY``. If ``SHARED_LIBRARY`` then ``hidden`` will be ``True``.
 
-API Reference
-*************
-
-.. automodule:: redbot.cogs.downloader.json_mixins
-
-.. autoclass RepoJSONMixin
-    :members
-
-.. automodule:: redbot.cogs.downloader.installable
-
-Installable
-^^^^^^^^^^^
-
-.. autoclass:: Installable
-    :members:
-
-.. automodule:: redbot.cogs.downloader.repo_manager
-
-Repo
-^^^^
-
-.. autoclass:: Repo
-    :members:
-
-Repo Manager
-^^^^^^^^^^^^
-
-.. autoclass:: RepoManager
-    :members:
-
-Exceptions
-^^^^^^^^^^
-
-.. automodule:: redbot.cogs.downloader.errors
-    :members:
+.. warning::
+    Shared libraries are deprecated since version 3.2 and are marked for removal in version 3.4.
 

docs/host-list.rst

@@ -0,0 +1,90 @@
+.. source: https://gist.github.com/Twentysix26/cb4401c6e507782aa6698e9e470243ed
+
+.. _host-list:
+
+=============
+VPS providers
+=============
+
+.. note::
+    This doc is written for the :ref:`hosting section <getting-started-hosting>`
+    of the :ref:`getting started <getting-started>` guide. Please take a look
+    if you don't know how to host Red on a VPS.
+
+This is a list of the recommended VPS providers.
+
+.. warning::
+    Please be aware that a Linux server is controlled through a command line.
+    If you don't know Unix basics, please take a look at `this guide
+    <https://www.digitalocean.com/community/tutorials/an-introduction-to-linux-basics>`_
+    from DigitalOcean which will introduce you to the Linux basics.
+
+-------------
+Linux hosting
+-------------
+
++------------------------------------+------------------------------------------------------+
+|Link                                |Description                                           |
++====================================+======================================================+
+|`Scaleway                           |Incredibly cheap but powerful VPSes, owned by         |
+|<https://www.scaleway.com/>`_       |`<https://online.net/>`_, based in Europe.            |
++------------------------------------+------------------------------------------------------+
+|`DigitalOcean                       |US-based cheap VPSes. The gold standard. Locations    |
+|<https://www.digitalocean.com/>`_   |available world wide.                                 |
++------------------------------------+------------------------------------------------------+
+|`OVH <https://www.ovh.co.uk/>`_     |Cheap VPSes, used by many people. French and Canadian |
+|                                    |locations available.                                  |
++------------------------------------+------------------------------------------------------+
+|`Time4VPS                           |Cheap VPSes, seemingly based in Lithuania.            |
+|<https://www.time4vps.eu/>`_        |                                                      |
++------------------------------------+------------------------------------------------------+
+|`Linode <https://www.linode.com/>`_ |More cheap VPSes!                                     |
++------------------------------------+------------------------------------------------------+
+|`Vultr <https://www.vultr.com/>`_   |US-based, DigitalOcean-like.                          |
++------------------------------------+------------------------------------------------------+
+
+------
+Others
+------
+
++-------------------------------------+-----------------------------------------------------+
+|Link                                 |                                                     |
++=====================================+=====================================================+
+|`AWS <https://aws.amazon.com/>`_     |Amazon Web Services. Free for a year (with certain   |
+|                                     |limits), but very pricey after that.                 |
++-------------------------------------+-----------------------------------------------------+
+|`Google Cloud                        |Same as AWS, but it's Google.                        |
+|<https://cloud.google.com/compute/>`_|                                                     |
++-------------------------------------+-----------------------------------------------------+
+|`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.                 |
++-------------------------------------+-----------------------------------------------------+
+
+------------
+Self-hosting
+------------
+
+You can always self-host on your own hardware.
+A Raspberry Pi 3 will be more than sufficient for small to medium sized bots.
+
+For bigger bots, you can build your own server PC for usage, or buy a rack
+server. Any modern hardware should work 100% fine.
+
+------------
+Free hosting
+------------
+
+`Google Cloud Compute Free Tier <https://cloud.google.com/free/docs/gcp-free-tier>`_,
+`Oracle Cloud Compute Always Free <https://oracle.com/cloud/free/#always-free>`_ and
+`AWS EC2 Free Tier <https://aws.amazon.com/free/>`_ have free tier VPSes suitable for small bots.
+AWS EC2 is not *always* free—it's a 12 month free 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

@@ -3,6 +3,8 @@
     You can adapt this file completely to your liking, but it should at least
     contain the root `toctree` directive.
 
+.. _main:
+
 Welcome to Red - Discord Bot's documentation!
 =============================================
 
@@ -12,23 +14,31 @@ Welcome to Red - Discord Bot's documentation!
 
     install_windows
     install_linux_mac
-    venv_guide
+    update_red
+    about_venv
     autostart_systemd
+    autostart_pm2
 
 .. toctree::
     :maxdepth: 2
     :caption: Cog Reference:
 
     cog_customcom
-    cog_downloader
     cog_permissions
 
+.. toctree::
+    :maxdepth: 2
+    :caption: User guides:
+
+    getting_started
+
 .. toctree::
     :maxdepth: 2
     :caption: Red Development Framework Reference:
 
     guide_migration
     guide_cog_creation
+    guide_publish_cogs
     framework_apikeys
     framework_bank
     framework_bot
@@ -37,19 +47,28 @@ Welcome to Red - Discord Bot's documentation!
     framework_commands
     framework_config
     framework_datamanager
-    framework_downloader
     framework_events
     framework_i18n
     framework_modlog
     framework_rpc
     framework_utils
+    version_guarantees
 
 .. toctree::
     :maxdepth: 2
     :caption: Changelogs:
 
+    changelog_3_3_0
+    release_notes_3_2_0
+    changelog_3_2_0
     changelog_3_1_0
 
+.. toctree::
+    :maxdepth: 2
+    :caption: Others
+
+    host-list
+
 
 Indices and tables
 ==================

docs/install_linux_mac.rst

@@ -7,7 +7,8 @@ Installing Red on Linux or Mac
 .. warning::
 
     For safety reasons, DO NOT install Red with a root user. If you are unsure how to create
-    a new user, see the man page for the ``useradd`` command.
+    a new user on Linux, see `this guide by DigitalOcean
+    <https://www.digitalocean.com/community/tutorials/how-to-create-a-sudo-user-on-ubuntu-quickstart>`_.
 
 -------------------------------
 Installing the pre-requirements
@@ -16,10 +17,23 @@ Installing the pre-requirements
 Please install the pre-requirements using the commands listed for your operating system.
 
 The pre-requirements are:
- - Python 3.7.0 or greater
- - pip 9.0 or greater
- - git
- - Java Runtime Environment 8 or later (for audio support)
+ - Python 3.8.1 or greater
+ - Pip 18.1 or greater
+ - Git 2.11+
+ - 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.
+
+
+*****************
+Operating systems
+*****************
+
+.. contents::
+    :local:
+
+----
 
 .. _install-arch:
 
@@ -29,47 +43,124 @@ Arch Linux
 
 .. code-block:: none
 
-    sudo pacman -Syu python-pip git base-devel jre8-openjdk
+    sudo pacman -Syu python python-pip git jre11-openjdk-headless base-devel
 
-.. _install-centos:
-.. _install-fedora:
-.. _install-rhel:
+Continue by `creating-venv-linux`.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~
-CentOS 7, Fedora, and RHEL
-~~~~~~~~~~~~~~~~~~~~~~~~~~
+----
+
+.. _install-centos7:
+.. _install-rhel7:
+
+~~~~~~~~~~~~~~~~~
+CentOS and RHEL 7
+~~~~~~~~~~~~~~~~~
 
 .. code-block:: none
 
-    yum -y groupinstall development
-    yum -y install https://centos7.iuscommunity.org/ius-release.rpm
-    sudo yum install zlib-devel bzip2 bzip2-devel readline-devel sqlite sqlite-devel \
-    openssl-devel xz xz-devel libffi-devel git2u java-1.8.0-openjdk
+    sudo yum -y groupinstall development
+    sudo yum -y install zlib-devel bzip2 bzip2-devel readline-devel sqlite sqlite-devel \
+      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
 
-Complete the rest of the installation by `installing Python 3.7 with pyenv <install-python-pyenv>`.
+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-centos:
+.. _install-rhel:
+
+~~~~~~~~~~~~~~~~~
+CentOS and RHEL 8
+~~~~~~~~~~~~~~~~~
+
+.. code-block:: none
+
+    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>`.
+
+----
+
+.. _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-headless
+    CXX=/usr/bin/g++
+
+Complete the rest of the installation by `installing Python 3.8 with pyenv <install-python-pyenv>`.
+
+----
 
 .. _install-debian:
 .. _install-raspbian:
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Debian and Raspbian Stretch
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. warning::
-
-    Audio will not work on Raspberry Pi's **below** 2B. This is a CPU problem and
-    *cannot* be fixed.
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+Debian and Raspbian Buster
+~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 We recommend installing pyenv as a method of installing non-native versions of python on
-Debian/Raspbian Stretch. This guide will tell you how. First, run the following commands:
+Debian/Raspbian Buster. This guide will tell you how. First, run the following commands:
 
 .. code-block:: none
 
-    sudo apt install -y make build-essential libssl-dev zlib1g-dev libbz2-dev \
-    libreadline-dev libsqlite3-dev wget curl llvm libncurses5-dev libncursesw5-dev \
-    xz-utils tk-dev libffi-dev liblzma-dev python3-openssl git unzip default-jre
+    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-headless
+    CXX=/usr/bin/g++
 
-Complete the rest of the installation by `installing Python 3.7 with pyenv <install-python-pyenv>`.
+Complete the rest of the installation by `installing Python 3.8 with pyenv <install-python-pyenv>`.
+
+----
+
+.. _install-fedora:
+
+~~~~~~~~~~~~
+Fedora Linux
+~~~~~~~~~~~~
+
+Fedora Linux 30 and above has all required packages available in official repositories. Install
+them with dnf:
+
+.. code-block:: none
+
+    sudo dnf -y install python38 git java-11-openjdk-headless @development-tools
+
+Continue by `creating-venv-linux`.
+
+----
 
 .. _install-mac:
 
@@ -82,77 +173,231 @@ 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/adoptopenjdk8
+    brew cask install adoptopenjdk/openjdk/adoptopenjdk11
 
-It's possible you will have network issues. If so, go in your Applications folder, inside it, go in the Python 3.7 folder then double click ``Install certificates.command``
+Continue by `creating-venv-linux`.
+
+----
+
+.. _install-opensuse:
+
+~~~~~~~~
+openSUSE
+~~~~~~~~
+
+openSUSE Leap
+*************
+
+We recommend installing a community package to get Python 3.8 on openSUSE Leap. This package will
+be installed to the ``/opt`` directory.
+
+First, add the Opt-Python community repository:
+
+.. code-block:: none
+
+    source /etc/os-release
+    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 -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:
+
+.. code-block:: none
+
+    echo 'export PATH="/opt/python/bin:$PATH"' | sudo tee /etc/profile.d/opt-python.sh
+    source /etc/profile.d/opt-python.sh
+
+Now, install pip with easy_install:
+
+.. code-block:: none
+
+    sudo /opt/python/bin/easy_install-3.8 pip
+
+Continue by `creating-venv-linux`.
+
+openSUSE Tumbleweed
+*******************
+
+openSUSE Tumbleweed has all required dependencies available in official repositories. Install them
+with zypper:
+
+.. code-block:: none
+
+    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-1604:
+
+~~~~~~~~~~~~~~~~
+Ubuntu 16.04 LTS
+~~~~~~~~~~~~~~~~
+
+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:
+
+.. code-block:: none
+
+    sudo add-apt-repository -yu 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-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:
-.. _install-ubuntu-bionic:
-.. _install-ubuntu-cosmic:
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Ubuntu 18.04 Bionic Beaver and 18.10 Cosmic Cuttlefish
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~
+Ubuntu 20.04 LTS
+~~~~~~~~~~~~~~~~
+
+We recommend adding the ``git-core`` ppa to install Git 2.11 or greater:
 
 .. code-block:: none
 
-    sudo apt install python3.7 python3.7-dev python3.7-venv python3-pip build-essential \
-    libssl-dev libffi-dev git unzip default-jre -y
-
-.. _install-ubuntu-xenial:
-
-~~~~~~~~~~~~~~~~~~~~~~~~~
-Ubuntu 16.04 Xenial Xerus
-~~~~~~~~~~~~~~~~~~~~~~~~~
-
-We recommend adding the ``deadsnakes`` apt repository to install Python 3.7 or greater:
-
-.. code-block:: none
-
-    sudo apt install software-properties-common
-    sudo add-apt-repository ppa:deadsnakes/ppa
     sudo apt update
+    sudo apt -y install software-properties-common
+    sudo add-apt-repository -y ppa:git-core/ppa
 
-Now, install python, pip, git and java with the following commands:
+Now install the pre-requirements with apt:
 
 .. code-block:: none
 
-    sudo apt install python3.7 python3.7-dev build-essential libssl-dev libffi-dev git \
-    unzip default-jre curl -y
-    curl https://bootstrap.pypa.io/get-pip.py | sudo python3.7
+    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-non-lts:
+
+~~~~~~~~~~~~~~~~~~~~~~~
+Ubuntu non-LTS versions
+~~~~~~~~~~~~~~~~~~~~~~~
+
+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 -yu ppa:git-core/ppa
+
+Now, to install non-native version of python on non-LTS versions of Ubuntu, we recommend
+installing pyenv. To do this, first run the following commands:
+
+.. code-block:: none
+
+    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-headless
+    CXX=/usr/bin/g++
+
+And then complete the rest of the installation by `installing Python 3.8 with pyenv <install-python-pyenv>`.
+
+----
 
 .. _install-python-pyenv:
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+****************************
 Installing Python with pyenv
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+****************************
 
-On distributions where Python 3.7 needs to be compiled from source, we recommend the use of pyenv.
+.. note::
+
+    If you followed one of the sections above, and weren't linked here afterwards, you should skip
+    this section.
+
+On distributions where Python 3.8 needs to be compiled from source, we recommend the use of pyenv.
 This simplifies the compilation process and has the added bonus of simplifying setting up Red in a
 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.7.2 -v
+    CONFIGURE_OPTS=--enable-optimizations pyenv install 3.8.3 -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
@@ -164,16 +409,94 @@ After that is finished, run:
 
 .. code-block:: none
 
-    pyenv global 3.7.2
+    pyenv global 3.8.3
 
-Pyenv is now installed and your system should be configured to run Python 3.7.
+Pyenv is now installed and your system should be configured to run Python 3.8.
+
+Continue by `creating-venv-linux`.
+
+.. _creating-venv-linux:
 
 ------------------------------
 Creating a Virtual Environment
 ------------------------------
 
-We **strongly** recommend installing Red into a virtual environment. See the section
-`installing-in-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.
+
+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:
 
@@ -183,31 +506,24 @@ Installing Red
 
 Choose one of the following commands to install Red.
 
-.. note::
-
-    If you're not inside an activated virtual environment, include the ``--user`` flag with all
-    ``python3.7 -m pip`` commands.
-
-To install without MongoDB support:
+To install without additional config backend support:
 
 .. code-block:: none
 
-    python3.7 -m pip install -U Red-DiscordBot
+    python -m pip install -U pip setuptools wheel
+    python -m pip install -U Red-DiscordBot
 
-Or, to install with MongoDB support:
+Or, to install with PostgreSQL support:
 
 .. code-block:: none
 
-    python3.7 -m pip install -U Red-DiscordBot[mongo]
+    python -m pip install -U pip setuptools wheel
+    python -m pip install -U Red-DiscordBot[postgres]
+
 
 .. note::
 
-  To install the development version, replace ``Red-DiscordBot`` in the above commands with the
-  following link:
-
-  .. code-block:: none
-
-      git+https://github.com/Cog-Creators/Red-DiscordBot@V3/develop#egg=Red-DiscordBot
+    These commands are also used for updating Red
 
 --------------------------
 Setting Up and Running Red
@@ -231,14 +547,9 @@ 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
-`this guide <https://discordpy.readthedocs.io/en/v1.0.1/discord.html#creating-a-bot-account>`_,
+:dpy_docs:`this guide <discord.html#creating-a-bot-account>`,
 section "Creating a Bot Account".
 
-You may also run Red via the launcher, which allows you to restart the bot
-from discord, and enable auto-restart. You may also update the bot from the
-launcher menu. Use the following command to run the launcher:
-
-.. code-block:: none
-
-    redbot-launcher
-
+.. tip::
+   If it's the first time you're using Red, you should check our `getting-started` guide
+   that will walk you through all essential information on how to interact with Red.

docs/install_windows.rst

@@ -4,20 +4,31 @@
 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
+ - 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.
 
-To install via powershell, search "powershell" in the windows start menu,
+.. 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"
 
 Then run each of the following commands:
@@ -26,26 +37,87 @@ Then run each of the following commands:
 
     Set-ExecutionPolicy Bypass -Scope Process -Force
     iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))
-    choco install git --params "/GitOnlyOnPath /WindowsTerminal" -y
-    choco install jre8 python -y; exit
+    choco upgrade git --params "/GitOnlyOnPath /WindowsTerminal" -y
+    choco upgrade visualstudio2019-workload-vctools -y
+    choco upgrade python3 -y
 
+For Audio support, you should also run the following command before exiting:
+
+.. code-block:: none
+
+    choco upgrade adoptopenjdk11jre -y
+
+
+From here, exit the prompt then continue onto `creating-venv-windows`.
+
+----
 
 ********************************
 Manually installing dependencies
 ********************************
 
-* `Python <https://www.python.org/downloads/>`_ - Red needs Python 3.7.0 or greater
+.. attention:: There are additional configuration steps required which are
+               not documented for installing dependencies manually.
+               These dependencies are only listed seperately here for
+               reference purposes.
 
-.. note:: Please make sure that the box to add Python to PATH is CHECKED, otherwise
-          you may run into issues when trying to run Red.
+* `MSVC Build tools <https://www.visualstudio.com/downloads/#build-tools-for-visual-studio-2019>`_
 
-* `Git <https://git-scm.com/download/win>`_
+* `Python 3.8.1 <https://www.python.org/downloads/>`_ - Red needs Python 3.8.1 or greater
 
-.. attention:: Please choose the option to "Run Git from the Windows Command Prompt" in Git's setup.
+.. 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.
 
-* `Java <https://java.com/en/download/manual.jsp>`_ - needed for Audio
+* `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 11 <https://adoptopenjdk.net/?variant=openjdk11&jvmVariant=hotspot>`_ - needed for Audio
+
+From here, continue onto `creating-venv-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.
+
+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)
+
+.. 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.
 
-.. attention:: Please choose the "Windows Online" installer.
 
 .. _installing-red-windows:
 
@@ -56,35 +128,26 @@ 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. Create and activate a virtual environment (strongly recommended), see the section `using-venv`
-3. Run **one** of the following commands, depending on what extras you want installed
+Run **one** of the following set of commands, depending on what extras you want installed
 
-  .. note::
-
-      If you're not inside an activated virtual environment, include the ``--user`` flag with all
-      ``pip`` commands.
-
-  * No MongoDB support:
+  * Normal installation:
 
     .. code-block:: none
 
+        python -m pip install -U pip setuptools wheel
         python -m pip install -U Red-DiscordBot
 
-  * With MongoDB support:
+  * With PostgreSQL support:
 
     .. code-block:: none
 
-        python -m pip install -U Red-DiscordBot[mongo]
+        python -m pip install -U pip setuptools wheel
+        python -m pip install -U Red-DiscordBot[postgres]
 
-  .. note::
 
-      To install the development version, replace ``Red-DiscordBot`` in the above commands with the
-      following link:
+.. note::
 
-      .. code-block:: none
-
-          git+https://github.com/Cog-Creators/Red-DiscordBot@V3/develop#egg=Red-DiscordBot
+    These commands are also used for updating Red
 
 --------------------------
 Setting Up and Running Red
@@ -108,13 +171,9 @@ 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
-`this guide <https://discordpy.readthedocs.io/en/v1.0.1/discord.html#creating-a-bot-account>`_,
+:dpy_docs:`this guide <discord.html#creating-a-bot-account>`,
 section "Creating a Bot Account".
 
-You may also run Red via the launcher, which allows you to restart the bot
-from discord, and enable auto-restart. You may also update the bot from the
-launcher menu. Use the following command to run the launcher:
-
-.. code-block:: none
-
-    redbot-launcher
+.. tip::
+   If it's the first time you're using Red, you should check our `getting-started` guide
+   that will walk you through all essential information on how to interact with Red.

docs/prolog.txt

@@ -0,0 +1,41 @@
+.. This file will be run at the beginning of all files.
+    You can add the subsitutions you need.
+
+.. this is a .txt so sphinx doesn't error because it's
+    missing in the index
+
+
+.. These are the comments for permissions locks
+
+.. |owner-lock| replace:: This command is locked to the
+    :ref:`bot owner <getting-started-permissions>`.
+
+.. |guildowner-lock| replace:: This command is locked to the
+    :ref:`server owner <getting-started-permissions>`.
+
+.. |admin-lock| replace:: This command is locked to the
+    :ref:`admin role <getting-started-permissions>`.
+
+.. |mod-lock| replace:: This command is locked to the
+    :ref:`mod role <getting-started-permissions>`.
+
+
+.. 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.
+    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|).
+
+.. |user-input| replace:: You can either provide the member's ID or its exact name with the tag or
+    not (|quotes|).
+
+.. |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|.
+
+.. |color-input| replace:: You can either provide the hexadecimal code of the color, or one of the
+    colors listed here: :class:`discord.Color`.

docs/release_notes_3_2_0.rst

@@ -0,0 +1,50 @@
+.. v3.2.0 Release Notes
+
+##################################
+Red DiscordBot 3.2.0 Release Notes
+##################################
+
+
+Please read the following prior to updating.
+
+- 3.2 comes with improvements which required breaking changes for 3rd party cogs.
+  When you update to 3.2, your cogs may not be compatible if the author has not handled
+  the changes yet.
+
+
+- 3.2 requires Python 3.8.1.
+  This was done so that we could better handle some behavior which was not fixed for Python 3.7.
+  If you need help updating, our install docs will cover everything you need to know to update.
+
+  .. note::
+  
+    You may get a notification from the downloader cog about needing to refetch dependencies
+    This is expected, and it will walk you through everything and do as much as it can for you.
+
+
+- 3.2 dropped support for the MongoDB driver
+  
+  - If you were not using the MongoDB driver, this does not effect 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,
+    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
+
+
+- 3.2 comes with many feature upgrades. A brief high level list of these is below.
+
+  - A metric ton of bugfixes
+  - Bot shutdown is handled significantly better
+  - Audio is much more powerful
+  - We've made it easier for cog creators to interact with the core bot APIs safely
+  - We've supplied cog creators with additional tools
+
+
+.. note:: 
+    
+  The full list of changes is much longer than we can include here,
+  but our changelog has the fine details.

docs/update_red.rst

@@ -0,0 +1,135 @@
+============
+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.
+
+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,132 +0,0 @@
-.. _installing-in-virtual-environment:
-
-=======================================
-Installing Red in a Virtual Environment
-=======================================
-Virtual environments allow you to isolate red's library dependencies, cog dependencies and python
-binaries from the rest of your system. It is strongly recommended you use this if you use python
-for more than just Red.
-
-.. _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
-``path/to/venv/`` (or ``path\to\venv\`` on Windows).
-
-~~~~~~~~~~~~~~~~~~~~~~~~
-``venv`` on Linux or Mac
-~~~~~~~~~~~~~~~~~~~~~~~~
-Create your virtual environment with the following command::
-
-    python3.7 -m venv path/to/venv/
-
-And activate it with the following command::
-
-    source path/to/venv/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::
-
-    python -m venv path\to\venv\
-
-And activate it with the following command::
-
-    path\to\venv\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.7.0 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.
-
-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

@@ -0,0 +1,38 @@
+.. _version-guarantees:
+
+==========
+Versioning
+==========
+
+Red is versioned as ``major.minor.micro``
+
+While this is very similar to SemVer, we have our own set of guarantees.
+
+Major versions are for project wide rewrites and are not expected in the foreseeable future.
+
+==========
+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
+excluded from being guaranteed.
+
+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.
+
+=======================
+Breaking Change Notices
+=======================
+
+Breaking changes in Red will be noted in the changelog with a special section.
+
+Breaking changes may only occur on a minor or major version bump.
+
+A change not covered by our guarantees may not be considered breaking for these purposes, 
+while still being documented as a breaking change in internal documentation
+for the purposes of other internal APIs.

make.bat

@@ -14,15 +14,19 @@ for /F "tokens=* USEBACKQ" %%A in (`git ls-files "*.py"`) do (
 goto %1
 
 :reformat
-black -l 99 !PYFILES!
+black !PYFILES!
 exit /B %ERRORLEVEL%
 
 :stylecheck
-black -l 99 --check !PYFILES!
+black --check !PYFILES!
+exit /B %ERRORLEVEL%
+
+:stylediff
+black --check --diff !PYFILES!
 exit /B %ERRORLEVEL%
 
 :newenv
-py -3.7 -m venv --clear .venv
+py -3.8 -m venv --clear .venv
 .\.venv\Scripts\python -m pip install -U pip setuptools
 goto syncenv
 

pyproject.toml

@@ -0,0 +1,18 @@
+[tool.black]
+    line-length = 99
+    target-version = ['py38']
+    include = '\.py$'
+    exclude = '''
+    /(
+          \.eggs
+        | \.git
+        | \.hg
+        | \.mypy_cache
+        | \.tox
+        | \.venv
+        | _build
+        | buck-out
+        | build
+        | dist
+    )/
+    '''

redbot/__init__.py

@@ -1,3 +1,5 @@
+import asyncio as _asyncio
+import os as _os
 import re as _re
 import sys as _sys
 import warnings as _warnings
@@ -13,11 +15,16 @@ from typing import (
 )
 
 
-MIN_PYTHON_VERSION = (3, 7, 0)
+MIN_PYTHON_VERSION = (3, 8, 1)
 
-__all__ = ["MIN_PYTHON_VERSION", "__version__", "version_info", "VersionInfo"]
-
-if _sys.version_info < MIN_PYTHON_VERSION:
+__all__ = [
+    "MIN_PYTHON_VERSION",
+    "__version__",
+    "version_info",
+    "VersionInfo",
+    "_update_event_loop_policy",
+]
+if _sys.version_info < MIN_PYTHON_VERSION and not _os.getenv("READTHEDOCS", False):
     print(
         f"Python {'.'.join(map(str, MIN_PYTHON_VERSION))} is required to run Red, but you have "
         f"{_sys.version}! Please update Python."
@@ -173,8 +180,46 @@ class VersionInfo:
         )
 
 
-__version__ = "3.1.6"
+def _update_event_loop_policy():
+    if _sys.implementation.name == "cpython":
+        # Let's not force this dependency, uvloop is much faster on cpython
+        try:
+            import uvloop as _uvloop
+        except ImportError:
+            pass
+        else:
+            _asyncio.set_event_loop_policy(_uvloop.EventLoopPolicy())
+
+
+__version__ = "3.3.10.dev1"
 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)
+    # DeprecationWarning: rename klass to create_protocol
+    #   warnings.warn("rename klass to create_protocol", DeprecationWarning)
+    _warnings.filterwarnings(
+        "ignore", category=DeprecationWarning, module="websockets", lineno=407
+    )
+    # DeprecationWarning: The loop argument is deprecated since Python 3.8, and scheduled for removal in Python 3.10.
+    #   transport, protocol = await self._create_connection()
+    _warnings.filterwarnings(
+        "ignore", category=DeprecationWarning, module="websockets", lineno=535
+    )

redbot/__main__.py

@@ -1,40 +1,37 @@
 #!/usr/bin/env python
 
-# Discord Version check
-
 import asyncio
+import functools
+import getpass
 import json
 import logging
 import os
+import pip
+import pkg_resources
+import platform
+import shutil
+import signal
 import sys
+from argparse import Namespace
+from copy import deepcopy
+from pathlib import Path
+from typing import NoReturn
 
 import discord
 
-# Set the event loop policies here so any subsequent `get_event_loop()`
+# Set the event loop policies here so any subsequent `new_event_loop()`
 # calls, in particular those as a result of the following imports,
 # return the correct loop object.
-if sys.platform == "win32":
-    asyncio.set_event_loop_policy(asyncio.WindowsProactorEventLoopPolicy())
-elif sys.implementation.name == "cpython":
-    # Let's not force this dependency, uvloop is much faster on cpython
-    try:
-        import uvloop
-    except ImportError:
-        uvloop = None
-        pass
-    else:
-        asyncio.set_event_loop_policy(uvloop.EventLoopPolicy())
+from redbot import _update_event_loop_policy, __version__
+
+_update_event_loop_policy()
 
 import redbot.logging
 from redbot.core.bot import Red, ExitCodes
-from redbot.core.cog_manager import CogManagerUI
-from redbot.core.global_checks import init_global_checks
-from redbot.core.events import init_events
 from redbot.core.cli import interactive_config, confirm, parse_cli_flags
-from redbot.core.core_commands import Core
-from redbot.core.dev_commands import Dev
-from redbot.core import __version__, modlog, bank, data_manager
-from signal import SIGTERM
+from redbot.setup import get_data_dir, get_name, save_config
+from redbot.core import data_manager, drivers
+from redbot.core._sharedlibdeprecation import SharedLibImportWarner
 
 
 log = logging.getLogger("red.main")
@@ -46,14 +43,10 @@ log = logging.getLogger("red.main")
 #
 
 
-async def _get_prefix_and_token(red, indict):
-    """
-    Again, please blame <@269933075037814786> for this.
-    :param indict:
-    :return:
-    """
-    indict["token"] = await red.db.token()
-    indict["prefix"] = await red.db.prefix()
+def _get_instance_names():
+    with data_manager.config_file.open(encoding="utf-8") as fs:
+        data = json.load(fs)
+    return sorted(data.keys())
 
 
 def list_instances():
@@ -64,42 +57,282 @@ def list_instances():
         )
         sys.exit(1)
     else:
-        with data_manager.config_file.open(encoding="utf-8") as fs:
-            data = json.load(fs)
         text = "Configured Instances:\n\n"
-        for instance_name in sorted(data.keys()):
+        for instance_name in _get_instance_names():
             text += "{}\n".format(instance_name)
         print(text)
         sys.exit(0)
 
 
-async def sigterm_handler(red, log):
-    log.info("SIGTERM received. Quitting...")
-    await red.shutdown(restart=False)
+def debug_info():
+    """Shows debug information useful for debugging."""
+    if sys.platform == "linux":
+        import distro  # pylint: disable=import-error
+
+    IS_WINDOWS = os.name == "nt"
+    IS_MAC = sys.platform == "darwin"
+    IS_LINUX = sys.platform == "linux"
+
+    pyver = sys.version
+    pipver = pip.__version__
+    redver = __version__
+    dpy_version = discord.__version__
+    if IS_WINDOWS:
+        os_info = platform.uname()
+        osver = "{} {} (version {})".format(os_info.system, os_info.release, os_info.version)
+    elif IS_MAC:
+        os_info = platform.mac_ver()
+        osver = "Mac OSX {} {}".format(os_info[0], os_info[2])
+    else:
+        os_info = distro.linux_distribution()
+        osver = "{} {}".format(os_info[0], os_info[1]).strip()
+    user_who_ran = getpass.getuser()
+    info = (
+        "Debug Info for Red\n\n"
+        + "Red version: {}\n".format(redver)
+        + "Python version: {}\n".format(pyver)
+        + "Python executable: {}\n".format(sys.executable)
+        + "Discord.py version: {}\n".format(dpy_version)
+        + "Pip version: {}\n".format(pipver)
+        + "OS version: {}\n".format(osver)
+        + "System arch: {}\n".format(platform.machine())
+        + "User: {}\n".format(user_who_ran)
+    )
+    print(info)
+    sys.exit(0)
 
 
-def main():
-    description = "Red V3"
-    cli_flags = parse_cli_flags(sys.argv[1:])
-    if cli_flags.list_instances:
-        list_instances()
-    elif cli_flags.version:
-        print(description)
-        print("Current Version: {}".format(__version__))
-        sys.exit(0)
-    elif not cli_flags.instance_name and not cli_flags.no_instance:
-        print("Error: No instance name was provided!")
+async def edit_instance(red, cli_flags):
+    no_prompt = cli_flags.no_prompt
+    token = cli_flags.token
+    owner = cli_flags.owner
+    prefix = cli_flags.prefix
+    old_name = cli_flags.instance_name
+    new_name = cli_flags.edit_instance_name
+    data_path = cli_flags.edit_data_path
+    copy_data = cli_flags.copy_data
+    confirm_overwrite = cli_flags.overwrite_existing_instance
+
+    if data_path is None and copy_data:
+        print("--copy-data can't be used without --edit-data-path argument")
         sys.exit(1)
-    if cli_flags.no_instance:
+    if new_name is None and confirm_overwrite:
+        print("--overwrite-existing-instance can't be used without --edit-instance-name argument")
+        sys.exit(1)
+    if (
+        no_prompt
+        and all(to_change is None for to_change in (token, owner, new_name, data_path))
+        and not prefix
+    ):
         print(
-            "\033[1m"
-            "Warning: The data will be placed in a temporary folder and removed on next system "
-            "reboot."
-            "\033[0m"
+            "No arguments to edit were provided."
+            " Available arguments (check help for more information):"
+            " --edit-instance-name, --edit-data-path, --copy-data, --owner, --token, --prefix"
         )
-        cli_flags.instance_name = "temporary_red"
-        data_manager.create_temp_config()
+        sys.exit(1)
+
+    await _edit_token(red, token, no_prompt)
+    await _edit_prefix(red, prefix, no_prompt)
+    await _edit_owner(red, owner, no_prompt)
+
+    data = deepcopy(data_manager.basic_config)
+    name = _edit_instance_name(old_name, new_name, confirm_overwrite, no_prompt)
+    _edit_data_path(data, name, data_path, copy_data, no_prompt)
+
+    save_config(name, data)
+    if old_name != name:
+        save_config(old_name, {}, remove=True)
+
+
+async def _edit_token(red, token, no_prompt):
+    if token:
+        if not len(token) >= 50:
+            print(
+                "The provided token doesn't look a valid Discord bot token."
+                " Instance's token will remain unchanged.\n"
+            )
+            return
+        await red._config.token.set(token)
+    elif not no_prompt and confirm("Would you like to change instance's token?", default=False):
+        await interactive_config(red, False, True, print_header=False)
+        print("Token updated.\n")
+
+
+async def _edit_prefix(red, prefix, no_prompt):
+    if prefix:
+        prefixes = sorted(prefix, reverse=True)
+        await red._config.prefix.set(prefixes)
+    elif not no_prompt and confirm("Would you like to change instance's prefixes?", default=False):
+        print(
+            "Enter the prefixes, separated by a space (please note "
+            "that prefixes containing a space will need to be added with [p]set prefix)"
+        )
+        while True:
+            prefixes = input("> ").strip().split()
+            if not prefixes:
+                print("You need to pass at least one prefix!")
+                continue
+            prefixes = sorted(prefixes, reverse=True)
+            await red._config.prefix.set(prefixes)
+            print("Prefixes updated.\n")
+            break
+
+
+async def _edit_owner(red, owner, no_prompt):
+    if owner:
+        if not (15 <= len(str(owner)) <= 21):
+            print(
+                "The provided owner id doesn't look like a valid Discord user id."
+                " Instance's owner will remain unchanged."
+            )
+            return
+        await red._config.owner.set(owner)
+    elif not no_prompt and confirm("Would you like to change instance's owner?", default=False):
+        print(
+            "Remember:\n"
+            "ONLY the person who is hosting Red should be owner."
+            " This has SERIOUS security implications."
+            " The owner can access any data that is present on the host system.\n"
+        )
+        if confirm("Are you sure you want to change instance's owner?", default=False):
+            print("Please enter a Discord user id for new owner:")
+            while True:
+                owner_id = input("> ").strip()
+                if not (15 <= len(owner_id) <= 21 and owner_id.isdecimal()):
+                    print("That doesn't look like a valid Discord user id.")
+                    continue
+                owner_id = int(owner_id)
+                await red._config.owner.set(owner_id)
+                print("Owner updated.")
+                break
+        else:
+            print("Instance's owner will remain unchanged.")
+        print()
+
+
+def _edit_instance_name(old_name, new_name, confirm_overwrite, no_prompt):
+    if new_name:
+        name = new_name
+        if name in _get_instance_names() and not confirm_overwrite:
+            name = old_name
+            print(
+                "An instance with this name already exists.\n"
+                "If you want to remove the existing instance and replace it with this one,"
+                " run this command with --overwrite-existing-instance flag."
+            )
+    elif not no_prompt and confirm("Would you like to change the instance name?", default=False):
+        name = get_name()
+        if name in _get_instance_names():
+            print(
+                "WARNING: An instance already exists with this name. "
+                "Continuing will overwrite the existing instance config."
+            )
+            if not confirm(
+                "Are you absolutely certain you want to continue with this instance name?",
+                default=False,
+            ):
+                print("Instance name will remain unchanged.")
+                name = old_name
+            else:
+                print("Instance name updated.")
+        else:
+            print("Instance name updated.")
+        print()
+    else:
+        name = old_name
+    return name
+
+
+def _edit_data_path(data, instance_name, data_path, copy_data, no_prompt):
+    # This modifies the passed dict.
+    if data_path:
+        new_path = Path(data_path)
+        try:
+            exists = new_path.exists()
+        except OSError:
+            print(
+                "We were unable to check your chosen directory."
+                " Provided path may contain an invalid character."
+                " Data location will remain unchanged."
+            )
+
+        if not exists:
+            try:
+                new_path.mkdir(parents=True, exist_ok=True)
+            except OSError:
+                print(
+                    "We were unable to create your chosen directory."
+                    " Data location will remain unchanged."
+                )
+        data["DATA_PATH"] = data_path
+        if copy_data and not _copy_data(data):
+            print("Can't copy data to non-empty location. Data location will remain unchanged.")
+            data["DATA_PATH"] = data_manager.basic_config["DATA_PATH"]
+    elif not no_prompt and confirm("Would you like to change the data location?", default=False):
+        data["DATA_PATH"] = get_data_dir(instance_name)
+        if confirm("Do you want to copy the data from old location?", default=True):
+            if not _copy_data(data):
+                print("Can't copy the data to non-empty location.")
+                if not confirm("Do you still want to use the new data location?"):
+                    data["DATA_PATH"] = data_manager.basic_config["DATA_PATH"]
+                    print("Data location will remain unchanged.")
+                    return
+            print("Old data has been copied over to the new location.")
+        print("Data location updated.")
+
+
+def _copy_data(data):
+    if Path(data["DATA_PATH"]).exists():
+        if any(os.scandir(data["DATA_PATH"])):
+            return False
+        else:
+            # this is needed because copytree doesn't work when destination folder exists
+            # Python 3.8 has `dirs_exist_ok` option for that
+            os.rmdir(data["DATA_PATH"])
+    shutil.copytree(data_manager.basic_config["DATA_PATH"], data["DATA_PATH"])
+    return True
+
+
+def handle_edit(cli_flags: Namespace):
+    """
+    This one exists to not log all the things like it's a full run of the bot.
+    """
+    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)
+    try:
+        driver_cls = drivers.get_driver_class()
+        loop.run_until_complete(driver_cls.initialize(**data_manager.storage_details()))
+        loop.run_until_complete(edit_instance(red, cli_flags))
+        loop.run_until_complete(driver_cls.teardown())
+    except (KeyboardInterrupt, EOFError):
+        print("Aborted!")
+    finally:
+        loop.run_until_complete(asyncio.sleep(1))
+        asyncio.set_event_loop(None)
+        loop.stop()
+        loop.close()
+        sys.exit(0)
+
+
+async def run_bot(red: Red, cli_flags: Namespace) -> None:
+    """
+    This runs the bot.
+    
+    Any shutdown which is a result of not being able to log in needs to raise
+    a SystemExit exception.
+
+    If the bot starts normally, the bot should be left to handle the exit case.
+    It will raise SystemExit in a task, which will reach the event loop and
+    interrupt running forever, then trigger our cleanup process, and does not
+    need additional handling in this function.
+    """
+
+    driver_cls = drivers.get_driver_class()
+
+    await driver_cls.initialize(**data_manager.storage_details())
+
     redbot.logging.init_logging(
         level=cli_flags.logging_level, location=data_manager.core_data_path() / "logs"
     )
@@ -108,71 +341,207 @@ def main():
     log.debug("Data Path: %s", data_manager._base_data_path())
     log.debug("Storage Type: %s", data_manager.storage_type())
 
-    red = Red(
-        cli_flags=cli_flags, description=description, dm_help=None, fetch_offline_members=True
-    )
-    loop = asyncio.get_event_loop()
-    loop.run_until_complete(red.maybe_update_config())
-    init_global_checks(red)
-    init_events(red, cli_flags)
+    # lib folder has to be in sys.path before trying to load any 3rd-party cog (GH-3061)
+    # We might want to change handling of requirements in Downloader at later date
+    LIB_PATH = data_manager.cog_data_path(raw_name="Downloader") / "lib"
+    LIB_PATH.mkdir(parents=True, exist_ok=True)
+    if str(LIB_PATH) not in sys.path:
+        sys.path.append(str(LIB_PATH))
 
-    red.add_cog(Core(red))
-    red.add_cog(CogManagerUI())
-    if cli_flags.dev:
-        red.add_cog(Dev())
-    # noinspection PyProtectedMember
-    loop.run_until_complete(modlog._init())
-    # noinspection PyProtectedMember
-    bank._init()
+        # "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 os.name == "posix":
-        loop.add_signal_handler(SIGTERM, lambda: asyncio.ensure_future(sigterm_handler(red, log)))
-    tmp_data = {}
-    loop.run_until_complete(_get_prefix_and_token(red, tmp_data))
-    token = os.environ.get("RED_TOKEN", tmp_data["token"])
     if cli_flags.token:
         token = cli_flags.token
-    prefix = cli_flags.prefix or tmp_data["prefix"]
+    else:
+        token = os.environ.get("RED_TOKEN", None)
+        if not token:
+            token = await red._config.token()
+
+    prefix = cli_flags.prefix or await red._config.prefix()
+
     if not (token and prefix):
         if cli_flags.no_prompt is False:
-            new_token = interactive_config(red, token_set=bool(token), prefix_set=bool(prefix))
+            new_token = await interactive_config(
+                red, token_set=bool(token), prefix_set=bool(prefix)
+            )
             if new_token:
                 token = new_token
         else:
             log.critical("Token and prefix must be set in order to login.")
             sys.exit(1)
-    loop.run_until_complete(_get_prefix_and_token(red, tmp_data))
 
     if cli_flags.dry_run:
-        loop.run_until_complete(red.http.close())
+        await red.http.close()
         sys.exit(0)
     try:
-        loop.run_until_complete(red.start(token, bot=True))
+        await red.start(token, bot=True, cli_flags=cli_flags)
     except discord.LoginFailure:
         log.critical("This token doesn't seem to be valid.")
-        db_token = loop.run_until_complete(red.db.token())
+        db_token = await red._config.token()
         if db_token and not cli_flags.no_prompt:
-            print("\nDo you want to reset the token? (y/n)")
-            if confirm("> "):
-                loop.run_until_complete(red.db.token.set(""))
+            if confirm("\nDo you want to reset the token?"):
+                await red._config.token.set("")
                 print("Token has been reset.")
-    except KeyboardInterrupt:
-        log.info("Keyboard interrupt detected. Quitting...")
-        loop.run_until_complete(red.logout())
-        red._shutdown_mode = ExitCodes.SHUTDOWN
-    except Exception as e:
-        log.critical("Fatal exception", exc_info=e)
-        loop.run_until_complete(red.logout())
-    finally:
-        pending = asyncio.Task.all_tasks(loop=red.loop)
-        gathered = asyncio.gather(*pending, loop=red.loop, return_exceptions=True)
-        gathered.cancel()
-        try:
-            loop.run_until_complete(red.rpc.close())
-        except AttributeError:
-            pass
+                sys.exit(0)
+        sys.exit(1)
 
-        sys.exit(red._shutdown_mode.value)
+    return None
+
+
+def handle_early_exit_flags(cli_flags: Namespace):
+    if cli_flags.list_instances:
+        list_instances()
+    elif cli_flags.version:
+        print("Red V3")
+        print("Current Version: {}".format(__version__))
+        sys.exit(0)
+    elif cli_flags.debuginfo:
+        debug_info()
+    elif not cli_flags.instance_name and (not cli_flags.no_instance or cli_flags.edit):
+        print("Error: No instance name was provided!")
+        sys.exit(1)
+
+
+async def shutdown_handler(red, signal_type=None, exit_code=None):
+    if signal_type:
+        log.info("%s received. Quitting...", signal_type)
+        # Do not collapse the below line into other logic
+        # We need to renter this function
+        # after it interrupts the event loop.
+        sys.exit(ExitCodes.SHUTDOWN)
+    elif exit_code is None:
+        log.info("Shutting down from unhandled exception")
+        red._shutdown_mode = ExitCodes.CRITICAL
+
+    if exit_code is not None:
+        red._shutdown_mode = exit_code
+
+    try:
+        await red.logout()
+    finally:
+        # Then cancels all outstanding tasks other than ourselves
+        pending = [t for t in asyncio.all_tasks() if t is not asyncio.current_task()]
+        [task.cancel() for task in pending]
+        await asyncio.gather(*pending, return_exceptions=True)
+
+
+def global_exception_handler(red, loop, context):
+    """
+    Logs unhandled exceptions in other tasks
+    """
+    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)
+
+
+def red_exception_handler(red, red_task: asyncio.Future):
+    """
+    This is set as a done callback for Red
+
+    must be used with functools.partial
+
+    If the main bot.run dies for some reason,
+    we don't want to swallow the exception and hang.
+    """
+    try:
+        red_task.result()
+    except (SystemExit, KeyboardInterrupt, asyncio.CancelledError):
+        pass  # Handled by the global_exception_handler, or cancellation
+    except Exception as exc:
+        log.critical("The main bot task didn't handle an exception and has crashed", exc_info=exc)
+        log.warning("Attempting to die as gracefully as possible...")
+        red.loop.create_task(shutdown_handler(red))
+
+
+def main():
+    red = None  # Error handling for users misusing the bot
+    cli_flags = parse_cli_flags(sys.argv[1:])
+    handle_early_exit_flags(cli_flags)
+    if cli_flags.edit:
+        handle_edit(cli_flags)
+        return
+    try:
+        loop = asyncio.new_event_loop()
+        asyncio.set_event_loop(loop)
+
+        if cli_flags.no_instance:
+            print(
+                "\033[1m"
+                "Warning: The data will be placed in a temporary folder and removed on next system "
+                "reboot."
+                "\033[0m"
+            )
+            cli_flags.instance_name = "temporary_red"
+            data_manager.create_temp_config()
+
+        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
+        )
+
+        if os.name != "nt":
+            # None of this works on windows.
+            # At least it's not a redundant handler...
+            signals = (signal.SIGHUP, signal.SIGTERM, signal.SIGINT)
+            for s in signals:
+                loop.add_signal_handler(
+                    s, lambda s=s: asyncio.create_task(shutdown_handler(red, s))
+                )
+
+        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
+        # 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)
+        fut.add_done_callback(r_exc_handler)
+        loop.run_forever()
+    except KeyboardInterrupt:
+        # We still have to catch this here too. (*joy*)
+        log.warning("Please do not use Ctrl+C to Shutdown Red! (attempting to die gracefully...)")
+        log.error("Received KeyboardInterrupt, treating as interrupt")
+        if red is not None:
+            loop.run_until_complete(shutdown_handler(red, signal.SIGINT))
+    except SystemExit as exc:
+        # We also have to catch this one here. Basically any exception which normally
+        # Kills the python interpreter (Base Exceptions minus asyncio.cancelled)
+        # We need to do something with prior to having the loop close
+        log.info("Shutting down with exit code: %s", exc.code)
+        if red is not None:
+            loop.run_until_complete(shutdown_handler(red, None, exc.code))
+    except Exception as exc:  # Non standard case.
+        log.exception("Unexpected exception (%s): ", type(exc), exc_info=exc)
+        if red is not None:
+            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
+        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
+        # with resources which require longer to clean up.
+        # With other event loops, a failure to cleanup prior to here
+        # results in a resource warning instead
+        log.info("Please wait, cleaning up a bit more")
+        loop.run_until_complete(asyncio.sleep(2))
+        asyncio.set_event_loop(None)
+        loop.stop()
+        loop.close()
+        exit_code = red._shutdown_mode if red is not None else 1
+        sys.exit(exit_code)
 
 
 if __name__ == "__main__":

redbot/cogs/admin/admin.py

@@ -7,7 +7,7 @@ from redbot.core import Config, checks, commands
 from redbot.core.i18n import Translator, cog_i18n
 from redbot.core.utils.chat_formatting import box
 from .announcer import Announcer
-from .converters import MemberDefaultAuthor, SelfRole
+from .converters import SelfRole
 
 log = logging.getLogger("red.admin")
 
@@ -19,27 +19,44 @@ GENERIC_FORBIDDEN = _(
     " Your command failed to successfully complete."
 )
 
-HIERARCHY_ISSUE = _(
-    "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."
+HIERARCHY_ISSUE_ADD = _(
+    "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."
 )
 
-USER_HIERARCHY_ISSUE = _(
-    "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."
+HIERARCHY_ISSUE_REMOVE = _(
+    "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."
+)
+
+ROLE_HIERARCHY_ISSUE = _(
+    "I can not edit {role.name}"
+    " because that role is higher than my or equal to highest role"
+    " in the Discord hierarchy."
+)
+
+USER_HIERARCHY_ISSUE_ADD = _(
+    "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."
+)
+
+USER_HIERARCHY_ISSUE_REMOVE = _(
+    "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."
 )
 
 ROLE_USER_HIERARCHY_ISSUE = _(
-    "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."
+    "I can not let you edit {role.name}"
+    " because that role is higher than or equal to your highest role"
+    " in the Discord hierarchy."
 )
 
+NEED_MANAGE_ROLES = _("I need manage roles permission to do that.")
+
 RUNNING_ANNOUNCEMENT = _(
     "I am already announcing something. If you would like to make a"
     " different announcement please use `{prefix}announce cancel`"
@@ -52,13 +69,12 @@ _ = T_
 class Admin(commands.Cog):
     """A collection of server administration utilities."""
 
-    def __init__(self, config=Config):
-        super().__init__()
-        self.conf = config.get_conf(self, 8237492837454039, force_registration=True)
+    def __init__(self):
+        self.config = Config.get_conf(self, 8237492837454039, force_registration=True)
 
-        self.conf.register_global(serverlocked=False)
+        self.config.register_global(serverlocked=False)
 
-        self.conf.register_guild(
+        self.config.register_guild(
             announce_ignore=False,
             announce_channel=None,  # Integer ID
             selfroles=[],  # List of integer ID's
@@ -72,10 +88,6 @@ class Admin(commands.Cog):
         except AttributeError:
             pass
 
-    @staticmethod
-    async def complain(ctx: commands.Context, message: str, **kwargs):
-        await ctx.send(message.format(**kwargs))
-
     def is_announcing(self) -> bool:
         """
         Is the bot currently announcing something?
@@ -104,18 +116,31 @@ class Admin(commands.Cog):
         :param role:
         :return:
         """
-        return ctx.author.top_role > role
+        return ctx.author.top_role > role or ctx.author == ctx.guild.owner
 
-    async def _addrole(self, ctx: commands.Context, member: discord.Member, role: discord.Role):
+    async def _addrole(
+        self, ctx: commands.Context, member: discord.Member, role: discord.Role, *, check_user=True
+    ):
+        if role in member.roles:
+            await ctx.send(
+                _("{member.display_name} already has the role {role.name}.").format(
+                    role=role, member=member
+                )
+            )
+            return
+        if check_user and not self.pass_user_hierarchy_check(ctx, role):
+            await ctx.send(_(USER_HIERARCHY_ISSUE_ADD).format(role=role, member=member))
+            return
+        if not self.pass_hierarchy_check(ctx, role):
+            await ctx.send(_(HIERARCHY_ISSUE_ADD).format(role=role, member=member))
+            return
+        if not ctx.guild.me.guild_permissions.manage_roles:
+            await ctx.send(_(NEED_MANAGE_ROLES))
+            return
         try:
             await member.add_roles(role)
         except discord.Forbidden:
-            if not self.pass_hierarchy_check(ctx, role):
-                await self.complain(
-                    ctx, T_(HIERARCHY_ISSUE), role=role, member=member, verb=_("add")
-                )
-            else:
-                await self.complain(ctx, T_(GENERIC_FORBIDDEN))
+            await ctx.send(_(GENERIC_FORBIDDEN))
         else:
             await ctx.send(
                 _("I successfully added {role.name} to {member.display_name}").format(
@@ -123,16 +148,29 @@ class Admin(commands.Cog):
                 )
             )
 
-    async def _removerole(self, ctx: commands.Context, member: discord.Member, role: discord.Role):
+    async def _removerole(
+        self, ctx: commands.Context, member: discord.Member, role: discord.Role, *, check_user=True
+    ):
+        if role not in member.roles:
+            await ctx.send(
+                _("{member.display_name} does not have the role {role.name}.").format(
+                    role=role, member=member
+                )
+            )
+            return
+        if check_user and not self.pass_user_hierarchy_check(ctx, role):
+            await ctx.send(_(USER_HIERARCHY_ISSUE_REMOVE).format(role=role, member=member))
+            return
+        if not self.pass_hierarchy_check(ctx, role):
+            await ctx.send(_(HIERARCHY_ISSUE_REMOVE).format(role=role, member=member))
+            return
+        if not ctx.guild.me.guild_permissions.manage_roles:
+            await ctx.send(_(NEED_MANAGE_ROLES))
+            return
         try:
             await member.remove_roles(role)
         except discord.Forbidden:
-            if not self.pass_hierarchy_check(ctx, role):
-                await self.complain(
-                    ctx, T_(HIERARCHY_ISSUE), role=role, member=member, verb=_("remove")
-                )
-            else:
-                await self.complain(ctx, T_(GENERIC_FORBIDDEN))
+            await ctx.send(_(GENERIC_FORBIDDEN))
         else:
             await ctx.send(
                 _("I successfully removed {role.name} from {member.display_name}").format(
@@ -144,41 +182,33 @@ class Admin(commands.Cog):
     @commands.guild_only()
     @checks.admin_or_permissions(manage_roles=True)
     async def addrole(
-        self, ctx: commands.Context, rolename: discord.Role, *, user: MemberDefaultAuthor = None
+        self, ctx: commands.Context, rolename: discord.Role, *, user: discord.Member = None
     ):
-        """Add a role to a user.
+        """
+        Add a role to a user.
 
+        Use double quotes if the role contains spaces.
         If user is left blank it defaults to the author of the command.
         """
         if user is None:
             user = ctx.author
-        if self.pass_user_hierarchy_check(ctx, rolename):
-            # noinspection PyTypeChecker
-            await self._addrole(ctx, user, rolename)
-        else:
-            await self.complain(
-                ctx, T_(USER_HIERARCHY_ISSUE), member=user, role=rolename, verb=_("add")
-            )
+        await self._addrole(ctx, user, rolename)
 
     @commands.command()
     @commands.guild_only()
     @checks.admin_or_permissions(manage_roles=True)
     async def removerole(
-        self, ctx: commands.Context, rolename: discord.Role, *, user: MemberDefaultAuthor = None
+        self, ctx: commands.Context, rolename: discord.Role, *, user: discord.Member = None
     ):
-        """Remove a role from a user.
+        """
+        Remove a role from a user.
 
+        Use double quotes if the role contains spaces.
         If user is left blank it defaults to the author of the command.
         """
         if user is None:
             user = ctx.author
-        if self.pass_user_hierarchy_check(ctx, rolename):
-            # noinspection PyTypeChecker
-            await self._removerole(ctx, user, rolename)
-        else:
-            await self.complain(
-                ctx, T_(USER_HIERARCHY_ISSUE), member=user, role=rolename, verb=_("remove")
-            )
+        await self._removerole(ctx, user, rolename)
 
     @commands.group()
     @commands.guild_only()
@@ -191,7 +221,8 @@ class Admin(commands.Cog):
     async def editrole_colour(
         self, ctx: commands.Context, role: discord.Role, value: discord.Colour
     ):
-        """Edit a role's colour.
+        """
+        Edit a role's colour.
 
         Use double quotes if the role contains spaces.
         Colour must be in hexadecimal format.
@@ -205,25 +236,30 @@ class Admin(commands.Cog):
         reason = "{}({}) changed the colour of role '{}'".format(author.name, author.id, role.name)
 
         if not self.pass_user_hierarchy_check(ctx, role):
-            await self.complain(ctx, T_(ROLE_USER_HIERARCHY_ISSUE), role=role)
+            await ctx.send(_(ROLE_USER_HIERARCHY_ISSUE).format(role=role))
+            return
+        if not self.pass_hierarchy_check(ctx, role):
+            await ctx.send(_(ROLE_HIERARCHY_ISSUE).format(role=role))
+            return
+        if not ctx.guild.me.guild_permissions.manage_roles:
+            await ctx.send(_(NEED_MANAGE_ROLES))
             return
-
         try:
             await role.edit(reason=reason, color=value)
         except discord.Forbidden:
-            await self.complain(ctx, T_(GENERIC_FORBIDDEN))
+            await ctx.send(_(GENERIC_FORBIDDEN))
         else:
             log.info(reason)
             await ctx.send(_("Done."))
 
     @editrole.command(name="name")
-    @checks.admin_or_permissions(administrator=True)
-    async def edit_role_name(self, ctx: commands.Context, role: discord.Role, *, name: str):
-        """Edit a role's name.
+    async def edit_role_name(self, ctx: commands.Context, role: discord.Role, name: str):
+        """
+        Edit a role's name.
 
         Use double quotes if the role or the name contain spaces.
 
-        Examples:
+        Example:
             `[p]editrole name \"The Transistor\" Test`
         """
         author = ctx.message.author
@@ -233,13 +269,18 @@ class Admin(commands.Cog):
         )
 
         if not self.pass_user_hierarchy_check(ctx, role):
-            await self.complain(ctx, T_(ROLE_USER_HIERARCHY_ISSUE), role=role)
+            await ctx.send(_(ROLE_USER_HIERARCHY_ISSUE).format(role=role))
+            return
+        if not self.pass_hierarchy_check(ctx, role):
+            await ctx.send(_(ROLE_HIERARCHY_ISSUE).format(role=role))
+            return
+        if not ctx.guild.me.guild_permissions.manage_roles:
+            await ctx.send(_(NEED_MANAGE_ROLES))
             return
-
         try:
             await role.edit(reason=reason, name=name)
         except discord.Forbidden:
-            await self.complain(ctx, T_(GENERIC_FORBIDDEN))
+            await ctx.send(_(GENERIC_FORBIDDEN))
         else:
             log.info(reason)
             await ctx.send(_("Done."))
@@ -249,49 +290,52 @@ 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
-            await self.complain(ctx, T_(RUNNING_ANNOUNCEMENT), prefix=prefix)
+            prefix = ctx.clean_prefix
+            await ctx.send(_(RUNNING_ANNOUNCEMENT).format(prefix=prefix))
 
     @announce.command(name="cancel")
-    @checks.is_owner()
     async def announce_cancel(self, ctx):
         """Cancel a running announce."""
-        try:
-            self.__current_announcer.cancel()
-        except AttributeError:
-            pass
-
+        if not self.is_announcing():
+            await ctx.send(_("There is no currently running announcement."))
+            return
+        self.__current_announcer.cancel()
         await ctx.send(_("The current announcement has been cancelled."))
 
-    @announce.command(name="channel")
+    @commands.group()
     @commands.guild_only()
     @checks.guildowner_or_permissions(administrator=True)
-    async def announce_channel(self, ctx, *, channel: discord.TextChannel = None):
-        """Change the channel to which the bot makes announcements."""
+    async def announceset(self, ctx):
+        """Change how announcements are sent in this guild."""
+        pass
+
+    @announceset.command(name="channel")
+    async def announceset_channel(self, ctx, *, channel: discord.TextChannel = None):
+        """
+        Change the channel where the bot will send announcements.
+        
+        If channel is left blank it defaults to the current channel.
+        """
         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)
         )
 
-    @announce.command(name="ignore")
-    @commands.guild_only()
-    @checks.guildowner_or_permissions(administrator=True)
-    async def announce_ignore(self, ctx):
+    @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:  # Keeping original logic....
+        ignored = await self.config.guild(ctx.guild).announce_ignore()
+        await self.config.guild(ctx.guild).announce_ignore.set(not ignored)
+        if ignored:
             await ctx.send(
                 _("The server {guild.name} will receive announcements.").format(guild=ctx.guild)
             )
@@ -304,67 +348,49 @@ class Admin(commands.Cog):
 
     async def _valid_selfroles(self, guild: discord.Guild) -> Tuple[discord.Role]:
         """
-        Returns a list of valid selfroles
+        Returns a tuple of valid selfroles
         :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
 
     @commands.guild_only()
-    @commands.group(invoke_without_command=True)
-    async def selfrole(self, ctx: commands.Context, *, selfrole: SelfRole):
-        """Add a role to yourself.
+    @commands.group()
+    async def selfrole(self, ctx: commands.Context):
+        """Apply selfroles."""
+        pass
+
+    @selfrole.command(name="add")
+    async def selfrole_add(self, ctx: commands.Context, *, selfrole: SelfRole):
+        """
+        Add a selfrole to yourself.
 
         Server admins must have configured the role as user settable.
-
         NOTE: The role is case sensitive!
         """
         # noinspection PyTypeChecker
-        await self._addrole(ctx, ctx.author, selfrole)
+        await self._addrole(ctx, ctx.author, selfrole, check_user=False)
 
     @selfrole.command(name="remove")
     async def selfrole_remove(self, ctx: commands.Context, *, selfrole: SelfRole):
-        """Remove a selfrole from yourself.
+        """
+        Remove a selfrole from yourself.
 
+        Server admins must have configured the role as user settable.
         NOTE: The role is case sensitive!
         """
         # noinspection PyTypeChecker
-        await self._removerole(ctx, ctx.author, selfrole)
-
-    @selfrole.command(name="add")
-    @checks.admin_or_permissions(manage_roles=True)
-    async def selfrole_add(self, ctx: commands.Context, *, role: discord.Role):
-        """Add a role to the list of available selfroles.
-
-        NOTE: The role is case sensitive!
-        """
-        async with self.conf.guild(ctx.guild).selfroles() as curr_selfroles:
-            if role.id not in curr_selfroles:
-                curr_selfroles.append(role.id)
-
-        await ctx.send(_("The selfroles list has been successfully modified."))
-
-    @selfrole.command(name="delete")
-    @checks.admin_or_permissions(manage_roles=True)
-    async def selfrole_delete(self, ctx: commands.Context, *, role: SelfRole):
-        """Remove a role from the list of available selfroles.
-
-        NOTE: The role is case sensitive!
-        """
-        async with self.conf.guild(ctx.guild).selfroles() as curr_selfroles:
-            curr_selfroles.remove(role.id)
-
-        await ctx.send(_("The selfroles list has been successfully modified."))
+        await self._removerole(ctx, ctx.author, selfrole, check_user=False)
 
     @selfrole.command(name="list")
     async def selfrole_list(self, ctx: commands.Context):
@@ -374,26 +400,66 @@ class Admin(commands.Cog):
         selfroles = await self._valid_selfroles(ctx.guild)
         fmt_selfroles = "\n".join(["+ " + r.name for r in selfroles])
 
+        if not fmt_selfroles:
+            await ctx.send("There are currently no selfroles.")
+            return
+
         msg = _("Available Selfroles:\n{selfroles}").format(selfroles=fmt_selfroles)
         await ctx.send(box(msg, "diff"))
 
-    async def _serverlock_check(self, guild: discord.Guild) -> bool:
+    @commands.group()
+    @checks.admin_or_permissions(manage_roles=True)
+    async def selfroleset(self, ctx: commands.Context):
+        """Manage selfroles."""
+        pass
+
+    @selfroleset.command(name="add")
+    async def selfroleset_add(self, ctx: commands.Context, *, role: discord.Role):
         """
-        Checks if serverlocked is enabled.
-        :param guild:
-        :return: True if locked and left server
+        Add a role to the list of available selfroles.
+
+        NOTE: The role is case sensitive!
         """
-        if await self.conf.serverlocked():
-            await guild.leave()
-            return True
-        return False
+        if not self.pass_user_hierarchy_check(ctx, role):
+            await ctx.send(
+                _(
+                    "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."
+                ).format(role=role)
+            )
+            return
+        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."))
+                return
+
+        await ctx.send(_("That role is already a selfrole."))
+
+    @selfroleset.command(name="remove")
+    async def selfroleset_remove(self, ctx: commands.Context, *, role: SelfRole):
+        """
+        Remove a role from the list of available selfroles.
+
+        NOTE: The role is case sensitive!
+        """
+        if not self.pass_user_hierarchy_check(ctx, role):
+            await ctx.send(
+                _(
+                    "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."
+                ).format(role=role)
+            )
+            return
+        async with self.config.guild(ctx.guild).selfroles() as curr_selfroles:
+            curr_selfroles.remove(role.id)
+
+        await ctx.send(_("Removed."))
 
     @commands.command()
     @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."))
@@ -401,9 +467,10 @@ 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._serverlock_check(guild):
-            return
+        if await self.config.serverlocked():
+            await guild.leave()
 
 
 # endregion

redbot/cogs/admin/announcer.py

@@ -3,6 +3,8 @@ import asyncio
 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__)
 
@@ -53,8 +55,8 @@ class Announcer:
 
     async def announcer(self):
         guild_list = self.ctx.bot.guilds
-        bot_owner = (await self.ctx.bot.application_info()).owner
-        for g in guild_list:
+        failed = []
+        async for g in AsyncIter(guild_list, delay=0.5):
             if not self.active:
                 return
 
@@ -66,9 +68,14 @@ class Announcer:
             try:
                 await channel.send(self.message)
             except discord.Forbidden:
-                await bot_owner.send(
-                    _("I could not announce to server: {server.id}").format(server=g)
-                )
-            await asyncio.sleep(0.5)
+                failed.append(str(g.id))
 
+        if failed:
+            msg = (
+                _("I could not announce to the following server: ")
+                if len(failed) == 1
+                else _("I could not announce to the following servers: ")
+            )
+            msg += humanize_list(tuple(map(inline, failed)))
+            await self.ctx.bot.send_to_owners(msg)
         self.active = False

redbot/cogs/admin/converters.py

@@ -5,31 +5,17 @@ from redbot.core.i18n import Translator
 _ = Translator("AdminConverters", __file__)
 
 
-class MemberDefaultAuthor(commands.Converter):
-    async def convert(self, ctx: commands.Context, arg: str) -> discord.Member:
-        member_converter = commands.MemberConverter()
-        try:
-            member = await member_converter.convert(ctx, arg)
-        except commands.BadArgument:
-            if arg.strip() != "":
-                raise
-            else:
-                member = ctx.author
-        return member
-
-
 class SelfRole(commands.Converter):
     async def convert(self, ctx: commands.Context, arg: str) -> discord.Role:
         admin = ctx.command.cog
         if admin is None:
             raise commands.BadArgument(_("The Admin cog is not loaded."))
 
-        conf = admin.conf
-        selfroles = await conf.guild(ctx.guild).selfroles()
-
         role_converter = commands.RoleConverter()
         role = await role_converter.convert(ctx, arg)
 
+        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."))
         return role

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

@@ -0,0 +1,240 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: red-discordbot\n"
+"POT-Creation-Date: 2020-04-23 12:07+0000\n"
+"Last-Translator: \n"
+"Language-Team: Afrikaans\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: af\n"
+"X-Crowdin-File-ID: 42\n"
+"Language: af_ZA\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 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:28
+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:34
+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:40
+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:46
+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:52
+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:58
+msgid "I need manage roles permission to do that."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:60
+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:70
+#, docstring
+msgid "A collection of server administration utilities."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:126
+msgid "{member.display_name} already has the role {role.name}."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:146
+msgid "I successfully added {role.name} to {member.display_name}"
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:156
+msgid "{member.display_name} does not have the role {role.name}."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:176
+msgid "I successfully removed {role.name} from {member.display_name}"
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:187
+#, 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:203
+#, 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:217
+#, docstring
+msgid "Edit role settings."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:224
+#, 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:253 redbot/cogs/admin/admin.py:286
+msgid "Done."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:257
+#, 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:291
+#, docstring
+msgid "Announce a message to all servers the bot is in."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:298
+msgid "The announcement has begun."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:305
+#, docstring
+msgid "Cancel a running announce."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:307
+msgid "There is no currently running announcement."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:310
+msgid "The current announcement has been cancelled."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:316
+#, docstring
+msgid "Change how announcements are sent in this guild."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:321
+#, 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:330
+msgid "The announcement channel has been set to {channel.mention}"
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:335
+#, docstring
+msgid "Toggle announcements being enabled this server."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:340
+msgid "The server {guild.name} will receive announcements."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:344
+msgid "The server {guild.name} will not receive announcements."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:370
+#, docstring
+msgid "Apply selfroles."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:375
+#, 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:386
+#, 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:397
+#, docstring
+msgid "\\n        Lists all available selfroles.\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:407
+msgid "Available Selfroles:\\n{selfroles}"
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:413
+#, docstring
+msgid "Manage selfroles."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:418
+#, 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:425
+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:433
+msgid "Added."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:436
+msgid "That role is already a selfrole."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:440
+#, 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:447
+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:455
+msgid "Removed."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:460
+#, docstring
+msgid "Lock a bot to its current servers only."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:465
+msgid "The bot is no longer serverlocked."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:467
+msgid "The bot is now serverlocked."
+msgstr ""
+
+#: redbot/cogs/admin/announcer.py:75
+msgid "I could not announce to the following server: "
+msgstr ""
+
+#: redbot/cogs/admin/announcer.py:77
+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/ar-SA.po

@@ -1,19 +1,18 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2019-07-05 22:33+0200\n"
-"PO-Revision-Date: 2019-07-06 16:12\n"
-"Last-Translator: Robert Jansen (Kowlin)\n"
+"POT-Creation-Date: 2020-04-23 12:07+0000\n"
+"Last-Translator: \n"
 "Language-Team: Arabic\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: redgettext 3.0\n"
+"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-Generator: crowdin.com\n"
 "X-Crowdin-Project: red-discordbot\n"
+"X-Crowdin-Project-ID: 289505\n"
 "X-Crowdin-Language: ar\n"
-"X-Crowdin-File: /cogs/admin/locales/messages.pot\n"
+"X-Crowdin-File-ID: 42\n"
 "Language: ar_SA\n"
 
 #: redbot/cogs/admin/admin.py:17
@@ -21,166 +20,221 @@ msgid "I attempted to do something that Discord denied me permissions for. Your
 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."
+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."
+#: redbot/cogs/admin/admin.py:28
+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:34
+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:40
+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:46
+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:52
+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:58
+msgid "I need manage roles permission to do that."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:60
 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:70
 #, 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:126
+msgid "{member.display_name} already has the role {role.name}."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:121
+#: redbot/cogs/admin/admin.py:146
 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"
+#: redbot/cogs/admin/admin.py:156
+msgid "{member.display_name} does not have the role {role.name}."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:138
+#: redbot/cogs/admin/admin.py:176
 msgid "I successfully removed {role.name} from {member.display_name}"
 msgstr "لقد قمت بنجاح بإزالة {role.name} من {member.display_name}"
 
-#: 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 "\\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:203
+#, 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:217
+#, docstring
 msgid "Edit role settings."
 msgstr "تعديل إعدادات الرتبة."
 
-#: redbot/cogs/admin/admin.py:194
+#: redbot/cogs/admin/admin.py:224
 #, 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:253 redbot/cogs/admin/admin.py:286
 msgid "Done."
 msgstr "تم."
 
-#: redbot/cogs/admin/admin.py:222
+#: redbot/cogs/admin/admin.py:257
 #, 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:291
 #, docstring
 msgid "Announce a message to all servers the bot is in."
 msgstr "الإعلان عن رسالة إلى جميع السيرفرات المتواجد بها البوت."
 
-#: redbot/cogs/admin/admin.py:257
+#: redbot/cogs/admin/admin.py:298
 msgid "The announcement has begun."
 msgstr "تم البدء في الإعلان."
 
-#: redbot/cogs/admin/admin.py:265
+#: redbot/cogs/admin/admin.py:305
 #, docstring
 msgid "Cancel a running announce."
 msgstr "إلغاء إعلان جارٍ."
 
-#: redbot/cogs/admin/admin.py:271
+#: redbot/cogs/admin/admin.py:307
+msgid "There is no currently running announcement."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:310
 msgid "The current announcement has been cancelled."
 msgstr "تم إلغاء الإعلان الحالي."
 
-#: redbot/cogs/admin/admin.py:277
+#: redbot/cogs/admin/admin.py:316
 #, 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:321
+#, 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:330
 msgid "The announcement channel has been set to {channel.mention}"
 msgstr "تم تحديث قناة الإعلانات إلى {channel.mention}"
 
-#: redbot/cogs/admin/admin.py:290
+#: redbot/cogs/admin/admin.py:335
 #, docstring
 msgid "Toggle announcements being enabled this server."
 msgstr "تم تمكين الإعلانات في السيرفر."
 
-#: redbot/cogs/admin/admin.py:296
+#: redbot/cogs/admin/admin.py:340
 msgid "The server {guild.name} will receive announcements."
 msgstr "سيرفر {guild.name} سيتلقى إعلانات الآن."
 
-#: redbot/cogs/admin/admin.py:300
+#: redbot/cogs/admin/admin.py:344
 msgid "The server {guild.name} will not receive announcements."
 msgstr "سيرفر {guild.name} لن يتلقى إعلانات."
 
-#: redbot/cogs/admin/admin.py:326
+#: redbot/cogs/admin/admin.py:370
 #, 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        "
+msgid "Apply selfroles."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:337
+#: redbot/cogs/admin/admin.py:375
 #, docstring
-msgid "Remove a selfrole from yourself.\\n\\n        NOTE: The role is case sensitive!\\n        "
+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:347
+#: redbot/cogs/admin/admin.py:386
 #, docstring
-msgid "Add a role to the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
+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: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
+#: redbot/cogs/admin/admin.py:397
 #, docstring
 msgid "\\n        Lists all available selfroles.\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:377
+#: redbot/cogs/admin/admin.py:407
 msgid "Available Selfroles:\\n{selfroles}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:394
+#: redbot/cogs/admin/admin.py:413
+#, docstring
+msgid "Manage selfroles."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:418
+#, 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:425
+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:433
+msgid "Added."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:436
+msgid "That role is already a selfrole."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:440
+#, 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:447
+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:455
+msgid "Removed."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:460
 #, docstring
 msgid "Lock a bot to its current servers only."
 msgstr "قفل البوت للسيرفر الحالي فقط."
 
-#: redbot/cogs/admin/admin.py:399
+#: redbot/cogs/admin/admin.py:465
 msgid "The bot is no longer serverlocked."
 msgstr "لم يعد البوت مقفول للسيرفر الحالي فقط."
 
-#: redbot/cogs/admin/admin.py:401
+#: redbot/cogs/admin/admin.py:467
 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:75
+msgid "I could not announce to the following server: "
+msgstr ""
 
-#: redbot/cogs/admin/converters.py:25
+#: redbot/cogs/admin/announcer.py:77
+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,19 +1,18 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2019-07-05 22:33+0200\n"
-"PO-Revision-Date: 2019-07-06 16:12\n"
-"Last-Translator: Robert Jansen (Kowlin)\n"
+"POT-Creation-Date: 2020-04-23 12:07+0000\n"
+"Last-Translator: \n"
 "Language-Team: Bulgarian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: redgettext 3.0\n"
+"Generated-By: redgettext 3.1\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: red-discordbot\n"
+"X-Crowdin-Project-ID: 289505\n"
 "X-Crowdin-Language: bg\n"
-"X-Crowdin-File: /cogs/admin/locales/messages.pot\n"
+"X-Crowdin-File-ID: 42\n"
 "Language: bg_BG\n"
 
 #: redbot/cogs/admin/admin.py:17
@@ -21,166 +20,221 @@ msgid "I attempted to do something that Discord denied me permissions for. Your
 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."
+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."
+#: redbot/cogs/admin/admin.py:28
+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:34
+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:40
+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:46
+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:52
+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:58
+msgid "I need manage roles permission to do that."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:60
 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
+#: redbot/cogs/admin/admin.py:70
 #, 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:126
+msgid "{member.display_name} already has the role {role.name}."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:121
+#: redbot/cogs/admin/admin.py:146
 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:156
+msgid "{member.display_name} does not have the role {role.name}."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:138
+#: redbot/cogs/admin/admin.py:176
 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 "\\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:203
+#, 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:217
+#, docstring
 msgid "Edit role settings."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:194
+#: redbot/cogs/admin/admin.py:224
 #, 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:253 redbot/cogs/admin/admin.py:286
 msgid "Done."
 msgstr "Завършено."
 
-#: redbot/cogs/admin/admin.py:222
+#: redbot/cogs/admin/admin.py:257
 #, 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:291
 #, docstring
 msgid "Announce a message to all servers the bot is in."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:257
+#: redbot/cogs/admin/admin.py:298
 msgid "The announcement has begun."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:265
+#: redbot/cogs/admin/admin.py:305
 #, docstring
 msgid "Cancel a running announce."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:271
+#: redbot/cogs/admin/admin.py:307
+msgid "There is no currently running announcement."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:310
 msgid "The current announcement has been cancelled."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:277
+#: redbot/cogs/admin/admin.py:316
 #, 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:321
+#, 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:330
 msgid "The announcement channel has been set to {channel.mention}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:290
+#: redbot/cogs/admin/admin.py:335
 #, docstring
 msgid "Toggle announcements being enabled this server."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:296
+#: redbot/cogs/admin/admin.py:340
 msgid "The server {guild.name} will receive announcements."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:300
+#: redbot/cogs/admin/admin.py:344
 msgid "The server {guild.name} will not receive announcements."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:326
+#: redbot/cogs/admin/admin.py:370
 #, 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        "
+msgid "Apply selfroles."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:337
+#: redbot/cogs/admin/admin.py:375
 #, docstring
-msgid "Remove a selfrole from yourself.\\n\\n        NOTE: The role is case sensitive!\\n        "
+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:347
+#: redbot/cogs/admin/admin.py:386
 #, docstring
-msgid "Add a role to the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
+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: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
+#: redbot/cogs/admin/admin.py:397
 #, docstring
 msgid "\\n        Lists all available selfroles.\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:377
+#: redbot/cogs/admin/admin.py:407
 msgid "Available Selfroles:\\n{selfroles}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:394
+#: redbot/cogs/admin/admin.py:413
+#, docstring
+msgid "Manage selfroles."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:418
+#, 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:425
+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:433
+msgid "Added."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:436
+msgid "That role is already a selfrole."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:440
+#, 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:447
+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:455
+msgid "Removed."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:460
 #, docstring
 msgid "Lock a bot to its current servers only."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:399
+#: redbot/cogs/admin/admin.py:465
 msgid "The bot is no longer serverlocked."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:401
+#: redbot/cogs/admin/admin.py:467
 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:75
+msgid "I could not announce to the following server: "
 msgstr ""
 
-#: redbot/cogs/admin/converters.py:25
+#: redbot/cogs/admin/announcer.py:77
+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/ca-ES.po

@@ -0,0 +1,240 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: red-discordbot\n"
+"POT-Creation-Date: 2020-04-23 12:07+0000\n"
+"Last-Translator: \n"
+"Language-Team: Catalan\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: ca\n"
+"X-Crowdin-File-ID: 42\n"
+"Language: ca_ES\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 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:28
+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:34
+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:40
+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:46
+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:52
+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:58
+msgid "I need manage roles permission to do that."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:60
+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:70
+#, docstring
+msgid "A collection of server administration utilities."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:126
+msgid "{member.display_name} already has the role {role.name}."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:146
+msgid "I successfully added {role.name} to {member.display_name}"
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:156
+msgid "{member.display_name} does not have the role {role.name}."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:176
+msgid "I successfully removed {role.name} from {member.display_name}"
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:187
+#, 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:203
+#, 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:217
+#, docstring
+msgid "Edit role settings."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:224
+#, 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:253 redbot/cogs/admin/admin.py:286
+msgid "Done."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:257
+#, 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:291
+#, docstring
+msgid "Announce a message to all servers the bot is in."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:298
+msgid "The announcement has begun."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:305
+#, docstring
+msgid "Cancel a running announce."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:307
+msgid "There is no currently running announcement."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:310
+msgid "The current announcement has been cancelled."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:316
+#, docstring
+msgid "Change how announcements are sent in this guild."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:321
+#, 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:330
+msgid "The announcement channel has been set to {channel.mention}"
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:335
+#, docstring
+msgid "Toggle announcements being enabled this server."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:340
+msgid "The server {guild.name} will receive announcements."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:344
+msgid "The server {guild.name} will not receive announcements."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:370
+#, docstring
+msgid "Apply selfroles."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:375
+#, 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:386
+#, 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:397
+#, docstring
+msgid "\\n        Lists all available selfroles.\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:407
+msgid "Available Selfroles:\\n{selfroles}"
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:413
+#, docstring
+msgid "Manage selfroles."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:418
+#, 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:425
+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:433
+msgid "Added."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:436
+msgid "That role is already a selfrole."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:440
+#, 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:447
+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:455
+msgid "Removed."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:460
+#, docstring
+msgid "Lock a bot to its current servers only."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:465
+msgid "The bot is no longer serverlocked."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:467
+msgid "The bot is now serverlocked."
+msgstr ""
+
+#: redbot/cogs/admin/announcer.py:75
+msgid "I could not announce to the following server: "
+msgstr ""
+
+#: redbot/cogs/admin/announcer.py:77
+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/cs-CZ.po

@@ -1,19 +1,18 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2019-07-05 22:33+0200\n"
-"PO-Revision-Date: 2019-07-14 02:15\n"
-"Last-Translator: Robert Jansen (Kowlin)\n"
+"POT-Creation-Date: 2020-04-23 12:07+0000\n"
+"Last-Translator: \n"
 "Language-Team: Czech\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: redgettext 3.0\n"
+"Generated-By: redgettext 3.1\n"
 "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 3;\n"
-"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: red-discordbot\n"
+"X-Crowdin-Project-ID: 289505\n"
 "X-Crowdin-Language: cs\n"
-"X-Crowdin-File: /cogs/admin/locales/messages.pot\n"
+"X-Crowdin-File-ID: 42\n"
 "Language: cs_CZ\n"
 
 #: redbot/cogs/admin/admin.py:17
@@ -21,166 +20,221 @@ msgid "I attempted to do something that Discord denied me permissions for. Your
 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 ""
+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 ""
+#: redbot/cogs/admin/admin.py:28
+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 ""
+#: redbot/cogs/admin/admin.py:34
+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:40
+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:46
+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:52
+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:58
+msgid "I need manage roles permission to do that."
+msgstr "K tomu potřebuji oprávnění spravovat role."
+
+#: redbot/cogs/admin/admin.py:60
 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:70
 #, 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 ""
+#: redbot/cogs/admin/admin.py:126
+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:146
 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 ""
+#: redbot/cogs/admin/admin.py:156
+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:176
 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
-#, 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 "\\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:203
+#, 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        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:217
+#, docstring
 msgid "Edit role settings."
 msgstr "Upraví nastavení role."
 
-#: redbot/cogs/admin/admin.py:194
+#: redbot/cogs/admin/admin.py:224
 #, 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       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:253 redbot/cogs/admin/admin.py:286
 msgid "Done."
 msgstr "Hotovo."
 
-#: redbot/cogs/admin/admin.py:222
+#: redbot/cogs/admin/admin.py:257
 #, 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        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:291
 #, docstring
 msgid "Announce a message to all servers the bot is in."
-msgstr ""
+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:298
 msgid "The announcement has begun."
-msgstr ""
+msgstr "Oznámení začalo."
 
-#: redbot/cogs/admin/admin.py:265
+#: redbot/cogs/admin/admin.py:305
 #, docstring
 msgid "Cancel a running announce."
-msgstr ""
+msgstr "Zrušit běžící oznámení."
 
-#: redbot/cogs/admin/admin.py:271
+#: redbot/cogs/admin/admin.py:307
+msgid "There is no currently running announcement."
+msgstr "V současné době neexistuje žádné spuštěné oznámení."
+
+#: redbot/cogs/admin/admin.py:310
 msgid "The current announcement has been cancelled."
-msgstr ""
+msgstr "Momentální oznámení bylo zrušeno."
 
-#: redbot/cogs/admin/admin.py:277
+#: redbot/cogs/admin/admin.py:316
 #, docstring
-msgid "Change the channel to which the bot makes announcements."
-msgstr ""
+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:321
+#, 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        Změňte kanál, kde bude bot odesílat oznámení.\\n        \\n        Pokud je kanál ponechán prázdný, výchozí je aktuální kanál.\\n        "
+
+#: redbot/cogs/admin/admin.py:330
 msgid "The announcement channel has been set to {channel.mention}"
-msgstr ""
+msgstr "Kanál pro oznámení byl nastaven na {channel.mention}"
 
-#: redbot/cogs/admin/admin.py:290
+#: redbot/cogs/admin/admin.py:335
 #, docstring
 msgid "Toggle announcements being enabled this server."
-msgstr ""
+msgstr "Zapne oznamování na tomto serveru."
 
-#: redbot/cogs/admin/admin.py:296
+#: redbot/cogs/admin/admin.py:340
 msgid "The server {guild.name} will receive announcements."
-msgstr ""
+msgstr "Server {guild.name} obdrží oznámení."
 
-#: redbot/cogs/admin/admin.py:300
+#: redbot/cogs/admin/admin.py:344
 msgid "The server {guild.name} will not receive announcements."
-msgstr ""
+msgstr "Server {guild.name} nebude dostávat oznámení."
 
-#: redbot/cogs/admin/admin.py:326
+#: redbot/cogs/admin/admin.py:370
 #, 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 ""
+msgid "Apply selfroles."
+msgstr "Aplikovat self-role."
 
-#: redbot/cogs/admin/admin.py:337
+#: redbot/cogs/admin/admin.py:375
 #, docstring
-msgid "Remove a selfrole from yourself.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr ""
+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:347
+#: redbot/cogs/admin/admin.py:386
 #, docstring
-msgid "Add a role to the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr ""
+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: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
+#: redbot/cogs/admin/admin.py:397
 #, docstring
 msgid "\\n        Lists all available selfroles.\\n        "
-msgstr ""
+msgstr "\\n        Seznam všech dostupných self-rolí.\\n        "
 
-#: redbot/cogs/admin/admin.py:377
+#: redbot/cogs/admin/admin.py:407
 msgid "Available Selfroles:\\n{selfroles}"
-msgstr ""
+msgstr "Dostupné vlastní role:\\n{selfroles}"
 
-#: redbot/cogs/admin/admin.py:394
+#: redbot/cogs/admin/admin.py:413
+#, docstring
+msgid "Manage selfroles."
+msgstr "Spravovat self-role."
+
+#: redbot/cogs/admin/admin.py:418
+#, 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:425
+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:433
+msgid "Added."
+msgstr "Přidáno."
+
+#: redbot/cogs/admin/admin.py:436
+msgid "That role is already a selfrole."
+msgstr "Tato role je již self-rolí."
+
+#: redbot/cogs/admin/admin.py:440
+#, 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:447
+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:455
+msgid "Removed."
+msgstr "Odstraněno."
+
+#: redbot/cogs/admin/admin.py:460
 #, docstring
 msgid "Lock a bot to its current servers only."
-msgstr ""
+msgstr "Uzamkne bota pouze na jeho aktuální servery."
 
-#: redbot/cogs/admin/admin.py:399
+#: redbot/cogs/admin/admin.py:465
 msgid "The bot is no longer serverlocked."
-msgstr ""
+msgstr "Bot již není uzamčen na server."
 
-#: redbot/cogs/admin/admin.py:401
+#: redbot/cogs/admin/admin.py:467
 msgid "The bot is now serverlocked."
-msgstr ""
+msgstr "Bot je nyní serverem uzamčen."
 
-#: redbot/cogs/admin/announcer.py:70
-msgid "I could not announce to server: {server.id}"
-msgstr ""
+#: redbot/cogs/admin/announcer.py:75
+msgid "I could not announce to the following server: "
+msgstr "Nemohu oznámit následujícímu serveru: "
 
-#: redbot/cogs/admin/converters.py:25
+#: redbot/cogs/admin/announcer.py:77
+msgid "I could not announce to the following servers: "
+msgstr "Nemohu oznámit následujícím serverům: "
+
+#: redbot/cogs/admin/converters.py:12
 msgid "The Admin cog is not loaded."
-msgstr ""
+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 ""
+msgstr "Daná role není platná self-role."
 

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

@@ -1,19 +1,18 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2019-07-05 22:33+0200\n"
-"PO-Revision-Date: 2019-07-06 16:12\n"
-"Last-Translator: Robert Jansen (Kowlin)\n"
+"POT-Creation-Date: 2020-04-23 12:07+0000\n"
+"Last-Translator: \n"
 "Language-Team: Danish\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: redgettext 3.0\n"
+"Generated-By: redgettext 3.1\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: red-discordbot\n"
+"X-Crowdin-Project-ID: 289505\n"
 "X-Crowdin-Language: da\n"
-"X-Crowdin-File: /cogs/admin/locales/messages.pot\n"
+"X-Crowdin-File-ID: 42\n"
 "Language: da_DK\n"
 
 #: redbot/cogs/admin/admin.py:17
@@ -21,166 +20,221 @@ msgid "I attempted to do something that Discord denied me permissions for. Your
 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."
+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."
+#: redbot/cogs/admin/admin.py:28
+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:34
+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:40
+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:46
+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:52
+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:58
+msgid "I need manage roles permission to do that."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:60
 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
+#: redbot/cogs/admin/admin.py:70
 #, 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:126
+msgid "{member.display_name} already has the role {role.name}."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:121
+#: redbot/cogs/admin/admin.py:146
 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:156
+msgid "{member.display_name} does not have the role {role.name}."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:138
+#: redbot/cogs/admin/admin.py:176
 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 "\\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:203
+#, 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:217
+#, docstring
 msgid "Edit role settings."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:194
+#: redbot/cogs/admin/admin.py:224
 #, 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:253 redbot/cogs/admin/admin.py:286
 msgid "Done."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:222
+#: redbot/cogs/admin/admin.py:257
 #, 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:291
 #, docstring
 msgid "Announce a message to all servers the bot is in."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:257
+#: redbot/cogs/admin/admin.py:298
 msgid "The announcement has begun."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:265
+#: redbot/cogs/admin/admin.py:305
 #, docstring
 msgid "Cancel a running announce."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:271
+#: redbot/cogs/admin/admin.py:307
+msgid "There is no currently running announcement."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:310
 msgid "The current announcement has been cancelled."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:277
+#: redbot/cogs/admin/admin.py:316
 #, 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:321
+#, 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:330
 msgid "The announcement channel has been set to {channel.mention}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:290
+#: redbot/cogs/admin/admin.py:335
 #, docstring
 msgid "Toggle announcements being enabled this server."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:296
+#: redbot/cogs/admin/admin.py:340
 msgid "The server {guild.name} will receive announcements."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:300
+#: redbot/cogs/admin/admin.py:344
 msgid "The server {guild.name} will not receive announcements."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:326
+#: redbot/cogs/admin/admin.py:370
 #, 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        "
+msgid "Apply selfroles."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:337
+#: redbot/cogs/admin/admin.py:375
 #, docstring
-msgid "Remove a selfrole from yourself.\\n\\n        NOTE: The role is case sensitive!\\n        "
+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:347
+#: redbot/cogs/admin/admin.py:386
 #, docstring
-msgid "Add a role to the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
+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: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
+#: redbot/cogs/admin/admin.py:397
 #, docstring
 msgid "\\n        Lists all available selfroles.\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:377
+#: redbot/cogs/admin/admin.py:407
 msgid "Available Selfroles:\\n{selfroles}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:394
+#: redbot/cogs/admin/admin.py:413
+#, docstring
+msgid "Manage selfroles."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:418
+#, 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:425
+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:433
+msgid "Added."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:436
+msgid "That role is already a selfrole."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:440
+#, 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:447
+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:455
+msgid "Removed."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:460
 #, docstring
 msgid "Lock a bot to its current servers only."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:399
+#: redbot/cogs/admin/admin.py:465
 msgid "The bot is no longer serverlocked."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:401
+#: redbot/cogs/admin/admin.py:467
 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:75
+msgid "I could not announce to the following server: "
 msgstr ""
 
-#: redbot/cogs/admin/converters.py:25
+#: redbot/cogs/admin/announcer.py:77
+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,186 +1,240 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2019-07-05 22:33+0200\n"
-"PO-Revision-Date: 2019-07-06 16:12\n"
-"Last-Translator: Robert Jansen (Kowlin)\n"
+"POT-Creation-Date: 2020-04-23 12:07+0000\n"
+"Last-Translator: \n"
 "Language-Team: German\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: redgettext 3.0\n"
+"Generated-By: redgettext 3.1\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: red-discordbot\n"
+"X-Crowdin-Project-ID: 289505\n"
 "X-Crowdin-Language: de\n"
-"X-Crowdin-File: /cogs/admin/locales/messages.pot\n"
+"X-Crowdin-File-ID: 42\n"
 "Language: de_DE\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 "Ich habe versucht etwas zu tun, für das mir Discord die Befugnis verweigerte. 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."
+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."
+#: redbot/cogs/admin/admin.py:28
+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:34
+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:40
+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:46
+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:52
+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:58
+msgid "I need manage roles permission to do that."
+msgstr "Ich braucht dafür die Bereichtigung „Rollen verwalten“."
+
+#: redbot/cogs/admin/admin.py:60
 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:70
 #, docstring
 msgid "A collection of server administration utilities."
-msgstr "Eine Sammlung von administrativen Server-Verwaltungsprogramme."
+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:126
+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:146
 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:156
+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:176
 msgid "I successfully removed {role.name} from {member.display_name}"
-msgstr "Ich habe erfolgreich {role.name} von {member.display_name} entfernt"
-
-#: 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 ""
+msgstr "Ich habe die Rolle „{role.name}“ erfolgreich von {member.display_name} entfernt."
 
 #: redbot/cogs/admin/admin.py:187
 #, docstring
-msgid "Edit role settings."
-msgstr "Bearbeiten der Rollen Einstellungen."
+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:194
+#: redbot/cogs/admin/admin.py:203
 #, 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        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:217 redbot/cogs/admin/admin.py:245
+#: redbot/cogs/admin/admin.py:217
+#, docstring
+msgid "Edit role settings."
+msgstr "Rolleneinstellungen bearbeiten."
+
+#: redbot/cogs/admin/admin.py:224
+#, 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        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:253 redbot/cogs/admin/admin.py:286
 msgid "Done."
 msgstr "Erledigt."
 
-#: redbot/cogs/admin/admin.py:222
+#: redbot/cogs/admin/admin.py:257
 #, 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        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:291
 #, docstring
 msgid "Announce a message to all servers the bot is in."
 msgstr "Mache eine Ankündigung auf allen Servern auf denen der Bot ist."
 
-#: redbot/cogs/admin/admin.py:257
+#: redbot/cogs/admin/admin.py:298
 msgid "The announcement has begun."
 msgstr "Die Ankündigung hat begonnen."
 
-#: redbot/cogs/admin/admin.py:265
+#: redbot/cogs/admin/admin.py:305
 #, docstring
 msgid "Cancel a running announce."
 msgstr "Breche eine laufende Ankündigung ab."
 
-#: redbot/cogs/admin/admin.py:271
+#: redbot/cogs/admin/admin.py:307
+msgid "There is no currently running announcement."
+msgstr "Es gibt keine derzeit laufende Ankündigung."
+
+#: redbot/cogs/admin/admin.py:310
 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:316
 #, docstring
-msgid "Change the channel to which the bot makes announcements."
-msgstr "Ändere den Kanal 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:321
+#, 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        Ändert den Kanal, in dem der Bot Ankündigungen senden wird.\\n        \\n        Wenn kein Kanal angegeben wird, wird standardmäßig der aktuelle Kanal gewählt.\\n        "
+
+#: redbot/cogs/admin/admin.py:330
 msgid "The announcement channel has been set to {channel.mention}"
-msgstr "Der für Ankündigungen gewählte Kanal wurde festgelegt auf {channel.mention}"
+msgstr "{channel.mention} wurde nun als Ankündigungskanal festgelegt."
 
-#: redbot/cogs/admin/admin.py:290
+#: redbot/cogs/admin/admin.py:335
 #, docstring
 msgid "Toggle announcements being enabled this server."
 msgstr "Schaltet Ankündigungen auf diesem Server ein oder aus."
 
-#: redbot/cogs/admin/admin.py:296
+#: redbot/cogs/admin/admin.py:340
 msgid "The server {guild.name} will receive announcements."
 msgstr "Der Server {guild.name} wird Ankündigunen erhalten."
 
-#: redbot/cogs/admin/admin.py:300
+#: redbot/cogs/admin/admin.py:344
 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
+#: redbot/cogs/admin/admin.py:370
 #, 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 ""
+msgid "Apply selfroles."
+msgstr "Selbst hinzufügbare Rollen anwenden."
 
-#: redbot/cogs/admin/admin.py:337
+#: redbot/cogs/admin/admin.py:375
 #, docstring
-msgid "Remove a selfrole from yourself.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr ""
+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:347
+#: redbot/cogs/admin/admin.py:386
 #, docstring
-msgid "Add a role to the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr ""
+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:355 redbot/cogs/admin/admin.py:367
-msgid "The selfroles list has been successfully modified."
-msgstr "Die Liste 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 ""
-
-#: redbot/cogs/admin/admin.py:371
+#: redbot/cogs/admin/admin.py:397
 #, docstring
 msgid "\\n        Lists all available selfroles.\\n        "
-msgstr ""
+msgstr "\\nGibt eine Liste verfügbarer selbst auswählbarer Rollen aus.\\n        "
 
-#: redbot/cogs/admin/admin.py:377
+#: redbot/cogs/admin/admin.py:407
 msgid "Available Selfroles:\\n{selfroles}"
-msgstr ""
+msgstr "Verfügbare selbst auswählbare Rollen:\\n{selfroles}"
 
-#: redbot/cogs/admin/admin.py:394
+#: redbot/cogs/admin/admin.py:413
+#, docstring
+msgid "Manage selfroles."
+msgstr "Selbst hinzufügbare Rollen verwalten."
+
+#: redbot/cogs/admin/admin.py:418
+#, 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:425
+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:433
+msgid "Added."
+msgstr "Hinzugefügt."
+
+#: redbot/cogs/admin/admin.py:436
+msgid "That role is already a selfrole."
+msgstr "Diese Rolle ist bereits selbst hinzufügbar."
+
+#: redbot/cogs/admin/admin.py:440
+#, 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:447
+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:455
+msgid "Removed."
+msgstr "Entfernt."
+
+#: redbot/cogs/admin/admin.py:460
 #, docstring
 msgid "Lock a bot to its current servers only."
-msgstr "Sperrt den Bot neuen Servern beizutreten."
+msgstr "Der Bot kann keinem neuen Server beitreten."
 
-#: redbot/cogs/admin/admin.py:399
+#: redbot/cogs/admin/admin.py:465
 msgid "The bot is no longer serverlocked."
-msgstr "Der Bot ist nicht länger gesperrt neuen Servern beizutreten."
+msgstr "Der Bot kann nun anderen Servern beitreten."
 
-#: redbot/cogs/admin/admin.py:401
+#: redbot/cogs/admin/admin.py:467
 msgid "The bot is now serverlocked."
 msgstr "Der Bot ist jetzt gesperrt neuen Servern beizutreten."
 
-#: redbot/cogs/admin/announcer.py:70
-msgid "I could not announce to server: {server.id}"
-msgstr "Ich konnte keine Ankündigung auf diesem Server machen: {server.id}"
+#: redbot/cogs/admin/announcer.py:75
+msgid "I could not announce to the following server: "
+msgstr "Ich konnte die Ankündigung auf diesem Server nicht ausführen: "
 
-#: redbot/cogs/admin/converters.py:25
+#: redbot/cogs/admin/announcer.py:77
+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: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 vorausgesetzte Rolle ist keine berechtigte selbst auswählbare Rolle."
+msgstr "Die angegebene Rolle ist keine gültige selbst auswählbare Rolle."
 

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

@@ -1,19 +1,18 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2019-07-05 22:33+0200\n"
-"PO-Revision-Date: 2019-07-06 16:12\n"
-"Last-Translator: Robert Jansen (Kowlin)\n"
+"POT-Creation-Date: 2020-04-23 12:07+0000\n"
+"Last-Translator: \n"
 "Language-Team: Greek\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: redgettext 3.0\n"
+"Generated-By: redgettext 3.1\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: red-discordbot\n"
+"X-Crowdin-Project-ID: 289505\n"
 "X-Crowdin-Language: el\n"
-"X-Crowdin-File: /cogs/admin/locales/messages.pot\n"
+"X-Crowdin-File-ID: 42\n"
 "Language: el_GR\n"
 
 #: redbot/cogs/admin/admin.py:17
@@ -21,166 +20,221 @@ msgid "I attempted to do something that Discord denied me permissions for. Your
 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."
+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."
+#: redbot/cogs/admin/admin.py:28
+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:34
+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:40
+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:46
+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:52
+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:58
+msgid "I need manage roles permission to do that."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:60
 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
+#: redbot/cogs/admin/admin.py:70
 #, 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:126
+msgid "{member.display_name} already has the role {role.name}."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:121
+#: redbot/cogs/admin/admin.py:146
 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:156
+msgid "{member.display_name} does not have the role {role.name}."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:138
+#: redbot/cogs/admin/admin.py:176
 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 "\\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:203
+#, 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:217
+#, docstring
 msgid "Edit role settings."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:194
+#: redbot/cogs/admin/admin.py:224
 #, 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:253 redbot/cogs/admin/admin.py:286
 msgid "Done."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:222
+#: redbot/cogs/admin/admin.py:257
 #, 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:291
 #, docstring
 msgid "Announce a message to all servers the bot is in."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:257
+#: redbot/cogs/admin/admin.py:298
 msgid "The announcement has begun."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:265
+#: redbot/cogs/admin/admin.py:305
 #, docstring
 msgid "Cancel a running announce."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:271
+#: redbot/cogs/admin/admin.py:307
+msgid "There is no currently running announcement."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:310
 msgid "The current announcement has been cancelled."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:277
+#: redbot/cogs/admin/admin.py:316
 #, 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:321
+#, 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:330
 msgid "The announcement channel has been set to {channel.mention}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:290
+#: redbot/cogs/admin/admin.py:335
 #, docstring
 msgid "Toggle announcements being enabled this server."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:296
+#: redbot/cogs/admin/admin.py:340
 msgid "The server {guild.name} will receive announcements."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:300
+#: redbot/cogs/admin/admin.py:344
 msgid "The server {guild.name} will not receive announcements."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:326
+#: redbot/cogs/admin/admin.py:370
 #, 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        "
+msgid "Apply selfroles."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:337
+#: redbot/cogs/admin/admin.py:375
 #, docstring
-msgid "Remove a selfrole from yourself.\\n\\n        NOTE: The role is case sensitive!\\n        "
+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:347
+#: redbot/cogs/admin/admin.py:386
 #, docstring
-msgid "Add a role to the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
+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: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
+#: redbot/cogs/admin/admin.py:397
 #, docstring
 msgid "\\n        Lists all available selfroles.\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:377
+#: redbot/cogs/admin/admin.py:407
 msgid "Available Selfroles:\\n{selfroles}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:394
+#: redbot/cogs/admin/admin.py:413
+#, docstring
+msgid "Manage selfroles."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:418
+#, 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:425
+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:433
+msgid "Added."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:436
+msgid "That role is already a selfrole."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:440
+#, 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:447
+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:455
+msgid "Removed."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:460
 #, docstring
 msgid "Lock a bot to its current servers only."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:399
+#: redbot/cogs/admin/admin.py:465
 msgid "The bot is no longer serverlocked."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:401
+#: redbot/cogs/admin/admin.py:467
 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:75
+msgid "I could not announce to the following server: "
 msgstr ""
 
-#: redbot/cogs/admin/converters.py:25
+#: redbot/cogs/admin/announcer.py:77
+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/en-US.po

@@ -0,0 +1,185 @@
+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"
+"Language-Team: English\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: en\n"
+"X-Crowdin-File: /admin/locales/messages.pot\n"
+"Language: en_US\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 ""
+
+#: 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 ""
+

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

@@ -1,19 +1,18 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2019-07-05 22:33+0200\n"
-"PO-Revision-Date: 2019-07-14 02:14\n"
-"Last-Translator: Robert Jansen (Kowlin)\n"
+"POT-Creation-Date: 2020-04-23 12:07+0000\n"
+"Last-Translator: \n"
 "Language-Team: Spanish\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: redgettext 3.0\n"
+"Generated-By: redgettext 3.1\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: red-discordbot\n"
+"X-Crowdin-Project-ID: 289505\n"
 "X-Crowdin-Language: es-ES\n"
-"X-Crowdin-File: /cogs/admin/locales/messages.pot\n"
+"X-Crowdin-File-ID: 42\n"
 "Language: es_ES\n"
 
 #: redbot/cogs/admin/admin.py:17
@@ -21,166 +20,221 @@ msgid "I attempted to do something that Discord denied me permissions for. Your
 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 "He intentado agregar {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 vuelva a intentarlo."
+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 "He intentado agregar {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 vuelva a intentarlo."
+#: redbot/cogs/admin/admin.py:28
+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:34
+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:40
+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:46
+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:52
+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:58
+msgid "I need manage roles permission to do that."
+msgstr "Necesito el permiso gestionar roles para hacerlo."
+
+#: redbot/cogs/admin/admin.py:60
 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:70
 #, 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:126
+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:146
 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:156
+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:176
 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
-#, 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        "
-
-#: 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 "Eliminar un rol de un usuario.\\n\\n        Si el usuario se deja en blanco, por defecto se convierte en autor del comando.\\n        "
-
 #: redbot/cogs/admin/admin.py:187
 #, 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        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:203
+#, 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        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:217
+#, docstring
 msgid "Edit role settings."
 msgstr "Editar configuración de rol."
 
-#: redbot/cogs/admin/admin.py:194
+#: redbot/cogs/admin/admin.py:224
 #, 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        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:253 redbot/cogs/admin/admin.py:286
 msgid "Done."
 msgstr "Listo."
 
-#: redbot/cogs/admin/admin.py:222
+#: redbot/cogs/admin/admin.py:257
 #, 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        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:291
 #, docstring
 msgid "Announce a message to all servers the bot is in."
 msgstr "Anunciar un mensaje a todos los servidores en que el bot está."
 
-#: redbot/cogs/admin/admin.py:257
+#: redbot/cogs/admin/admin.py:298
 msgid "The announcement has begun."
-msgstr ""
+msgstr "El anuncio ha comenzado."
 
-#: redbot/cogs/admin/admin.py:265
+#: redbot/cogs/admin/admin.py:305
 #, docstring
 msgid "Cancel a running announce."
-msgstr ""
+msgstr "Cancela un anuncio en ejecución."
 
-#: redbot/cogs/admin/admin.py:271
+#: redbot/cogs/admin/admin.py:307
+msgid "There is no currently running announcement."
+msgstr "No hay ningún anuncio en ejecución."
+
+#: redbot/cogs/admin/admin.py:310
 msgid "The current announcement has been cancelled."
-msgstr ""
+msgstr "El anuncio actual ha sido cancelado."
 
-#: redbot/cogs/admin/admin.py:277
+#: redbot/cogs/admin/admin.py:316
 #, docstring
-msgid "Change the channel to which the bot makes announcements."
-msgstr ""
+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:321
+#, 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 se deja en blanco el canal por defecto es el canal actual.\\n        "
+
+#: redbot/cogs/admin/admin.py:330
 msgid "The announcement channel has been set to {channel.mention}"
-msgstr ""
+msgstr "El canal de anuncios se ha establecido en {channel.mention}"
 
-#: redbot/cogs/admin/admin.py:290
+#: redbot/cogs/admin/admin.py:335
 #, docstring
 msgid "Toggle announcements being enabled this server."
-msgstr ""
+msgstr "Alternar la activación de los anuncios en este servidor."
 
-#: redbot/cogs/admin/admin.py:296
+#: redbot/cogs/admin/admin.py:340
 msgid "The server {guild.name} will receive announcements."
-msgstr ""
+msgstr "El servidor {guild.name} recibirá anuncios."
 
-#: redbot/cogs/admin/admin.py:300
+#: redbot/cogs/admin/admin.py:344
 msgid "The server {guild.name} will not receive announcements."
-msgstr ""
+msgstr "El servidor {guild.name} no recibirá anuncios."
 
-#: redbot/cogs/admin/admin.py:326
+#: redbot/cogs/admin/admin.py:370
 #, 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 ""
+msgid "Apply selfroles."
+msgstr "Aplicar selfroles."
 
-#: redbot/cogs/admin/admin.py:337
+#: redbot/cogs/admin/admin.py:375
 #, docstring
-msgid "Remove a selfrole from yourself.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr ""
+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:347
+#: redbot/cogs/admin/admin.py:386
 #, docstring
-msgid "Add a role to the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr ""
+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: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
+#: redbot/cogs/admin/admin.py:397
 #, docstring
 msgid "\\n        Lists all available selfroles.\\n        "
-msgstr ""
+msgstr "\\n        Lista de todos los selfroles disponibles.\\n        "
 
-#: redbot/cogs/admin/admin.py:377
+#: redbot/cogs/admin/admin.py:407
 msgid "Available Selfroles:\\n{selfroles}"
-msgstr ""
+msgstr "Selfroles disponibles:\\n{selfroles}"
 
-#: redbot/cogs/admin/admin.py:394
+#: redbot/cogs/admin/admin.py:413
+#, docstring
+msgid "Manage selfroles."
+msgstr "Gestionar selfroles."
+
+#: redbot/cogs/admin/admin.py:418
+#, 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:425
+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:433
+msgid "Added."
+msgstr "Añadido."
+
+#: redbot/cogs/admin/admin.py:436
+msgid "That role is already a selfrole."
+msgstr "Ese rol ya es un selfrole."
+
+#: redbot/cogs/admin/admin.py:440
+#, 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:447
+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:455
+msgid "Removed."
+msgstr "Eliminado."
+
+#: redbot/cogs/admin/admin.py:460
 #, docstring
 msgid "Lock a bot to its current servers only."
-msgstr ""
+msgstr "Bloquea el bot sólo a sus servidores actuales."
 
-#: redbot/cogs/admin/admin.py:399
+#: redbot/cogs/admin/admin.py:465
 msgid "The bot is no longer serverlocked."
-msgstr ""
+msgstr "El bot ya no está bloqueado por el servidor."
 
-#: redbot/cogs/admin/admin.py:401
+#: redbot/cogs/admin/admin.py:467
 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:75
+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:77
+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,19 +1,18 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2019-07-05 22:33+0200\n"
-"PO-Revision-Date: 2019-07-14 02:15\n"
-"Last-Translator: Robert Jansen (Kowlin)\n"
+"POT-Creation-Date: 2020-04-23 12:07+0000\n"
+"Last-Translator: \n"
 "Language-Team: Finnish\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: redgettext 3.0\n"
+"Generated-By: redgettext 3.1\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: red-discordbot\n"
+"X-Crowdin-Project-ID: 289505\n"
 "X-Crowdin-Language: fi\n"
-"X-Crowdin-File: /cogs/admin/locales/messages.pot\n"
+"X-Crowdin-File-ID: 42\n"
 "Language: fi_FI\n"
 
 #: redbot/cogs/admin/admin.py:17
@@ -21,166 +20,221 @@ msgid "I attempted to do something that Discord denied me permissions for. Your
 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."
+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."
+#: redbot/cogs/admin/admin.py:28
+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:34
+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:40
+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:46
+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:52
+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:58
+msgid "I need manage roles permission to do that."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:60
 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:70
 #, 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:126
+msgid "{member.display_name} already has the role {role.name}."
+msgstr ""
 
-#: redbot/cogs/admin/admin.py:121
+#: redbot/cogs/admin/admin.py:146
 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:156
+msgid "{member.display_name} does not have the role {role.name}."
+msgstr ""
 
-#: redbot/cogs/admin/admin.py:138
+#: redbot/cogs/admin/admin.py:176
 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
-#, 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 "\\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:203
+#, 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:217
+#, docstring
 msgid "Edit role settings."
 msgstr "Muokkaa rooliasetuksia."
 
-#: redbot/cogs/admin/admin.py:194
+#: redbot/cogs/admin/admin.py:224
 #, 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:253 redbot/cogs/admin/admin.py:286
 msgid "Done."
 msgstr "Tehty."
 
-#: redbot/cogs/admin/admin.py:222
+#: redbot/cogs/admin/admin.py:257
 #, 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:291
 #, 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:298
 msgid "The announcement has begun."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:265
+#: redbot/cogs/admin/admin.py:305
 #, docstring
 msgid "Cancel a running announce."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:271
+#: redbot/cogs/admin/admin.py:307
+msgid "There is no currently running announcement."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:310
 msgid "The current announcement has been cancelled."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:277
+#: redbot/cogs/admin/admin.py:316
 #, 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:321
+#, 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:330
 msgid "The announcement channel has been set to {channel.mention}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:290
+#: redbot/cogs/admin/admin.py:335
 #, docstring
 msgid "Toggle announcements being enabled this server."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:296
+#: redbot/cogs/admin/admin.py:340
 msgid "The server {guild.name} will receive announcements."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:300
+#: redbot/cogs/admin/admin.py:344
 msgid "The server {guild.name} will not receive announcements."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:326
+#: redbot/cogs/admin/admin.py:370
 #, 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        "
+msgid "Apply selfroles."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:337
+#: redbot/cogs/admin/admin.py:375
 #, docstring
-msgid "Remove a selfrole from yourself.\\n\\n        NOTE: The role is case sensitive!\\n        "
+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:347
+#: redbot/cogs/admin/admin.py:386
 #, docstring
-msgid "Add a role to the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
+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: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
+#: redbot/cogs/admin/admin.py:397
 #, docstring
 msgid "\\n        Lists all available selfroles.\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:377
+#: redbot/cogs/admin/admin.py:407
 msgid "Available Selfroles:\\n{selfroles}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:394
+#: redbot/cogs/admin/admin.py:413
+#, docstring
+msgid "Manage selfroles."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:418
+#, 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:425
+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:433
+msgid "Added."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:436
+msgid "That role is already a selfrole."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:440
+#, 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:447
+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:455
+msgid "Removed."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:460
 #, docstring
 msgid "Lock a bot to its current servers only."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:399
+#: redbot/cogs/admin/admin.py:465
 msgid "The bot is no longer serverlocked."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:401
+#: redbot/cogs/admin/admin.py:467
 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:75
+msgid "I could not announce to the following server: "
 msgstr ""
 
-#: redbot/cogs/admin/converters.py:25
+#: redbot/cogs/admin/announcer.py:77
+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,19 +1,18 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2019-07-05 22:33+0200\n"
-"PO-Revision-Date: 2019-07-06 16:11\n"
-"Last-Translator: Robert Jansen (Kowlin)\n"
+"POT-Creation-Date: 2020-04-23 12:07+0000\n"
+"Last-Translator: \n"
 "Language-Team: French\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: redgettext 3.0\n"
+"Generated-By: redgettext 3.1\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: red-discordbot\n"
+"X-Crowdin-Project-ID: 289505\n"
 "X-Crowdin-Language: fr\n"
-"X-Crowdin-File: /cogs/admin/locales/messages.pot\n"
+"X-Crowdin-File-ID: 42\n"
 "Language: fr_FR\n"
 
 #: redbot/cogs/admin/admin.py:17
@@ -21,166 +20,221 @@ msgid "I attempted to do something that Discord denied me permissions for. Your
 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."
+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é."
+#: redbot/cogs/admin/admin.py:28
+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:34
+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:40
+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:46
+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:52
+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:58
+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:60
 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:70
 #, 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:126
+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:146
 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:156
+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:176
 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
-#, 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        "
-
-#: 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 "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        "
-
 #: redbot/cogs/admin/admin.py:187
 #, 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        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:203
+#, 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        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:217
+#, 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:224
 #, 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:253 redbot/cogs/admin/admin.py:286
 msgid "Done."
 msgstr "Fait."
 
-#: redbot/cogs/admin/admin.py:222
+#: redbot/cogs/admin/admin.py:257
 #, 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:291
 #, 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:298
 msgid "The announcement has begun."
 msgstr "L’annonce a commencé."
 
-#: redbot/cogs/admin/admin.py:265
+#: redbot/cogs/admin/admin.py:305
 #, docstring
 msgid "Cancel a running announce."
 msgstr "Interrompre une annonce en cours."
 
-#: redbot/cogs/admin/admin.py:271
+#: redbot/cogs/admin/admin.py:307
+msgid "There is no currently running announcement."
+msgstr "Il n'y a aucune annonce en cours d'exécution."
+
+#: redbot/cogs/admin/admin.py:310
 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:316
 #, 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:321
+#, 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        Changer le salon où le bot enverra des annonces.\\n        \\n        Si le salon est laissé vide, il est par défaut sur le salon actuel.\\n        "
+
+#: redbot/cogs/admin/admin.py:330
 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
+#: redbot/cogs/admin/admin.py:335
 #, docstring
 msgid "Toggle announcements being enabled this server."
 msgstr "Activer ou désactiver les annonces sur ce serveur."
 
-#: redbot/cogs/admin/admin.py:296
+#: redbot/cogs/admin/admin.py:340
 msgid "The server {guild.name} will receive announcements."
 msgstr "Le serveur {guild.name} recevra maintenant les annonces."
 
-#: redbot/cogs/admin/admin.py:300
+#: redbot/cogs/admin/admin.py:344
 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
+#: redbot/cogs/admin/admin.py:370
 #, 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        "
+msgid "Apply selfroles."
+msgstr "Appliquer auto-rôles."
 
-#: redbot/cogs/admin/admin.py:337
+#: redbot/cogs/admin/admin.py:375
 #, 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        "
+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:347
+#: redbot/cogs/admin/admin.py:386
 #, 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        "
+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: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
+#: redbot/cogs/admin/admin.py:397
 #, 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:407
 msgid "Available Selfroles:\\n{selfroles}"
 msgstr "Auto-rôles disponibles :\\n{selfroles}"
 
-#: redbot/cogs/admin/admin.py:394
+#: redbot/cogs/admin/admin.py:413
+#, docstring
+msgid "Manage selfroles."
+msgstr "Gérer les auto-roles."
+
+#: redbot/cogs/admin/admin.py:418
+#, 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:425
+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:433
+msgid "Added."
+msgstr "Ajouté."
+
+#: redbot/cogs/admin/admin.py:436
+msgid "That role is already a selfrole."
+msgstr "Ce rôle est déjà un selfrole."
+
+#: redbot/cogs/admin/admin.py:440
+#, 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:447
+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:455
+msgid "Removed."
+msgstr "Retiré."
+
+#: redbot/cogs/admin/admin.py:460
 #, 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:465
 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:467
 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:75
+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:77
+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

@@ -0,0 +1,240 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: red-discordbot\n"
+"POT-Creation-Date: 2020-04-23 12:07+0000\n"
+"Last-Translator: \n"
+"Language-Team: Hebrew\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=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-ID: 42\n"
+"Language: he_IL\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 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:28
+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:34
+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:40
+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:46
+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:52
+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:58
+msgid "I need manage roles permission to do that."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:60
+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:70
+#, docstring
+msgid "A collection of server administration utilities."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:126
+msgid "{member.display_name} already has the role {role.name}."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:146
+msgid "I successfully added {role.name} to {member.display_name}"
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:156
+msgid "{member.display_name} does not have the role {role.name}."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:176
+msgid "I successfully removed {role.name} from {member.display_name}"
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:187
+#, 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:203
+#, 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:217
+#, docstring
+msgid "Edit role settings."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:224
+#, 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:253 redbot/cogs/admin/admin.py:286
+msgid "Done."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:257
+#, 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:291
+#, docstring
+msgid "Announce a message to all servers the bot is in."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:298
+msgid "The announcement has begun."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:305
+#, docstring
+msgid "Cancel a running announce."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:307
+msgid "There is no currently running announcement."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:310
+msgid "The current announcement has been cancelled."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:316
+#, docstring
+msgid "Change how announcements are sent in this guild."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:321
+#, 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:330
+msgid "The announcement channel has been set to {channel.mention}"
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:335
+#, docstring
+msgid "Toggle announcements being enabled this server."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:340
+msgid "The server {guild.name} will receive announcements."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:344
+msgid "The server {guild.name} will not receive announcements."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:370
+#, docstring
+msgid "Apply selfroles."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:375
+#, 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:386
+#, 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:397
+#, docstring
+msgid "\\n        Lists all available selfroles.\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:407
+msgid "Available Selfroles:\\n{selfroles}"
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:413
+#, docstring
+msgid "Manage selfroles."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:418
+#, 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:425
+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:433
+msgid "Added."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:436
+msgid "That role is already a selfrole."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:440
+#, 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:447
+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:455
+msgid "Removed."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:460
+#, docstring
+msgid "Lock a bot to its current servers only."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:465
+msgid "The bot is no longer serverlocked."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:467
+msgid "The bot is now serverlocked."
+msgstr ""
+
+#: redbot/cogs/admin/announcer.py:75
+msgid "I could not announce to the following server: "
+msgstr ""
+
+#: redbot/cogs/admin/announcer.py:77
+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/hu-HU.po

@@ -1,19 +1,18 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2019-07-05 22:33+0200\n"
-"PO-Revision-Date: 2019-07-06 16:13\n"
-"Last-Translator: Robert Jansen (Kowlin)\n"
+"POT-Creation-Date: 2020-04-23 12:07+0000\n"
+"Last-Translator: \n"
 "Language-Team: Hungarian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: redgettext 3.0\n"
+"Generated-By: redgettext 3.1\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: red-discordbot\n"
+"X-Crowdin-Project-ID: 289505\n"
 "X-Crowdin-Language: hu\n"
-"X-Crowdin-File: /cogs/admin/locales/messages.pot\n"
+"X-Crowdin-File-ID: 42\n"
 "Language: hu_HU\n"
 
 #: redbot/cogs/admin/admin.py:17
@@ -21,166 +20,221 @@ msgid "I attempted to do something that Discord denied me permissions for. Your
 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."
+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."
+#: redbot/cogs/admin/admin.py:28
+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:34
+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:40
+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:46
+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:52
+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:58
+msgid "I need manage roles permission to do that."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:60
 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
+#: redbot/cogs/admin/admin.py:70
 #, 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:126
+msgid "{member.display_name} already has the role {role.name}."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:121
+#: redbot/cogs/admin/admin.py:146
 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:156
+msgid "{member.display_name} does not have the role {role.name}."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:138
+#: redbot/cogs/admin/admin.py:176
 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 "\\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:203
+#, 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:217
+#, docstring
 msgid "Edit role settings."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:194
+#: redbot/cogs/admin/admin.py:224
 #, 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:253 redbot/cogs/admin/admin.py:286
 msgid "Done."
 msgstr "Kész."
 
-#: redbot/cogs/admin/admin.py:222
+#: redbot/cogs/admin/admin.py:257
 #, 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:291
 #, docstring
 msgid "Announce a message to all servers the bot is in."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:257
+#: redbot/cogs/admin/admin.py:298
 msgid "The announcement has begun."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:265
+#: redbot/cogs/admin/admin.py:305
 #, docstring
 msgid "Cancel a running announce."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:271
+#: redbot/cogs/admin/admin.py:307
+msgid "There is no currently running announcement."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:310
 msgid "The current announcement has been cancelled."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:277
+#: redbot/cogs/admin/admin.py:316
 #, 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:321
+#, 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:330
 msgid "The announcement channel has been set to {channel.mention}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:290
+#: redbot/cogs/admin/admin.py:335
 #, docstring
 msgid "Toggle announcements being enabled this server."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:296
+#: redbot/cogs/admin/admin.py:340
 msgid "The server {guild.name} will receive announcements."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:300
+#: redbot/cogs/admin/admin.py:344
 msgid "The server {guild.name} will not receive announcements."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:326
+#: redbot/cogs/admin/admin.py:370
 #, 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        "
+msgid "Apply selfroles."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:337
+#: redbot/cogs/admin/admin.py:375
 #, docstring
-msgid "Remove a selfrole from yourself.\\n\\n        NOTE: The role is case sensitive!\\n        "
+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:347
+#: redbot/cogs/admin/admin.py:386
 #, docstring
-msgid "Add a role to the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
+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: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
+#: redbot/cogs/admin/admin.py:397
 #, docstring
 msgid "\\n        Lists all available selfroles.\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:377
+#: redbot/cogs/admin/admin.py:407
 msgid "Available Selfroles:\\n{selfroles}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:394
+#: redbot/cogs/admin/admin.py:413
+#, docstring
+msgid "Manage selfroles."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:418
+#, 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:425
+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:433
+msgid "Added."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:436
+msgid "That role is already a selfrole."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:440
+#, 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:447
+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:455
+msgid "Removed."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:460
 #, docstring
 msgid "Lock a bot to its current servers only."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:399
+#: redbot/cogs/admin/admin.py:465
 msgid "The bot is no longer serverlocked."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:401
+#: redbot/cogs/admin/admin.py:467
 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:75
+msgid "I could not announce to the following server: "
 msgstr ""
 
-#: redbot/cogs/admin/converters.py:25
+#: redbot/cogs/admin/announcer.py:77
+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,19 +1,18 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2019-07-05 22:33+0200\n"
-"PO-Revision-Date: 2019-07-06 16:14\n"
-"Last-Translator: Robert Jansen (Kowlin)\n"
+"POT-Creation-Date: 2020-04-23 12:07+0000\n"
+"Last-Translator: \n"
 "Language-Team: Indonesian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: redgettext 3.0\n"
+"Generated-By: redgettext 3.1\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: red-discordbot\n"
+"X-Crowdin-Project-ID: 289505\n"
 "X-Crowdin-Language: id\n"
-"X-Crowdin-File: /cogs/admin/locales/messages.pot\n"
+"X-Crowdin-File-ID: 42\n"
 "Language: id_ID\n"
 
 #: redbot/cogs/admin/admin.py:17
@@ -21,166 +20,221 @@ msgid "I attempted to do something that Discord denied me permissions for. Your
 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."
+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."
+#: redbot/cogs/admin/admin.py:28
+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:34
+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:40
+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:46
+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:52
+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:58
+msgid "I need manage roles permission to do that."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:60
 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
+#: redbot/cogs/admin/admin.py:70
 #, 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:126
+msgid "{member.display_name} already has the role {role.name}."
+msgstr ""
 
-#: redbot/cogs/admin/admin.py:121
+#: redbot/cogs/admin/admin.py:146
 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:156
+msgid "{member.display_name} does not have the role {role.name}."
+msgstr ""
 
-#: redbot/cogs/admin/admin.py:138
+#: redbot/cogs/admin/admin.py:176
 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 "\\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:203
+#, 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:217
+#, docstring
 msgid "Edit role settings."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:194
+#: redbot/cogs/admin/admin.py:224
 #, 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:253 redbot/cogs/admin/admin.py:286
 msgid "Done."
 msgstr "Selesai."
 
-#: redbot/cogs/admin/admin.py:222
+#: redbot/cogs/admin/admin.py:257
 #, 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:291
 #, docstring
 msgid "Announce a message to all servers the bot is in."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:257
+#: redbot/cogs/admin/admin.py:298
 msgid "The announcement has begun."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:265
+#: redbot/cogs/admin/admin.py:305
 #, docstring
 msgid "Cancel a running announce."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:271
+#: redbot/cogs/admin/admin.py:307
+msgid "There is no currently running announcement."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:310
 msgid "The current announcement has been cancelled."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:277
+#: redbot/cogs/admin/admin.py:316
 #, 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:321
+#, 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:330
 msgid "The announcement channel has been set to {channel.mention}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:290
+#: redbot/cogs/admin/admin.py:335
 #, docstring
 msgid "Toggle announcements being enabled this server."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:296
+#: redbot/cogs/admin/admin.py:340
 msgid "The server {guild.name} will receive announcements."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:300
+#: redbot/cogs/admin/admin.py:344
 msgid "The server {guild.name} will not receive announcements."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:326
+#: redbot/cogs/admin/admin.py:370
 #, 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        "
+msgid "Apply selfroles."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:337
+#: redbot/cogs/admin/admin.py:375
 #, docstring
-msgid "Remove a selfrole from yourself.\\n\\n        NOTE: The role is case sensitive!\\n        "
+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:347
+#: redbot/cogs/admin/admin.py:386
 #, docstring
-msgid "Add a role to the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
+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: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
+#: redbot/cogs/admin/admin.py:397
 #, docstring
 msgid "\\n        Lists all available selfroles.\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:377
+#: redbot/cogs/admin/admin.py:407
 msgid "Available Selfroles:\\n{selfroles}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:394
+#: redbot/cogs/admin/admin.py:413
+#, docstring
+msgid "Manage selfroles."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:418
+#, 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:425
+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:433
+msgid "Added."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:436
+msgid "That role is already a selfrole."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:440
+#, 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:447
+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:455
+msgid "Removed."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:460
 #, docstring
 msgid "Lock a bot to its current servers only."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:399
+#: redbot/cogs/admin/admin.py:465
 msgid "The bot is no longer serverlocked."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:401
+#: redbot/cogs/admin/admin.py:467
 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:75
+msgid "I could not announce to the following server: "
 msgstr ""
 
-#: redbot/cogs/admin/converters.py:25
+#: redbot/cogs/admin/announcer.py:77
+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,19 +1,18 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2019-07-05 22:33+0200\n"
-"PO-Revision-Date: 2019-07-06 16:13\n"
-"Last-Translator: Robert Jansen (Kowlin)\n"
+"POT-Creation-Date: 2020-04-23 12:07+0000\n"
+"Last-Translator: \n"
 "Language-Team: Italian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: redgettext 3.0\n"
+"Generated-By: redgettext 3.1\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: red-discordbot\n"
+"X-Crowdin-Project-ID: 289505\n"
 "X-Crowdin-Language: it\n"
-"X-Crowdin-File: /cogs/admin/locales/messages.pot\n"
+"X-Crowdin-File-ID: 42\n"
 "Language: it_IT\n"
 
 #: redbot/cogs/admin/admin.py:17
@@ -21,166 +20,221 @@ msgid "I attempted to do something that Discord denied me permissions for. Your
 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."
+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."
+#: redbot/cogs/admin/admin.py:28
+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:34
+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:40
+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:46
+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:52
+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:58
+msgid "I need manage roles permission to do that."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:60
 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:70
 #, 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:126
+msgid "{member.display_name} already has the role {role.name}."
+msgstr ""
 
-#: redbot/cogs/admin/admin.py:121
+#: redbot/cogs/admin/admin.py:146
 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:156
+msgid "{member.display_name} does not have the role {role.name}."
+msgstr ""
 
-#: redbot/cogs/admin/admin.py:138
+#: redbot/cogs/admin/admin.py:176
 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
-#, 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 "\\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:203
+#, 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:217
+#, docstring
 msgid "Edit role settings."
 msgstr "Modifica impostazioni ruolo."
 
-#: redbot/cogs/admin/admin.py:194
+#: redbot/cogs/admin/admin.py:224
 #, 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:253 redbot/cogs/admin/admin.py:286
 msgid "Done."
 msgstr "Fatto."
 
-#: redbot/cogs/admin/admin.py:222
+#: redbot/cogs/admin/admin.py:257
 #, 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:291
 #, 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:298
 msgid "The announcement has begun."
 msgstr "L'annuncio è partito."
 
-#: redbot/cogs/admin/admin.py:265
+#: redbot/cogs/admin/admin.py:305
 #, docstring
 msgid "Cancel a running announce."
 msgstr "Cancella un annuncio in corso."
 
-#: redbot/cogs/admin/admin.py:271
+#: redbot/cogs/admin/admin.py:307
+msgid "There is no currently running announcement."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:310
 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:316
 #, 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:321
+#, 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:330
 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
+#: redbot/cogs/admin/admin.py:335
 #, docstring
 msgid "Toggle announcements being enabled this server."
 msgstr "Attiva/disattiva gli annunci in questo server."
 
-#: redbot/cogs/admin/admin.py:296
+#: redbot/cogs/admin/admin.py:340
 msgid "The server {guild.name} will receive announcements."
 msgstr "Il server {guild.name} riceverà gli annunci."
 
-#: redbot/cogs/admin/admin.py:300
+#: redbot/cogs/admin/admin.py:344
 msgid "The server {guild.name} will not receive announcements."
 msgstr "Il server {guild.name} non riceverà gli annunci."
 
-#: redbot/cogs/admin/admin.py:326
+#: redbot/cogs/admin/admin.py:370
 #, 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        "
+msgid "Apply selfroles."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:337
+#: redbot/cogs/admin/admin.py:375
 #, docstring
-msgid "Remove a selfrole from yourself.\\n\\n        NOTE: The role is case sensitive!\\n        "
+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:347
+#: redbot/cogs/admin/admin.py:386
 #, docstring
-msgid "Add a role to the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
+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: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
+#: redbot/cogs/admin/admin.py:397
 #, docstring
 msgid "\\n        Lists all available selfroles.\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:377
+#: redbot/cogs/admin/admin.py:407
 msgid "Available Selfroles:\\n{selfroles}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:394
+#: redbot/cogs/admin/admin.py:413
+#, docstring
+msgid "Manage selfroles."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:418
+#, 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:425
+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:433
+msgid "Added."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:436
+msgid "That role is already a selfrole."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:440
+#, 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:447
+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:455
+msgid "Removed."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:460
 #, 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:465
 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:467
 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:75
+msgid "I could not announce to the following server: "
+msgstr ""
 
-#: redbot/cogs/admin/converters.py:25
+#: redbot/cogs/admin/announcer.py:77
+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,19 +1,18 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2019-07-05 22:33+0200\n"
-"PO-Revision-Date: 2019-07-06 16:13\n"
-"Last-Translator: Robert Jansen (Kowlin)\n"
+"POT-Creation-Date: 2020-04-23 12:07+0000\n"
+"Last-Translator: \n"
 "Language-Team: Japanese\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: redgettext 3.0\n"
+"Generated-By: redgettext 3.1\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: red-discordbot\n"
+"X-Crowdin-Project-ID: 289505\n"
 "X-Crowdin-Language: ja\n"
-"X-Crowdin-File: /cogs/admin/locales/messages.pot\n"
+"X-Crowdin-File-ID: 42\n"
 "Language: ja_JP\n"
 
 #: redbot/cogs/admin/admin.py:17
@@ -21,166 +20,221 @@ msgid "I attempted to do something that Discord denied me permissions for. Your
 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."
+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."
+#: redbot/cogs/admin/admin.py:28
+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:34
+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:40
+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:46
+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:52
+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:58
+msgid "I need manage roles permission to do that."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:60
 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
+#: redbot/cogs/admin/admin.py:70
 #, 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:126
+msgid "{member.display_name} already has the role {role.name}."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:121
+#: redbot/cogs/admin/admin.py:146
 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:156
+msgid "{member.display_name} does not have the role {role.name}."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:138
+#: redbot/cogs/admin/admin.py:176
 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 "\\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:203
+#, 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:217
+#, docstring
 msgid "Edit role settings."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:194
+#: redbot/cogs/admin/admin.py:224
 #, 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:253 redbot/cogs/admin/admin.py:286
 msgid "Done."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:222
+#: redbot/cogs/admin/admin.py:257
 #, 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:291
 #, docstring
 msgid "Announce a message to all servers the bot is in."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:257
+#: redbot/cogs/admin/admin.py:298
 msgid "The announcement has begun."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:265
+#: redbot/cogs/admin/admin.py:305
 #, docstring
 msgid "Cancel a running announce."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:271
+#: redbot/cogs/admin/admin.py:307
+msgid "There is no currently running announcement."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:310
 msgid "The current announcement has been cancelled."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:277
+#: redbot/cogs/admin/admin.py:316
 #, 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:321
+#, 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:330
 msgid "The announcement channel has been set to {channel.mention}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:290
+#: redbot/cogs/admin/admin.py:335
 #, docstring
 msgid "Toggle announcements being enabled this server."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:296
+#: redbot/cogs/admin/admin.py:340
 msgid "The server {guild.name} will receive announcements."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:300
+#: redbot/cogs/admin/admin.py:344
 msgid "The server {guild.name} will not receive announcements."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:326
+#: redbot/cogs/admin/admin.py:370
 #, 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        "
+msgid "Apply selfroles."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:337
+#: redbot/cogs/admin/admin.py:375
 #, docstring
-msgid "Remove a selfrole from yourself.\\n\\n        NOTE: The role is case sensitive!\\n        "
+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:347
+#: redbot/cogs/admin/admin.py:386
 #, docstring
-msgid "Add a role to the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
+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: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
+#: redbot/cogs/admin/admin.py:397
 #, docstring
 msgid "\\n        Lists all available selfroles.\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:377
+#: redbot/cogs/admin/admin.py:407
 msgid "Available Selfroles:\\n{selfroles}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:394
+#: redbot/cogs/admin/admin.py:413
+#, docstring
+msgid "Manage selfroles."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:418
+#, 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:425
+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:433
+msgid "Added."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:436
+msgid "That role is already a selfrole."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:440
+#, 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:447
+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:455
+msgid "Removed."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:460
 #, docstring
 msgid "Lock a bot to its current servers only."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:399
+#: redbot/cogs/admin/admin.py:465
 msgid "The bot is no longer serverlocked."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:401
+#: redbot/cogs/admin/admin.py:467
 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:75
+msgid "I could not announce to the following server: "
 msgstr ""
 
-#: redbot/cogs/admin/converters.py:25
+#: redbot/cogs/admin/announcer.py:77
+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,19 +1,18 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2019-07-05 22:33+0200\n"
-"PO-Revision-Date: 2019-07-06 16:13\n"
-"Last-Translator: Robert Jansen (Kowlin)\n"
+"POT-Creation-Date: 2020-04-23 12:07+0000\n"
+"Last-Translator: \n"
 "Language-Team: Korean\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: redgettext 3.0\n"
+"Generated-By: redgettext 3.1\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: red-discordbot\n"
+"X-Crowdin-Project-ID: 289505\n"
 "X-Crowdin-Language: ko\n"
-"X-Crowdin-File: /cogs/admin/locales/messages.pot\n"
+"X-Crowdin-File-ID: 42\n"
 "Language: ko_KR\n"
 
 #: redbot/cogs/admin/admin.py:17
@@ -21,166 +20,221 @@ msgid "I attempted to do something that Discord denied me permissions for. Your
 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."
+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."
+#: redbot/cogs/admin/admin.py:28
+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:34
+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:40
+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:46
+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:52
+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:58
+msgid "I need manage roles permission to do that."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:60
 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
+#: redbot/cogs/admin/admin.py:70
 #, 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:126
+msgid "{member.display_name} already has the role {role.name}."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:121
+#: redbot/cogs/admin/admin.py:146
 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:156
+msgid "{member.display_name} does not have the role {role.name}."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:138
+#: redbot/cogs/admin/admin.py:176
 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."
+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:194
+#: redbot/cogs/admin/admin.py:203
 #, 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        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:217 redbot/cogs/admin/admin.py:245
+#: redbot/cogs/admin/admin.py:217
+#, docstring
+msgid "Edit role settings."
+msgstr "역할 설정을 변경했어요."
+
+#: redbot/cogs/admin/admin.py:224
+#, 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:253 redbot/cogs/admin/admin.py:286
 msgid "Done."
 msgstr "다 했어요."
 
-#: redbot/cogs/admin/admin.py:222
+#: redbot/cogs/admin/admin.py:257
 #, 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:291
 #, docstring
 msgid "Announce a message to all servers the bot is in."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:257
+#: redbot/cogs/admin/admin.py:298
 msgid "The announcement has begun."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:265
+#: redbot/cogs/admin/admin.py:305
 #, docstring
 msgid "Cancel a running announce."
+msgstr "실행 중인 공지사항을 취소했어요."
+
+#: redbot/cogs/admin/admin.py:307
+msgid "There is no currently running announcement."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:271
+#: redbot/cogs/admin/admin.py:310
 msgid "The current announcement has been cancelled."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:277
+#: redbot/cogs/admin/admin.py:316
 #, 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:321
+#, 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:330
 msgid "The announcement channel has been set to {channel.mention}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:290
+#: redbot/cogs/admin/admin.py:335
 #, docstring
 msgid "Toggle announcements being enabled this server."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:296
+#: redbot/cogs/admin/admin.py:340
 msgid "The server {guild.name} will receive announcements."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:300
+#: redbot/cogs/admin/admin.py:344
 msgid "The server {guild.name} will not receive announcements."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:326
+#: redbot/cogs/admin/admin.py:370
 #, 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        "
+msgid "Apply selfroles."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:337
+#: redbot/cogs/admin/admin.py:375
 #, docstring
-msgid "Remove a selfrole from yourself.\\n\\n        NOTE: The role is case sensitive!\\n        "
+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:347
+#: redbot/cogs/admin/admin.py:386
 #, docstring
-msgid "Add a role to the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
+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: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
+#: redbot/cogs/admin/admin.py:397
 #, docstring
 msgid "\\n        Lists all available selfroles.\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:377
+#: redbot/cogs/admin/admin.py:407
 msgid "Available Selfroles:\\n{selfroles}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:394
+#: redbot/cogs/admin/admin.py:413
+#, docstring
+msgid "Manage selfroles."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:418
+#, 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:425
+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:433
+msgid "Added."
+msgstr "추가됐어요."
+
+#: redbot/cogs/admin/admin.py:436
+msgid "That role is already a selfrole."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:440
+#, 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:447
+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:455
+msgid "Removed."
+msgstr "제거됐어요."
+
+#: redbot/cogs/admin/admin.py:460
 #, docstring
 msgid "Lock a bot to its current servers only."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:399
+#: redbot/cogs/admin/admin.py:465
 msgid "The bot is no longer serverlocked."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:401
+#: redbot/cogs/admin/admin.py:467
 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:75
+msgid "I could not announce to the following server: "
 msgstr ""
 
-#: redbot/cogs/admin/converters.py:25
+#: redbot/cogs/admin/announcer.py:77
+msgid "I could not announce to the following servers: "
+msgstr "다음과 같은 서버에 알릴 수 없어요. : "
+
+#: 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/nl-NL.po

@@ -1,186 +1,240 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2019-07-05 22:33+0200\n"
-"PO-Revision-Date: 2019-07-06 16:13\n"
-"Last-Translator: Robert Jansen (Kowlin)\n"
+"POT-Creation-Date: 2020-04-23 12:07+0000\n"
+"Last-Translator: \n"
 "Language-Team: Dutch\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: redgettext 3.0\n"
+"Generated-By: redgettext 3.1\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: red-discordbot\n"
+"X-Crowdin-Project-ID: 289505\n"
 "X-Crowdin-Language: nl\n"
-"X-Crowdin-File: /cogs/admin/locales/messages.pot\n"
+"X-Crowdin-File-ID: 42\n"
 "Language: nl_NL\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 "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 ""
+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 ""
+#: redbot/cogs/admin/admin.py:28
+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:34
+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:40
+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:46
+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:52
+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:58
+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:60
 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:70
 #, 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:126
+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:146
 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:156
+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:176
 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
-#, 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 "\\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:203
+#, 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        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:217
+#, docstring
 msgid "Edit role settings."
 msgstr "Rol instellingen bewerken."
 
-#: redbot/cogs/admin/admin.py:194
+#: redbot/cogs/admin/admin.py:224
 #, 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:253 redbot/cogs/admin/admin.py:286
 msgid "Done."
 msgstr "Klaar."
 
-#: redbot/cogs/admin/admin.py:222
+#: redbot/cogs/admin/admin.py:257
 #, 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:291
 #, 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:298
 msgid "The announcement has begun."
 msgstr "De aankondiging is begonnen."
 
-#: redbot/cogs/admin/admin.py:265
+#: redbot/cogs/admin/admin.py:305
 #, docstring
 msgid "Cancel a running announce."
 msgstr "Annuleer een huidige aankondiging."
 
-#: redbot/cogs/admin/admin.py:271
+#: redbot/cogs/admin/admin.py:307
+msgid "There is no currently running announcement."
+msgstr "Er is momenteel geen lopende aankondiging."
+
+#: redbot/cogs/admin/admin.py:310
 msgid "The current announcement has been cancelled."
 msgstr "De huidige aankondiging is geannuleerd."
 
-#: redbot/cogs/admin/admin.py:277
+#: redbot/cogs/admin/admin.py:316
 #, 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:321
+#, 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        Verander het kanaal waar de bot aankondigingen zal verzenden.\\n        \\n        Als het kanaal leeg is dan is het standaard ingesteld op het huidige kanaal.\\n        "
+
+#: redbot/cogs/admin/admin.py:330
 msgid "The announcement channel has been set to {channel.mention}"
 msgstr "Het aankondigingskanaal is aangepast naar {channel.mention}"
 
-#: redbot/cogs/admin/admin.py:290
+#: redbot/cogs/admin/admin.py:335
 #, docstring
 msgid "Toggle announcements being enabled this server."
 msgstr "Aankondigingen zijn geactiveerd in deze server."
 
-#: redbot/cogs/admin/admin.py:296
+#: redbot/cogs/admin/admin.py:340
 msgid "The server {guild.name} will receive announcements."
 msgstr "De server {guild.name} ontvangt aankondigingen."
 
-#: redbot/cogs/admin/admin.py:300
+#: redbot/cogs/admin/admin.py:344
 msgid "The server {guild.name} will not receive announcements."
 msgstr "De server {guild.name} ontvangt geen aankondigingen."
 
-#: redbot/cogs/admin/admin.py:326
+#: redbot/cogs/admin/admin.py:370
 #, 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 ""
+msgid "Apply selfroles."
+msgstr "Zelfrollen toepassen."
 
-#: redbot/cogs/admin/admin.py:337
+#: redbot/cogs/admin/admin.py:375
 #, docstring
-msgid "Remove a selfrole from yourself.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr ""
+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:347
+#: redbot/cogs/admin/admin.py:386
 #, docstring
-msgid "Add a role to the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr ""
+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: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
+#: redbot/cogs/admin/admin.py:397
 #, 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:407
 msgid "Available Selfroles:\\n{selfroles}"
-msgstr ""
+msgstr "Beschikbare zelfrollen:\\n{selfroles}"
 
-#: redbot/cogs/admin/admin.py:394
+#: redbot/cogs/admin/admin.py:413
+#, docstring
+msgid "Manage selfroles."
+msgstr "Beheer zelfrollen."
+
+#: redbot/cogs/admin/admin.py:418
+#, 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:425
+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:433
+msgid "Added."
+msgstr "Toegevoegd."
+
+#: redbot/cogs/admin/admin.py:436
+msgid "That role is already a selfrole."
+msgstr "Die rol is al een zelfrol."
+
+#: redbot/cogs/admin/admin.py:440
+#, 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:447
+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:455
+msgid "Removed."
+msgstr "Verwijderd."
+
+#: redbot/cogs/admin/admin.py:460
 #, 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:465
 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:467
 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:75
+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:77
+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,19 +1,18 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2019-07-05 22:33+0200\n"
-"PO-Revision-Date: 2019-07-06 16:13\n"
-"Last-Translator: Robert Jansen (Kowlin)\n"
+"POT-Creation-Date: 2020-04-23 12:07+0000\n"
+"Last-Translator: \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.0\n"
+"Generated-By: redgettext 3.1\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: red-discordbot\n"
+"X-Crowdin-Project-ID: 289505\n"
 "X-Crowdin-Language: no\n"
-"X-Crowdin-File: /cogs/admin/locales/messages.pot\n"
+"X-Crowdin-File-ID: 42\n"
 "Language: no_NO\n"
 
 #: redbot/cogs/admin/admin.py:17
@@ -21,166 +20,221 @@ msgid "I attempted to do something that Discord denied me permissions for. Your
 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."
+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."
+#: redbot/cogs/admin/admin.py:28
+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:34
+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:40
+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:46
+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:52
+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:58
+msgid "I need manage roles permission to do that."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:60
 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
+#: redbot/cogs/admin/admin.py:70
 #, 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:126
+msgid "{member.display_name} already has the role {role.name}."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:121
+#: redbot/cogs/admin/admin.py:146
 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:156
+msgid "{member.display_name} does not have the role {role.name}."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:138
+#: redbot/cogs/admin/admin.py:176
 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 "\\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:203
+#, 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:217
+#, docstring
 msgid "Edit role settings."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:194
+#: redbot/cogs/admin/admin.py:224
 #, 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:253 redbot/cogs/admin/admin.py:286
 msgid "Done."
 msgstr "Ferdig."
 
-#: redbot/cogs/admin/admin.py:222
+#: redbot/cogs/admin/admin.py:257
 #, 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:291
 #, docstring
 msgid "Announce a message to all servers the bot is in."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:257
+#: redbot/cogs/admin/admin.py:298
 msgid "The announcement has begun."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:265
+#: redbot/cogs/admin/admin.py:305
 #, docstring
 msgid "Cancel a running announce."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:271
+#: redbot/cogs/admin/admin.py:307
+msgid "There is no currently running announcement."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:310
 msgid "The current announcement has been cancelled."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:277
+#: redbot/cogs/admin/admin.py:316
 #, 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:321
+#, 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:330
 msgid "The announcement channel has been set to {channel.mention}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:290
+#: redbot/cogs/admin/admin.py:335
 #, docstring
 msgid "Toggle announcements being enabled this server."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:296
+#: redbot/cogs/admin/admin.py:340
 msgid "The server {guild.name} will receive announcements."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:300
+#: redbot/cogs/admin/admin.py:344
 msgid "The server {guild.name} will not receive announcements."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:326
+#: redbot/cogs/admin/admin.py:370
 #, 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        "
+msgid "Apply selfroles."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:337
+#: redbot/cogs/admin/admin.py:375
 #, docstring
-msgid "Remove a selfrole from yourself.\\n\\n        NOTE: The role is case sensitive!\\n        "
+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:347
+#: redbot/cogs/admin/admin.py:386
 #, docstring
-msgid "Add a role to the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
+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: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
+#: redbot/cogs/admin/admin.py:397
 #, docstring
 msgid "\\n        Lists all available selfroles.\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:377
+#: redbot/cogs/admin/admin.py:407
 msgid "Available Selfroles:\\n{selfroles}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:394
+#: redbot/cogs/admin/admin.py:413
+#, docstring
+msgid "Manage selfroles."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:418
+#, 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:425
+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:433
+msgid "Added."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:436
+msgid "That role is already a selfrole."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:440
+#, 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:447
+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:455
+msgid "Removed."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:460
 #, docstring
 msgid "Lock a bot to its current servers only."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:399
+#: redbot/cogs/admin/admin.py:465
 msgid "The bot is no longer serverlocked."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:401
+#: redbot/cogs/admin/admin.py:467
 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:75
+msgid "I could not announce to the following server: "
 msgstr ""
 
-#: redbot/cogs/admin/converters.py:25
+#: redbot/cogs/admin/announcer.py:77
+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/pl-PL.po

@@ -1,19 +1,18 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2019-07-05 22:33+0200\n"
-"PO-Revision-Date: 2019-07-06 16:13\n"
-"Last-Translator: Robert Jansen (Kowlin)\n"
+"POT-Creation-Date: 2020-04-23 12:07+0000\n"
+"Last-Translator: \n"
 "Language-Team: Polish\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: redgettext 3.0\n"
+"Generated-By: redgettext 3.1\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
-"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: red-discordbot\n"
+"X-Crowdin-Project-ID: 289505\n"
 "X-Crowdin-Language: pl\n"
-"X-Crowdin-File: /cogs/admin/locales/messages.pot\n"
+"X-Crowdin-File-ID: 42\n"
 "Language: pl_PL\n"
 
 #: redbot/cogs/admin/admin.py:17
@@ -21,166 +20,221 @@ msgid "I attempted to do something that Discord denied me permissions for. Your
 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 "Spróbowałam {verb} {role.name} na {member.display_name}, ale ta rola jest wyższa niż moja najwyższa rola w hierarchii Discorda, więc nie mogłam jej dodać. Daj mi proszę wyższą rolę i spróbuj ponownie."
+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 "Spróbowałam {verb} {role.name} na {member.display_name}, ale ta rola jest wyższa niż twoja najwyższa rola w hierarchii Discorda, więc nie mogłam jej dodać. Uzyskaj proszę wyższą rolę i spróbuj ponownie."
+#: redbot/cogs/admin/admin.py:28
+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 "Spróbowałam zmienić {role.name}, ale ta rola jest wyższa niż twoja najwyższa rola w hierarchii Discorda, więc nie mogłam jej dodać. Uzyskaj proszę wyższą rolę i spróbuj ponownie."
+#: redbot/cogs/admin/admin.py:34
+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:40
+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:46
+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:52
+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:58
+msgid "I need manage roles permission to do that."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:60
 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
+#: redbot/cogs/admin/admin.py:70
 #, docstring
 msgid "A collection of server administration utilities."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:115 redbot/cogs/admin/admin.py:160
-msgid "add"
-msgstr "dodać"
+#: redbot/cogs/admin/admin.py:126
+msgid "{member.display_name} already has the role {role.name}."
+msgstr ""
 
-#: redbot/cogs/admin/admin.py:121
+#: redbot/cogs/admin/admin.py:146
 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 "usunąć"
+#: redbot/cogs/admin/admin.py:156
+msgid "{member.display_name} does not have the role {role.name}."
+msgstr ""
 
-#: redbot/cogs/admin/admin.py:138
+#: redbot/cogs/admin/admin.py:176
 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 "\\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:203
+#, 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:217
+#, docstring
 msgid "Edit role settings."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:194
+#: redbot/cogs/admin/admin.py:224
 #, 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:253 redbot/cogs/admin/admin.py:286
 msgid "Done."
 msgstr "Gotowe."
 
-#: redbot/cogs/admin/admin.py:222
+#: redbot/cogs/admin/admin.py:257
 #, 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:291
 #, docstring
 msgid "Announce a message to all servers the bot is in."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:257
+#: redbot/cogs/admin/admin.py:298
 msgid "The announcement has begun."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:265
+#: redbot/cogs/admin/admin.py:305
 #, docstring
 msgid "Cancel a running announce."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:271
+#: redbot/cogs/admin/admin.py:307
+msgid "There is no currently running announcement."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:310
 msgid "The current announcement has been cancelled."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:277
+#: redbot/cogs/admin/admin.py:316
 #, 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:321
+#, 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:330
 msgid "The announcement channel has been set to {channel.mention}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:290
+#: redbot/cogs/admin/admin.py:335
 #, docstring
 msgid "Toggle announcements being enabled this server."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:296
+#: redbot/cogs/admin/admin.py:340
 msgid "The server {guild.name} will receive announcements."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:300
+#: redbot/cogs/admin/admin.py:344
 msgid "The server {guild.name} will not receive announcements."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:326
+#: redbot/cogs/admin/admin.py:370
 #, 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        "
+msgid "Apply selfroles."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:337
+#: redbot/cogs/admin/admin.py:375
 #, docstring
-msgid "Remove a selfrole from yourself.\\n\\n        NOTE: The role is case sensitive!\\n        "
+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:347
+#: redbot/cogs/admin/admin.py:386
 #, docstring
-msgid "Add a role to the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
+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: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
+#: redbot/cogs/admin/admin.py:397
 #, docstring
 msgid "\\n        Lists all available selfroles.\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:377
+#: redbot/cogs/admin/admin.py:407
 msgid "Available Selfroles:\\n{selfroles}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:394
+#: redbot/cogs/admin/admin.py:413
+#, docstring
+msgid "Manage selfroles."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:418
+#, 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:425
+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:433
+msgid "Added."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:436
+msgid "That role is already a selfrole."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:440
+#, 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:447
+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:455
+msgid "Removed."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:460
 #, docstring
 msgid "Lock a bot to its current servers only."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:399
+#: redbot/cogs/admin/admin.py:465
 msgid "The bot is no longer serverlocked."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:401
+#: redbot/cogs/admin/admin.py:467
 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:75
+msgid "I could not announce to the following server: "
 msgstr ""
 
-#: redbot/cogs/admin/converters.py:25
+#: redbot/cogs/admin/announcer.py:77
+msgid "I could not announce to the following servers: "
+msgstr ""
+
+#: redbot/cogs/admin/converters.py:12
 msgid "The Admin cog is not loaded."
 msgstr "Moduł Admin nie jest załadowany."
 
-#: 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/pt-BR.po

@@ -1,19 +1,18 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2019-07-05 22:33+0200\n"
-"PO-Revision-Date: 2019-07-06 16:14\n"
-"Last-Translator: Robert Jansen (Kowlin)\n"
+"POT-Creation-Date: 2020-04-23 12:07+0000\n"
+"Last-Translator: \n"
 "Language-Team: Portuguese, Brazilian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: redgettext 3.0\n"
+"Generated-By: redgettext 3.1\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: red-discordbot\n"
+"X-Crowdin-Project-ID: 289505\n"
 "X-Crowdin-Language: pt-BR\n"
-"X-Crowdin-File: /cogs/admin/locales/messages.pot\n"
+"X-Crowdin-File-ID: 42\n"
 "Language: pt_BR\n"
 
 #: redbot/cogs/admin/admin.py:17
@@ -21,166 +20,221 @@ msgid "I attempted to do something that Discord denied me permissions for. Your
 msgstr "Eu tentei fazer algo que o Discord me negou as permissões. Seu comando falhou em ser completado com sucesso."
 
 #: 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 ""
+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 "Não posso atribuir o cargo {role.name} para {member.display_name} porque este cargo é mais alto ou igual que o meu cargo mais alto na hierarquia do 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 ""
+#: redbot/cogs/admin/admin.py:28
+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 "Não posso remover o cargo {role.name} de {member.display_name} porque este cargo é mais alto ou igual que o meu cargo mais alto na hierarquia do 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 ""
+#: redbot/cogs/admin/admin.py:34
+msgid "I can not edit {role.name} because that role is higher than my or equal to highest role in the Discord hierarchy."
+msgstr "Não posso alterar o cargo {role.name} porque este cargo é mais alto ou igual que o meu cargo mais alto na hierarquia do Discord."
 
-#: redbot/cogs/admin/admin.py:43
+#: redbot/cogs/admin/admin.py:40
+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 "Não posso deixar você atribuir o cargo {role.name} para {member.display_name} porque este cargo é mais alto ou igual que o meu cargo mais alto na hierarquia do Discord."
+
+#: redbot/cogs/admin/admin.py:46
+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 "Não posso deixar você rmover o cargo {role.name} de {member.display_name} porque este cargo é mais alto ou igual que o meu cargo mais alto na hierarquia do Discord."
+
+#: redbot/cogs/admin/admin.py:52
+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 "Não posso deixar você alterar o cargo {role.name} porque este cargo é mais alto ou igual que o meu cargo mais alto na hierarquia do Discord."
+
+#: redbot/cogs/admin/admin.py:58
+msgid "I need manage roles permission to do that."
+msgstr "Preciso da permissão para alterar os cargos para fazer isto."
+
+#: redbot/cogs/admin/admin.py:60
 msgid "I am already announcing something. If you would like to make a different announcement please use `{prefix}announce cancel` first."
 msgstr "Eu já estou anunciando algo. Se quer fazer um anúncio diferente, por favor use `{prefix}announce cancel` primeiro."
 
-#: redbot/cogs/admin/admin.py:53
+#: redbot/cogs/admin/admin.py:70
 #, docstring
 msgid "A collection of server administration utilities."
-msgstr "Uma coleção de ferramentas de administração para o servidor."
+msgstr "Um conjunto de ferramentas para a administração do servidor."
 
-#: redbot/cogs/admin/admin.py:115 redbot/cogs/admin/admin.py:160
-msgid "add"
-msgstr ""
+#: redbot/cogs/admin/admin.py:126
+msgid "{member.display_name} already has the role {role.name}."
+msgstr "{member.display_name} já tem o cargo {role.name}."
 
-#: redbot/cogs/admin/admin.py:121
+#: redbot/cogs/admin/admin.py:146
 msgid "I successfully added {role.name} to {member.display_name}"
 msgstr "Eu adicionei com sucesso {role.name} de {member.display_name}"
 
-#: redbot/cogs/admin/admin.py:132 redbot/cogs/admin/admin.py:180
-msgid "remove"
-msgstr ""
+#: redbot/cogs/admin/admin.py:156
+msgid "{member.display_name} does not have the role {role.name}."
+msgstr "{member.display_name} não tem o cargo {role.name}."
 
-#: redbot/cogs/admin/admin.py:138
+#: redbot/cogs/admin/admin.py:176
 msgid "I successfully removed {role.name} from {member.display_name}"
-msgstr "Eu removi com sucesso {role.name} de {member.display_name}"
-
-#: 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 ""
+msgstr "Eu removi {role.name} de {member.display_name} com sucesso"
 
 #: redbot/cogs/admin/admin.py:187
 #, docstring
-msgid "Edit role settings."
-msgstr "Edite as configurações de cargo."
+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        Concede um cargo a um(a) usuário(a).\\n\\n        Use aspas duplas se o nome do cargo contiver espaços.\\n        Se o usuário for deixado em branco, por padrão será usado a(o) autor(a) do comando.\\n        "
 
-#: redbot/cogs/admin/admin.py:194
+#: redbot/cogs/admin/admin.py:203
 #, 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        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        Remove um cargo de um(a) usuário(a).\\n\\n        Use aspas duplas se o nome do cargo contiver espaços.\\n        Se o usuário for deixado em branco, por padrão será usado a(o) autor(a) do comando.\\n        "
 
-#: redbot/cogs/admin/admin.py:217 redbot/cogs/admin/admin.py:245
+#: redbot/cogs/admin/admin.py:217
+#, docstring
+msgid "Edit role settings."
+msgstr "Altera as configurações de cargo."
+
+#: redbot/cogs/admin/admin.py:224
+#, 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        Edita a cor de um cargo.\\n\\n        Use aspas duplas se o cargo contiver espaços.\\n        A cor precisa estar em formato hexadecimal.\\n        [Seletor de cores online](http://www.w3schools.com/colors/colors_picker.asp)\\n\\n        Exemplos:\\n            `[p]editrole colour \\\"O Transistor\\\" #ff0000`\\n            `[p]editrole colour Teste #ff9900`\\n        "
+
+#: redbot/cogs/admin/admin.py:253 redbot/cogs/admin/admin.py:286
 msgid "Done."
 msgstr "Concluído."
 
-#: redbot/cogs/admin/admin.py:222
+#: redbot/cogs/admin/admin.py:257
 #, 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        Alterar o nome de um cargo.\\n\\n        Use aspas duplas se o cargo ou o nome contiverem espaços.\\n\\n        Exemplo:\\n            `[p]editrole name \\\"O Transistor\\\" Teste`\\n        "
 
-#: redbot/cogs/admin/admin.py:250
+#: redbot/cogs/admin/admin.py:291
 #, docstring
 msgid "Announce a message to all servers the bot is in."
-msgstr ""
+msgstr "Anuncia uma mensagem para todos os servidores onde o bot está."
 
-#: redbot/cogs/admin/admin.py:257
+#: redbot/cogs/admin/admin.py:298
 msgid "The announcement has begun."
-msgstr ""
+msgstr "O anúncio começou."
 
-#: redbot/cogs/admin/admin.py:265
+#: redbot/cogs/admin/admin.py:305
 #, docstring
 msgid "Cancel a running announce."
-msgstr ""
+msgstr "Cancela um anúncio em andamento."
 
-#: redbot/cogs/admin/admin.py:271
+#: redbot/cogs/admin/admin.py:307
+msgid "There is no currently running announcement."
+msgstr "Não existe nenhum anúncio em andamento."
+
+#: redbot/cogs/admin/admin.py:310
 msgid "The current announcement has been cancelled."
-msgstr ""
+msgstr "O anúncio atual foi cancelado."
 
-#: redbot/cogs/admin/admin.py:277
+#: redbot/cogs/admin/admin.py:316
 #, docstring
-msgid "Change the channel to which the bot makes announcements."
-msgstr ""
+msgid "Change how announcements are sent in this guild."
+msgstr "Altera como os anúncios são enviados nessa guilda."
 
-#: redbot/cogs/admin/admin.py:283
+#: redbot/cogs/admin/admin.py:321
+#, 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        Altera o canal para onde o bot enviará os anúncios.\\n        \\n        Se o canal for deixado em branco, por padrão será usado o canal atual.\\n        "
+
+#: redbot/cogs/admin/admin.py:330
 msgid "The announcement channel has been set to {channel.mention}"
-msgstr ""
+msgstr "O canal de anúncios foi definido como {channel.mention}"
 
-#: redbot/cogs/admin/admin.py:290
+#: redbot/cogs/admin/admin.py:335
 #, docstring
 msgid "Toggle announcements being enabled this server."
-msgstr ""
+msgstr "Alterna se os anúncios estão habilitados nesse servidor."
 
-#: redbot/cogs/admin/admin.py:296
+#: redbot/cogs/admin/admin.py:340
 msgid "The server {guild.name} will receive announcements."
-msgstr ""
+msgstr "O servidor {guild.name} receberá anúncios."
 
-#: redbot/cogs/admin/admin.py:300
+#: redbot/cogs/admin/admin.py:344
 msgid "The server {guild.name} will not receive announcements."
-msgstr ""
+msgstr "O servidor {guild.name} não receberá anúncios."
 
-#: redbot/cogs/admin/admin.py:326
+#: redbot/cogs/admin/admin.py:370
 #, 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 ""
+msgid "Apply selfroles."
+msgstr "Concede cargos autoatribuíveis a si."
 
-#: redbot/cogs/admin/admin.py:337
+#: redbot/cogs/admin/admin.py:375
 #, docstring
-msgid "Remove a selfrole from yourself.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr ""
+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        Concede um cargo autoatribuível a si.\\n\\n        Os administradores do servidor precisarão configurar o cargo como autoatribuível.\\n        NOTA: o nome do cargo diferencia entre maiúsculas e minúsculas!\\n        "
 
-#: redbot/cogs/admin/admin.py:347
+#: redbot/cogs/admin/admin.py:386
 #, docstring
-msgid "Add a role to the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr ""
+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        Remove um cargo autoatribuível de si.\\n\\n        Os administradores do servidor precisarão configurar o cargo como autoatribuível.\\n        NOTA: o nome do cargo diferencia entre maiúsculas e minúsculas!\\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 ""
-
-#: redbot/cogs/admin/admin.py:371
+#: redbot/cogs/admin/admin.py:397
 #, docstring
 msgid "\\n        Lists all available selfroles.\\n        "
-msgstr ""
+msgstr "\\n        Lista todos os cargos autoatribuíveis.\\n        "
 
-#: redbot/cogs/admin/admin.py:377
+#: redbot/cogs/admin/admin.py:407
 msgid "Available Selfroles:\\n{selfroles}"
-msgstr ""
+msgstr "Cargos autoatribuíveis disponíveis:\\n{selfroles}"
 
-#: redbot/cogs/admin/admin.py:394
+#: redbot/cogs/admin/admin.py:413
+#, docstring
+msgid "Manage selfroles."
+msgstr "Gerenciar cargos autoatribuíveis."
+
+#: redbot/cogs/admin/admin.py:418
+#, docstring
+msgid "\\n        Add a role to the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
+msgstr "\\n        Adiciona um cargo à lista de cargos autoatribuíveis.\\n\\n        NOTA: o nome do cargo diferencia entre maiúsculas e minúsculas!\\n        "
+
+#: redbot/cogs/admin/admin.py:425
+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 "Não posso deixar você atribuir {role.name} como um cargo autoatribuível porque este cargo é mais alto ou igual ao seu mais alto cargo na hierarquia do Discord."
+
+#: redbot/cogs/admin/admin.py:433
+msgid "Added."
+msgstr "Adicionado."
+
+#: redbot/cogs/admin/admin.py:436
+msgid "That role is already a selfrole."
+msgstr "Este cargo já é autoatribuível."
+
+#: redbot/cogs/admin/admin.py:440
+#, docstring
+msgid "\\n        Remove a role from the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
+msgstr "\\n        Remove um cargo da lista de cargos autoatribuíveis.\\n\\n        NOTA: o nome do cargo diferencia entre maiúsculas e minúsculas!\\n        "
+
+#: redbot/cogs/admin/admin.py:447
+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 "Não posso deixar você remover o cargo {role.name} da lista de cargos autoatribuíveis porque este cargo é mais alto ou igual ao seu mais alto cargo na hierarquia do Discord."
+
+#: redbot/cogs/admin/admin.py:455
+msgid "Removed."
+msgstr "Removido."
+
+#: redbot/cogs/admin/admin.py:460
 #, docstring
 msgid "Lock a bot to its current servers only."
-msgstr ""
+msgstr "Restringe o bot somente aos servidores atuais."
 
-#: redbot/cogs/admin/admin.py:399
+#: redbot/cogs/admin/admin.py:465
 msgid "The bot is no longer serverlocked."
-msgstr ""
+msgstr "O bot não está mais restrito aos servidores atuais."
 
-#: redbot/cogs/admin/admin.py:401
+#: redbot/cogs/admin/admin.py:467
 msgid "The bot is now serverlocked."
-msgstr ""
+msgstr "O está restrito aos servidores atuais."
 
-#: redbot/cogs/admin/announcer.py:70
-msgid "I could not announce to server: {server.id}"
-msgstr ""
+#: redbot/cogs/admin/announcer.py:75
+msgid "I could not announce to the following server: "
+msgstr "Não pude anunciar no seguinte servidor: "
 
-#: redbot/cogs/admin/converters.py:25
+#: redbot/cogs/admin/announcer.py:77
+msgid "I could not announce to the following servers: "
+msgstr "Não pude anunciar nos seguintes servidores: "
+
+#: redbot/cogs/admin/converters.py:12
 msgid "The Admin cog is not loaded."
-msgstr ""
+msgstr "O cog 'Admin' não está carregado."
 
-#: redbot/cogs/admin/converters.py:34
+#: redbot/cogs/admin/converters.py:20
 msgid "The provided role is not a valid selfrole."
-msgstr ""
+msgstr "O cargo fornecido não é um cargo autoatribuível válido."
 

redbot/cogs/admin/locales/pt-PT.po

@@ -1,19 +1,18 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2019-07-05 22:33+0200\n"
-"PO-Revision-Date: 2019-07-06 16:13\n"
-"Last-Translator: Robert Jansen (Kowlin)\n"
+"POT-Creation-Date: 2020-04-23 12:07+0000\n"
+"Last-Translator: \n"
 "Language-Team: Portuguese\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: redgettext 3.0\n"
+"Generated-By: redgettext 3.1\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: red-discordbot\n"
+"X-Crowdin-Project-ID: 289505\n"
 "X-Crowdin-Language: pt-PT\n"
-"X-Crowdin-File: /cogs/admin/locales/messages.pot\n"
+"X-Crowdin-File-ID: 42\n"
 "Language: pt_PT\n"
 
 #: redbot/cogs/admin/admin.py:17
@@ -21,166 +20,221 @@ msgid "I attempted to do something that Discord denied me permissions for. Your
 msgstr "Tentei fazer uma coisa que o Discord negou permissão para fazer. O comando não foi concluído."
 
 #: 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."
+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 "Eu não posso dar {role.name} a {member.display_name} porque esse cargo é igual ou maior a meu cargo na hierarquia do Discord."
+
+#: redbot/cogs/admin/admin.py:28
+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 "Não posso remover {role.name} de {member.display_name} porque esse cargo é igual ou maior a meu cargo na hierarquia do Discord."
+
+#: redbot/cogs/admin/admin.py:34
+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: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."
+#: redbot/cogs/admin/admin.py:40
+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: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:46
+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:43
+#: redbot/cogs/admin/admin.py:52
+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:58
+msgid "I need manage roles permission to do that."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:60
 msgid "I am already announcing something. If you would like to make a different announcement please use `{prefix}announce cancel` first."
 msgstr "Já estou a anunciar algo. Se queres fazer um anúncio diferente usa `{prefix}announce cancel` antes de usares este comando."
 
-#: redbot/cogs/admin/admin.py:53
+#: redbot/cogs/admin/admin.py:70
 #, docstring
 msgid "A collection of server administration utilities."
 msgstr "Uma coleção de utilidades para administração de servidores."
 
-#: redbot/cogs/admin/admin.py:115 redbot/cogs/admin/admin.py:160
-msgid "add"
+#: redbot/cogs/admin/admin.py:126
+msgid "{member.display_name} already has the role {role.name}."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:121
+#: redbot/cogs/admin/admin.py:146
 msgid "I successfully added {role.name} to {member.display_name}"
 msgstr "Adicionei com sucesso {role.name} a {member.display_name}"
 
-#: redbot/cogs/admin/admin.py:132 redbot/cogs/admin/admin.py:180
-msgid "remove"
+#: redbot/cogs/admin/admin.py:156
+msgid "{member.display_name} does not have the role {role.name}."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:138
+#: redbot/cogs/admin/admin.py:176
 msgid "I successfully removed {role.name} from {member.display_name}"
 msgstr "Removi com sucesso {role.name} de {member.display_name}"
 
-#: 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 "\\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:203
+#, 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:217
+#, docstring
 msgid "Edit role settings."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:194
+#: redbot/cogs/admin/admin.py:224
 #, 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:253 redbot/cogs/admin/admin.py:286
 msgid "Done."
 msgstr "Concluído."
 
-#: redbot/cogs/admin/admin.py:222
+#: redbot/cogs/admin/admin.py:257
 #, 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:291
 #, docstring
 msgid "Announce a message to all servers the bot is in."
 msgstr "Anuncia uma mensagem para todos os servidores em que o bot está."
 
-#: redbot/cogs/admin/admin.py:257
+#: redbot/cogs/admin/admin.py:298
 msgid "The announcement has begun."
 msgstr "O anúncio foi iniciado."
 
-#: redbot/cogs/admin/admin.py:265
+#: redbot/cogs/admin/admin.py:305
 #, docstring
 msgid "Cancel a running announce."
 msgstr "Cancelar um anúncio em curso."
 
-#: redbot/cogs/admin/admin.py:271
+#: redbot/cogs/admin/admin.py:307
+msgid "There is no currently running announcement."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:310
 msgid "The current announcement has been cancelled."
 msgstr "O anúncio atual foi cancelado."
 
-#: redbot/cogs/admin/admin.py:277
+#: redbot/cogs/admin/admin.py:316
 #, docstring
-msgid "Change the channel to which the bot makes announcements."
-msgstr "Mude o canal para o qual o bot faz os anúncios."
+msgid "Change how announcements are sent in this guild."
+msgstr ""
 
-#: redbot/cogs/admin/admin.py:283
+#: redbot/cogs/admin/admin.py:321
+#, 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:330
 msgid "The announcement channel has been set to {channel.mention}"
 msgstr "O canal de anúncio foi definido para {channel.mention}"
 
-#: redbot/cogs/admin/admin.py:290
+#: redbot/cogs/admin/admin.py:335
 #, docstring
 msgid "Toggle announcements being enabled this server."
 msgstr "Ativar ou Desativar os anúncios neste servidor."
 
-#: redbot/cogs/admin/admin.py:296
+#: redbot/cogs/admin/admin.py:340
 msgid "The server {guild.name} will receive announcements."
 msgstr "O servidor {guild.name} vai receber anúncios."
 
-#: redbot/cogs/admin/admin.py:300
+#: redbot/cogs/admin/admin.py:344
 msgid "The server {guild.name} will not receive announcements."
 msgstr "O servidor {guild.name} não vai receber anúncios."
 
-#: redbot/cogs/admin/admin.py:326
+#: redbot/cogs/admin/admin.py:370
 #, 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        "
+msgid "Apply selfroles."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:337
+#: redbot/cogs/admin/admin.py:375
 #, docstring
-msgid "Remove a selfrole from yourself.\\n\\n        NOTE: The role is case sensitive!\\n        "
+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:347
+#: redbot/cogs/admin/admin.py:386
 #, docstring
-msgid "Add a role to the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
+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:355 redbot/cogs/admin/admin.py:367
-msgid "The selfroles list has been successfully modified."
-msgstr "A lista de cargos definíveis foi modificada com sucesso."
-
-#: 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
+#: redbot/cogs/admin/admin.py:397
 #, docstring
 msgid "\\n        Lists all available selfroles.\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:377
+#: redbot/cogs/admin/admin.py:407
 msgid "Available Selfroles:\\n{selfroles}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:394
+#: redbot/cogs/admin/admin.py:413
+#, docstring
+msgid "Manage selfroles."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:418
+#, 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:425
+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:433
+msgid "Added."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:436
+msgid "That role is already a selfrole."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:440
+#, 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:447
+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:455
+msgid "Removed."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:460
 #, docstring
 msgid "Lock a bot to its current servers only."
 msgstr "Bloquear o bot aos servidores atuais."
 
-#: redbot/cogs/admin/admin.py:399
+#: redbot/cogs/admin/admin.py:465
 msgid "The bot is no longer serverlocked."
 msgstr "O bot já não está bloqueado aos servidores atuais."
 
-#: redbot/cogs/admin/admin.py:401
+#: redbot/cogs/admin/admin.py:467
 msgid "The bot is now serverlocked."
 msgstr "O bot está agora bloqueado aos servidores atuais."
 
-#: redbot/cogs/admin/announcer.py:70
-msgid "I could not announce to server: {server.id}"
-msgstr "Não me foi possível anunciar no servidor: {server.id}"
+#: redbot/cogs/admin/announcer.py:75
+msgid "I could not announce to the following server: "
+msgstr ""
 
-#: redbot/cogs/admin/converters.py:25
+#: redbot/cogs/admin/announcer.py:77
+msgid "I could not announce to the following servers: "
+msgstr ""
+
+#: redbot/cogs/admin/converters.py:12
 msgid "The Admin cog is not loaded."
 msgstr "O cog 'Admin' não está carregado."
 
-#: redbot/cogs/admin/converters.py:34
+#: redbot/cogs/admin/converters.py:20
 msgid "The provided role is not a valid selfrole."
 msgstr "O cargo indicado não é um cargo definível válido."
 

redbot/cogs/admin/locales/ro-RO.po

@@ -1,19 +1,18 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2019-07-05 22:33+0200\n"
-"PO-Revision-Date: 2019-07-14 02:09\n"
-"Last-Translator: Robert Jansen (Kowlin)\n"
+"POT-Creation-Date: 2020-04-23 12:07+0000\n"
+"Last-Translator: \n"
 "Language-Team: Romanian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: redgettext 3.0\n"
+"Generated-By: redgettext 3.1\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100>0 && n%100<20)) ? 1 : 2);\n"
-"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: red-discordbot\n"
+"X-Crowdin-Project-ID: 289505\n"
 "X-Crowdin-Language: ro\n"
-"X-Crowdin-File: /cogs/admin/locales/messages.pot\n"
+"X-Crowdin-File-ID: 42\n"
 "Language: ro_RO\n"
 
 #: redbot/cogs/admin/admin.py:17
@@ -21,166 +20,221 @@ msgid "I attempted to do something that Discord denied me permissions for. Your
 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."
+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."
+#: redbot/cogs/admin/admin.py:28
+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:34
+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:40
+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:46
+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:52
+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:58
+msgid "I need manage roles permission to do that."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:60
 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
+#: redbot/cogs/admin/admin.py:70
 #, 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:126
+msgid "{member.display_name} already has the role {role.name}."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:121
+#: redbot/cogs/admin/admin.py:146
 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:156
+msgid "{member.display_name} does not have the role {role.name}."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:138
+#: redbot/cogs/admin/admin.py:176
 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 "\\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:203
+#, 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:217
+#, docstring
 msgid "Edit role settings."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:194
+#: redbot/cogs/admin/admin.py:224
 #, 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:253 redbot/cogs/admin/admin.py:286
 msgid "Done."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:222
+#: redbot/cogs/admin/admin.py:257
 #, 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:291
 #, docstring
 msgid "Announce a message to all servers the bot is in."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:257
+#: redbot/cogs/admin/admin.py:298
 msgid "The announcement has begun."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:265
+#: redbot/cogs/admin/admin.py:305
 #, docstring
 msgid "Cancel a running announce."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:271
+#: redbot/cogs/admin/admin.py:307
+msgid "There is no currently running announcement."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:310
 msgid "The current announcement has been cancelled."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:277
+#: redbot/cogs/admin/admin.py:316
 #, 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:321
+#, 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:330
 msgid "The announcement channel has been set to {channel.mention}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:290
+#: redbot/cogs/admin/admin.py:335
 #, docstring
 msgid "Toggle announcements being enabled this server."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:296
+#: redbot/cogs/admin/admin.py:340
 msgid "The server {guild.name} will receive announcements."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:300
+#: redbot/cogs/admin/admin.py:344
 msgid "The server {guild.name} will not receive announcements."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:326
+#: redbot/cogs/admin/admin.py:370
 #, 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        "
+msgid "Apply selfroles."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:337
+#: redbot/cogs/admin/admin.py:375
 #, docstring
-msgid "Remove a selfrole from yourself.\\n\\n        NOTE: The role is case sensitive!\\n        "
+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:347
+#: redbot/cogs/admin/admin.py:386
 #, docstring
-msgid "Add a role to the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
+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: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
+#: redbot/cogs/admin/admin.py:397
 #, docstring
 msgid "\\n        Lists all available selfroles.\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:377
+#: redbot/cogs/admin/admin.py:407
 msgid "Available Selfroles:\\n{selfroles}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:394
+#: redbot/cogs/admin/admin.py:413
+#, docstring
+msgid "Manage selfroles."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:418
+#, 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:425
+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:433
+msgid "Added."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:436
+msgid "That role is already a selfrole."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:440
+#, 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:447
+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:455
+msgid "Removed."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:460
 #, docstring
 msgid "Lock a bot to its current servers only."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:399
+#: redbot/cogs/admin/admin.py:465
 msgid "The bot is no longer serverlocked."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:401
+#: redbot/cogs/admin/admin.py:467
 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:75
+msgid "I could not announce to the following server: "
 msgstr ""
 
-#: redbot/cogs/admin/converters.py:25
+#: redbot/cogs/admin/announcer.py:77
+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/ru-RU.po

@@ -1,19 +1,18 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2019-07-05 22:33+0200\n"
-"PO-Revision-Date: 2019-07-06 16:13\n"
-"Last-Translator: Robert Jansen (Kowlin)\n"
+"POT-Creation-Date: 2020-04-23 12:07+0000\n"
+"Last-Translator: \n"
 "Language-Team: Russian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: redgettext 3.0\n"
+"Generated-By: redgettext 3.1\n"
 "Plural-Forms: nplurals=4; plural=((n%10==1 && n%100!=11) ? 0 : ((n%10 >= 2 && n%10 <=4 && (n%100 < 12 || n%100 > 14)) ? 1 : ((n%10 == 0 || (n%10 >= 5 && n%10 <=9)) || (n%100 >= 11 && n%100 <= 14)) ? 2 : 3));\n"
-"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: red-discordbot\n"
+"X-Crowdin-Project-ID: 289505\n"
 "X-Crowdin-Language: ru\n"
-"X-Crowdin-File: /cogs/admin/locales/messages.pot\n"
+"X-Crowdin-File-ID: 42\n"
 "Language: ru_RU\n"
 
 #: redbot/cogs/admin/admin.py:17
@@ -21,166 +20,221 @@ msgid "I attempted to do something that Discord denied me permissions for. Your
 msgstr "Я попыталась сделать что-то, в чем Discord отказал мне в разрешениях. Ваша команда не была выполнена успешно."
 
 #: 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 ""
+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 "Я не могу дать {role.name} для {member.display_name}, потому что эта роль выше или равна моей самой высокой роли в иерархии 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 ""
+#: redbot/cogs/admin/admin.py:28
+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 "Я не могу убрать {role.name} у {member.display_name}, потому что эта роль выше или равна моей самой высокой роли в иерархии 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 "Я попытался изменить {role.name}, но эта роль выше Вашей в иерархии Discord, поэтому я не смог добавить её. Повысьте роль и попробуйте еще раз."
+#: redbot/cogs/admin/admin.py:34
+msgid "I can not edit {role.name} because that role is higher than my or equal to highest role in the Discord hierarchy."
+msgstr "Я не могу редактировать {role.name}, потому что эта роль выше моей или равна самой высокой роли в иерархии Discord."
 
-#: redbot/cogs/admin/admin.py:43
+#: redbot/cogs/admin/admin.py:40
+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 "Я не могу вам дать {role.name}, {member.display_name}, поскольку эта роль выше или равна вашей самой высокой роли в иерархии Discord."
+
+#: redbot/cogs/admin/admin.py:46
+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 "Я не могу позволить вам удалить {role.name} у {member.display_name}, потому что эта роль выше или равна вашей самой высокой роли в иерархии Discord."
+
+#: redbot/cogs/admin/admin.py:52
+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 "Я не могу позволить вам редактировать {role.name}, потому что эта роль больше или равна вашей самой высокой роли в иерархии Discord."
+
+#: redbot/cogs/admin/admin.py:58
+msgid "I need manage roles permission to do that."
+msgstr "Мне нужно управлять правами ролей, чтобы сделать это."
+
+#: redbot/cogs/admin/admin.py:60
 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:70
 #, 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:126
+msgid "{member.display_name} already has the role {role.name}."
+msgstr "{member.display_name} уже имеет роль {role.name}."
 
-#: redbot/cogs/admin/admin.py:121
+#: redbot/cogs/admin/admin.py:146
 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:156
+msgid "{member.display_name} does not have the role {role.name}."
+msgstr "{member.display_name} не имеет роли {role.name}."
 
-#: redbot/cogs/admin/admin.py:138
+#: redbot/cogs/admin/admin.py:176
 msgid "I successfully removed {role.name} from {member.display_name}"
 msgstr "Я успешно забрала роль {role.name} у пользователя {member.display_name}"
 
-#: 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 "\\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        Добавить роль пользователю.\\n\\n        Используйте двойные кавычки, если роль содержит пробелы.\\n        Если пользователь не указан, по умолчанию используется автор команды.\\n        "
+
+#: redbot/cogs/admin/admin.py:203
+#, 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        Удалить роль у пользователя.\\n\\n        Используйте двойные кавычки, если роль содержит пробелы.\\n        Если пользователь не указан, по умолчанию используется автор команды.\\n        "
+
+#: redbot/cogs/admin/admin.py:217
+#, docstring
 msgid "Edit role settings."
 msgstr "Изменение параметров роли."
 
-#: redbot/cogs/admin/admin.py:194
+#: redbot/cogs/admin/admin.py:224
 #, 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        Изменить цвет роли.\\n\\n        Используйте двойные кавычки, если роль содержит пробелы.\\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        "
 
-#: redbot/cogs/admin/admin.py:217 redbot/cogs/admin/admin.py:245
+#: redbot/cogs/admin/admin.py:253 redbot/cogs/admin/admin.py:286
 msgid "Done."
 msgstr "Готово."
 
-#: redbot/cogs/admin/admin.py:222
+#: redbot/cogs/admin/admin.py:257
 #, 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        Изменить название роли.\\n\\n        Используйте двойные кавычки, если роль или имя содержат пробелы.\\n\\n        Примеры:\\n            `[p]editrole name \\\"The Transistor\\\" Test`\\n        "
 
-#: redbot/cogs/admin/admin.py:250
+#: redbot/cogs/admin/admin.py:291
 #, docstring
 msgid "Announce a message to all servers the bot is in."
 msgstr "Объявить сообщение на всех серверах, к которым подключен бот."
 
-#: redbot/cogs/admin/admin.py:257
+#: redbot/cogs/admin/admin.py:298
 msgid "The announcement has begun."
 msgstr "Объявление началось."
 
-#: redbot/cogs/admin/admin.py:265
+#: redbot/cogs/admin/admin.py:305
 #, docstring
 msgid "Cancel a running announce."
 msgstr "Отменить текущее объявление."
 
-#: redbot/cogs/admin/admin.py:271
+#: redbot/cogs/admin/admin.py:307
+msgid "There is no currently running announcement."
+msgstr "В данный момент нет запущенных объявлений."
+
+#: redbot/cogs/admin/admin.py:310
 msgid "The current announcement has been cancelled."
 msgstr "Текущее объявление было отменено."
 
-#: redbot/cogs/admin/admin.py:277
+#: redbot/cogs/admin/admin.py:316
 #, 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:321
+#, 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        Изменить канал, в котором бот будет отправлять объявления.\\n        \\n        Если канал не указан, по умолчанию используется текущий канал.\\n        "
+
+#: redbot/cogs/admin/admin.py:330
 msgid "The announcement channel has been set to {channel.mention}"
 msgstr "Канал объявления был установлен на {channel.mention}"
 
-#: redbot/cogs/admin/admin.py:290
+#: redbot/cogs/admin/admin.py:335
 #, docstring
 msgid "Toggle announcements being enabled this server."
 msgstr "Переключить объявления, когда этот сервер включен."
 
-#: redbot/cogs/admin/admin.py:296
+#: redbot/cogs/admin/admin.py:340
 msgid "The server {guild.name} will receive announcements."
 msgstr "Сервер {guild.name} будет получать объявления."
 
-#: redbot/cogs/admin/admin.py:300
+#: redbot/cogs/admin/admin.py:344
 msgid "The server {guild.name} will not receive announcements."
 msgstr "Сервер {guild.name} не будет получать объявления."
 
-#: redbot/cogs/admin/admin.py:326
+#: redbot/cogs/admin/admin.py:370
 #, 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 ""
+msgid "Apply selfroles."
+msgstr "Применить свои роли."
 
-#: redbot/cogs/admin/admin.py:337
+#: redbot/cogs/admin/admin.py:375
 #, docstring
-msgid "Remove a selfrole from yourself.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr ""
+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        Добавить собственную роль себе.\\n\\n        Администраторы сервера должны настроить роль как устанавливаемую пользователем.\\n        ПРИМЕЧАНИЕ: Роль чувствительна к регистру!\\n        "
 
-#: redbot/cogs/admin/admin.py:347
+#: redbot/cogs/admin/admin.py:386
 #, docstring
-msgid "Add a role to the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr ""
+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        Удалить собственную роль у себя.\\n\\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 ""
-
-#: redbot/cogs/admin/admin.py:371
+#: redbot/cogs/admin/admin.py:397
 #, docstring
 msgid "\\n        Lists all available selfroles.\\n        "
-msgstr ""
+msgstr "\\n        Список всех доступных Собственных ролей.\\n        "
 
-#: redbot/cogs/admin/admin.py:377
+#: redbot/cogs/admin/admin.py:407
 msgid "Available Selfroles:\\n{selfroles}"
-msgstr ""
+msgstr "Доступные Собственные роли:\\n{selfroles}"
 
-#: redbot/cogs/admin/admin.py:394
+#: redbot/cogs/admin/admin.py:413
+#, docstring
+msgid "Manage selfroles."
+msgstr "Управление своими ролями."
+
+#: redbot/cogs/admin/admin.py:418
+#, docstring
+msgid "\\n        Add a role to the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
+msgstr "\\n        Добавить роль в список доступных своих ролей.\\n\\n        ПРИМЕЧАНИЕ: Роль чувствительна к регистру!\\n        "
+
+#: redbot/cogs/admin/admin.py:425
+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 "Я не могу позволить вам добавить {role.name} в качестве собственной роли, потому что эта роль выше или равна вашей самой высокой роли в иерархии Discord."
+
+#: redbot/cogs/admin/admin.py:433
+msgid "Added."
+msgstr "Добавлено."
+
+#: redbot/cogs/admin/admin.py:436
+msgid "That role is already a selfrole."
+msgstr "Эта роль уже является собственной ролью."
+
+#: redbot/cogs/admin/admin.py:440
+#, docstring
+msgid "\\n        Remove a role from the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
+msgstr "\\n        Удалить роль из списка доступных собственных ролей.\\n\\n        ПРИМЕЧАНИЕ: Роль чувствительна к регистру!\\n        "
+
+#: redbot/cogs/admin/admin.py:447
+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 "Я не могу позволить вам сделать {role.name} не собственной ролью, потому что эта роль выше или равна вашей самой высокой роли в иерархии Discord."
+
+#: redbot/cogs/admin/admin.py:455
+msgid "Removed."
+msgstr "Удалено."
+
+#: redbot/cogs/admin/admin.py:460
 #, docstring
 msgid "Lock a bot to its current servers only."
 msgstr "Зафиксировать бота только на его текущих серверах."
 
-#: redbot/cogs/admin/admin.py:399
+#: redbot/cogs/admin/admin.py:465
 msgid "The bot is no longer serverlocked."
 msgstr "Бот больше не зафиксирован на сервере."
 
-#: redbot/cogs/admin/admin.py:401
+#: redbot/cogs/admin/admin.py:467
 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:75
+msgid "I could not announce to the following server: "
+msgstr "Я не могу сделать объявление на следующем сервере: "
 
-#: redbot/cogs/admin/converters.py:25
+#: redbot/cogs/admin/announcer.py:77
+msgid "I could not announce to the following servers: "
+msgstr "Я не могу сделать объявление на следующих серверах: "
+
+#: redbot/cogs/admin/converters.py:12
 msgid "The Admin cog is not loaded."
 msgstr "Модуль Admin не загружен."
 
-#: 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/sk-SK.po

@@ -1,186 +1,242 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2019-07-05 22:33+0200\n"
-"PO-Revision-Date: 2019-07-06 16:14\n"
-"Last-Translator: Robert Jansen (Kowlin)\n"
+"POT-Creation-Date: 2020-04-23 12:07+0000\n"
+"Last-Translator: \n"
 "Language-Team: Slovak\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: redgettext 3.0\n"
+"Generated-By: redgettext 3.1\n"
 "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 3;\n"
-"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: red-discordbot\n"
+"X-Crowdin-Project-ID: 289505\n"
 "X-Crowdin-Language: sk\n"
-"X-Crowdin-File: /cogs/admin/locales/messages.pot\n"
+"X-Crowdin-File-ID: 42\n"
 "Language: sk_SK\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 ""
+msgstr "Pokúsil som sa urobiť niečo, pre čo mi Discord odoprel povolenie. Váš príkaz sa nepodarilo úspešne dokončiť."
 
 #: 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."
+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 "Nemôžem dať {role.name} na {member.display_name} pretože táto rola je vyššia alebo rovná mojej najvyššej rolí v Discord hierarchií."
+
+#: redbot/cogs/admin/admin.py:28
+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: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."
+#: redbot/cogs/admin/admin.py:34
+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: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:40
+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:43
+#: redbot/cogs/admin/admin.py:46
+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:52
+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:58
+msgid "I need manage roles permission to do that."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:60
 msgid "I am already announcing something. If you would like to make a different announcement please use `{prefix}announce cancel` first."
-msgstr ""
+msgstr "Už niečo oznamujem. Ak by ste chceli urobiť iné oznámenie, prosím, najskôr použite `{prefix} oznámiť zrušenie`."
 
-#: redbot/cogs/admin/admin.py:53
+#: redbot/cogs/admin/admin.py:70
 #, docstring
 msgid "A collection of server administration utilities."
-msgstr ""
+msgstr "\n"
+"Zbierka obslužných programov pre správu servera."
 
-#: redbot/cogs/admin/admin.py:115 redbot/cogs/admin/admin.py:160
-msgid "add"
-msgstr ""
+#: redbot/cogs/admin/admin.py:126
+msgid "{member.display_name} already has the role {role.name}."
+msgstr "{member.display_name} už má rolu {role.name}."
 
-#: redbot/cogs/admin/admin.py:121
+#: redbot/cogs/admin/admin.py:146
 msgid "I successfully added {role.name} to {member.display_name}"
+msgstr "\n"
+"Úspešne som pridal {role.name} do {member.display_name}"
+
+#: redbot/cogs/admin/admin.py:156
+msgid "{member.display_name} does not have the role {role.name}."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:132 redbot/cogs/admin/admin.py:180
-msgid "remove"
-msgstr ""
-
-#: redbot/cogs/admin/admin.py:138
+#: redbot/cogs/admin/admin.py:176
 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 "\\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:203
+#, 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:217
+#, docstring
 msgid "Edit role settings."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:194
+#: redbot/cogs/admin/admin.py:224
 #, 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:253 redbot/cogs/admin/admin.py:286
 msgid "Done."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:222
+#: redbot/cogs/admin/admin.py:257
 #, 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:291
 #, docstring
 msgid "Announce a message to all servers the bot is in."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:257
+#: redbot/cogs/admin/admin.py:298
 msgid "The announcement has begun."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:265
+#: redbot/cogs/admin/admin.py:305
 #, docstring
 msgid "Cancel a running announce."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:271
+#: redbot/cogs/admin/admin.py:307
+msgid "There is no currently running announcement."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:310
 msgid "The current announcement has been cancelled."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:277
+#: redbot/cogs/admin/admin.py:316
 #, 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:321
+#, 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:330
 msgid "The announcement channel has been set to {channel.mention}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:290
+#: redbot/cogs/admin/admin.py:335
 #, docstring
 msgid "Toggle announcements being enabled this server."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:296
+#: redbot/cogs/admin/admin.py:340
 msgid "The server {guild.name} will receive announcements."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:300
+#: redbot/cogs/admin/admin.py:344
 msgid "The server {guild.name} will not receive announcements."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:326
+#: redbot/cogs/admin/admin.py:370
 #, 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        "
+msgid "Apply selfroles."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:337
+#: redbot/cogs/admin/admin.py:375
 #, docstring
-msgid "Remove a selfrole from yourself.\\n\\n        NOTE: The role is case sensitive!\\n        "
+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:347
+#: redbot/cogs/admin/admin.py:386
 #, docstring
-msgid "Add a role to the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
+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: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
+#: redbot/cogs/admin/admin.py:397
 #, docstring
 msgid "\\n        Lists all available selfroles.\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:377
+#: redbot/cogs/admin/admin.py:407
 msgid "Available Selfroles:\\n{selfroles}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:394
+#: redbot/cogs/admin/admin.py:413
+#, docstring
+msgid "Manage selfroles."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:418
+#, 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:425
+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:433
+msgid "Added."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:436
+msgid "That role is already a selfrole."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:440
+#, 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:447
+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:455
+msgid "Removed."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:460
 #, docstring
 msgid "Lock a bot to its current servers only."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:399
+#: redbot/cogs/admin/admin.py:465
 msgid "The bot is no longer serverlocked."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:401
+#: redbot/cogs/admin/admin.py:467
 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:75
+msgid "I could not announce to the following server: "
 msgstr ""
 
-#: redbot/cogs/admin/converters.py:25
+#: redbot/cogs/admin/announcer.py:77
+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/sr-SP.po

@@ -0,0 +1,240 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: red-discordbot\n"
+"POT-Creation-Date: 2020-04-23 12:07+0000\n"
+"Last-Translator: \n"
+"Language-Team: Serbian (Cyrillic)\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: sr\n"
+"X-Crowdin-File-ID: 42\n"
+"Language: sr_SP\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 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:28
+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:34
+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:40
+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:46
+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:52
+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:58
+msgid "I need manage roles permission to do that."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:60
+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:70
+#, docstring
+msgid "A collection of server administration utilities."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:126
+msgid "{member.display_name} already has the role {role.name}."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:146
+msgid "I successfully added {role.name} to {member.display_name}"
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:156
+msgid "{member.display_name} does not have the role {role.name}."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:176
+msgid "I successfully removed {role.name} from {member.display_name}"
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:187
+#, 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:203
+#, 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:217
+#, docstring
+msgid "Edit role settings."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:224
+#, 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:253 redbot/cogs/admin/admin.py:286
+msgid "Done."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:257
+#, 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:291
+#, docstring
+msgid "Announce a message to all servers the bot is in."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:298
+msgid "The announcement has begun."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:305
+#, docstring
+msgid "Cancel a running announce."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:307
+msgid "There is no currently running announcement."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:310
+msgid "The current announcement has been cancelled."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:316
+#, docstring
+msgid "Change how announcements are sent in this guild."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:321
+#, 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:330
+msgid "The announcement channel has been set to {channel.mention}"
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:335
+#, docstring
+msgid "Toggle announcements being enabled this server."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:340
+msgid "The server {guild.name} will receive announcements."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:344
+msgid "The server {guild.name} will not receive announcements."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:370
+#, docstring
+msgid "Apply selfroles."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:375
+#, 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:386
+#, 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:397
+#, docstring
+msgid "\\n        Lists all available selfroles.\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:407
+msgid "Available Selfroles:\\n{selfroles}"
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:413
+#, docstring
+msgid "Manage selfroles."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:418
+#, 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:425
+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:433
+msgid "Added."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:436
+msgid "That role is already a selfrole."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:440
+#, 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:447
+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:455
+msgid "Removed."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:460
+#, docstring
+msgid "Lock a bot to its current servers only."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:465
+msgid "The bot is no longer serverlocked."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:467
+msgid "The bot is now serverlocked."
+msgstr ""
+
+#: redbot/cogs/admin/announcer.py:75
+msgid "I could not announce to the following server: "
+msgstr ""
+
+#: redbot/cogs/admin/announcer.py:77
+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/sv-SE.po

@@ -1,19 +1,18 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2019-07-05 22:33+0200\n"
-"PO-Revision-Date: 2019-07-06 16:14\n"
-"Last-Translator: Robert Jansen (Kowlin)\n"
+"POT-Creation-Date: 2020-04-23 12:07+0000\n"
+"Last-Translator: \n"
 "Language-Team: Swedish\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: redgettext 3.0\n"
+"Generated-By: redgettext 3.1\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: red-discordbot\n"
+"X-Crowdin-Project-ID: 289505\n"
 "X-Crowdin-Language: sv-SE\n"
-"X-Crowdin-File: /cogs/admin/locales/messages.pot\n"
+"X-Crowdin-File-ID: 42\n"
 "Language: sv_SE\n"
 
 #: redbot/cogs/admin/admin.py:17
@@ -21,166 +20,221 @@ msgid "I attempted to do something that Discord denied me permissions for. Your
 msgstr "Jag försökte göra något som Discord nekade mig behörighet till. Ditt kommando kunde inte slutföras."
 
 #: 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."
+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."
+#: redbot/cogs/admin/admin.py:28
+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:34
+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:40
+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:46
+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:52
+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:58
+msgid "I need manage roles permission to do that."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:60
 msgid "I am already announcing something. If you would like to make a different announcement please use `{prefix}announce cancel` first."
-msgstr ""
+msgstr "Jag tillkännager redan något. Om du vill göra ett annat tillkännagivande, vänligen använd `{prefix}announce cancel` först."
 
-#: redbot/cogs/admin/admin.py:53
+#: redbot/cogs/admin/admin.py:70
 #, docstring
 msgid "A collection of server administration utilities."
 msgstr "En samling administrationsverktyg för servern."
 
-#: redbot/cogs/admin/admin.py:115 redbot/cogs/admin/admin.py:160
-msgid "add"
+#: redbot/cogs/admin/admin.py:126
+msgid "{member.display_name} already has the role {role.name}."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:121
+#: redbot/cogs/admin/admin.py:146
 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:156
+msgid "{member.display_name} does not have the role {role.name}."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:138
+#: redbot/cogs/admin/admin.py:176
 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 "\\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:203
+#, 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:217
+#, docstring
 msgid "Edit role settings."
 msgstr "Redigera rollinställningar."
 
-#: redbot/cogs/admin/admin.py:194
+#: redbot/cogs/admin/admin.py:224
 #, 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:253 redbot/cogs/admin/admin.py:286
 msgid "Done."
 msgstr "Klart."
 
-#: redbot/cogs/admin/admin.py:222
+#: redbot/cogs/admin/admin.py:257
 #, 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:291
 #, docstring
 msgid "Announce a message to all servers the bot is in."
-msgstr ""
+msgstr "Meddela ett meddelande till alla servrar som botten är i."
 
-#: redbot/cogs/admin/admin.py:257
+#: redbot/cogs/admin/admin.py:298
 msgid "The announcement has begun."
-msgstr ""
+msgstr "Tillkännagivandet har börjat."
 
-#: redbot/cogs/admin/admin.py:265
+#: redbot/cogs/admin/admin.py:305
 #, docstring
 msgid "Cancel a running announce."
+msgstr "Avbryt en löpande avisering."
+
+#: redbot/cogs/admin/admin.py:307
+msgid "There is no currently running announcement."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:271
+#: redbot/cogs/admin/admin.py:310
 msgid "The current announcement has been cancelled."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:277
+#: redbot/cogs/admin/admin.py:316
 #, 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:321
+#, 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:330
 msgid "The announcement channel has been set to {channel.mention}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:290
+#: redbot/cogs/admin/admin.py:335
 #, docstring
 msgid "Toggle announcements being enabled this server."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:296
+#: redbot/cogs/admin/admin.py:340
 msgid "The server {guild.name} will receive announcements."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:300
+#: redbot/cogs/admin/admin.py:344
 msgid "The server {guild.name} will not receive announcements."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:326
+#: redbot/cogs/admin/admin.py:370
 #, 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        "
+msgid "Apply selfroles."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:337
+#: redbot/cogs/admin/admin.py:375
 #, docstring
-msgid "Remove a selfrole from yourself.\\n\\n        NOTE: The role is case sensitive!\\n        "
+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:347
+#: redbot/cogs/admin/admin.py:386
 #, docstring
-msgid "Add a role to the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
+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: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
+#: redbot/cogs/admin/admin.py:397
 #, docstring
 msgid "\\n        Lists all available selfroles.\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:377
+#: redbot/cogs/admin/admin.py:407
 msgid "Available Selfroles:\\n{selfroles}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:394
+#: redbot/cogs/admin/admin.py:413
+#, docstring
+msgid "Manage selfroles."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:418
+#, 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:425
+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:433
+msgid "Added."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:436
+msgid "That role is already a selfrole."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:440
+#, 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:447
+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:455
+msgid "Removed."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:460
 #, docstring
 msgid "Lock a bot to its current servers only."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:399
+#: redbot/cogs/admin/admin.py:465
 msgid "The bot is no longer serverlocked."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:401
+#: redbot/cogs/admin/admin.py:467
 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:75
+msgid "I could not announce to the following server: "
 msgstr ""
 
-#: redbot/cogs/admin/converters.py:25
+#: redbot/cogs/admin/announcer.py:77
+msgid "I could not announce to the following servers: "
+msgstr ""
+
+#: redbot/cogs/admin/converters.py:12
 msgid "The Admin cog is not loaded."
-msgstr ""
+msgstr "Admin cog är inte laddad."
 
-#: redbot/cogs/admin/converters.py:34
+#: redbot/cogs/admin/converters.py:20
 msgid "The provided role is not a valid selfrole."
-msgstr ""
+msgstr "Den angivna rollen är inte en giltig självroll."
 

redbot/cogs/admin/locales/tr-TR.po

@@ -1,186 +1,240 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2019-07-05 22:33+0200\n"
-"PO-Revision-Date: 2019-07-06 16:14\n"
-"Last-Translator: Robert Jansen (Kowlin)\n"
+"POT-Creation-Date: 2020-04-23 12:07+0000\n"
+"Last-Translator: \n"
 "Language-Team: Turkish\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: redgettext 3.0\n"
+"Generated-By: redgettext 3.1\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: red-discordbot\n"
+"X-Crowdin-Project-ID: 289505\n"
 "X-Crowdin-Language: tr\n"
-"X-Crowdin-File: /cogs/admin/locales/messages.pot\n"
+"X-Crowdin-File-ID: 42\n"
 "Language: tr_TR\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 ""
+msgstr "Bir şey denemeye çalıştım ancak Discord izinlerim yeterli olmadı. Komutunuz işleme koyulamadı."
 
 #: 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 ""
+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 "{member.display_name} kullanıcısına {role.name} veremiyorum çünkü bu rol kendi rolümden daha yüksek bir pozisyonda."
 
-#: 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:28
+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 "{member.display_name} kullanıcısından {role.name} rolünü kaldıramıyorum çünkü bu rolümden daha yüksek pozisyonda."
 
-#: 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:34
+msgid "I can not edit {role.name} because that role is higher than my or equal to highest role in the Discord hierarchy."
+msgstr "{role.name} kullanıcısının rolünü düzenleyemiyorum, çünkü bu rolümden daha yüksek pozisyonda."
 
-#: redbot/cogs/admin/admin.py:43
+#: redbot/cogs/admin/admin.py:40
+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 "{member.display_name} kullanıcısına {role.name} rolünü vermene müsaade edemem çünkü bu rol senin mevcut rolünden daha yüksek durumda."
+
+#: redbot/cogs/admin/admin.py:46
+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 "{member.display_name} kullanıcısının {role.name} rolünü silmene müsaade edemem çünkü bu rol mevcut rolünden daha yüksek durumda."
+
+#: redbot/cogs/admin/admin.py:52
+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 "{role.name} rolünü düzenlemene müsaade edemem çünkü bu rol mevcut rolünden daha yüksek durumda."
+
+#: redbot/cogs/admin/admin.py:58
+msgid "I need manage roles permission to do that."
+msgstr "Bunu yapabilmem için \"rolleri yönet\" iznine ihtiyacım var."
+
+#: redbot/cogs/admin/admin.py:60
 msgid "I am already announcing something. If you would like to make a different announcement please use `{prefix}announce cancel` first."
-msgstr ""
+msgstr "Zaten şu anda bir duyuru yapmaktayım. Başka bir duyuru yapmak istiyorsanız lütfen bu komutu kullanın: `{prefix}announce cancel`."
 
-#: redbot/cogs/admin/admin.py:53
+#: redbot/cogs/admin/admin.py:70
 #, docstring
 msgid "A collection of server administration utilities."
-msgstr ""
+msgstr "Sunucu yönetimiyle ilgili ayarlar."
 
-#: redbot/cogs/admin/admin.py:115 redbot/cogs/admin/admin.py:160
-msgid "add"
-msgstr ""
+#: redbot/cogs/admin/admin.py:126
+msgid "{member.display_name} already has the role {role.name}."
+msgstr "{member.display_name} kullanıcısı {role.name} rolüne zaten sahip."
 
-#: redbot/cogs/admin/admin.py:121
+#: redbot/cogs/admin/admin.py:146
 msgid "I successfully added {role.name} to {member.display_name}"
-msgstr ""
+msgstr "{role.name} rolünü {member.display_name} kullanıcısına başarılı bir şekilde ekledim."
 
-#: redbot/cogs/admin/admin.py:132 redbot/cogs/admin/admin.py:180
-msgid "remove"
-msgstr ""
+#: redbot/cogs/admin/admin.py:156
+msgid "{member.display_name} does not have the role {role.name}."
+msgstr "{member.display_name} kullanıcısı {role.name} rolüne sahip değil."
 
-#: redbot/cogs/admin/admin.py:138
+#: redbot/cogs/admin/admin.py:176
 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 ""
+msgstr "{role.name} rolünü {member.display_name} kullanıcısından başarılı bir şekilde kaldırdım"
 
 #: redbot/cogs/admin/admin.py:187
 #, 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        Kullanıcıya rol ekle.\\n\\n        Rol boşluk içeriyorsa çift tırnak işareti kullanın.\\n        Kullanıcı boş bırakılırsa, varsayılan olarak komutun yazarıdır.\\n        "
+
+#: redbot/cogs/admin/admin.py:203
+#, 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        Kullanıcıdan rol sil.\\n\\n        Rol boşluk içeriyorsa çift tırnak işareti kullanın.\\n        Kullanıcı boş bırakılırsa, varsayılan olarak komutun yazarıdır.\\n        "
+
+#: redbot/cogs/admin/admin.py:217
+#, docstring
 msgid "Edit role settings."
-msgstr ""
+msgstr "Rol ayarlarını düzenle."
 
-#: redbot/cogs/admin/admin.py:194
+#: redbot/cogs/admin/admin.py:224
 #, 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 "Rol rengini düzenler.\\n\\n        Rol boşluk içeriyorsa çift tırnak kulanın.\\n        Renk hexadecimal formatında olmalıdır.\\n        [Online colour picker](http://www.w3schools.com/colors/colors_picker.asp)\\n\\n        Örneğin:\\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:253 redbot/cogs/admin/admin.py:286
 msgid "Done."
-msgstr "Tamamdır."
-
-#: 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 ""
+msgstr "Tamamlandı."
 
 #: redbot/cogs/admin/admin.py:257
-msgid "The announcement has begun."
-msgstr ""
+#, 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 "Rolün ismini düzenler.\\n\\n        Rol boşluk içeriyorsa çift tırnak kulanın.\\n\\n        Örneğin:\\n            `[p]editrole name \\\"The Transistor\\\" Test`\\n        "
 
-#: redbot/cogs/admin/admin.py:265
+#: redbot/cogs/admin/admin.py:291
+#, docstring
+msgid "Announce a message to all servers the bot is in."
+msgstr "Botun bulunduğu tüm sunuculara duyuru geçer."
+
+#: redbot/cogs/admin/admin.py:298
+msgid "The announcement has begun."
+msgstr "Duyuru başladı."
+
+#: redbot/cogs/admin/admin.py:305
 #, docstring
 msgid "Cancel a running announce."
-msgstr ""
+msgstr "Şu an yapılan duyuruyu iptal eder."
 
-#: redbot/cogs/admin/admin.py:271
+#: redbot/cogs/admin/admin.py:307
+msgid "There is no currently running announcement."
+msgstr "Şu anda yapılan bir duyuru mevcut değil."
+
+#: redbot/cogs/admin/admin.py:310
 msgid "The current announcement has been cancelled."
-msgstr ""
+msgstr "Şu an yapılan duyuru iptal edildi."
 
-#: redbot/cogs/admin/admin.py:277
+#: redbot/cogs/admin/admin.py:316
 #, docstring
-msgid "Change the channel to which the bot makes announcements."
-msgstr ""
+msgid "Change how announcements are sent in this guild."
+msgstr "Anonsların sunucuya nasıl gönderileceğini belirleyin."
 
-#: redbot/cogs/admin/admin.py:283
+#: redbot/cogs/admin/admin.py:321
+#, 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        Botun anonsları hangi kanalda yapacağını belirleyin.\\n        \\n        Boş bırakırsanız bot anonsları mevcut kanala yapacaktır.\\n        "
+
+#: redbot/cogs/admin/admin.py:330
 msgid "The announcement channel has been set to {channel.mention}"
-msgstr ""
+msgstr "{channel.mention} duyuru kanalı olarak ayarlandı"
 
-#: redbot/cogs/admin/admin.py:290
+#: redbot/cogs/admin/admin.py:335
 #, docstring
 msgid "Toggle announcements being enabled this server."
-msgstr ""
+msgstr "Duyuru sistemi bu sunucu için aktif edildi."
 
-#: redbot/cogs/admin/admin.py:296
+#: redbot/cogs/admin/admin.py:340
 msgid "The server {guild.name} will receive announcements."
-msgstr ""
+msgstr "{guild.name} sunucusu artık duyuruları alacak."
 
-#: redbot/cogs/admin/admin.py:300
+#: redbot/cogs/admin/admin.py:344
 msgid "The server {guild.name} will not receive announcements."
-msgstr ""
+msgstr "{guild.name} sunucusu artık duyuruları almayacak."
 
-#: redbot/cogs/admin/admin.py:326
+#: redbot/cogs/admin/admin.py:370
 #, 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 ""
+msgid "Apply selfroles."
+msgstr "Kişisel rol ekle."
 
-#: redbot/cogs/admin/admin.py:337
+#: redbot/cogs/admin/admin.py:375
 #, docstring
-msgid "Remove a selfrole from yourself.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr ""
+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 "Kişisel rol ekler.\\n\\n        Sunucu yöneticileri kullanıcının kullanabileceği şekilde ayarlamalıdır.\\n\\n        NOT: Rol büyük küçük harf duyarlıdır!\\n        "
 
-#: redbot/cogs/admin/admin.py:347
+#: redbot/cogs/admin/admin.py:386
 #, docstring
-msgid "Add a role to the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
-msgstr ""
+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 "Kişisel rol siler.\\n\\n        Sunucu yöneticileri kullanıcının kullanabileceği şekilde ayarlamalıdır.\\n\\n        NOT: Rol büyük küçük harf duyarlıdır!\\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 ""
-
-#: redbot/cogs/admin/admin.py:371
+#: redbot/cogs/admin/admin.py:397
 #, docstring
 msgid "\\n        Lists all available selfroles.\\n        "
-msgstr ""
+msgstr "\\n        Kullanılabilir kişisel rolleri listeler.\\n        "
 
-#: redbot/cogs/admin/admin.py:377
+#: redbot/cogs/admin/admin.py:407
 msgid "Available Selfroles:\\n{selfroles}"
-msgstr ""
+msgstr "Kullanılabilir kişisel roller:\\n{selfroles}"
 
-#: redbot/cogs/admin/admin.py:394
+#: redbot/cogs/admin/admin.py:413
+#, docstring
+msgid "Manage selfroles."
+msgstr "Kişisel rolleri düzenle."
+
+#: redbot/cogs/admin/admin.py:418
+#, docstring
+msgid "\\n        Add a role to the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
+msgstr "\\n        Kullanılabilir kişisel roller listesine rol ekler.\\n\\n        NOT: Rol büyük küçük harf duyarlıdır!\\n        "
+
+#: redbot/cogs/admin/admin.py:425
+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 "{role.name} kullanıcısına belirttiğin rolü vermene müsaade edemem çünkü bu rol mevcut rolünden daha yüksek."
+
+#: redbot/cogs/admin/admin.py:433
+msgid "Added."
+msgstr "Eklendi."
+
+#: redbot/cogs/admin/admin.py:436
+msgid "That role is already a selfrole."
+msgstr "Bu rol zaten bir kişisel rol."
+
+#: redbot/cogs/admin/admin.py:440
+#, docstring
+msgid "\\n        Remove a role from the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
+msgstr "\\n        Kullanılabilir kişisel roller listesinden rol siler.\\n\\n        NOT: Rol büyük küçük harf duyarlıdır!\\n        "
+
+#: redbot/cogs/admin/admin.py:447
+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 "{role.name} kullanıcısından belirttiğin rolü silmene müsaade edemem çünkü bu rol mevcut rolünden daha yüksek."
+
+#: redbot/cogs/admin/admin.py:455
+msgid "Removed."
+msgstr "Kaldırıldı."
+
+#: redbot/cogs/admin/admin.py:460
 #, docstring
 msgid "Lock a bot to its current servers only."
-msgstr ""
+msgstr "Botu şu an bulunduğu sunucularda kilitler."
 
-#: redbot/cogs/admin/admin.py:399
+#: redbot/cogs/admin/admin.py:465
 msgid "The bot is no longer serverlocked."
-msgstr ""
+msgstr "Botun sunucu kilidi aktif değil."
 
-#: redbot/cogs/admin/admin.py:401
+#: redbot/cogs/admin/admin.py:467
 msgid "The bot is now serverlocked."
-msgstr ""
+msgstr "Botun sunucu kilidi aktif."
 
-#: redbot/cogs/admin/announcer.py:70
-msgid "I could not announce to server: {server.id}"
-msgstr ""
+#: redbot/cogs/admin/announcer.py:75
+msgid "I could not announce to the following server: "
+msgstr "Bu sunucuya duyuru yapamıyorum: "
 
-#: redbot/cogs/admin/converters.py:25
+#: redbot/cogs/admin/announcer.py:77
+msgid "I could not announce to the following servers: "
+msgstr "Bu sunuculara duyuru yapamıyorum: "
+
+#: redbot/cogs/admin/converters.py:12
 msgid "The Admin cog is not loaded."
-msgstr ""
+msgstr "The Admin eklentisi yüklenmedi."
 
-#: redbot/cogs/admin/converters.py:34
+#: redbot/cogs/admin/converters.py:20
 msgid "The provided role is not a valid selfrole."
-msgstr ""
+msgstr "Girilen kişisel rol geçerli bir kişisel rol değil."
 

redbot/cogs/admin/locales/uk-UA.po

@@ -0,0 +1,240 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: red-discordbot\n"
+"POT-Creation-Date: 2020-04-23 12:07+0000\n"
+"Last-Translator: \n"
+"Language-Team: Ukrainian\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=4; plural=((n%10==1 && n%100!=11) ? 0 : ((n%10 >= 2 && n%10 <=4 && (n%100 < 12 || n%100 > 14)) ? 1 : ((n%10 == 0 || (n%10 >= 5 && n%10 <=9)) || (n%100 >= 11 && n%100 <= 14)) ? 2 : 3));\n"
+"X-Crowdin-Project: red-discordbot\n"
+"X-Crowdin-Project-ID: 289505\n"
+"X-Crowdin-Language: uk\n"
+"X-Crowdin-File-ID: 42\n"
+"Language: uk_UA\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 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:28
+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:34
+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:40
+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:46
+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:52
+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:58
+msgid "I need manage roles permission to do that."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:60
+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:70
+#, docstring
+msgid "A collection of server administration utilities."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:126
+msgid "{member.display_name} already has the role {role.name}."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:146
+msgid "I successfully added {role.name} to {member.display_name}"
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:156
+msgid "{member.display_name} does not have the role {role.name}."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:176
+msgid "I successfully removed {role.name} from {member.display_name}"
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:187
+#, 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:203
+#, 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:217
+#, docstring
+msgid "Edit role settings."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:224
+#, 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:253 redbot/cogs/admin/admin.py:286
+msgid "Done."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:257
+#, 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:291
+#, docstring
+msgid "Announce a message to all servers the bot is in."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:298
+msgid "The announcement has begun."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:305
+#, docstring
+msgid "Cancel a running announce."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:307
+msgid "There is no currently running announcement."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:310
+msgid "The current announcement has been cancelled."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:316
+#, docstring
+msgid "Change how announcements are sent in this guild."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:321
+#, 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:330
+msgid "The announcement channel has been set to {channel.mention}"
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:335
+#, docstring
+msgid "Toggle announcements being enabled this server."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:340
+msgid "The server {guild.name} will receive announcements."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:344
+msgid "The server {guild.name} will not receive announcements."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:370
+#, docstring
+msgid "Apply selfroles."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:375
+#, 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:386
+#, 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:397
+#, docstring
+msgid "\\n        Lists all available selfroles.\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:407
+msgid "Available Selfroles:\\n{selfroles}"
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:413
+#, docstring
+msgid "Manage selfroles."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:418
+#, 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:425
+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:433
+msgid "Added."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:436
+msgid "That role is already a selfrole."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:440
+#, 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:447
+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:455
+msgid "Removed."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:460
+#, docstring
+msgid "Lock a bot to its current servers only."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:465
+msgid "The bot is no longer serverlocked."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:467
+msgid "The bot is now serverlocked."
+msgstr ""
+
+#: redbot/cogs/admin/announcer.py:75
+msgid "I could not announce to the following server: "
+msgstr ""
+
+#: redbot/cogs/admin/announcer.py:77
+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/vi-VN.po

@@ -0,0 +1,240 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: red-discordbot\n"
+"POT-Creation-Date: 2020-04-23 12:07+0000\n"
+"Last-Translator: \n"
+"Language-Team: Vietnamese\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=1; plural=0;\n"
+"X-Crowdin-Project: red-discordbot\n"
+"X-Crowdin-Project-ID: 289505\n"
+"X-Crowdin-Language: vi\n"
+"X-Crowdin-File-ID: 42\n"
+"Language: vi_VN\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 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:28
+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:34
+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:40
+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:46
+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:52
+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:58
+msgid "I need manage roles permission to do that."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:60
+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:70
+#, docstring
+msgid "A collection of server administration utilities."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:126
+msgid "{member.display_name} already has the role {role.name}."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:146
+msgid "I successfully added {role.name} to {member.display_name}"
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:156
+msgid "{member.display_name} does not have the role {role.name}."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:176
+msgid "I successfully removed {role.name} from {member.display_name}"
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:187
+#, 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:203
+#, 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:217
+#, docstring
+msgid "Edit role settings."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:224
+#, 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:253 redbot/cogs/admin/admin.py:286
+msgid "Done."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:257
+#, 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:291
+#, docstring
+msgid "Announce a message to all servers the bot is in."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:298
+msgid "The announcement has begun."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:305
+#, docstring
+msgid "Cancel a running announce."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:307
+msgid "There is no currently running announcement."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:310
+msgid "The current announcement has been cancelled."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:316
+#, docstring
+msgid "Change how announcements are sent in this guild."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:321
+#, 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:330
+msgid "The announcement channel has been set to {channel.mention}"
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:335
+#, docstring
+msgid "Toggle announcements being enabled this server."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:340
+msgid "The server {guild.name} will receive announcements."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:344
+msgid "The server {guild.name} will not receive announcements."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:370
+#, docstring
+msgid "Apply selfroles."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:375
+#, 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:386
+#, 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:397
+#, docstring
+msgid "\\n        Lists all available selfroles.\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:407
+msgid "Available Selfroles:\\n{selfroles}"
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:413
+#, docstring
+msgid "Manage selfroles."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:418
+#, 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:425
+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:433
+msgid "Added."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:436
+msgid "That role is already a selfrole."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:440
+#, 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:447
+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:455
+msgid "Removed."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:460
+#, docstring
+msgid "Lock a bot to its current servers only."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:465
+msgid "The bot is no longer serverlocked."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:467
+msgid "The bot is now serverlocked."
+msgstr ""
+
+#: redbot/cogs/admin/announcer.py:75
+msgid "I could not announce to the following server: "
+msgstr ""
+
+#: redbot/cogs/admin/announcer.py:77
+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/zh-CN.po

@@ -1,19 +1,18 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2019-07-05 22:33+0200\n"
-"PO-Revision-Date: 2019-07-06 16:14\n"
-"Last-Translator: Robert Jansen (Kowlin)\n"
+"POT-Creation-Date: 2020-04-23 12:07+0000\n"
+"Last-Translator: \n"
 "Language-Team: Chinese Simplified\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: redgettext 3.0\n"
+"Generated-By: redgettext 3.1\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: red-discordbot\n"
+"X-Crowdin-Project-ID: 289505\n"
 "X-Crowdin-Language: zh-CN\n"
-"X-Crowdin-File: /cogs/admin/locales/messages.pot\n"
+"X-Crowdin-File-ID: 42\n"
 "Language: zh_CN\n"
 
 #: redbot/cogs/admin/admin.py:17
@@ -21,166 +20,221 @@ msgid "I attempted to do something that Discord denied me permissions for. Your
 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."
+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."
+#: redbot/cogs/admin/admin.py:28
+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:34
+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:40
+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:46
+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:52
+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:58
+msgid "I need manage roles permission to do that."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:60
 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
+#: redbot/cogs/admin/admin.py:70
 #, 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:126
+msgid "{member.display_name} already has the role {role.name}."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:121
+#: redbot/cogs/admin/admin.py:146
 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:156
+msgid "{member.display_name} does not have the role {role.name}."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:138
+#: redbot/cogs/admin/admin.py:176
 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 "\\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:203
+#, 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:217
+#, docstring
 msgid "Edit role settings."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:194
+#: redbot/cogs/admin/admin.py:224
 #, 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:253 redbot/cogs/admin/admin.py:286
 msgid "Done."
 msgstr "完成。"
 
-#: redbot/cogs/admin/admin.py:222
+#: redbot/cogs/admin/admin.py:257
 #, 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:291
 #, docstring
 msgid "Announce a message to all servers the bot is in."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:257
+#: redbot/cogs/admin/admin.py:298
 msgid "The announcement has begun."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:265
+#: redbot/cogs/admin/admin.py:305
 #, docstring
 msgid "Cancel a running announce."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:271
+#: redbot/cogs/admin/admin.py:307
+msgid "There is no currently running announcement."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:310
 msgid "The current announcement has been cancelled."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:277
+#: redbot/cogs/admin/admin.py:316
 #, 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:321
+#, 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:330
 msgid "The announcement channel has been set to {channel.mention}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:290
+#: redbot/cogs/admin/admin.py:335
 #, docstring
 msgid "Toggle announcements being enabled this server."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:296
+#: redbot/cogs/admin/admin.py:340
 msgid "The server {guild.name} will receive announcements."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:300
+#: redbot/cogs/admin/admin.py:344
 msgid "The server {guild.name} will not receive announcements."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:326
+#: redbot/cogs/admin/admin.py:370
 #, 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        "
+msgid "Apply selfroles."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:337
+#: redbot/cogs/admin/admin.py:375
 #, docstring
-msgid "Remove a selfrole from yourself.\\n\\n        NOTE: The role is case sensitive!\\n        "
+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:347
+#: redbot/cogs/admin/admin.py:386
 #, docstring
-msgid "Add a role to the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
+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: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
+#: redbot/cogs/admin/admin.py:397
 #, docstring
 msgid "\\n        Lists all available selfroles.\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:377
+#: redbot/cogs/admin/admin.py:407
 msgid "Available Selfroles:\\n{selfroles}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:394
+#: redbot/cogs/admin/admin.py:413
+#, docstring
+msgid "Manage selfroles."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:418
+#, 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:425
+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:433
+msgid "Added."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:436
+msgid "That role is already a selfrole."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:440
+#, 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:447
+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:455
+msgid "Removed."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:460
 #, docstring
 msgid "Lock a bot to its current servers only."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:399
+#: redbot/cogs/admin/admin.py:465
 msgid "The bot is no longer serverlocked."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:401
+#: redbot/cogs/admin/admin.py:467
 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:75
+msgid "I could not announce to the following server: "
 msgstr ""
 
-#: redbot/cogs/admin/converters.py:25
+#: redbot/cogs/admin/announcer.py:77
+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/zh-HK.po

@@ -0,0 +1,240 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: red-discordbot\n"
+"POT-Creation-Date: 2020-04-23 12:07+0000\n"
+"Last-Translator: \n"
+"Language-Team: Chinese Traditional, Hong Kong\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=1; plural=0;\n"
+"X-Crowdin-Project: red-discordbot\n"
+"X-Crowdin-Project-ID: 289505\n"
+"X-Crowdin-Language: zh-HK\n"
+"X-Crowdin-File-ID: 42\n"
+"Language: zh_HK\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 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:28
+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:34
+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:40
+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:46
+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:52
+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:58
+msgid "I need manage roles permission to do that."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:60
+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:70
+#, docstring
+msgid "A collection of server administration utilities."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:126
+msgid "{member.display_name} already has the role {role.name}."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:146
+msgid "I successfully added {role.name} to {member.display_name}"
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:156
+msgid "{member.display_name} does not have the role {role.name}."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:176
+msgid "I successfully removed {role.name} from {member.display_name}"
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:187
+#, 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:203
+#, 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:217
+#, docstring
+msgid "Edit role settings."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:224
+#, 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:253 redbot/cogs/admin/admin.py:286
+msgid "Done."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:257
+#, 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:291
+#, docstring
+msgid "Announce a message to all servers the bot is in."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:298
+msgid "The announcement has begun."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:305
+#, docstring
+msgid "Cancel a running announce."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:307
+msgid "There is no currently running announcement."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:310
+msgid "The current announcement has been cancelled."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:316
+#, docstring
+msgid "Change how announcements are sent in this guild."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:321
+#, 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:330
+msgid "The announcement channel has been set to {channel.mention}"
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:335
+#, docstring
+msgid "Toggle announcements being enabled this server."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:340
+msgid "The server {guild.name} will receive announcements."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:344
+msgid "The server {guild.name} will not receive announcements."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:370
+#, docstring
+msgid "Apply selfroles."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:375
+#, 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:386
+#, 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:397
+#, docstring
+msgid "\\n        Lists all available selfroles.\\n        "
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:407
+msgid "Available Selfroles:\\n{selfroles}"
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:413
+#, docstring
+msgid "Manage selfroles."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:418
+#, 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:425
+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:433
+msgid "Added."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:436
+msgid "That role is already a selfrole."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:440
+#, 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:447
+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:455
+msgid "Removed."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:460
+#, docstring
+msgid "Lock a bot to its current servers only."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:465
+msgid "The bot is no longer serverlocked."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:467
+msgid "The bot is now serverlocked."
+msgstr ""
+
+#: redbot/cogs/admin/announcer.py:75
+msgid "I could not announce to the following server: "
+msgstr ""
+
+#: redbot/cogs/admin/announcer.py:77
+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/zh-TW.po

@@ -1,19 +1,18 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2019-07-05 22:33+0200\n"
-"PO-Revision-Date: 2019-07-14 02:15\n"
-"Last-Translator: Robert Jansen (Kowlin)\n"
+"POT-Creation-Date: 2020-04-23 12:07+0000\n"
+"Last-Translator: \n"
 "Language-Team: Chinese Traditional\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: redgettext 3.0\n"
+"Generated-By: redgettext 3.1\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: red-discordbot\n"
+"X-Crowdin-Project-ID: 289505\n"
 "X-Crowdin-Language: zh-TW\n"
-"X-Crowdin-File: /cogs/admin/locales/messages.pot\n"
+"X-Crowdin-File-ID: 42\n"
 "Language: zh_TW\n"
 
 #: redbot/cogs/admin/admin.py:17
@@ -21,166 +20,221 @@ msgid "I attempted to do something that Discord denied me permissions for. Your
 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."
+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."
+#: redbot/cogs/admin/admin.py:28
+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:34
+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:40
+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:46
+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:52
+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:58
+msgid "I need manage roles permission to do that."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:60
 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
+#: redbot/cogs/admin/admin.py:70
 #, 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:126
+msgid "{member.display_name} already has the role {role.name}."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:121
+#: redbot/cogs/admin/admin.py:146
 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:156
+msgid "{member.display_name} does not have the role {role.name}."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:138
+#: redbot/cogs/admin/admin.py:176
 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 "\\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:203
+#, 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:217
+#, docstring
 msgid "Edit role settings."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:194
+#: redbot/cogs/admin/admin.py:224
 #, 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:253 redbot/cogs/admin/admin.py:286
 msgid "Done."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:222
+#: redbot/cogs/admin/admin.py:257
 #, 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:291
 #, docstring
 msgid "Announce a message to all servers the bot is in."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:257
+#: redbot/cogs/admin/admin.py:298
 msgid "The announcement has begun."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:265
+#: redbot/cogs/admin/admin.py:305
 #, docstring
 msgid "Cancel a running announce."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:271
+#: redbot/cogs/admin/admin.py:307
+msgid "There is no currently running announcement."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:310
 msgid "The current announcement has been cancelled."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:277
+#: redbot/cogs/admin/admin.py:316
 #, 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:321
+#, 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:330
 msgid "The announcement channel has been set to {channel.mention}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:290
+#: redbot/cogs/admin/admin.py:335
 #, docstring
 msgid "Toggle announcements being enabled this server."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:296
+#: redbot/cogs/admin/admin.py:340
 msgid "The server {guild.name} will receive announcements."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:300
+#: redbot/cogs/admin/admin.py:344
 msgid "The server {guild.name} will not receive announcements."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:326
+#: redbot/cogs/admin/admin.py:370
 #, 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        "
+msgid "Apply selfroles."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:337
+#: redbot/cogs/admin/admin.py:375
 #, docstring
-msgid "Remove a selfrole from yourself.\\n\\n        NOTE: The role is case sensitive!\\n        "
+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:347
+#: redbot/cogs/admin/admin.py:386
 #, docstring
-msgid "Add a role to the list of available selfroles.\\n\\n        NOTE: The role is case sensitive!\\n        "
+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: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
+#: redbot/cogs/admin/admin.py:397
 #, docstring
 msgid "\\n        Lists all available selfroles.\\n        "
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:377
+#: redbot/cogs/admin/admin.py:407
 msgid "Available Selfroles:\\n{selfroles}"
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:394
+#: redbot/cogs/admin/admin.py:413
+#, docstring
+msgid "Manage selfroles."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:418
+#, 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:425
+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:433
+msgid "Added."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:436
+msgid "That role is already a selfrole."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:440
+#, 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:447
+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:455
+msgid "Removed."
+msgstr ""
+
+#: redbot/cogs/admin/admin.py:460
 #, docstring
 msgid "Lock a bot to its current servers only."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:399
+#: redbot/cogs/admin/admin.py:465
 msgid "The bot is no longer serverlocked."
 msgstr ""
 
-#: redbot/cogs/admin/admin.py:401
+#: redbot/cogs/admin/admin.py:467
 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:75
+msgid "I could not announce to the following server: "
 msgstr ""
 
-#: redbot/cogs/admin/converters.py:25
+#: redbot/cogs/admin/announcer.py:77
+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/alias/__init__.py

@@ -2,5 +2,7 @@ from .alias import Alias
 from redbot.core.bot import Red
 
 
-def setup(bot: Red):
-    bot.add_cog(Alias(bot))
+async def setup(bot: Red):
+    cog = Alias(bot)
+    await cog.initialize()
+    bot.add_cog(cog)

redbot/cogs/alias/alias.py

@@ -1,16 +1,16 @@
 from copy import copy
-from re import findall, search
+from re import search
 from string import Formatter
-from typing import Generator, Tuple, Iterable, Optional
+from typing import Dict, List
 
 import discord
-from discord.ext.commands.view import StringView
 from redbot.core import Config, commands, checks
 from redbot.core.i18n import Translator, cog_i18n
-from redbot.core.utils.chat_formatting import box
+from redbot.core.utils.chat_formatting import box, pagify
+from redbot.core.utils.menus import menu, DEFAULT_CONTROLS
 
 from redbot.core.bot import Red
-from .alias_entry import AliasEntry
+from .alias_entry import AliasEntry, AliasCache, ArgParseError
 
 _ = Translator("Alias", __file__)
 
@@ -26,10 +26,6 @@ class _TrackingFormatter(Formatter):
         return super().get_value(key, args, kwargs)
 
 
-class ArgParseError(Exception):
-    pass
-
-
 @cog_i18n(_)
 class Alias(commands.Cog):
     """Create aliases for commands.
@@ -42,110 +38,36 @@ class Alias(commands.Cog):
     and append them to the stored alias.
     """
 
-    default_global_settings = {"entries": []}
+    default_global_settings: Dict[str, list] = {"entries": []}
 
-    default_guild_settings = {"enabled": False, "entries": []}  # Going to be a list of dicts
+    default_guild_settings: Dict[str, list] = {"entries": []}  # Going to be a list of dicts
 
     def __init__(self, bot: Red):
         super().__init__()
         self.bot = bot
-        self._aliases = Config.get_conf(self, 8927348724)
+        self.config = Config.get_conf(self, 8927348724)
 
-        self._aliases.register_global(**self.default_global_settings)
-        self._aliases.register_guild(**self.default_guild_settings)
+        self.config.register_global(**self.default_global_settings)
+        self.config.register_guild(**self.default_guild_settings)
+        self._aliases: AliasCache = AliasCache(config=self.config, cache_enabled=True)
 
-    async def unloaded_aliases(self, guild: discord.Guild) -> Generator[AliasEntry, None, None]:
-        return (AliasEntry.from_json(d) for d in (await self._aliases.guild(guild).entries()))
-
-    async def unloaded_global_aliases(self) -> Generator[AliasEntry, None, None]:
-        return (AliasEntry.from_json(d) for d in (await self._aliases.entries()))
-
-    async def loaded_aliases(self, guild: discord.Guild) -> Generator[AliasEntry, None, None]:
-        return (
-            AliasEntry.from_json(d, bot=self.bot)
-            for d in (await self._aliases.guild(guild).entries())
-        )
-
-    async def loaded_global_aliases(self) -> Generator[AliasEntry, None, None]:
-        return (AliasEntry.from_json(d, bot=self.bot) for d in (await self._aliases.entries()))
-
-    async def is_alias(
-        self,
-        guild: Optional[discord.Guild],
-        alias_name: str,
-        server_aliases: Iterable[AliasEntry] = (),
-    ) -> Tuple[bool, Optional[AliasEntry]]:
-
-        if not server_aliases and guild is not None:
-            server_aliases = await self.unloaded_aliases(guild)
-
-        global_aliases = await self.unloaded_global_aliases()
-
-        for aliases in (server_aliases, global_aliases):
-            for alias in aliases:
-                if alias.name == alias_name:
-                    return True, alias
-
-        return False, None
+    async def initialize(self):
+        # This can be where we set the cache_enabled attribute later
+        if not self._aliases._loaded:
+            await self._aliases.load_aliases()
 
     def is_command(self, alias_name: str) -> bool:
+        """
+        The logic here is that if this returns true, the name should not be used for an alias
+        The function name can be changed when alias is reworked
+        """
         command = self.bot.get_command(alias_name)
-        return command is not None
+        return command is not None or alias_name in commands.RESERVED_COMMAND_NAMES
 
     @staticmethod
     def is_valid_alias_name(alias_name: str) -> bool:
         return not bool(search(r"\s", alias_name)) and alias_name.isprintable()
 
-    async def add_alias(
-        self, ctx: commands.Context, alias_name: str, command: str, global_: bool = False
-    ) -> AliasEntry:
-        indices = findall(r"{(\d*)}", command)
-        if indices:
-            try:
-                indices = [int(a[0]) for a in indices]
-            except IndexError:
-                raise ArgParseError(_("Arguments must be specified with a number."))
-            low = min(indices)
-            indices = [a - low for a in indices]
-            high = max(indices)
-            gaps = set(indices).symmetric_difference(range(high + 1))
-            if gaps:
-                raise ArgParseError(
-                    _("Arguments must be sequential. Missing arguments: ")
-                    + ", ".join(str(i + low) for i in gaps)
-                )
-            command = command.format(*(f"{{{i}}}" for i in range(-low, high + low + 1)))
-
-        alias = AliasEntry(alias_name, command, ctx.author, global_=global_)
-
-        if global_:
-            settings = self._aliases
-        else:
-            settings = self._aliases.guild(ctx.guild)
-            await settings.enabled.set(True)
-
-        async with settings.entries() as curr_aliases:
-            curr_aliases.append(alias.to_json())
-
-        return alias
-
-    async def delete_alias(
-        self, ctx: commands.Context, alias_name: str, global_: bool = False
-    ) -> bool:
-        if global_:
-            settings = self._aliases
-        else:
-            settings = self._aliases.guild(ctx.guild)
-
-        async with settings.entries() as aliases:
-            for alias in aliases:
-                alias_obj = AliasEntry.from_json(alias)
-                if alias_obj.name == alias_name:
-                    aliases.remove(alias)
-                    return True
-
-        return False
-
     async def get_prefix(self, message: discord.Message) -> str:
         """
         Tries to determine what prefix is used in a message object.
@@ -163,57 +85,11 @@ class Alias(commands.Cog):
                 return p
         raise ValueError(_("No prefix found."))
 
-    def get_extra_args_from_alias(
-        self, message: discord.Message, prefix: str, alias: AliasEntry
-    ) -> str:
-        """
-        When an alias is executed by a user in chat this function tries
-            to get any extra arguments passed in with the call.
-            Whitespace will be trimmed from both ends.
-        :param message: 
-        :param prefix: 
-        :param alias: 
-        :return: 
-        """
-        known_content_length = len(prefix) + len(alias.name)
-        extra = message.content[known_content_length:]
-        view = StringView(extra)
-        view.skip_ws()
-        extra = []
-        while not view.eof:
-            prev = view.index
-            word = view.get_quoted_word()
-            if len(word) < view.index - prev:
-                word = "".join((view.buffer[prev], word, view.buffer[view.index - 1]))
-            extra.append(word)
-            view.skip_ws()
-        return extra
-
-    async def maybe_call_alias(
-        self, message: discord.Message, aliases: Iterable[AliasEntry] = None
-    ):
-        try:
-            prefix = await self.get_prefix(message)
-        except ValueError:
-            return
-
-        try:
-            potential_alias = message.content[len(prefix) :].split(" ")[0]
-        except IndexError:
-            return False
-
-        is_alias, alias = await self.is_alias(
-            message.guild, potential_alias, server_aliases=aliases
-        )
-
-        if is_alias:
-            await self.call_alias(message, prefix, alias)
-
     async def call_alias(self, message: discord.Message, prefix: str, alias: AliasEntry):
         new_message = copy(message)
         try:
-            args = self.get_extra_args_from_alias(message, prefix, alias)
-        except commands.BadArgument as bae:
+            args = alias.get_extra_args_from_alias(message, prefix)
+        except commands.BadArgument:
             return
 
         trackform = _TrackingFormatter()
@@ -225,8 +101,29 @@ class Alias(commands.Cog):
         )
         await self.bot.process_commands(new_message)
 
+    async def paginate_alias_list(
+        self, ctx: commands.Context, alias_list: List[AliasEntry]
+    ) -> None:
+        names = sorted(["+ " + a.name for a in alias_list])
+        message = "\n".join(names)
+        temp = list(pagify(message, delims=["\n"], page_length=1850))
+        alias_list = []
+        count = 0
+        for page in temp:
+            count += 1
+            page = page.lstrip("\n")
+            page = (
+                _("Aliases:\n")
+                + page
+                + _("\n\nPage {page}/{total}").format(page=count, total=len(temp))
+            )
+            alias_list.append(box("".join(page), "diff"))
+        if len(alias_list) == 1:
+            await ctx.send(alias_list[0])
+            return
+        await menu(ctx, alias_list, DEFAULT_CONTROLS)
+
     @commands.group()
-    @commands.guild_only()
     async def alias(self, ctx: commands.Context):
         """Manage command aliases."""
         pass
@@ -253,13 +150,13 @@ class Alias(commands.Cog):
             )
             return
 
-        is_alias, something_useless = await self.is_alias(ctx.guild, alias_name)
-        if is_alias:
+        alias = await self._aliases.get_alias(ctx.guild, alias_name)
+        if alias:
             await ctx.send(
                 _(
                     "You attempted to create a new alias"
                     " with the name {name} but that"
-                    " alias already exists on this server."
+                    " alias already exists."
                 ).format(name=alias_name)
             )
             return
@@ -275,13 +172,20 @@ class Alias(commands.Cog):
                 ).format(name=alias_name)
             )
             return
+
+        given_command_exists = self.bot.get_command(command.split(maxsplit=1)[0]) is not None
+        if not given_command_exists:
+            await ctx.send(
+                _("You attempted to create a new alias for a command that doesn't exist.")
+            )
+            return
         # endregion
 
         # At this point we know we need to make a new alias
         #   and that the alias name is valid.
 
         try:
-            await self.add_alias(ctx, alias_name, command)
+            await self._aliases.add_alias(ctx, alias_name, command)
         except ArgParseError as e:
             return await ctx.send(" ".join(e.args))
 
@@ -305,13 +209,13 @@ class Alias(commands.Cog):
             )
             return
 
-        is_alias, something_useless = await self.is_alias(ctx.guild, alias_name)
-        if is_alias:
+        alias = await self._aliases.get_alias(None, alias_name)
+        if alias:
             await ctx.send(
                 _(
                     "You attempted to create a new global alias"
                     " with the name {name} but that"
-                    " alias already exists on this server."
+                    " alias already exists."
                 ).format(name=alias_name)
             )
             return
@@ -327,10 +231,17 @@ class Alias(commands.Cog):
                 ).format(name=alias_name)
             )
             return
+
+        given_command_exists = self.bot.get_command(command.split(maxsplit=1)[0]) is not None
+        if not given_command_exists:
+            await ctx.send(
+                _("You attempted to create a new alias for a command that doesn't exist.")
+            )
+            return
         # endregion
 
         try:
-            await self.add_alias(ctx, alias_name, command, global_=True)
+            await self._aliases.add_alias(ctx, alias_name, command, global_=True)
         except ArgParseError as e:
             return await ctx.send(" ".join(e.args))
 
@@ -341,31 +252,20 @@ class Alias(commands.Cog):
         )
 
     @alias.command(name="help")
-    @commands.guild_only()
     async def _help_alias(self, ctx: commands.Context, alias_name: str):
         """Try to execute help for the base command of the alias."""
-        is_alias, alias = await self.is_alias(ctx.guild, alias_name=alias_name)
-        if is_alias:
-            if self.is_command(alias.command):
-                base_cmd = alias.command
-            else:
-                base_cmd = alias.command.rsplit(" ", 1)[0]
-
-            new_msg = copy(ctx.message)
-            new_msg.content = _("{prefix}help {command}").format(
-                prefix=ctx.prefix, command=base_cmd
-            )
-            await self.bot.process_commands(new_msg)
+        alias = await self._aliases.get_alias(ctx.guild, alias_name=alias_name)
+        if alias:
+            await self.bot.send_help_for(ctx, alias.command)
         else:
             await ctx.send(_("No such alias exists."))
 
     @alias.command(name="show")
-    @commands.guild_only()
     async def _show_alias(self, ctx: commands.Context, alias_name: str):
         """Show what command the alias executes."""
-        is_alias, alias = await self.is_alias(ctx.guild, alias_name)
+        alias = await self._aliases.get_alias(ctx.guild, alias_name)
 
-        if is_alias:
+        if alias:
             await ctx.send(
                 _("The `{alias_name}` alias will execute the command `{command}`").format(
                     alias_name=alias_name, command=alias.command
@@ -379,14 +279,11 @@ class Alias(commands.Cog):
     @commands.guild_only()
     async def _del_alias(self, ctx: commands.Context, alias_name: str):
         """Delete an existing alias on this server."""
-        aliases = await self.unloaded_aliases(ctx.guild)
-        try:
-            next(aliases)
-        except StopIteration:
+        if not await self._aliases.get_guild_aliases(ctx.guild):
             await ctx.send(_("There are no aliases on this server."))
             return
 
-        if await self.delete_alias(ctx, alias_name):
+        if await self._aliases.delete_alias(ctx, alias_name):
             await ctx.send(
                 _("Alias with the name `{name}` was successfully deleted.").format(name=alias_name)
             )
@@ -397,14 +294,11 @@ class Alias(commands.Cog):
     @global_.command(name="delete", aliases=["del", "remove"])
     async def _del_global_alias(self, ctx: commands.Context, alias_name: str):
         """Delete an existing global alias."""
-        aliases = await self.unloaded_global_aliases()
-        try:
-            next(aliases)
-        except StopIteration:
-            await ctx.send(_("There are no aliases on this bot."))
+        if not await self._aliases.get_global_aliases():
+            await ctx.send(_("There are no global aliases on this bot."))
             return
 
-        if await self.delete_alias(ctx, alias_name, global_=True):
+        if await self._aliases.delete_alias(ctx, alias_name, global_=True):
             await ctx.send(
                 _("Alias with the name `{name}` was successfully deleted.").format(name=alias_name)
             )
@@ -413,34 +307,36 @@ class Alias(commands.Cog):
 
     @alias.command(name="list")
     @commands.guild_only()
+    @checks.bot_has_permissions(add_reactions=True)
     async def _list_alias(self, ctx: commands.Context):
         """List the available aliases on this server."""
-        names = [_("Aliases:")] + sorted(
-            ["+ " + a.name for a in (await self.unloaded_aliases(ctx.guild))]
-        )
-        if len(names) == 0:
-            await ctx.send(_("There are no aliases on this server."))
-        else:
-            await ctx.send(box("\n".join(names), "diff"))
+        guild_aliases = await self._aliases.get_guild_aliases(ctx.guild)
+        if not guild_aliases:
+            return await ctx.send(_("There are no aliases on this server."))
+        await self.paginate_alias_list(ctx, guild_aliases)
 
     @global_.command(name="list")
+    @checks.bot_has_permissions(add_reactions=True)
     async def _list_global_alias(self, ctx: commands.Context):
         """List the available global aliases on this bot."""
-        names = [_("Aliases:")] + sorted(
-            ["+ " + a.name for a in await self.unloaded_global_aliases()]
-        )
-        if len(names) == 0:
-            await ctx.send(_("There are no aliases on this server."))
-        else:
-            await ctx.send(box("\n".join(names), "diff"))
+        global_aliases = await self._aliases.get_global_aliases()
+        if not global_aliases:
+            return await ctx.send(_("There are no global aliases."))
+        await self.paginate_alias_list(ctx, global_aliases)
 
     @commands.Cog.listener()
-    async def on_message(self, message: discord.Message):
-        aliases = list(await self.unloaded_global_aliases())
-        if message.guild is not None:
-            aliases = aliases + list(await self.unloaded_aliases(message.guild))
-
-        if len(aliases) == 0:
+    async def on_message_without_command(self, message: discord.Message):
+        try:
+            prefix = await self.get_prefix(message)
+        except ValueError:
             return
 
-        await self.maybe_call_alias(message, aliases=aliases)
+        try:
+            potential_alias = message.content[len(prefix) :].split(" ")[0]
+        except IndexError:
+            return
+
+        alias = await self._aliases.get_alias(message.guild, potential_alias)
+
+        if alias:
+            await self.call_alias(message, prefix, alias)

redbot/cogs/alias/alias_entry.py

@@ -1,25 +1,37 @@
-from typing import Tuple
+from typing import Tuple, Dict, Optional, List, Union
+from re import findall
 
 import discord
-from redbot.core import commands
+from discord.ext.commands.view import StringView
+from redbot.core import commands, Config
+from redbot.core.i18n import Translator
+from redbot.core.utils import AsyncIter
+
+_ = Translator("Alias", __file__)
+
+
+class ArgParseError(Exception):
+    pass
 
 
 class AliasEntry:
+    """An object containing all required information about an alias"""
+
+    name: str
+    command: Union[Tuple[str], str]
+    creator: int
+    guild: Optional[int]
+    uses: int
+
     def __init__(
-        self, name: str, command: Tuple[str], creator: discord.Member, global_: bool = False
+        self, name: str, command: Union[Tuple[str], str], creator: int, guild: Optional[int],
     ):
         super().__init__()
-        self.has_real_data = False
         self.name = name
         self.command = command
         self.creator = creator
 
-        self.global_ = global_
-
-        self.guild = None
-        if hasattr(creator, "guild"):
-            self.guild = creator.guild
-
+        self.guild = guild
         self.uses = 0
 
     def inc(self):
@@ -30,34 +42,182 @@ class AliasEntry:
         self.uses += 1
         return self.uses
 
+    def get_extra_args_from_alias(self, message: discord.Message, prefix: str) -> str:
+        """
+        When an alias is executed by a user in chat this function tries
+            to get any extra arguments passed in with the call.
+            Whitespace will be trimmed from both ends.
+        :param message:
+        :param prefix:
+        :param alias:
+        :return:
+        """
+        known_content_length = len(prefix) + len(self.name)
+        extra = message.content[known_content_length:]
+        view = StringView(extra)
+        view.skip_ws()
+        extra = []
+        while not view.eof:
+            prev = view.index
+            word = view.get_quoted_word()
+            if len(word) < view.index - prev:
+                word = "".join((view.buffer[prev], word, view.buffer[view.index - 1]))
+            extra.append(word)
+            view.skip_ws()
+        return extra
+
     def to_json(self) -> dict:
-        try:
-            creator = str(self.creator.id)
-            guild = str(self.guild.id)
-        except AttributeError:
-            creator = self.creator
-            guild = self.guild
 
         return {
             "name": self.name,
             "command": self.command,
-            "creator": creator,
-            "guild": guild,
-            "global": self.global_,
+            "creator": self.creator,
+            "guild": self.guild,
             "uses": self.uses,
         }
 
     @classmethod
-    def from_json(cls, data: dict, bot: commands.Bot = None):
-        ret = cls(data["name"], data["command"], data["creator"], global_=data["global"])
-
-        if bot:
-            ret.has_real_data = True
-            ret.creator = bot.get_user(int(data["creator"]))
-            guild = bot.get_guild(int(data["guild"]))
-            ret.guild = guild
-        else:
-            ret.guild = data["guild"]
-
+    def from_json(cls, data: dict):
+        ret = cls(data["name"], data["command"], data["creator"], data["guild"])
         ret.uses = data.get("uses", 0)
         return ret
+
+
+class AliasCache:
+    def __init__(self, config: Config, cache_enabled: bool = True):
+        self.config = config
+        self._cache_enabled = cache_enabled
+        self._loaded = False
+        self._aliases: Dict[Optional[int], Dict[str, AliasEntry]] = {None: {}}
+
+    async def load_aliases(self):
+        if not self._cache_enabled:
+            self._loaded = True
+            return
+        for alias in await self.config.entries():
+            self._aliases[None][alias["name"]] = AliasEntry.from_json(alias)
+
+        all_guilds = await self.config.all_guilds()
+        async for guild_id, guild_data in AsyncIter(all_guilds.items(), steps=100):
+            if guild_id not in self._aliases:
+                self._aliases[guild_id] = {}
+            for alias in guild_data["entries"]:
+                self._aliases[guild_id][alias["name"]] = AliasEntry.from_json(alias)
+        self._loaded = True
+
+    async def get_aliases(self, ctx: commands.Context) -> List[AliasEntry]:
+        """Returns all possible aliases with the given context"""
+        global_aliases: List[AliasEntry] = []
+        server_aliases: List[AliasEntry] = []
+        global_aliases = await self.get_global_aliases()
+        if ctx.guild and ctx.guild.id in self._aliases:
+            server_aliases = await self.get_guild_aliases(ctx.guild)
+        return global_aliases + server_aliases
+
+    async def get_guild_aliases(self, guild: discord.Guild) -> List[AliasEntry]:
+        """Returns all guild specific aliases"""
+        aliases: List[AliasEntry] = []
+
+        if self._cache_enabled:
+            if guild.id in self._aliases:
+                for _, alias in self._aliases[guild.id].items():
+                    aliases.append(alias)
+        else:
+            aliases = [AliasEntry.from_json(d) for d in await self.config.guild(guild).entries()]
+        return aliases
+
+    async def get_global_aliases(self) -> List[AliasEntry]:
+        """Returns all global specific aliases"""
+        aliases: List[AliasEntry] = []
+        if self._cache_enabled:
+            for _, alias in self._aliases[None].items():
+                aliases.append(alias)
+        else:
+            aliases = [AliasEntry.from_json(d) for d in await self.config.entries()]
+        return aliases
+
+    async def get_alias(
+        self, guild: Optional[discord.Guild], alias_name: str,
+    ) -> Optional[AliasEntry]:
+        """Returns an AliasEntry object if the provided alias_name is a registered alias"""
+        server_aliases: List[AliasEntry] = []
+
+        if self._cache_enabled:
+            if alias_name in self._aliases[None]:
+                return self._aliases[None][alias_name]
+            if guild is not None:
+                if guild.id in self._aliases:
+                    if alias_name in self._aliases[guild.id]:
+                        return self._aliases[guild.id][alias_name]
+        else:
+            if guild:
+                server_aliases = [
+                    AliasEntry.from_json(d) for d in await self.config.guild(guild.id).entries()
+                ]
+            global_aliases = [AliasEntry.from_json(d) for d in await self.config.entries()]
+            all_aliases = global_aliases + server_aliases
+
+            for alias in all_aliases:
+                if alias.name == alias_name:
+                    return alias
+
+        return None
+
+    async def add_alias(
+        self, ctx: commands.Context, alias_name: str, command: str, global_: bool = False
+    ) -> AliasEntry:
+        indices = findall(r"{(\d*)}", command)
+        if indices:
+            try:
+                indices = [int(a[0]) for a in indices]
+            except IndexError:
+                raise ArgParseError(_("Arguments must be specified with a number."))
+            low = min(indices)
+            indices = [a - low for a in indices]
+            high = max(indices)
+            gaps = set(indices).symmetric_difference(range(high + 1))
+            if gaps:
+                raise ArgParseError(
+                    _("Arguments must be sequential. Missing arguments: ")
+                    + ", ".join(str(i + low) for i in gaps)
+                )
+            command = command.format(*(f"{{{i}}}" for i in range(-low, high + low + 1)))
+
+        if global_:
+            alias = AliasEntry(alias_name, command, ctx.author.id, None)
+            settings = self.config
+            if self._cache_enabled:
+                self._aliases[None][alias.name] = alias
+        else:
+            alias = AliasEntry(alias_name, command, ctx.author.id, ctx.guild.id)
+            settings = self.config.guild(ctx.guild)
+            if self._cache_enabled:
+                if ctx.guild.id not in self._aliases:
+                    self._aliases[ctx.guild.id] = {}
+                self._aliases[ctx.guild.id][alias.name] = alias
+
+        async with settings.entries() as curr_aliases:
+            curr_aliases.append(alias.to_json())
+
+        return alias
+
+    async def delete_alias(
+        self, ctx: commands.Context, alias_name: str, global_: bool = False
+    ) -> bool:
+        if global_:
+            settings = self.config
+        else:
+            settings = self.config.guild(ctx.guild)
+
+        async with settings.entries() as aliases:
+            for alias in aliases:
+                if alias["name"] == alias_name:
+                    aliases.remove(alias)
+                    if self._cache_enabled:
+                        if global_:
+                            del self._aliases[None][alias_name]
+                        else:
+                            del self._aliases[ctx.guild.id][alias_name]
+                    return True
+
+        return False

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

@@ -0,0 +1,160 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: red-discordbot\n"
+"POT-Creation-Date: 2020-06-18 12:13+0000\n"
+"Last-Translator: \n"
+"Language-Team: Afrikaans\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: af\n"
+"X-Crowdin-File-ID: 8\n"
+"Language: af_ZA\n"
+
+#: redbot/cogs/alias/alias.py:31
+#, docstring
+msgid "Create aliases for commands.\\n\\n    Aliases are alternative names shortcuts for commands. They\\n    can act as both a lambda (storing arguments for repeated use)\\n    or as simply a shortcut to saying \\\"x y z\\\".\\n\\n    When run, aliases will accept any additional arguments\\n    and append them to the stored alias.\\n    "
+msgstr ""
+
+#: redbot/cogs/alias/alias.py:86
+msgid "No prefix found."
+msgstr ""
+
+#: redbot/cogs/alias/alias.py:116
+msgid "Aliases:\\n"
+msgstr ""
+
+#: redbot/cogs/alias/alias.py:118
+msgid "\\n\\nPage {page}/{total}"
+msgstr ""
+
+#: redbot/cogs/alias/alias.py:128
+#, docstring
+msgid "Manage command aliases."
+msgstr ""
+
+#: redbot/cogs/alias/alias.py:133
+#, docstring
+msgid "Manage global aliases."
+msgstr ""
+
+#: redbot/cogs/alias/alias.py:140
+#, docstring
+msgid "Add an alias for a command."
+msgstr ""
+
+#: redbot/cogs/alias/alias.py:145
+msgid "You attempted to create a new alias with the name {name} but that name is already a command on this bot."
+msgstr ""
+
+#: redbot/cogs/alias/alias.py:156
+msgid "You attempted to create a new alias with the name {name} but that alias already exists."
+msgstr ""
+
+#: redbot/cogs/alias/alias.py:167
+msgid "You attempted to create a new alias with the name {name} but that name is an invalid alias name. Alias names may not contain spaces."
+msgstr ""
+
+#: redbot/cogs/alias/alias.py:179 redbot/cogs/alias/alias.py:238
+msgid "You attempted to create a new alias for a command that doesn't exist."
+msgstr ""
+
+#: redbot/cogs/alias/alias.py:193
+msgid "A new alias with the trigger `{name}` has been created."
+msgstr ""
+
+#: redbot/cogs/alias/alias.py:199
+#, docstring
+msgid "Add a global alias for a command."
+msgstr ""
+
+#: redbot/cogs/alias/alias.py:204
+msgid "You attempted to create a new global alias with the name {name} but that name is already a command on this bot."
+msgstr ""
+
+#: redbot/cogs/alias/alias.py:215
+msgid "You attempted to create a new global alias with the name {name} but that alias already exists."
+msgstr ""
+
+#: redbot/cogs/alias/alias.py:226
+msgid "You attempted to create a new global alias with the name {name} but that name is an invalid alias name. Alias names may not contain spaces."
+msgstr ""
+
+#: redbot/cogs/alias/alias.py:249
+msgid "A new global alias with the trigger `{name}` has been created."
+msgstr ""
+
+#: redbot/cogs/alias/alias.py:256
+#, docstring
+msgid "Try to execute help for the base command of the alias."
+msgstr ""
+
+#: redbot/cogs/alias/alias.py:261
+msgid "No such alias exists."
+msgstr ""
+
+#: redbot/cogs/alias/alias.py:265
+#, docstring
+msgid "Show what command the alias executes."
+msgstr ""
+
+#: redbot/cogs/alias/alias.py:270
+msgid "The `{alias_name}` alias will execute the command `{command}`"
+msgstr ""
+
+#: redbot/cogs/alias/alias.py:275
+msgid "There is no alias with the name `{name}`"
+msgstr ""
+
+#: redbot/cogs/alias/alias.py:281
+#, docstring
+msgid "Delete an existing alias on this server."
+msgstr ""
+
+#: redbot/cogs/alias/alias.py:283 redbot/cogs/alias/alias.py:315
+msgid "There are no aliases on this server."
+msgstr ""
+
+#: redbot/cogs/alias/alias.py:288 redbot/cogs/alias/alias.py:303
+msgid "Alias with the name `{name}` was successfully deleted."
+msgstr ""
+
+#: redbot/cogs/alias/alias.py:291 redbot/cogs/alias/alias.py:306
+msgid "Alias with name `{name}` was not found."
+msgstr ""
+
+#: redbot/cogs/alias/alias.py:296
+#, docstring
+msgid "Delete an existing global alias."
+msgstr ""
+
+#: redbot/cogs/alias/alias.py:298
+msgid "There are no global aliases on this bot."
+msgstr ""
+
+#: redbot/cogs/alias/alias.py:312
+#, docstring
+msgid "List the available aliases on this server."
+msgstr ""
+
+#: redbot/cogs/alias/alias.py:321
+#, docstring
+msgid "List the available global aliases on this bot."
+msgstr ""
+
+#: redbot/cogs/alias/alias.py:324
+msgid "There are no global aliases."
+msgstr ""
+
+#: redbot/cogs/alias/alias_entry.py:174
+msgid "Arguments must be specified with a number."
+msgstr ""
+
+#: redbot/cogs/alias/alias_entry.py:181
+msgid "Arguments must be sequential. Missing arguments: "
+msgstr ""
+

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

@@ -1,154 +1,160 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2019-07-05 22:33+0200\n"
-"PO-Revision-Date: 2019-07-06 16:12\n"
-"Last-Translator: Robert Jansen (Kowlin)\n"
+"POT-Creation-Date: 2020-06-18 12:13+0000\n"
+"Last-Translator: \n"
 "Language-Team: Arabic\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: redgettext 3.0\n"
+"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-Generator: crowdin.com\n"
 "X-Crowdin-Project: red-discordbot\n"
+"X-Crowdin-Project-ID: 289505\n"
 "X-Crowdin-Language: ar\n"
-"X-Crowdin-File: /cogs/alias/locales/messages.pot\n"
+"X-Crowdin-File-ID: 8\n"
 "Language: ar_SA\n"
 
-#: redbot/cogs/alias/alias.py:35
+#: redbot/cogs/alias/alias.py:31
 #, docstring
 msgid "Create aliases for commands.\\n\\n    Aliases are alternative names shortcuts for commands. They\\n    can act as both a lambda (storing arguments for repeated use)\\n    or as simply a shortcut to saying \\\"x y z\\\".\\n\\n    When run, aliases will accept any additional arguments\\n    and append them to the stored alias.\\n    "
 msgstr ""
 
-#: redbot/cogs/alias/alias.py:107
-msgid "Arguments must be specified with a number."
-msgstr ""
-
-#: redbot/cogs/alias/alias.py:114
-msgid "Arguments must be sequential. Missing arguments: "
-msgstr ""
-
-#: redbot/cogs/alias/alias.py:164
+#: redbot/cogs/alias/alias.py:86
 msgid "No prefix found."
 msgstr ""
 
-#: redbot/cogs/alias/alias.py:231
+#: redbot/cogs/alias/alias.py:116
+msgid "Aliases:\\n"
+msgstr ""
+
+#: redbot/cogs/alias/alias.py:118
+msgid "\\n\\nPage {page}/{total}"
+msgstr ""
+
+#: redbot/cogs/alias/alias.py:128
 #, docstring
 msgid "Manage command aliases."
 msgstr ""
 
-#: redbot/cogs/alias/alias.py:236
+#: redbot/cogs/alias/alias.py:133
 #, docstring
 msgid "Manage global aliases."
 msgstr ""
 
-#: redbot/cogs/alias/alias.py:243
+#: redbot/cogs/alias/alias.py:140
 #, docstring
 msgid "Add an alias for a command."
 msgstr ""
 
-#: redbot/cogs/alias/alias.py:248
+#: redbot/cogs/alias/alias.py:145
 msgid "You attempted to create a new alias with the name {name} but that name is already a command on this bot."
 msgstr ""
 
-#: redbot/cogs/alias/alias.py:259
-msgid "You attempted to create a new alias with the name {name} but that alias already exists on this server."
+#: redbot/cogs/alias/alias.py:156
+msgid "You attempted to create a new alias with the name {name} but that alias already exists."
 msgstr ""
 
-#: redbot/cogs/alias/alias.py:270
+#: redbot/cogs/alias/alias.py:167
 msgid "You attempted to create a new alias with the name {name} but that name is an invalid alias name. Alias names may not contain spaces."
 msgstr ""
 
-#: redbot/cogs/alias/alias.py:289
+#: redbot/cogs/alias/alias.py:179 redbot/cogs/alias/alias.py:238
+msgid "You attempted to create a new alias for a command that doesn't exist."
+msgstr ""
+
+#: redbot/cogs/alias/alias.py:193
 msgid "A new alias with the trigger `{name}` has been created."
 msgstr ""
 
-#: redbot/cogs/alias/alias.py:295
+#: redbot/cogs/alias/alias.py:199
 #, docstring
 msgid "Add a global alias for a command."
 msgstr ""
 
-#: redbot/cogs/alias/alias.py:300
+#: redbot/cogs/alias/alias.py:204
 msgid "You attempted to create a new global alias with the name {name} but that name is already a command on this bot."
 msgstr ""
 
-#: redbot/cogs/alias/alias.py:311
-msgid "You attempted to create a new global alias with the name {name} but that alias already exists on this server."
+#: redbot/cogs/alias/alias.py:215
+msgid "You attempted to create a new global alias with the name {name} but that alias already exists."
 msgstr ""
 
-#: redbot/cogs/alias/alias.py:322
+#: redbot/cogs/alias/alias.py:226
 msgid "You attempted to create a new global alias with the name {name} but that name is an invalid alias name. Alias names may not contain spaces."
 msgstr ""
 
-#: redbot/cogs/alias/alias.py:338
+#: redbot/cogs/alias/alias.py:249
 msgid "A new global alias with the trigger `{name}` has been created."
 msgstr ""
 
-#: redbot/cogs/alias/alias.py:346
+#: redbot/cogs/alias/alias.py:256
 #, docstring
 msgid "Try to execute help for the base command of the alias."
 msgstr ""
 
-#: redbot/cogs/alias/alias.py:355
-msgid "{prefix}help {command}"
-msgstr ""
-
-#: redbot/cogs/alias/alias.py:360
+#: redbot/cogs/alias/alias.py:261
 msgid "No such alias exists."
 msgstr ""
 
-#: redbot/cogs/alias/alias.py:365
+#: redbot/cogs/alias/alias.py:265
 #, docstring
 msgid "Show what command the alias executes."
 msgstr ""
 
-#: redbot/cogs/alias/alias.py:370
+#: redbot/cogs/alias/alias.py:270
 msgid "The `{alias_name}` alias will execute the command `{command}`"
 msgstr ""
 
-#: redbot/cogs/alias/alias.py:375
+#: redbot/cogs/alias/alias.py:275
 msgid "There is no alias with the name `{name}`"
 msgstr ""
 
-#: redbot/cogs/alias/alias.py:381
+#: redbot/cogs/alias/alias.py:281
 #, docstring
 msgid "Delete an existing alias on this server."
 msgstr ""
 
-#: redbot/cogs/alias/alias.py:386 redbot/cogs/alias/alias.py:422
-#: redbot/cogs/alias/alias.py:433
+#: redbot/cogs/alias/alias.py:283 redbot/cogs/alias/alias.py:315
 msgid "There are no aliases on this server."
 msgstr ""
 
-#: redbot/cogs/alias/alias.py:391 redbot/cogs/alias/alias.py:409
+#: redbot/cogs/alias/alias.py:288 redbot/cogs/alias/alias.py:303
 msgid "Alias with the name `{name}` was successfully deleted."
 msgstr ""
 
-#: redbot/cogs/alias/alias.py:394 redbot/cogs/alias/alias.py:412
+#: redbot/cogs/alias/alias.py:291 redbot/cogs/alias/alias.py:306
 msgid "Alias with name `{name}` was not found."
 msgstr ""
 
-#: redbot/cogs/alias/alias.py:399
+#: redbot/cogs/alias/alias.py:296
 #, docstring
 msgid "Delete an existing global alias."
 msgstr ""
 
-#: redbot/cogs/alias/alias.py:404
-msgid "There are no aliases on this bot."
+#: redbot/cogs/alias/alias.py:298
+msgid "There are no global aliases on this bot."
 msgstr ""
 
-#: redbot/cogs/alias/alias.py:417
+#: redbot/cogs/alias/alias.py:312
 #, docstring
 msgid "List the available aliases on this server."
 msgstr ""
 
-#: redbot/cogs/alias/alias.py:418 redbot/cogs/alias/alias.py:429
-msgid "Aliases:"
-msgstr ""
-
-#: redbot/cogs/alias/alias.py:428
+#: redbot/cogs/alias/alias.py:321
 #, docstring
 msgid "List the available global aliases on this bot."
 msgstr ""
 
+#: redbot/cogs/alias/alias.py:324
+msgid "There are no global aliases."
+msgstr ""
+
+#: redbot/cogs/alias/alias_entry.py:174
+msgid "Arguments must be specified with a number."
+msgstr ""
+
+#: redbot/cogs/alias/alias_entry.py:181
+msgid "Arguments must be sequential. Missing arguments: "
+msgstr ""
+

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

@@ -1,154 +1,160 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2019-07-05 22:33+0200\n"
-"PO-Revision-Date: 2019-07-06 16:12\n"
-"Last-Translator: Robert Jansen (Kowlin)\n"
+"POT-Creation-Date: 2020-06-18 12:13+0000\n"
+"Last-Translator: \n"
 "Language-Team: Bulgarian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: redgettext 3.0\n"
+"Generated-By: redgettext 3.1\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: red-discordbot\n"
+"X-Crowdin-Project-ID: 289505\n"
 "X-Crowdin-Language: bg\n"
-"X-Crowdin-File: /cogs/alias/locales/messages.pot\n"
+"X-Crowdin-File-ID: 8\n"
 "Language: bg_BG\n"
 
-#: redbot/cogs/alias/alias.py:35
+#: redbot/cogs/alias/alias.py:31
 #, docstring
 msgid "Create aliases for commands.\\n\\n    Aliases are alternative names shortcuts for commands. They\\n    can act as both a lambda (storing arguments for repeated use)\\n    or as simply a shortcut to saying \\\"x y z\\\".\\n\\n    When run, aliases will accept any additional arguments\\n    and append them to the stored alias.\\n    "
 msgstr ""
 
-#: redbot/cogs/alias/alias.py:107
-msgid "Arguments must be specified with a number."
-msgstr ""
-
-#: redbot/cogs/alias/alias.py:114
-msgid "Arguments must be sequential. Missing arguments: "
-msgstr ""
-
-#: redbot/cogs/alias/alias.py:164
+#: redbot/cogs/alias/alias.py:86
 msgid "No prefix found."
 msgstr "Няма намерен префикс."
 
-#: redbot/cogs/alias/alias.py:231
+#: redbot/cogs/alias/alias.py:116
+msgid "Aliases:\\n"
+msgstr ""
+
+#: redbot/cogs/alias/alias.py:118
+msgid "\\n\\nPage {page}/{total}"
+msgstr ""
+
+#: redbot/cogs/alias/alias.py:128
 #, docstring
 msgid "Manage command aliases."
 msgstr ""
 
-#: redbot/cogs/alias/alias.py:236
+#: redbot/cogs/alias/alias.py:133
 #, docstring
 msgid "Manage global aliases."
 msgstr ""
 
-#: redbot/cogs/alias/alias.py:243
+#: redbot/cogs/alias/alias.py:140
 #, docstring
 msgid "Add an alias for a command."
 msgstr ""
 
-#: redbot/cogs/alias/alias.py:248
+#: redbot/cogs/alias/alias.py:145
 msgid "You attempted to create a new alias with the name {name} but that name is already a command on this bot."
 msgstr ""
 
-#: redbot/cogs/alias/alias.py:259
-msgid "You attempted to create a new alias with the name {name} but that alias already exists on this server."
+#: redbot/cogs/alias/alias.py:156
+msgid "You attempted to create a new alias with the name {name} but that alias already exists."
 msgstr ""
 
-#: redbot/cogs/alias/alias.py:270
+#: redbot/cogs/alias/alias.py:167
 msgid "You attempted to create a new alias with the name {name} but that name is an invalid alias name. Alias names may not contain spaces."
 msgstr ""
 
-#: redbot/cogs/alias/alias.py:289
+#: redbot/cogs/alias/alias.py:179 redbot/cogs/alias/alias.py:238
+msgid "You attempted to create a new alias for a command that doesn't exist."
+msgstr ""
+
+#: redbot/cogs/alias/alias.py:193
 msgid "A new alias with the trigger `{name}` has been created."
 msgstr ""
 
-#: redbot/cogs/alias/alias.py:295
+#: redbot/cogs/alias/alias.py:199
 #, docstring
 msgid "Add a global alias for a command."
 msgstr ""
 
-#: redbot/cogs/alias/alias.py:300
+#: redbot/cogs/alias/alias.py:204
 msgid "You attempted to create a new global alias with the name {name} but that name is already a command on this bot."
 msgstr ""
 
-#: redbot/cogs/alias/alias.py:311
-msgid "You attempted to create a new global alias with the name {name} but that alias already exists on this server."
+#: redbot/cogs/alias/alias.py:215
+msgid "You attempted to create a new global alias with the name {name} but that alias already exists."
 msgstr ""
 
-#: redbot/cogs/alias/alias.py:322
+#: redbot/cogs/alias/alias.py:226
 msgid "You attempted to create a new global alias with the name {name} but that name is an invalid alias name. Alias names may not contain spaces."
 msgstr ""
 
-#: redbot/cogs/alias/alias.py:338
+#: redbot/cogs/alias/alias.py:249
 msgid "A new global alias with the trigger `{name}` has been created."
 msgstr ""
 
-#: redbot/cogs/alias/alias.py:346
+#: redbot/cogs/alias/alias.py:256
 #, docstring
 msgid "Try to execute help for the base command of the alias."
 msgstr ""
 
-#: redbot/cogs/alias/alias.py:355
-msgid "{prefix}help {command}"
-msgstr ""
-
-#: redbot/cogs/alias/alias.py:360
+#: redbot/cogs/alias/alias.py:261
 msgid "No such alias exists."
 msgstr "Този псевдоним не съществува."
 
-#: redbot/cogs/alias/alias.py:365
+#: redbot/cogs/alias/alias.py:265
 #, docstring
 msgid "Show what command the alias executes."
 msgstr ""
 
-#: redbot/cogs/alias/alias.py:370
+#: redbot/cogs/alias/alias.py:270
 msgid "The `{alias_name}` alias will execute the command `{command}`"
 msgstr ""
 
-#: redbot/cogs/alias/alias.py:375
+#: redbot/cogs/alias/alias.py:275
 msgid "There is no alias with the name `{name}`"
 msgstr ""
 
-#: redbot/cogs/alias/alias.py:381
+#: redbot/cogs/alias/alias.py:281
 #, docstring
 msgid "Delete an existing alias on this server."
 msgstr ""
 
-#: redbot/cogs/alias/alias.py:386 redbot/cogs/alias/alias.py:422
-#: redbot/cogs/alias/alias.py:433
+#: redbot/cogs/alias/alias.py:283 redbot/cogs/alias/alias.py:315
 msgid "There are no aliases on this server."
 msgstr "Няма използвани псевдоними на този сървър."
 
-#: redbot/cogs/alias/alias.py:391 redbot/cogs/alias/alias.py:409
+#: redbot/cogs/alias/alias.py:288 redbot/cogs/alias/alias.py:303
 msgid "Alias with the name `{name}` was successfully deleted."
 msgstr ""
 
-#: redbot/cogs/alias/alias.py:394 redbot/cogs/alias/alias.py:412
+#: redbot/cogs/alias/alias.py:291 redbot/cogs/alias/alias.py:306
 msgid "Alias with name `{name}` was not found."
 msgstr ""
 
-#: redbot/cogs/alias/alias.py:399
+#: redbot/cogs/alias/alias.py:296
 #, docstring
 msgid "Delete an existing global alias."
 msgstr ""
 
-#: redbot/cogs/alias/alias.py:404
-msgid "There are no aliases on this bot."
-msgstr "Няма псевдоними положени към този бот."
+#: redbot/cogs/alias/alias.py:298
+msgid "There are no global aliases on this bot."
+msgstr ""
 
-#: redbot/cogs/alias/alias.py:417
+#: redbot/cogs/alias/alias.py:312
 #, docstring
 msgid "List the available aliases on this server."
 msgstr ""
 
-#: redbot/cogs/alias/alias.py:418 redbot/cogs/alias/alias.py:429
-msgid "Aliases:"
-msgstr "Псевдоними:"
-
-#: redbot/cogs/alias/alias.py:428
+#: redbot/cogs/alias/alias.py:321
 #, docstring
 msgid "List the available global aliases on this bot."
 msgstr ""
 
+#: redbot/cogs/alias/alias.py:324
+msgid "There are no global aliases."
+msgstr ""
+
+#: redbot/cogs/alias/alias_entry.py:174
+msgid "Arguments must be specified with a number."
+msgstr ""
+
+#: redbot/cogs/alias/alias_entry.py:181
+msgid "Arguments must be sequential. Missing arguments: "
+msgstr ""
+