[V3] Beta 12 release (#1525)

* [V3] update translations from Crowdin

* [V3] bump version to 3.0.0b12

.github/CODEOWNERS

@@ -21,6 +21,9 @@ redbot/core/rpc.py                       @tekulvw
 redbot/core/sentry_setup.py              @Kowlin @tekulvw
 redbot/core/utils/chat_formatting.py     @tekulvw
 redbot/core/utils/mod.py                 @palmtree5
+redbot/core/utils/data_converter.py      @mikeshardmind
+redbot/core/utils/antispam.py            @mikeshardmind
+redbot/core/utils/tunnel.py              @mikeshardmind
 
 # Cogs
 redbot/cogs/admin/*                 @tekulvw
@@ -38,6 +41,8 @@ redbot/cogs/mod/*                   @palmtree5
 redbot/cogs/modlog/*                @palmtree5
 redbot/cogs/streams/*               @Twentysix26 @palmtree5
 redbot/cogs/trivia/*                @Tobotimus
+redbot/cogs/dataconverter/*         @mikeshardmind
+redbot/cogs/reports/*               @mikeshardmind
 
 # Docs
 docs/*                              @tekulvw @palmtree5
@@ -47,3 +52,7 @@ setup.py                            @tekulvw
 redbot/__init__.py                  @tekulvw
 redbot/__main__.py                  @tekulvw
 redbot/setup.py                     @tekulvw
+
+# Others
+.travis.yml                         @Kowlin
+crowdin.yml                         @Kowlin

.gitignore

@@ -156,3 +156,5 @@ ENV/
 # mypy
 .mypy_cache/
 
+# pytest
+.pytest_cache/

.readthedocs.yml

@@ -0,0 +1,14 @@
+formats:
+  - pdf
+
+build:
+  image: latest
+
+requirements_file: docs/requirements.txt
+
+python:
+  version: 3.6
+  pip_install: true
+  extra_requirements:
+    - docs
+    - mongo

.travis.yml

@@ -17,16 +17,11 @@ script:
 
 jobs:
   include:
-    - stage: Deployment
+    - stage: PyPi Deployment
       if: tag IS present
       python: 3.5.3
       env:
         - DEPLOYING=true
-      before_deployment:
-      - 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
       deploy:
         - provider: pypi
           user: Red-DiscordBot
@@ -38,11 +33,22 @@ jobs:
             branch: V3/develop
             python: 3.5.3
             tags: true
-        - provider: script
-          script: python3 ./generate_strings.py
-          skip_cleanup: true
-          on:
-            repo: Cog-Creators/Red-DiscordBot
-            branch: V3/develop
-            python: 3.5.3
-            tags: true
+    - stage: Crowdin Deployment
+      if: tag IS present
+      python: 3.5.3
+      env:
+        - DEPLOYING=true
+      before_deployment:
+      - 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
+      deploy:
+      - provider: script
+        script: python3 ./generate_strings.py
+        skip_cleanup: true
+        on:
+          repo: Cog-Creators/Red-DiscordBot
+          branch: V3/develop
+          python: 3.5.3
+          tags: true

docs/autostart_systemd.rst

@@ -0,0 +1,48 @@
+.. systemd service guide
+
+==========================
+Setting up auto-restart using systemd on Linux
+==========================
+
+---------------------------
+Creating the service file
+---------------------------
+
+Create the new service file:
+
+:code:`sudo nano /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):
+
+.. code-block:: none
+
+    [Unit]
+    Description=%I redbot
+    After=multi-user.target
+
+    [Service]
+    ExecStart=/home/username/.local/bin/redbot %I --no-prompt
+    User=username
+    Group=username
+    Type=idle
+    Restart=always
+    RestartSec=15
+
+    [Install]
+    WantedBy=multi-user.target
+
+Save and exit :code:`ctrl + O; enter; ctrl + x`
+
+---------------------------
+Starting and enabling the service
+---------------------------
+
+To start the bot, run the service and add the instance name after the **@**:
+
+:code:`sudo systemctl start red@instancename`
+
+To set the bot to start on boot, you must enable the service, again adding the instance name after the **@**:
+
+:code:`sudo systemctl enable red@instancename`
+
+.. note:: This same file can be used to start as many instances of the bot as you wish, without creating more service files, just start and enable more services and add any bot instance name after the **@**

docs/cog_dataconverter.rst

@@ -0,0 +1,62 @@
+.. Importing data from a V2 install
+
+================================
+Importing data from a V2 install
+================================
+
+----------------
+What you'll need
+----------------
+
+1. A Running V3 bot
+2. The path where your V2 bot is installed
+
+--------------
+Importing data
+--------------
+
+.. important::
+
+    Unless otherwise specified, the V2 data will take priority over V3 data for the same entires
+
+.. important::
+
+    For the purposes of this guide, your prefix will be denoted as 
+    [p]
+
+    You should swap whatever you made your prefix in for this.
+    All of the below are commands to be entered in discord where the bot can
+    see them.
+
+The dataconverter cog is not loaded by default. To start, load it with
+
+.. code-block:: none
+
+    [p]load dataconverter
+
+Next, you'll need to give it the path where your V2 install is.
+
+On linux and OSX, it may look something like:
+
+.. code-block:: none
+
+    /home/username/Red-DiscordBot/
+
+On Windows it will look something like:
+
+.. code-block:: none
+
+    C:\Users\yourusername\Red-DiscordBot
+
+Once you have that path, give it to the bot with the following command
+(make sure to swap your own path in)
+
+.. code-block:: none
+
+    [p]convertdata /home/username/Red-DiscordBot/
+
+
+From here, if the path is correct, you will be prompted with an interactive menu asking you
+what data you would like to import
+
+You can select an entry by number, or quit with any of 'quit', 'exit', 'q', '-1', or 'cancel'

docs/conf.py

@@ -55,17 +55,18 @@ master_doc = 'index'
 
 # General information about the project.
 project = 'Red - Discord Bot'
-copyright = '2017, Cog Creators'
+copyright = '2018, Cog Creators'
 author = 'Cog Creators'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
+from redbot.core import __version__
 # The short X.Y version.
-version = '3.0.0a1'
+version = __version__
 # The full version, including alpha/beta/rc tags.
-release = '3.0.0a1'
+release = __version__
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docs/framework_bot.rst

@@ -0,0 +1,19 @@
+.. bot module docs
+
+===
+Bot
+===
+
+.. automodule:: redbot.core.bot
+
+RedBase
+^^^^^^^
+
+.. autoclass:: RedBase
+    :members:
+
+Red
+^^^
+
+.. autoclass:: Red
+    :members:

docs/framework_rpc.rst

@@ -0,0 +1,8 @@
+.. rpc docs
+
+===
+RPC
+===
+
+.. automodule:: redbot.core.rpc
+    :members:

docs/framework_utils.rst

@@ -10,8 +10,26 @@ Chat Formatting
 .. automodule:: redbot.core.utils.chat_formatting
     :members:
 
+Embed Helpers
+=============
+
+.. automodule:: redbot.core.utils.embed
+    :members:
+
 Mod Helpers
 ===========
 
 .. automodule:: redbot.core.utils.mod
     :members:
+
+V2 Data Conversion
+==================
+
+.. automodule:: redbot.core.utils.data_converter
+    :members: DataConverter
+
+Tunnel
+======
+
+.. automodule:: redbot.core.utils.tunnel
+    :members: Tunnel

docs/guide_data_conversion.rst

@@ -0,0 +1,154 @@
+.. Converting Data from a V2 cog
+
+.. role:: python(code)
+    :language: python
+
+============================
+Importing Data From a V2 Cog
+============================
+
+This guide serves as a tutorial on using the DataConverter class
+to import settings from a V2 cog. 
+
+------------------
+Things you'll need
+------------------
+
+1. The path where each file holding related settings in v2 is
+2. A conversion function to take the data and transform it to conform to Config
+
+-----------------------
+Getting your file paths
+-----------------------
+
+You should probably not try to find the files manually.
+Asking the user for the base install path and using a relative path to where the
+data should be, then testing that the file exists there is safer. This is especially
+True if your cog has multiple settings files
+
+Example
+
+.. code-block:: python
+
+    from discord.ext import commands
+    from pathlib import Path
+
+    @commands.command(name="filefinder")
+    async def file_finding_command(self, ctx, filepath):
+        """
+        this finds a file based on a user provided input and a known relative path
+        """
+
+        base_path = Path(filepath)
+        fp = base_path / 'data' / 'mycog' / 'settings.json'
+        if not fp.is_file():
+            pass
+            # fail, prompting user
+        else:
+            pass
+            # do something with the file
+
+---------------
+Converting data
+---------------
+
+Once you've gotten your v2 settings file, you'll want to be able to import it
+There are a couple options available depending on how you would like to convert
+the data.
+
+The first one takes a data path, and a conversion function and does the rest for you.
+This is great for simple data that just needs to quickly be imported without much
+modification.
+
+
+Here's an example of that in use:
+
+.. code-block:: python
+
+    from pathlib import Path
+    from discord.ext import commands
+
+    from redbot.core.utils.data_converter import DataConverter as dc
+    from redbot.core.config import Config
+
+    ...
+            
+    
+        async def import_v2(self, file_path: Path):
+            """
+            to be called from a command limited to owner
+
+            This should be a coroutine as the convert function will
+            need to be awaited
+            """
+
+            # First we give the converter our cog's Config instance.
+            converter = dc(self.config)
+            
+            # next we design a way to get all of the data into Config's internal
+            # format. This should be a generator, but you can also return a single
+            # list with identical results outside of memory usage
+            def conversion_spec(v2data):
+                for guild_id in v2.data.keys():
+                    yield {(Config.GUILD, guild_id): {('blacklisted',): True}}
+                    # This is yielding a dictionary that is designed for config's set_raw. 
+                    # The keys should be a tuple of Config scopes + the needed Identifiers. The
+                    # values should be another dictionary whose keys are tuples representing
+                    # config settings, the value should be the value to set for that.
+
+            # Then we pass the file and the conversion function
+            await converter.convert(file_path, conversion_spec)
+            # From here, our data should be imported
+
+
+You can also choose to convert all of your data and pass it as a single dict
+This can be useful if you want finer control over the dataconversion or want to
+preserve any data from v3 that may share the same entry and set it aside to prompt
+a user
+
+.. code-block:: python
+
+    from pathlib import Path
+    from discord.ext import commands
+
+    from redbot.core.utils.data_converter import DataConverter as dc
+    from redbot.core.config import Config
+
+    ...
+
+    await dc(config_instance).dict_import(some_processed_dict)
+
+
+The format of the items of the dict is the same as in the above example
+
+
+-----------------------------------
+Config Scopes and their Identifiers
+-----------------------------------
+
+This section is provided as a quick reference for the identifiers for default
+scopes available in Config. This does not cover usage of custom scopes, though the
+data converter is compatible with those as well.
+
+Global::
+    :code:`(Config.GLOBAL,)`
+Guild::
+    :code:`(Config.GUILD, guild_id)`
+Channel::
+    :code:`(Config.CHANNEL, channel_id)`
+User::
+    :code:`(Config.USER, user_id)`
+Member::
+    :code:`(Config.MEMBER, guild_id, user_id)`
+Role::
+    :code:`(Config.ROLE, role_id)`
+
+
+-----------------------------
+More information and Examples
+-----------------------------
+
+For a more in depth look at how all of these commands function
+You may want to take a look at how core data is being imported
+
+:code:`redbot/cogs/dataconverter/core_specs.py`

docs/index.rst

@@ -15,7 +15,10 @@ Welcome to Red - Discord Bot's documentation!
     install_ubuntu
     install_debian
     install_centos
+    install_arch
     install_raspbian
+    cog_dataconverter
+    autostart_systemd
 
 .. toctree::
     :maxdepth: 2
@@ -29,14 +32,18 @@ Welcome to Red - Discord Bot's documentation!
 
     guide_migration
     guide_cog_creation
+    guide_data_conversion
     framework_bank
+    framework_bot
     framework_cogmanager
-    framework_datamanager
     framework_config
+    framework_context
+    framework_datamanager
     framework_downloader
+    framework_events
     framework_i18n
     framework_modlog
-    framework_context
+    framework_rpc
     framework_utils
 
 

docs/install_arch.rst

@@ -0,0 +1,55 @@
+.. arch install guide
+
+==============================
+Installing Red on Arch Linux
+==============================
+
+.. warning:: For safety reasons, DO NOT install Red with a root user. Instead, make a new one.
+
+:code:`https://wiki.archlinux.org/index.php/Users_and_groups`
+
+-------------------------------
+Installing the pre-requirements
+-------------------------------
+
+.. code-block:: none
+
+    sudo pacman -Sy python-pip git base-devel jre8-openjdk
+
+------------------
+Installing the bot
+------------------
+
+To install without audio:
+
+:code:`pip3 install -U --process-dependency-links red-discordbot --user`
+
+To install with audio:
+
+:code:`pip3 install -U --process-dependency-links red-discordbot[voice] --user`
+
+To install the development version (without audio):
+
+:code:`pip3 install -U --process-dependency-links git+https://github.com/Cog-Creators/Red-DiscordBot@V3/develop#egg=red-discordbot --user`
+
+To install the development version (with audio):
+
+:code:`pip3 install -U --process-dependency-links git+https://github.com/Cog-Creators/Red-DiscordBot@V3/develop#egg=red-discordbot[voice] --user`
+
+------------------------
+Setting up your instance
+------------------------
+
+Run :code:`redbot-setup` and follow the prompts. It will ask first for where you want to
+store the data (the default is :code:`~/.local/share/Red-DiscordBot`) and will then ask
+for confirmation of that selection. Next, it will ask you to choose your storage backend
+(the default here is JSON). It will then ask for a name for your instance. This can be
+anything as long as it does not contain spaces; however, keep in mind that this is the
+name you will use to run your bot, and so it should be something you can remember.
+
+-----------
+Running Red
+-----------
+
+Run :code:`redbot <your instance name>` and run through the initial setup. This will ask for
+your token and a prefix.

docs/install_centos.rst

@@ -4,6 +4,8 @@
 Installing Red on CentOS 7
 ==========================
 
+.. warning:: For safety reasons, DO NOT install Red with a root user. Instead, `make a new one <https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/4/html/Step_by_Step_Guide/s1-starting-create-account.html>`_.
+
 ---------------------------
 Installing pre-requirements
 ---------------------------
@@ -12,7 +14,7 @@ Installing pre-requirements
 
     yum -y groupinstall development
     yum -y install https://centos7.iuscommunity.org/ius-release.rpm
-    yum -y install yum-utils wget which python35u python35u-pip python35u-devel openssl-devel libffi-devel git opus-devel java-1.8.0-openjdk
+    yum -y install yum-utils wget which python35u python35u-pip python35u-devel openssl-devel libffi-devel git java-1.8.0-openjdk
     sh -c "$(wget https://gist.githubusercontent.com/mustafaturan/7053900/raw/27f4c8bad3ee2bb0027a1a52dc8501bf1e53b270/latest-ffmpeg-centos6.sh -O -)"
 
 --------------
@@ -21,19 +23,19 @@ Installing Red
 
 Without audio:
 
-:code:`pip3 install -U --process-dependency-links red-discordbot`
+:code:`pip3 install -U --process-dependency-links red-discordbot --user`
 
 With audio:
 
-:code:`pip3 install -U --process-dependency-links red-discordbot[voice]`
+:code:`pip3 install -U --process-dependency-links red-discordbot[voice] --user`
 
 To install the development version (without audio):
 
-:code:`pip3 install -U --process-dependency-links git+https://github.com/Cog-Creators/Red-DiscordBot@V3/develop#egg=red-discordbot`
+:code:`pip3 install -U --process-dependency-links git+https://github.com/Cog-Creators/Red-DiscordBot@V3/develop#egg=red-discordbot --user`
 
 To install the development version (with audio):
 
-:code:`pip3 install -U --process-dependency-links git+https://github.com/Cog-Creators/Red-DiscordBot@V3/develop#egg=red-discordbot[voice]`
+:code:`pip3 install -U --process-dependency-links git+https://github.com/Cog-Creators/Red-DiscordBot@V3/develop#egg=red-discordbot[voice] --user`
 
 ----------------------
 Setting up an instance

docs/install_debian.rst

@@ -4,7 +4,7 @@
 Installing Red on Debian Stretch
 ================================
 
-.. warning:: For safety reasons, DO NOT install Red with a root user. Instead, make a new one.
+.. warning:: For safety reasons, DO NOT install Red with a root user. Instead, `make a new one <https://manpages.debian.org/stretch/adduser/adduser.8.en.html>`_.
 
 ---------------------------
 Installing pre-requirements
@@ -14,7 +14,7 @@ Installing pre-requirements
 
     echo "deb http://httpredir.debian.org/debian stretch-backports main contrib non-free" >> /etc/apt/sources.list
     apt-get update
-    apt-get install python3.5-dev python3-pip build-essential libssl-dev libffi-dev git ffmpeg libopus-dev unzip default-jre -y
+    apt-get install python3.5-dev python3-pip build-essential libssl-dev libffi-dev git unzip default-jre -y
 
 ------------------
 Installing the bot

docs/install_mac.rst

@@ -15,8 +15,6 @@ Installing pre-requirements
 * After the installation, install the required packages by pasting the commands and pressing enter, one-by-one:
     * :code:`brew install python3 --with-brewed-openssl`
     * :code:`brew install git`
-    * :code:`brew install ffmpeg --with-ffplay`
-    * :code:`brew install opus`
     * :code:`brew tap caskroom/versions`
     * :code:`brew cask install java8`
 

docs/install_raspbian.rst

@@ -4,13 +4,16 @@
 Installing Red on Raspbian Stretch
 ==================================
 
+.. warning:: For safety reasons, DO NOT install Red with a root user. Instead, `make a new one <https://www.raspberrypi.org/documentation/linux/usage/users.md>`_.
+
 ---------------------------
 Installing pre-requirements
 ---------------------------
 
 .. code-block:: none
 
-    sudo apt-get install python3.5-dev python3-pip build-essential libssl-dev libffi-dev git libav-tools libopus-dev unzip default-jre -y
+    sudo apt-get install python3.5-dev python3-pip build-essential libssl-dev libffi-dev git unzip default-jre -y
+
 
 --------------
 Installing Red
@@ -18,19 +21,19 @@ Installing Red
 
 Without audio:
 
-:code:`pip3 install -U --process-dependency-links red-discordbot`
+:code:`pip3 install -U --process-dependency-links red-discordbot --user`
 
 With audio:
 
-:code:`pip3 install -U --process-dependency-links red-discordbot[voice]`
+:code:`pip3 install -U --process-dependency-links red-discordbot[voice] --user`
 
 To install the development version (without audio):
 
-:code:`pip3 install -U --process-dependency-links git+https://github.com/Cog-Creators/Red-DiscordBot@V3/develop#egg=red-discordbot`
+:code:`pip3 install -U --process-dependency-links git+https://github.com/Cog-Creators/Red-DiscordBot@V3/develop#egg=red-discordbot --user`
 
 To install the development version (with audio):
 
-:code:`pip3 install -U --process-dependency-links git+https://github.com/Cog-Creators/Red-DiscordBot@V3/develop#egg=red-discordbot[voice]`
+:code:`pip3 install -U --process-dependency-links git+https://github.com/Cog-Creators/Red-DiscordBot@V3/develop#egg=red-discordbot[voice] --user`
 
 ----------------------
 Setting up an instance

docs/install_ubuntu.rst

@@ -4,7 +4,7 @@
 Installing Red on Ubuntu 16.04
 ==============================
 
-.. warning:: For safety reasons, DO NOT install Red with a root user. Instead, make a new one.
+.. warning:: For safety reasons, DO NOT install Red with a root user. Instead, `make a new one <http://manpages.ubuntu.com/manpages/artful/man8/adduser.8.html>`_.
 
 -------------------------------
 Installing the pre-requirements
@@ -12,7 +12,8 @@ Installing the pre-requirements
 
 .. code-block:: none
 
-    sudo apt install python3.5-dev python3-pip build-essential libssl-dev libffi-dev git ffmpeg libopus-dev unzip default-jre -y
+    sudo apt install python3.5-dev python3-pip build-essential libssl-dev libffi-dev git unzip default-jre -y
+
 
 ------------------
 Installing the bot
@@ -20,19 +21,19 @@ Installing the bot
 
 To install without audio:
 
-:code:`pip3 install -U --process-dependency-links red-discordbot`
+:code:`pip3 install -U --process-dependency-links red-discordbot --user`
 
 To install with audio:
 
-:code:`pip3 install -U --process-dependency-links red-discordbot[voice]`
+:code:`pip3 install -U --process-dependency-links red-discordbot[voice] --user`
 
 To install the development version (without audio):
 
-:code:`pip3 install -U --process-dependency-links git+https://github.com/Cog-Creators/Red-DiscordBot@V3/develop#egg=red-discordbot`
+:code:`pip3 install -U --process-dependency-links git+https://github.com/Cog-Creators/Red-DiscordBot@V3/develop#egg=red-discordbot --user`
 
 To install the development version (with audio):
 
-:code:`pip3 install -U --process-dependency-links git+https://github.com/Cog-Creators/Red-DiscordBot@V3/develop#egg=red-discordbot[voice]`
+:code:`pip3 install -U --process-dependency-links git+https://github.com/Cog-Creators/Red-DiscordBot@V3/develop#egg=red-discordbot[voice] --user`
 
 ------------------------
 Setting up your instance

docs/requirements.txt

@@ -1,4 +1,4 @@
-sphinx==1.6.3
+sphinx==1.6.5
 sphinxcontrib-asyncio
 sphinx_rtd_theme
 git+https://github.com/Rapptz/discord.py@rewrite#egg=discord.py[voice]

redbot/__main__.py

@@ -96,15 +96,18 @@ def list_instances():
 
 
 def main():
+    description = "Red - Version {}".format(__version__)
     cli_flags = parse_cli_flags(sys.argv[1:])
     if cli_flags.list_instances:
         list_instances()
+    elif cli_flags.version:
+        print(description)
+        sys.exit(0)
     elif not cli_flags.instance_name:
         print("Error: No instance name was provided!")
         sys.exit(1)
     load_basic_configuration(cli_flags.instance_name)
     log, sentry_log = init_loggers(cli_flags)
-    description = "Red - Version {}".format(__version__)
     red = Red(cli_flags, description=description, pm_help=None)
     init_global_checks(red)
     init_events(red, cli_flags)

redbot/cogs/admin/admin.py

@@ -375,7 +375,7 @@ class Admin:
     @checks.is_owner()
     async def serverlock(self, ctx: commands.Context):
         """
-        Locks a bot to it's current servers only.
+        Locks a bot to its current servers only.
         """
         serverlocked = await self.conf.serverlocked()
         await self.conf.serverlocked.set(not serverlocked)

redbot/cogs/admin/announcer.py

@@ -65,7 +65,7 @@ class Announcer:
             try:
                 await channel.send(self.message)
             except discord.Forbidden:
-                await bot_owner.send("I could not announce to guild: {}".format(
+                await bot_owner.send("I could not announce to server: {}".format(
                                          g.id
                                      ))
             await asyncio.sleep(0.5)

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

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
 "POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:32-0500\n"
+"PO-Revision-Date: 2018-04-15 16:41-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: Arabic\n"
 "MIME-Version: 1.0\n"

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

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
 "POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:33-0500\n"
+"PO-Revision-Date: 2018-04-15 16:42-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: Bulgarian\n"
 "MIME-Version: 1.0\n"

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

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
 "POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:33-0500\n"
+"PO-Revision-Date: 2018-04-15 16:42-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: Danish\n"
 "MIME-Version: 1.0\n"

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

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
 "POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:33-0500\n"
+"PO-Revision-Date: 2018-04-15 16:42-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: German\n"
 "MIME-Version: 1.0\n"

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

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
 "POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:33-0500\n"
+"PO-Revision-Date: 2018-04-15 16:42-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: Greek\n"
 "MIME-Version: 1.0\n"

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

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
 "POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:34-0500\n"
+"PO-Revision-Date: 2018-04-15 16:43-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: Pirate English\n"
 "MIME-Version: 1.0\n"

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

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
 "POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:32-0500\n"
+"PO-Revision-Date: 2018-04-15 16:41-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: Spanish\n"
 "MIME-Version: 1.0\n"

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

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
 "POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:33-0500\n"
+"PO-Revision-Date: 2018-04-15 16:42-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: Finnish\n"
 "MIME-Version: 1.0\n"

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

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
 "POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:32-0500\n"
+"PO-Revision-Date: 2018-04-15 16:41-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: French\n"
 "MIME-Version: 1.0\n"

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

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
 "POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:33-0500\n"
+"PO-Revision-Date: 2018-04-15 16:42-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: Hungarian\n"
 "MIME-Version: 1.0\n"

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

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
 "POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:34-0500\n"
+"PO-Revision-Date: 2018-04-15 16:43-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: Indonesian\n"
 "MIME-Version: 1.0\n"

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

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
 "POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:33-0500\n"
+"PO-Revision-Date: 2018-04-15 16:42-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: Italian\n"
 "MIME-Version: 1.0\n"

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

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
 "POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:33-0500\n"
+"PO-Revision-Date: 2018-04-15 16:42-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: Japanese\n"
 "MIME-Version: 1.0\n"

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

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
 "POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:33-0500\n"
+"PO-Revision-Date: 2018-04-15 16:42-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: Korean\n"
 "MIME-Version: 1.0\n"

redbot/cogs/admin/locales/lol-US.po

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
 "POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:34-0500\n"
+"PO-Revision-Date: 2018-04-15 16:43-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: LOLCAT\n"
 "MIME-Version: 1.0\n"

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

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
 "POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:33-0500\n"
+"PO-Revision-Date: 2018-04-15 16:42-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: Dutch\n"
 "MIME-Version: 1.0\n"

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

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
 "POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:33-0500\n"
+"PO-Revision-Date: 2018-04-15 16:42-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: Norwegian\n"
 "MIME-Version: 1.0\n"

redbot/cogs/admin/locales/pl-PL.po

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
 "POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:33-0500\n"
+"PO-Revision-Date: 2018-04-15 16:43-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: Polish\n"
 "MIME-Version: 1.0\n"

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

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
 "POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:34-0500\n"
+"PO-Revision-Date: 2018-04-15 16:43-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: Portuguese, Brazilian\n"
 "MIME-Version: 1.0\n"

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

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
 "POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:33-0500\n"
+"PO-Revision-Date: 2018-04-15 16:43-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: Portuguese\n"
 "MIME-Version: 1.0\n"

redbot/cogs/admin/locales/ru-RU.po

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
 "POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:33-0500\n"
+"PO-Revision-Date: 2018-04-15 16:43-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: Russian\n"
 "MIME-Version: 1.0\n"

redbot/cogs/admin/locales/sv-SE.po

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
 "POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:34-0500\n"
+"PO-Revision-Date: 2018-04-15 16:43-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: Swedish\n"
 "MIME-Version: 1.0\n"

redbot/cogs/admin/locales/zh-CN.po

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
 "POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:34-0500\n"
+"PO-Revision-Date: 2018-04-15 16:43-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: Chinese Simplified\n"
 "MIME-Version: 1.0\n"

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

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
 "POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:32-0500\n"
+"PO-Revision-Date: 2018-04-15 16:41-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: Arabic\n"
 "MIME-Version: 1.0\n"

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

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
 "POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:33-0500\n"
+"PO-Revision-Date: 2018-04-15 16:42-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: Bulgarian\n"
 "MIME-Version: 1.0\n"

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

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
 "POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:33-0500\n"
+"PO-Revision-Date: 2018-04-15 16:42-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: Danish\n"
 "MIME-Version: 1.0\n"

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

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
 "POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:33-0500\n"
+"PO-Revision-Date: 2018-04-15 16:42-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: German\n"
 "MIME-Version: 1.0\n"

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

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
 "POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:33-0500\n"
+"PO-Revision-Date: 2018-04-15 16:42-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: Greek\n"
 "MIME-Version: 1.0\n"

redbot/cogs/alias/locales/en-PT.po

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
 "POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:34-0500\n"
+"PO-Revision-Date: 2018-04-15 16:43-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: Pirate English\n"
 "MIME-Version: 1.0\n"
@@ -22,15 +22,15 @@ msgstr "Arrr, no prefix found capt'n!"
 
 #: ../alias.py:198
 msgid "You attempted to create a new alias with the name {} but that name is already a command on this bot."
-msgstr ""
+msgstr "Ye try and make a squeeky-clean alias with the name {} but 'she be taken by another order."
 
 #: ../alias.py:205
 msgid "You attempted to create a new alias with the name {} but that alias already exists on this server."
-msgstr ""
+msgstr "Ye try and make a Squeeky-clean alias with the name {} but 'she already be on the island."
 
 #: ../alias.py:212
 msgid "You attempted to create a new alias with the name {} but that name is an invalid alias name. Alias names may not contain spaces."
-msgstr ""
+msgstr "Ye try and make a Squeeky-clean alias with the name {} but 'she walk the plank! Spaces in an alias must walk the plank."
 
 #: ../alias.py:224
 msgid "A new alias with the trigger `{}` has been created."
@@ -38,15 +38,15 @@ msgstr "Arrr! A new alias with thee trigger `{}` has been created."
 
 #: ../alias.py:236
 msgid "You attempted to create a new global alias with the name {} but that name is already a command on this bot."
-msgstr ""
+msgstr "Ye try and make a squeeky-clean global alias with the name {} but 'she be taken by another order."
 
 #: ../alias.py:243
 msgid "You attempted to create a new global alias with the name {} but that alias already exists on this server."
-msgstr ""
+msgstr "Ye try and make a Squeeky-clean global alias with the name {} but 'she already be on the island."
 
 #: ../alias.py:250
 msgid "You attempted to create a new global alias with the name {} but that name is an invalid alias name. Alias names may not contain spaces."
-msgstr ""
+msgstr "Ye try and make a Squeeky-clean global alias with the name {} but 'she walk the plank! Spaces in an alias must walk the plank."
 
 #: ../alias.py:259
 msgid "A new global alias with the trigger `{}` has been created."

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

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
 "POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:32-0500\n"
+"PO-Revision-Date: 2018-04-15 16:41-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: Spanish\n"
 "MIME-Version: 1.0\n"

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

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
 "POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:33-0500\n"
+"PO-Revision-Date: 2018-04-15 16:42-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: Finnish\n"
 "MIME-Version: 1.0\n"

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

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
 "POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:32-0500\n"
+"PO-Revision-Date: 2018-04-15 16:41-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: French\n"
 "MIME-Version: 1.0\n"

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

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
 "POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:33-0500\n"
+"PO-Revision-Date: 2018-04-15 16:42-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: Hungarian\n"
 "MIME-Version: 1.0\n"

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

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
 "POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:34-0500\n"
+"PO-Revision-Date: 2018-04-15 16:43-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: Indonesian\n"
 "MIME-Version: 1.0\n"
@@ -22,15 +22,15 @@ msgstr "Awalan tidak ditemukan."
 
 #: ../alias.py:198
 msgid "You attempted to create a new alias with the name {} but that name is already a command on this bot."
-msgstr ""
+msgstr "Anda mencoba untuk membuat sebuah alias baru dengan nama {} tetapi nama itu sudah menjadi perintah pada bot ini."
 
 #: ../alias.py:205
 msgid "You attempted to create a new alias with the name {} but that alias already exists on this server."
-msgstr ""
+msgstr "Anda mencoba untuk membuat sebuah alias baru dengan nama {} tetapi alias itu sudah ada pada server ini."
 
 #: ../alias.py:212
 msgid "You attempted to create a new alias with the name {} but that name is an invalid alias name. Alias names may not contain spaces."
-msgstr ""
+msgstr "Anda mencoba untuk membuat sebuah alias baru dengan nama {} tetapi nama itu adalah sebuah nama alias yang tidak berlaku. Nama alias tidak boleh berisi spasi."
 
 #: ../alias.py:224
 msgid "A new alias with the trigger `{}` has been created."
@@ -38,15 +38,15 @@ msgstr "Alias baru dengan pemicu '{}' telah dibuat."
 
 #: ../alias.py:236
 msgid "You attempted to create a new global alias with the name {} but that name is already a command on this bot."
-msgstr ""
+msgstr "Anda mencoba untuk membuat sebuah alias global baru dengan nama {} tetapi nama itu sudah menjadi sebuah perintah pada bot ini."
 
 #: ../alias.py:243
 msgid "You attempted to create a new global alias with the name {} but that alias already exists on this server."
-msgstr ""
+msgstr "Anda mencoba untuk membuat sebuah alias global baru dengan nama {} tetapi alias itu sudah ada pada server ini."
 
 #: ../alias.py:250
 msgid "You attempted to create a new global alias with the name {} but that name is an invalid alias name. Alias names may not contain spaces."
-msgstr ""
+msgstr "Anda mencoba untuk membuat sebuah alias global baru dengan nama {} tetapi nama itu adalah sebuah nama alias yang tidak berlaku. Nama alias tidak boleh berisi spasi."
 
 #: ../alias.py:259
 msgid "A new global alias with the trigger `{}` has been created."

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

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
 "POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:33-0500\n"
+"PO-Revision-Date: 2018-04-15 16:42-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: Italian\n"
 "MIME-Version: 1.0\n"

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

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
 "POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:33-0500\n"
+"PO-Revision-Date: 2018-04-15 16:42-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: Japanese\n"
 "MIME-Version: 1.0\n"

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

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
 "POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:33-0500\n"
+"PO-Revision-Date: 2018-04-15 16:42-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: Korean\n"
 "MIME-Version: 1.0\n"
@@ -18,73 +18,73 @@ msgstr ""
 
 #: ../alias.py:129
 msgid "No prefix found."
-msgstr "접두사가 발견되지 않았습니다."
+msgstr "프리픽스를 찾을 수 없어요."
 
 #: ../alias.py:198
 msgid "You attempted to create a new alias with the name {} but that name is already a command on this bot."
-msgstr ""
+msgstr "이름이 {} 인 바로가기를 만들려고 했지만, 이 봇의 커맨드와 중복돼요."
 
 #: ../alias.py:205
 msgid "You attempted to create a new alias with the name {} but that alias already exists on this server."
-msgstr ""
+msgstr "이름이 {} 인 바로가기를 만들려고 했지만, 해당 바로가기가 이미 이 서버에 등록되어 있어요."
 
 #: ../alias.py:212
 msgid "You attempted to create a new alias with the name {} but that name is an invalid alias name. Alias names may not contain spaces."
-msgstr ""
+msgstr "이름이 {} 인 바로가기를 만들려고 했지만, 잘못된 바로가기 이름에요. 바로가기 이름에는 공백이 포함될 수 없어요."
 
 #: ../alias.py:224
 msgid "A new alias with the trigger `{}` has been created."
-msgstr "`{}`로 발동되는 바로가기가 생성되었습니다."
+msgstr "트리거 `{}` 이(가) 포함된 별칭이 등록됐어요."
 
 #: ../alias.py:236
 msgid "You attempted to create a new global alias with the name {} but that name is already a command on this bot."
-msgstr ""
+msgstr "이름이 {} 인 글로벌 별칭을 만들려고 했지만, 이 봇의 커맨드와 중복돼요."
 
 #: ../alias.py:243
 msgid "You attempted to create a new global alias with the name {} but that alias already exists on this server."
-msgstr ""
+msgstr "이름이 {} 인 글로벌 별칭을 만들려고 했지만, 해당 별칭이 이미 이 서버에 등록되어 있어요."
 
 #: ../alias.py:250
 msgid "You attempted to create a new global alias with the name {} but that name is an invalid alias name. Alias names may not contain spaces."
-msgstr ""
+msgstr "이름이 {} 인 글로벌 별칭을 만들려고 했지만, 잘못된 별칭 이름에요. 별칭 이름에는 공백이 포함될 수 없어요."
 
 #: ../alias.py:259
 msgid "A new global alias with the trigger `{}` has been created."
-msgstr "`{}`로 발동되는 전역 바로가기가 생성 되었습니다."
+msgstr "트리거 `{}` 이(가) 포함된 글로벌 별칭이 등록됐어요."
 
 #: ../alias.py:274
 msgid "No such alias exists."
-msgstr "해당 바로가기가 없습니다."
+msgstr "그런 별칭은 등록되어 있지 않아요."
 
 #: ../alias.py:283
 msgid "The `{}` alias will execute the command `{}`"
-msgstr "바로가기 `{}`는 명령어 `{}` 를 실행 합니다."
+msgstr "`{}` 별칭이 `{}` 커맨드를 실행했어요."
 
 #: ../alias.py:286
 msgid "There is no alias with the name `{}`"
-msgstr "`{}`로 지정된 바로가기가 없습니다."
+msgstr "`{}` 이란 이름으로 등록된 별칭이 없어요."
 
 #: ../alias.py:298
 msgid "There are no aliases on this guild."
-msgstr "이 길드에는 바로가기가 없습니다."
+msgstr "이 길드에 등록된 별칭이 없어요."
 
 #: ../alias.py:302 ../alias.py:320
 msgid "Alias with the name `{}` was successfully deleted."
-msgstr "바로가기 `{}` 가 성공적으로 삭제 되었습니다."
+msgstr "별칭 `{}` 이(가) 성공적으로 삭제됐어요."
 
 #: ../alias.py:305 ../alias.py:323
 msgid "Alias with name `{}` was not found."
-msgstr "바로가기 `{}` 가 발견되지 않았습니다."
+msgstr "`{}` 바로가기가 등록되어 있지 않아요."
 
 #: ../alias.py:316
 msgid "There are no aliases on this bot."
-msgstr "이 봇에는 바로가기가 없습니다."
+msgstr "이 봇에 등록된 별칭이 없어요."
 
 #: ../alias.py:331 ../alias.py:342
 msgid "Aliases:"
-msgstr "바로가기 리스트:"
+msgstr "등록된 별칭 리스트 :"
 
 #: ../alias.py:333 ../alias.py:344
 msgid "There are no aliases on this server."
-msgstr "이 서버에는 별칭이 없습니다."
+msgstr "이 서버에 등록된 별칭이 없어요."
 

redbot/cogs/alias/locales/lol-US.po

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
 "POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:34-0500\n"
+"PO-Revision-Date: 2018-04-15 16:43-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: LOLCAT\n"
 "MIME-Version: 1.0\n"

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

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
 "POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:33-0500\n"
+"PO-Revision-Date: 2018-04-15 16:42-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: Dutch\n"
 "MIME-Version: 1.0\n"

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

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
 "POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:33-0500\n"
+"PO-Revision-Date: 2018-04-15 16:42-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: Norwegian\n"
 "MIME-Version: 1.0\n"

redbot/cogs/alias/locales/pl-PL.po

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
 "POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:33-0500\n"
+"PO-Revision-Date: 2018-04-15 16:43-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: Polish\n"
 "MIME-Version: 1.0\n"

redbot/cogs/alias/locales/pt-BR.po

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
 "POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:34-0500\n"
+"PO-Revision-Date: 2018-04-15 16:43-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: Portuguese, Brazilian\n"
 "MIME-Version: 1.0\n"

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

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
 "POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:33-0500\n"
+"PO-Revision-Date: 2018-04-15 16:43-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: Portuguese\n"
 "MIME-Version: 1.0\n"

redbot/cogs/alias/locales/ru-RU.po

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
 "POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:33-0500\n"
+"PO-Revision-Date: 2018-04-15 16:43-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: Russian\n"
 "MIME-Version: 1.0\n"
@@ -22,15 +22,15 @@ msgstr "Префикс не найден."
 
 #: ../alias.py:198
 msgid "You attempted to create a new alias with the name {} but that name is already a command on this bot."
-msgstr ""
+msgstr "Вы пытались создать новый псевдоним с именем {}, но это имя используется как команда в этом боте."
 
 #: ../alias.py:205
 msgid "You attempted to create a new alias with the name {} but that alias already exists on this server."
-msgstr ""
+msgstr "Вы пытались создать новый псевдоним с именем {}, но это имя используется как команда на этом сервере."
 
 #: ../alias.py:212
 msgid "You attempted to create a new alias with the name {} but that name is an invalid alias name. Alias names may not contain spaces."
-msgstr ""
+msgstr "Вы пытались создать новый псевдоним с именем {}, но это имя является недопустимым псевдонимом. Имена псевдонимов не могут содержать пробелы."
 
 #: ../alias.py:224
 msgid "A new alias with the trigger `{}` has been created."
@@ -38,15 +38,15 @@ msgstr "Был создан новый псевдоним с триггером
 
 #: ../alias.py:236
 msgid "You attempted to create a new global alias with the name {} but that name is already a command on this bot."
-msgstr ""
+msgstr "Вы пытались создать новый глобальный псевдоним с именем {}, но это имя уже используется как команда в этом боте."
 
 #: ../alias.py:243
 msgid "You attempted to create a new global alias with the name {} but that alias already exists on this server."
-msgstr ""
+msgstr "Вы пытались создать новый глобальный псевдоним с именем {}, но это имя уже существует на этом сервере."
 
 #: ../alias.py:250
 msgid "You attempted to create a new global alias with the name {} but that name is an invalid alias name. Alias names may not contain spaces."
-msgstr ""
+msgstr "Вы пытались создать новый псевдоним с именем {], но это имя явлется недопустимым именем для псевдонима. Псевдонимы не могут содержать пробелы."
 
 #: ../alias.py:259
 msgid "A new global alias with the trigger `{}` has been created."
@@ -86,5 +86,5 @@ msgstr "Алиасы:"
 
 #: ../alias.py:333 ../alias.py:344
 msgid "There are no aliases on this server."
-msgstr "На этом сервере еще нет алиасов."
+msgstr "На этом сервере нет псевдонимов."
 

redbot/cogs/alias/locales/sv-SE.po

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
 "POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:34-0500\n"
+"PO-Revision-Date: 2018-04-15 16:43-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: Swedish\n"
 "MIME-Version: 1.0\n"

redbot/cogs/alias/locales/zh-CN.po

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
 "POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:34-0500\n"
+"PO-Revision-Date: 2018-04-15 16:43-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: Chinese Simplified\n"
 "MIME-Version: 1.0\n"

redbot/cogs/audio/__init__.py

@@ -1,18 +1,17 @@
 from pathlib import Path
 from aiohttp import ClientSession
 import shutil
-import asyncio
 
 from .audio import Audio
 from .manager import start_lavalink_server
 from discord.ext import commands
 from redbot.core.data_manager import cog_data_path
+import redbot.core
 
-LAVALINK_BUILD = 3112
-LAVALINK_BUILD_URL = (
-    "https://ci.fredboat.com/repository/download/"
-    "Lavalink_Build/{}:id/Lavalink.jar?guest=1"
-).format(LAVALINK_BUILD)
+LAVALINK_DOWNLOAD_URL = (
+    "https://github.com/Cog-Creators/Red-DiscordBot/"
+    "releases/download/{}/Lavalink.jar"
+).format(redbot.core.__version__)
 
 LAVALINK_DOWNLOAD_DIR = cog_data_path(raw_name="Audio")
 LAVALINK_JAR_FILE = LAVALINK_DOWNLOAD_DIR / "Lavalink.jar"
@@ -23,7 +22,7 @@ BUNDLED_APP_YML_FILE = Path(__file__).parent / "application.yml"
 
 async def download_lavalink(session):
     with LAVALINK_JAR_FILE.open(mode='wb') as f:
-        async with session.get(LAVALINK_BUILD_URL) as resp:
+        async with session.get(LAVALINK_DOWNLOAD_URL) as resp:
             while True:
                 chunk = await resp.content.read(512)
                 if not chunk:
@@ -33,25 +32,25 @@ async def download_lavalink(session):
 
 async def maybe_download_lavalink(loop, cog):
     jar_exists = LAVALINK_JAR_FILE.exists()
-    current_build = await cog.config.current_build()
+    current_build = redbot.core.VersionInfo(*await cog.config.current_build())
 
-    if not jar_exists or current_build < LAVALINK_BUILD:
+    session = ClientSession(loop=loop)
+
+    if not jar_exists or current_build < redbot.core.version_info:
         LAVALINK_DOWNLOAD_DIR.mkdir(parents=True, exist_ok=True)
-        with ClientSession(loop=loop) as session:
-            await download_lavalink(session)
-        await cog.config.current_build.set(LAVALINK_BUILD)
+        await download_lavalink(session)
+        await cog.config.current_build.set(redbot.core.version_info.to_json())
+
+    session.close()
 
     shutil.copyfile(str(BUNDLED_APP_YML_FILE), str(APP_YML_FILE))
 
 
 async def setup(bot: commands.Bot):
     cog = Audio(bot)
-    await maybe_download_lavalink(bot.loop, cog)
-    await start_lavalink_server(bot.loop)
+    if not await cog.config.use_external_lavalink():
+        await maybe_download_lavalink(bot.loop, cog)
+        await start_lavalink_server(bot.loop)
 
-    async def _finish():
-        await asyncio.sleep(10)
-        await cog.init_config()
-        bot.add_cog(cog)
-
-    bot.loop.create_task(_finish())
+    bot.add_cog(cog)
+    bot.loop.create_task(cog.init_config())

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

@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:32-0500\n"
+"POT-Creation-Date: 2018-04-02 17:36+AKDT\n"
+"PO-Revision-Date: 2018-04-15 16:41-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: Arabic\n"
 "MIME-Version: 1.0\n"
@@ -16,27 +16,3 @@ msgstr ""
 "X-Crowdin-File: /cogs/audio/locales/messages.pot\n"
 "Language: ar_SA\n"
 
-#: ../audio.py:25 ../audio.py:45
-msgid "Join a voice channel first!"
-msgstr ""
-
-#: ../audio.py:33
-msgid "Let's play a file that exists pls"
-msgstr ""
-
-#: ../audio.py:38 ../audio.py:58
-msgid "{} is playing a song..."
-msgstr ""
-
-#: ../audio.py:48
-msgid "Youtube links pls"
-msgstr ""
-
-#: ../audio.py:67 ../audio.py:77 ../audio.py:87 ../audio.py:97
-msgid "I'm not even connected to a voice channel!"
-msgstr ""
-
-#: ../audio.py:95
-msgid "Volume set."
-msgstr ""
-

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

@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:33-0500\n"
+"POT-Creation-Date: 2018-04-02 17:36+AKDT\n"
+"PO-Revision-Date: 2018-04-15 16:42-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: Bulgarian\n"
 "MIME-Version: 1.0\n"
@@ -16,27 +16,3 @@ msgstr ""
 "X-Crowdin-File: /cogs/audio/locales/messages.pot\n"
 "Language: bg_BG\n"
 
-#: ../audio.py:25 ../audio.py:45
-msgid "Join a voice channel first!"
-msgstr ""
-
-#: ../audio.py:33
-msgid "Let's play a file that exists pls"
-msgstr ""
-
-#: ../audio.py:38 ../audio.py:58
-msgid "{} is playing a song..."
-msgstr ""
-
-#: ../audio.py:48
-msgid "Youtube links pls"
-msgstr ""
-
-#: ../audio.py:67 ../audio.py:77 ../audio.py:87 ../audio.py:97
-msgid "I'm not even connected to a voice channel!"
-msgstr ""
-
-#: ../audio.py:95
-msgid "Volume set."
-msgstr ""
-

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

@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:33-0500\n"
+"POT-Creation-Date: 2018-04-02 17:36+AKDT\n"
+"PO-Revision-Date: 2018-04-15 16:42-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: Danish\n"
 "MIME-Version: 1.0\n"
@@ -16,27 +16,3 @@ msgstr ""
 "X-Crowdin-File: /cogs/audio/locales/messages.pot\n"
 "Language: da_DK\n"
 
-#: ../audio.py:25 ../audio.py:45
-msgid "Join a voice channel first!"
-msgstr ""
-
-#: ../audio.py:33
-msgid "Let's play a file that exists pls"
-msgstr ""
-
-#: ../audio.py:38 ../audio.py:58
-msgid "{} is playing a song..."
-msgstr ""
-
-#: ../audio.py:48
-msgid "Youtube links pls"
-msgstr ""
-
-#: ../audio.py:67 ../audio.py:77 ../audio.py:87 ../audio.py:97
-msgid "I'm not even connected to a voice channel!"
-msgstr ""
-
-#: ../audio.py:95
-msgid "Volume set."
-msgstr ""
-

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

@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:33-0500\n"
+"POT-Creation-Date: 2018-04-02 17:36+AKDT\n"
+"PO-Revision-Date: 2018-04-15 16:42-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: German\n"
 "MIME-Version: 1.0\n"
@@ -16,27 +16,3 @@ msgstr ""
 "X-Crowdin-File: /cogs/audio/locales/messages.pot\n"
 "Language: de_DE\n"
 
-#: ../audio.py:25 ../audio.py:45
-msgid "Join a voice channel first!"
-msgstr "Du musst zuerst einem Sprach Kanal beitreten!"
-
-#: ../audio.py:33
-msgid "Let's play a file that exists pls"
-msgstr "Lassen Sie uns eine Datei spielen, die es gibt"
-
-#: ../audio.py:38 ../audio.py:58
-msgid "{} is playing a song..."
-msgstr "{} spielt ein Lied..."
-
-#: ../audio.py:48
-msgid "Youtube links pls"
-msgstr "YouTube Links bitte"
-
-#: ../audio.py:67 ../audio.py:77 ../audio.py:87 ../audio.py:97
-msgid "I'm not even connected to a voice channel!"
-msgstr "Ich bin noch nicht einmal mit einem Sprachkanal verbunden!"
-
-#: ../audio.py:95
-msgid "Volume set."
-msgstr "Lautstärke einstellen."
-

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

@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:33-0500\n"
+"POT-Creation-Date: 2018-04-02 17:36+AKDT\n"
+"PO-Revision-Date: 2018-04-15 16:42-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: Greek\n"
 "MIME-Version: 1.0\n"
@@ -16,27 +16,3 @@ msgstr ""
 "X-Crowdin-File: /cogs/audio/locales/messages.pot\n"
 "Language: el_GR\n"
 
-#: ../audio.py:25 ../audio.py:45
-msgid "Join a voice channel first!"
-msgstr ""
-
-#: ../audio.py:33
-msgid "Let's play a file that exists pls"
-msgstr ""
-
-#: ../audio.py:38 ../audio.py:58
-msgid "{} is playing a song..."
-msgstr ""
-
-#: ../audio.py:48
-msgid "Youtube links pls"
-msgstr ""
-
-#: ../audio.py:67 ../audio.py:77 ../audio.py:87 ../audio.py:97
-msgid "I'm not even connected to a voice channel!"
-msgstr ""
-
-#: ../audio.py:95
-msgid "Volume set."
-msgstr ""
-

redbot/cogs/audio/locales/en-PT.po

@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:34-0500\n"
+"POT-Creation-Date: 2018-04-02 17:36+AKDT\n"
+"PO-Revision-Date: 2018-04-15 16:43-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: Pirate English\n"
 "MIME-Version: 1.0\n"
@@ -16,27 +16,3 @@ msgstr ""
 "X-Crowdin-File: /cogs/audio/locales/messages.pot\n"
 "Language: en_PT\n"
 
-#: ../audio.py:25 ../audio.py:45
-msgid "Join a voice channel first!"
-msgstr ""
-
-#: ../audio.py:33
-msgid "Let's play a file that exists pls"
-msgstr ""
-
-#: ../audio.py:38 ../audio.py:58
-msgid "{} is playing a song..."
-msgstr ""
-
-#: ../audio.py:48
-msgid "Youtube links pls"
-msgstr ""
-
-#: ../audio.py:67 ../audio.py:77 ../audio.py:87 ../audio.py:97
-msgid "I'm not even connected to a voice channel!"
-msgstr ""
-
-#: ../audio.py:95
-msgid "Volume set."
-msgstr ""
-

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

@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:32-0500\n"
+"POT-Creation-Date: 2018-04-02 17:36+AKDT\n"
+"PO-Revision-Date: 2018-04-15 16:41-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: Spanish\n"
 "MIME-Version: 1.0\n"
@@ -16,27 +16,3 @@ msgstr ""
 "X-Crowdin-File: /cogs/audio/locales/messages.pot\n"
 "Language: es_ES\n"
 
-#: ../audio.py:25 ../audio.py:45
-msgid "Join a voice channel first!"
-msgstr ""
-
-#: ../audio.py:33
-msgid "Let's play a file that exists pls"
-msgstr ""
-
-#: ../audio.py:38 ../audio.py:58
-msgid "{} is playing a song..."
-msgstr ""
-
-#: ../audio.py:48
-msgid "Youtube links pls"
-msgstr ""
-
-#: ../audio.py:67 ../audio.py:77 ../audio.py:87 ../audio.py:97
-msgid "I'm not even connected to a voice channel!"
-msgstr ""
-
-#: ../audio.py:95
-msgid "Volume set."
-msgstr ""
-

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

@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:33-0500\n"
+"POT-Creation-Date: 2018-04-02 17:36+AKDT\n"
+"PO-Revision-Date: 2018-04-15 16:42-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: Finnish\n"
 "MIME-Version: 1.0\n"
@@ -16,27 +16,3 @@ msgstr ""
 "X-Crowdin-File: /cogs/audio/locales/messages.pot\n"
 "Language: fi_FI\n"
 
-#: ../audio.py:25 ../audio.py:45
-msgid "Join a voice channel first!"
-msgstr ""
-
-#: ../audio.py:33
-msgid "Let's play a file that exists pls"
-msgstr ""
-
-#: ../audio.py:38 ../audio.py:58
-msgid "{} is playing a song..."
-msgstr ""
-
-#: ../audio.py:48
-msgid "Youtube links pls"
-msgstr ""
-
-#: ../audio.py:67 ../audio.py:77 ../audio.py:87 ../audio.py:97
-msgid "I'm not even connected to a voice channel!"
-msgstr ""
-
-#: ../audio.py:95
-msgid "Volume set."
-msgstr ""
-

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

@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:32-0500\n"
+"POT-Creation-Date: 2018-04-02 17:36+AKDT\n"
+"PO-Revision-Date: 2018-04-15 16:41-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: French\n"
 "MIME-Version: 1.0\n"
@@ -16,27 +16,3 @@ msgstr ""
 "X-Crowdin-File: /cogs/audio/locales/messages.pot\n"
 "Language: fr_FR\n"
 
-#: ../audio.py:25 ../audio.py:45
-msgid "Join a voice channel first!"
-msgstr "Rejoignez un salon vocal d'abord!"
-
-#: ../audio.py:33
-msgid "Let's play a file that exists pls"
-msgstr "Veuillez faire jouer un fichier qui existe"
-
-#: ../audio.py:38 ../audio.py:58
-msgid "{} is playing a song..."
-msgstr "{} joue une chanson..."
-
-#: ../audio.py:48
-msgid "Youtube links pls"
-msgstr "Veuillez entrer des liens YouTube"
-
-#: ../audio.py:67 ../audio.py:77 ../audio.py:87 ../audio.py:97
-msgid "I'm not even connected to a voice channel!"
-msgstr "Je ne suis pas connecté à un salon vocal!"
-
-#: ../audio.py:95
-msgid "Volume set."
-msgstr "Volume changé."
-

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

@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:33-0500\n"
+"POT-Creation-Date: 2018-04-02 17:36+AKDT\n"
+"PO-Revision-Date: 2018-04-15 16:42-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: Hungarian\n"
 "MIME-Version: 1.0\n"
@@ -16,27 +16,3 @@ msgstr ""
 "X-Crowdin-File: /cogs/audio/locales/messages.pot\n"
 "Language: hu_HU\n"
 
-#: ../audio.py:25 ../audio.py:45
-msgid "Join a voice channel first!"
-msgstr ""
-
-#: ../audio.py:33
-msgid "Let's play a file that exists pls"
-msgstr ""
-
-#: ../audio.py:38 ../audio.py:58
-msgid "{} is playing a song..."
-msgstr ""
-
-#: ../audio.py:48
-msgid "Youtube links pls"
-msgstr ""
-
-#: ../audio.py:67 ../audio.py:77 ../audio.py:87 ../audio.py:97
-msgid "I'm not even connected to a voice channel!"
-msgstr ""
-
-#: ../audio.py:95
-msgid "Volume set."
-msgstr ""
-

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

@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:34-0500\n"
+"POT-Creation-Date: 2018-04-02 17:36+AKDT\n"
+"PO-Revision-Date: 2018-04-15 16:43-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: Indonesian\n"
 "MIME-Version: 1.0\n"
@@ -16,27 +16,3 @@ msgstr ""
 "X-Crowdin-File: /cogs/audio/locales/messages.pot\n"
 "Language: id_ID\n"
 
-#: ../audio.py:25 ../audio.py:45
-msgid "Join a voice channel first!"
-msgstr ""
-
-#: ../audio.py:33
-msgid "Let's play a file that exists pls"
-msgstr ""
-
-#: ../audio.py:38 ../audio.py:58
-msgid "{} is playing a song..."
-msgstr ""
-
-#: ../audio.py:48
-msgid "Youtube links pls"
-msgstr ""
-
-#: ../audio.py:67 ../audio.py:77 ../audio.py:87 ../audio.py:97
-msgid "I'm not even connected to a voice channel!"
-msgstr ""
-
-#: ../audio.py:95
-msgid "Volume set."
-msgstr ""
-

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

@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:33-0500\n"
+"POT-Creation-Date: 2018-04-02 17:36+AKDT\n"
+"PO-Revision-Date: 2018-04-15 16:42-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: Italian\n"
 "MIME-Version: 1.0\n"
@@ -16,27 +16,3 @@ msgstr ""
 "X-Crowdin-File: /cogs/audio/locales/messages.pot\n"
 "Language: it_IT\n"
 
-#: ../audio.py:25 ../audio.py:45
-msgid "Join a voice channel first!"
-msgstr ""
-
-#: ../audio.py:33
-msgid "Let's play a file that exists pls"
-msgstr ""
-
-#: ../audio.py:38 ../audio.py:58
-msgid "{} is playing a song..."
-msgstr ""
-
-#: ../audio.py:48
-msgid "Youtube links pls"
-msgstr ""
-
-#: ../audio.py:67 ../audio.py:77 ../audio.py:87 ../audio.py:97
-msgid "I'm not even connected to a voice channel!"
-msgstr ""
-
-#: ../audio.py:95
-msgid "Volume set."
-msgstr ""
-

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

@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:33-0500\n"
+"POT-Creation-Date: 2018-04-02 17:36+AKDT\n"
+"PO-Revision-Date: 2018-04-15 16:42-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: Japanese\n"
 "MIME-Version: 1.0\n"
@@ -16,27 +16,3 @@ msgstr ""
 "X-Crowdin-File: /cogs/audio/locales/messages.pot\n"
 "Language: ja_JP\n"
 
-#: ../audio.py:25 ../audio.py:45
-msgid "Join a voice channel first!"
-msgstr ""
-
-#: ../audio.py:33
-msgid "Let's play a file that exists pls"
-msgstr ""
-
-#: ../audio.py:38 ../audio.py:58
-msgid "{} is playing a song..."
-msgstr ""
-
-#: ../audio.py:48
-msgid "Youtube links pls"
-msgstr ""
-
-#: ../audio.py:67 ../audio.py:77 ../audio.py:87 ../audio.py:97
-msgid "I'm not even connected to a voice channel!"
-msgstr ""
-
-#: ../audio.py:95
-msgid "Volume set."
-msgstr ""
-

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

@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:33-0500\n"
+"POT-Creation-Date: 2018-04-02 17:36+AKDT\n"
+"PO-Revision-Date: 2018-04-15 16:42-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: Korean\n"
 "MIME-Version: 1.0\n"
@@ -16,27 +16,3 @@ msgstr ""
 "X-Crowdin-File: /cogs/audio/locales/messages.pot\n"
 "Language: ko_KR\n"
 
-#: ../audio.py:25 ../audio.py:45
-msgid "Join a voice channel first!"
-msgstr ""
-
-#: ../audio.py:33
-msgid "Let's play a file that exists pls"
-msgstr ""
-
-#: ../audio.py:38 ../audio.py:58
-msgid "{} is playing a song..."
-msgstr ""
-
-#: ../audio.py:48
-msgid "Youtube links pls"
-msgstr ""
-
-#: ../audio.py:67 ../audio.py:77 ../audio.py:87 ../audio.py:97
-msgid "I'm not even connected to a voice channel!"
-msgstr ""
-
-#: ../audio.py:95
-msgid "Volume set."
-msgstr ""
-

redbot/cogs/audio/locales/lol-US.po

@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:34-0500\n"
+"POT-Creation-Date: 2018-04-02 17:36+AKDT\n"
+"PO-Revision-Date: 2018-04-15 16:43-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: LOLCAT\n"
 "MIME-Version: 1.0\n"
@@ -16,27 +16,3 @@ msgstr ""
 "X-Crowdin-File: /cogs/audio/locales/messages.pot\n"
 "Language: lol_US\n"
 
-#: ../audio.py:25 ../audio.py:45
-msgid "Join a voice channel first!"
-msgstr ""
-
-#: ../audio.py:33
-msgid "Let's play a file that exists pls"
-msgstr ""
-
-#: ../audio.py:38 ../audio.py:58
-msgid "{} is playing a song..."
-msgstr ""
-
-#: ../audio.py:48
-msgid "Youtube links pls"
-msgstr ""
-
-#: ../audio.py:67 ../audio.py:77 ../audio.py:87 ../audio.py:97
-msgid "I'm not even connected to a voice channel!"
-msgstr ""
-
-#: ../audio.py:95
-msgid "Volume set."
-msgstr ""
-

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

@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:33-0500\n"
+"POT-Creation-Date: 2018-04-02 17:36+AKDT\n"
+"PO-Revision-Date: 2018-04-15 16:42-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: Dutch\n"
 "MIME-Version: 1.0\n"
@@ -16,27 +16,3 @@ msgstr ""
 "X-Crowdin-File: /cogs/audio/locales/messages.pot\n"
 "Language: nl_NL\n"
 
-#: ../audio.py:25 ../audio.py:45
-msgid "Join a voice channel first!"
-msgstr ""
-
-#: ../audio.py:33
-msgid "Let's play a file that exists pls"
-msgstr ""
-
-#: ../audio.py:38 ../audio.py:58
-msgid "{} is playing a song..."
-msgstr ""
-
-#: ../audio.py:48
-msgid "Youtube links pls"
-msgstr ""
-
-#: ../audio.py:67 ../audio.py:77 ../audio.py:87 ../audio.py:97
-msgid "I'm not even connected to a voice channel!"
-msgstr ""
-
-#: ../audio.py:95
-msgid "Volume set."
-msgstr ""
-

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

@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:33-0500\n"
+"POT-Creation-Date: 2018-04-02 17:36+AKDT\n"
+"PO-Revision-Date: 2018-04-15 16:42-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: Norwegian\n"
 "MIME-Version: 1.0\n"
@@ -16,27 +16,3 @@ msgstr ""
 "X-Crowdin-File: /cogs/audio/locales/messages.pot\n"
 "Language: no_NO\n"
 
-#: ../audio.py:25 ../audio.py:45
-msgid "Join a voice channel first!"
-msgstr ""
-
-#: ../audio.py:33
-msgid "Let's play a file that exists pls"
-msgstr ""
-
-#: ../audio.py:38 ../audio.py:58
-msgid "{} is playing a song..."
-msgstr ""
-
-#: ../audio.py:48
-msgid "Youtube links pls"
-msgstr ""
-
-#: ../audio.py:67 ../audio.py:77 ../audio.py:87 ../audio.py:97
-msgid "I'm not even connected to a voice channel!"
-msgstr ""
-
-#: ../audio.py:95
-msgid "Volume set."
-msgstr ""
-

redbot/cogs/audio/locales/pl-PL.po

@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:33-0500\n"
+"POT-Creation-Date: 2018-04-02 17:36+AKDT\n"
+"PO-Revision-Date: 2018-04-15 16:43-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: Polish\n"
 "MIME-Version: 1.0\n"
@@ -16,27 +16,3 @@ msgstr ""
 "X-Crowdin-File: /cogs/audio/locales/messages.pot\n"
 "Language: pl_PL\n"
 
-#: ../audio.py:25 ../audio.py:45
-msgid "Join a voice channel first!"
-msgstr ""
-
-#: ../audio.py:33
-msgid "Let's play a file that exists pls"
-msgstr ""
-
-#: ../audio.py:38 ../audio.py:58
-msgid "{} is playing a song..."
-msgstr ""
-
-#: ../audio.py:48
-msgid "Youtube links pls"
-msgstr ""
-
-#: ../audio.py:67 ../audio.py:77 ../audio.py:87 ../audio.py:97
-msgid "I'm not even connected to a voice channel!"
-msgstr ""
-
-#: ../audio.py:95
-msgid "Volume set."
-msgstr ""
-

redbot/cogs/audio/locales/pt-BR.po

@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:34-0500\n"
+"POT-Creation-Date: 2018-04-02 17:36+AKDT\n"
+"PO-Revision-Date: 2018-04-15 16:43-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: Portuguese, Brazilian\n"
 "MIME-Version: 1.0\n"
@@ -16,27 +16,3 @@ msgstr ""
 "X-Crowdin-File: /cogs/audio/locales/messages.pot\n"
 "Language: pt_BR\n"
 
-#: ../audio.py:25 ../audio.py:45
-msgid "Join a voice channel first!"
-msgstr ""
-
-#: ../audio.py:33
-msgid "Let's play a file that exists pls"
-msgstr ""
-
-#: ../audio.py:38 ../audio.py:58
-msgid "{} is playing a song..."
-msgstr ""
-
-#: ../audio.py:48
-msgid "Youtube links pls"
-msgstr ""
-
-#: ../audio.py:67 ../audio.py:77 ../audio.py:87 ../audio.py:97
-msgid "I'm not even connected to a voice channel!"
-msgstr ""
-
-#: ../audio.py:95
-msgid "Volume set."
-msgstr ""
-

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

@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:33-0500\n"
+"POT-Creation-Date: 2018-04-02 17:36+AKDT\n"
+"PO-Revision-Date: 2018-04-15 16:43-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: Portuguese\n"
 "MIME-Version: 1.0\n"
@@ -16,27 +16,3 @@ msgstr ""
 "X-Crowdin-File: /cogs/audio/locales/messages.pot\n"
 "Language: pt_PT\n"
 
-#: ../audio.py:25 ../audio.py:45
-msgid "Join a voice channel first!"
-msgstr ""
-
-#: ../audio.py:33
-msgid "Let's play a file that exists pls"
-msgstr ""
-
-#: ../audio.py:38 ../audio.py:58
-msgid "{} is playing a song..."
-msgstr ""
-
-#: ../audio.py:48
-msgid "Youtube links pls"
-msgstr ""
-
-#: ../audio.py:67 ../audio.py:77 ../audio.py:87 ../audio.py:97
-msgid "I'm not even connected to a voice channel!"
-msgstr ""
-
-#: ../audio.py:95
-msgid "Volume set."
-msgstr ""
-

redbot/cogs/audio/locales/ru-RU.po

@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:33-0500\n"
+"POT-Creation-Date: 2018-04-02 17:36+AKDT\n"
+"PO-Revision-Date: 2018-04-15 16:43-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: Russian\n"
 "MIME-Version: 1.0\n"
@@ -16,27 +16,3 @@ msgstr ""
 "X-Crowdin-File: /cogs/audio/locales/messages.pot\n"
 "Language: ru_RU\n"
 
-#: ../audio.py:25 ../audio.py:45
-msgid "Join a voice channel first!"
-msgstr ""
-
-#: ../audio.py:33
-msgid "Let's play a file that exists pls"
-msgstr ""
-
-#: ../audio.py:38 ../audio.py:58
-msgid "{} is playing a song..."
-msgstr ""
-
-#: ../audio.py:48
-msgid "Youtube links pls"
-msgstr ""
-
-#: ../audio.py:67 ../audio.py:77 ../audio.py:87 ../audio.py:97
-msgid "I'm not even connected to a voice channel!"
-msgstr ""
-
-#: ../audio.py:95
-msgid "Volume set."
-msgstr ""
-

redbot/cogs/audio/locales/sv-SE.po

@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:34-0500\n"
+"POT-Creation-Date: 2018-04-02 17:36+AKDT\n"
+"PO-Revision-Date: 2018-04-15 16:43-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: Swedish\n"
 "MIME-Version: 1.0\n"
@@ -16,27 +16,3 @@ msgstr ""
 "X-Crowdin-File: /cogs/audio/locales/messages.pot\n"
 "Language: sv_SE\n"
 
-#: ../audio.py:25 ../audio.py:45
-msgid "Join a voice channel first!"
-msgstr "Hoppa in i en röstkanal först!"
-
-#: ../audio.py:33
-msgid "Let's play a file that exists pls"
-msgstr "Spela en fil som finns tack"
-
-#: ../audio.py:38 ../audio.py:58
-msgid "{} is playing a song..."
-msgstr "{} spelar en låt..."
-
-#: ../audio.py:48
-msgid "Youtube links pls"
-msgstr "Youtube länkar tack"
-
-#: ../audio.py:67 ../audio.py:77 ../audio.py:87 ../audio.py:97
-msgid "I'm not even connected to a voice channel!"
-msgstr "Jag är inte ens ansluten till en röstkanal!"
-
-#: ../audio.py:95
-msgid "Volume set."
-msgstr "Volymnivån inställd."
-

redbot/cogs/audio/locales/zh-CN.po

@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:34-0500\n"
+"POT-Creation-Date: 2018-04-02 17:36+AKDT\n"
+"PO-Revision-Date: 2018-04-15 16:43-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: Chinese Simplified\n"
 "MIME-Version: 1.0\n"
@@ -16,27 +16,3 @@ msgstr ""
 "X-Crowdin-File: /cogs/audio/locales/messages.pot\n"
 "Language: zh_CN\n"
 
-#: ../audio.py:25 ../audio.py:45
-msgid "Join a voice channel first!"
-msgstr ""
-
-#: ../audio.py:33
-msgid "Let's play a file that exists pls"
-msgstr ""
-
-#: ../audio.py:38 ../audio.py:58
-msgid "{} is playing a song..."
-msgstr ""
-
-#: ../audio.py:48
-msgid "Youtube links pls"
-msgstr ""
-
-#: ../audio.py:67 ../audio.py:77 ../audio.py:87 ../audio.py:97
-msgid "I'm not even connected to a voice channel!"
-msgstr ""
-
-#: ../audio.py:95
-msgid "Volume set."
-msgstr ""
-

redbot/cogs/audio/manager.py

@@ -1,12 +1,22 @@
 import shlex
+import shutil
 import asyncio
-from subprocess import Popen, DEVNULL
+from subprocess import Popen, DEVNULL, PIPE
 import os
+import logging
+
+log = logging.getLogger('red.audio.manager')
 
 proc = None
 SHUTDOWN = asyncio.Event()
 
 
+def has_java_error(pid):
+    from . import LAVALINK_DOWNLOAD_DIR
+    poss_error_file = LAVALINK_DOWNLOAD_DIR / 'hs_err_pid{}.log'.format(pid)
+    return poss_error_file.exists()
+
+
 async def monitor_lavalink_server(loop):
     while not SHUTDOWN.is_set():
         if proc.poll() is not None:
@@ -14,13 +24,55 @@ async def monitor_lavalink_server(loop):
         await asyncio.sleep(0.5)
 
     if not SHUTDOWN.is_set():
-        print("Lavalink jar shutdown, restarting.")
-        await start_lavalink_server(loop)
+        log.info("Lavalink jar shutdown.")
+        if not has_java_error(proc.pid):
+            log.info("Restarting Lavalink jar.")
+            await start_lavalink_server(loop)
+        else:
+            log.error("Your Java is borked. Please find the hs_err_pid{}.log file"
+                      " in the Audio data folder and report this issue.".format(
+                proc.pid
+            ))
 
 
+async def has_java(loop):
+    java_available = shutil.which('java') is not None
+    if not java_available:
+        return False
+
+    version = await get_java_version(loop)
+    return version >= (1, 8), version
+
+
+async def get_java_version(loop):
+    """
+    This assumes we've already checked that java exists.
+    """
+    proc = Popen(
+        shlex.split("java -version", posix=os.name == 'posix'),
+        stdout=PIPE, stderr=PIPE
+    )
+    _, err = proc.communicate()
+
+    version_info = str(err, encoding='utf-8')
+
+    version_line = version_info.split('\n')[0]
+    version_start = version_line.find('"')
+    version_string = version_line[version_start + 1:-1]
+    major, minor = version_string.split('.')[:2]
+    return int(major), int(minor)
+
 async def start_lavalink_server(loop):
+    java_available, java_version = await has_java(loop)
+    if not java_available:
+        raise RuntimeError("You must install Java 1.8+ for Lavalink to run.")
+
+    extra_flags = ""
+    if java_version == (1, 8):
+        extra_flags = "-Dsun.zip.disableMemoryMapping=true"
+
     from . import LAVALINK_DOWNLOAD_DIR, LAVALINK_JAR_FILE
-    start_cmd = "java -jar {}".format(LAVALINK_JAR_FILE.resolve())
+    start_cmd = "java {} -jar {}".format(extra_flags, LAVALINK_JAR_FILE.resolve())
 
     global proc
     proc = Popen(
@@ -29,13 +81,15 @@ async def start_lavalink_server(loop):
         stdout=DEVNULL, stderr=DEVNULL
     )
 
-    print("Lavalink jar started. PID: {}".format(proc.pid))
+    log.info("Lavalink jar started. PID: {}".format(proc.pid))
 
     loop.create_task(monitor_lavalink_server(loop))
 
 
 def shutdown_lavalink_server():
-    print("Shutting down lavalink server.")
+    log.info("Shutting down lavalink server.")
     SHUTDOWN.set()
+    global proc
     if proc is not None:
         proc.terminate()
+        proc = None

redbot/cogs/bank/bank.py

@@ -1,4 +1,5 @@
 import discord
+from redbot.core.utils.chat_formatting import box
 
 from redbot.core import checks, bank
 from redbot.core.i18n import CogI18n
@@ -60,17 +61,37 @@ class Bank:
     async def bankset(self, ctx: commands.Context):
         """Base command for bank settings"""
         if ctx.invoked_subcommand is None:
+            if await bank.is_global():
+                bank_name = await bank._conf.bank_name()
+                currency_name = await bank._conf.currency()
+                default_balance = await bank._conf.default_balance()
+            else:
+                if not ctx.guild:
+                    await ctx.send_help()
+                    return
+                bank_name = await bank._conf.guild(ctx.guild).bank_name()
+                currency_name = await bank._conf.guild(ctx.guild).currency()
+                default_balance = await bank._conf.guild(ctx.guild).default_balance()
+
+            settings = (_(
+                "Bank settings:\n\n"
+                "Bank name: {}\n"
+                "Currency: {}\n"
+                "Default balance: {}"
+                "").format(bank_name, currency_name, default_balance)
+            )
+            await ctx.send(box(settings))
             await ctx.send_help()
 
     @bankset.command(name="toggleglobal")
     @checks.is_owner()
     async def bankset_toggleglobal(self, ctx: commands.Context, confirm: bool=False):
         """Toggles whether the bank is global or not
-        If the bank is global, it will become per-guild
-        If the bank is per-guild, it will become global"""
+        If the bank is global, it will become per-server
+        If the bank is per-server, it will become global"""
         cur_setting = await bank.is_global()
 
-        word = _("per-guild") if cur_setting else _("global")
+        word = _("per-server") if cur_setting else _("global")
         if confirm is False:
             await ctx.send(
                 _("This will toggle the bank to be {}, deleting all accounts "

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

@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:32-0500\n"
+"POT-Creation-Date: 2018-04-02 17:36+AKDT\n"
+"PO-Revision-Date: 2018-04-15 16:41-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: Arabic\n"
 "MIME-Version: 1.0\n"
@@ -16,23 +16,34 @@ msgstr ""
 "X-Crowdin-File: /cogs/bank/locales/messages.pot\n"
 "Language: ar_SA\n"
 
-#: ../bank.py:68
+#: ../bank.py:76
+msgid "Bank settings:\n\n"
+"Bank name: {}\n"
+"Currency: {}\n"
+"Default balance: {}"
+msgstr ""
+
+#: ../bank.py:94
 msgid "global"
 msgstr ""
 
-#: ../bank.py:68
+#: ../bank.py:94
 msgid "per-guild"
 msgstr ""
 
-#: ../bank.py:70
+#: ../bank.py:97
+msgid "This will toggle the bank to be {}, deleting all accounts in the process! If you're sure, type `{}`"
+msgstr ""
+
+#: ../bank.py:104
 msgid "The bank is now {}."
 msgstr ""
 
-#: ../bank.py:77
+#: ../bank.py:111
 msgid "Bank's name has been set to {}"
 msgstr ""
 
-#: ../bank.py:84
+#: ../bank.py:118
 msgid "Currency name has been set to {}"
 msgstr ""
 

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

@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:33-0500\n"
+"POT-Creation-Date: 2018-04-02 17:36+AKDT\n"
+"PO-Revision-Date: 2018-04-15 16:42-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: Bulgarian\n"
 "MIME-Version: 1.0\n"
@@ -16,23 +16,34 @@ msgstr ""
 "X-Crowdin-File: /cogs/bank/locales/messages.pot\n"
 "Language: bg_BG\n"
 
-#: ../bank.py:68
+#: ../bank.py:76
+msgid "Bank settings:\n\n"
+"Bank name: {}\n"
+"Currency: {}\n"
+"Default balance: {}"
+msgstr ""
+
+#: ../bank.py:94
 msgid "global"
 msgstr "глобален"
 
-#: ../bank.py:68
+#: ../bank.py:94
 msgid "per-guild"
 msgstr "по гилдиево"
 
-#: ../bank.py:70
+#: ../bank.py:97
+msgid "This will toggle the bank to be {}, deleting all accounts in the process! If you're sure, type `{}`"
+msgstr ""
+
+#: ../bank.py:104
 msgid "The bank is now {}."
 msgstr "Банката вече е {}."
 
-#: ../bank.py:77
+#: ../bank.py:111
 msgid "Bank's name has been set to {}"
 msgstr "Името на банката е настроено на {}"
 
-#: ../bank.py:84
+#: ../bank.py:118
 msgid "Currency name has been set to {}"
 msgstr "Името на валутата е настроено на {}"
 

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

@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:33-0500\n"
+"POT-Creation-Date: 2018-04-02 17:36+AKDT\n"
+"PO-Revision-Date: 2018-04-15 16:42-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: Danish\n"
 "MIME-Version: 1.0\n"
@@ -16,23 +16,34 @@ msgstr ""
 "X-Crowdin-File: /cogs/bank/locales/messages.pot\n"
 "Language: da_DK\n"
 
-#: ../bank.py:68
+#: ../bank.py:76
+msgid "Bank settings:\n\n"
+"Bank name: {}\n"
+"Currency: {}\n"
+"Default balance: {}"
+msgstr ""
+
+#: ../bank.py:94
 msgid "global"
 msgstr ""
 
-#: ../bank.py:68
+#: ../bank.py:94
 msgid "per-guild"
 msgstr ""
 
-#: ../bank.py:70
+#: ../bank.py:97
+msgid "This will toggle the bank to be {}, deleting all accounts in the process! If you're sure, type `{}`"
+msgstr ""
+
+#: ../bank.py:104
 msgid "The bank is now {}."
 msgstr ""
 
-#: ../bank.py:77
+#: ../bank.py:111
 msgid "Bank's name has been set to {}"
 msgstr ""
 
-#: ../bank.py:84
+#: ../bank.py:118
 msgid "Currency name has been set to {}"
 msgstr ""
 

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

@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:33-0500\n"
+"POT-Creation-Date: 2018-04-02 17:36+AKDT\n"
+"PO-Revision-Date: 2018-04-15 16:42-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: German\n"
 "MIME-Version: 1.0\n"
@@ -16,23 +16,37 @@ msgstr ""
 "X-Crowdin-File: /cogs/bank/locales/messages.pot\n"
 "Language: de_DE\n"
 
-#: ../bank.py:68
+#: ../bank.py:76
+msgid "Bank settings:\n\n"
+"Bank name: {}\n"
+"Currency: {}\n"
+"Default balance: {}"
+msgstr "Bank Einstellungen:\n\n"
+"Bank Name: {}\n"
+"Währung: {}\n"
+"Standartguthaben: {}"
+
+#: ../bank.py:94
 msgid "global"
 msgstr "Global"
 
-#: ../bank.py:68
+#: ../bank.py:94
 msgid "per-guild"
 msgstr "Per Server"
 
-#: ../bank.py:70
+#: ../bank.py:97
+msgid "This will toggle the bank to be {}, deleting all accounts in the process! If you're sure, type `{}`"
+msgstr "Dies schaltet die Bank auf {} um und löscht dabei alle Konten! Wenn Sie sicher sind, geben Sie `{}` ein"
+
+#: ../bank.py:104
 msgid "The bank is now {}."
 msgstr "Die Bank ist nun {}."
 
-#: ../bank.py:77
+#: ../bank.py:111
 msgid "Bank's name has been set to {}"
 msgstr "Der Bank Name wurde geändert zu {}"
 
-#: ../bank.py:84
+#: ../bank.py:118
 msgid "Currency name has been set to {}"
 msgstr "Der Währungsname wurde geändert zu {}"
 

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

@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: red-discordbot\n"
-"POT-Creation-Date: 2018-02-18 14:42+AKST\n"
-"PO-Revision-Date: 2018-02-25 21:33-0500\n"
+"POT-Creation-Date: 2018-04-02 17:36+AKDT\n"
+"PO-Revision-Date: 2018-04-15 16:42-0400\n"
 "Last-Translator: Kowlin <boxedpp@gmail.com>\n"
 "Language-Team: Greek\n"
 "MIME-Version: 1.0\n"
@@ -16,23 +16,34 @@ msgstr ""
 "X-Crowdin-File: /cogs/bank/locales/messages.pot\n"
 "Language: el_GR\n"
 
-#: ../bank.py:68
+#: ../bank.py:76
+msgid "Bank settings:\n\n"
+"Bank name: {}\n"
+"Currency: {}\n"
+"Default balance: {}"
+msgstr ""
+
+#: ../bank.py:94
 msgid "global"
 msgstr ""
 
-#: ../bank.py:68
+#: ../bank.py:94
 msgid "per-guild"
 msgstr ""
 
-#: ../bank.py:70
+#: ../bank.py:97
+msgid "This will toggle the bank to be {}, deleting all accounts in the process! If you're sure, type `{}`"
+msgstr ""
+
+#: ../bank.py:104
 msgid "The bank is now {}."
 msgstr ""
 
-#: ../bank.py:77
+#: ../bank.py:111
 msgid "Bank's name has been set to {}"
 msgstr ""
 
-#: ../bank.py:84
+#: ../bank.py:118
 msgid "Currency name has been set to {}"
 msgstr ""