diff --git a/CHANGELOG.md b/CHANGELOG.md
index fc2e19fb..4f248b5d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ New release of Oragono!
 ### Security
 
 ### Added
+* Added new French translation (thanks to [Joshua](https://github.com/joshk0)!).
 * Added new Turkish translation (thanks to [Yaser](https://crowdin.com/profile/Apsimati)!).
 * Added proposed IRCv3 capability [`draft/languages`](https://gist.github.com/DanielOaks/8126122f74b26012a3de37db80e4e0c6).
 * Added proposed IRCv3 capability [`draft/resume`](https://github.com/ircv3/ircv3-specifications/pull/306).
diff --git a/languages/fr_FR-help.lang.json b/languages/fr_FR-help.lang.json
new file mode 100644
index 00000000..ade388cb
--- /dev/null
+++ b/languages/fr_FR-help.lang.json
@@ -0,0 +1,65 @@
+{
+  "= Help Topics =\n\nCommands:\n%s\n\nRPL_ISUPPORT Tokens:\n%s\n\nInformation:\n%s": "",
+  "== Channel Modes ==\n\nOragono supports the following channel modes:\n\n  +b  |  Client masks that are banned from the channel (e.g. *!*@127.0.0.1)\n  +e  |  Client masks that are exempted from bans.\n  +I  |  Client masks that are exempted from the invite-only flag.\n  +i  |  Invite-only mode, only invited clients can join the channel.\n  +k  |  Key required when joining the channel.\n  +l  |  Client join limit for the channel.\n  +m  |  Moderated mode, only privileged clients can talk on the channel.\n  +n  |  No-outside-messages mode, only users that are on the channel can send\n      |  messages to it.\n  +r  |  Only registered users can talk in the channel.\n  +s  |  Secret mode, channel won't show up in /LIST or whois replies.\n  +t  |  Only channel opers can modify the topic.\n\n= Prefixes =\n\n  +q (~)  |  Founder channel mode.\n  +a (&)  |  Admin channel mode.\n  +o (@)  |  Operator channel mode.\n  +h (%)  |  Halfop channel mode.\n  +v (+)  |  Voice channel mode.": "",
+  "== Server Notice Masks ==\n\nOragono supports the following server notice masks for operators:\n\n  a  |  Local announcements.\n  c  |  Local client connections.\n  j  |  Local channel actions.\n  k  |  Local kills.\n  n  |  Local nick changes.\n  o  |  Local oper actions.\n  q  |  Local quits.\n  t  |  Local /STATS usage.\n  u  |  Local client account actions.\n  x  |  Local X-lines (DLINE/KLINE/etc).\n\nTo set a snomask, do this with your nickname:\n\n  /MODE <nick> +s <chars>\n\nFor instance, this would set the kill, oper, account and xline snomasks on dan:\n\n  /MODE dan +s koux": "",
+  "== User Modes ==\n\nOragono supports the following user modes:\n\n  +a  |  User is marked as being away. This mode is set with the /AWAY command.\n  +i  |  User is marked as invisible (their channels are hidden from whois replies).\n  +o  |  User is an IRC operator.\n  +R  |  User only accepts messages from other registered users. \n  +s  |  Server Notice Masks (see help with /HELPOP snomasks).\n  +Z  |  User is connected via TLS.": "",
+  "@+client-only-tags TAGMSG <target>{,<target>}\n\nSends the given client-only tags to the given targets as a TAGMSG. See the IRCv3\nspecs for more info: http://ircv3.net/specs/core/message-tags-3.3.html": "",
+  "ACC REGISTER <accountname> [callback_namespace:]<callback> [cred_type] :<credential>\nACC VERIFY <accountname> <auth_code>\n\nUsed in account registration. See the relevant specs for more info:\nhttps://oragono.io/specs.html": "",
+  "AMBIANCE <target> <text to be sent>\n\nThe AMBIANCE command is used to send a scene notification to the given target.": "",
+  "AUTHENTICATE\n\nUsed during SASL authentication. See the IRCv3 specs for more info:\nhttp://ircv3.net/specs/extensions/sasl-3.1.html": "",
+  "AWAY [message]\n\nIf [message] is sent, marks you away. If [message] is not sent, marks you no\nlonger away.": "",
+  "CAP <subcommand> [:<capabilities>]\n\nUsed in capability negotiation. See the IRCv3 specs for more info:\nhttp://ircv3.net/specs/core/capability-negotiation-3.1.html\nhttp://ircv3.net/specs/core/capability-negotiation-3.2.html": "",
+  "CHANSERV <subcommand> [params]\n\nChanServ controls channel registrations.": "",
+  "CS <subcommand> [params]\n\nChanServ controls channel registrations.": "",
+  "DEBUG <option>\n\nPrints debug information about the IRCd. <option> can be one of:\n\n* GCSTATS: Garbage control statistics.\n* NUMGOROUTINE: Number of goroutines in use.\n* STARTCPUPROFILE: Starts the CPU profiler.\n* STOPCPUPROFILE: Stops the CPU profiler.\n* PROFILEHEAP: Writes out the CPU profiler info.": "",
+  "DLINE [ANDKILL] [MYSELF] [duration] <ip>/<net> [ON <server>] [reason [| oper reason]]\nDLINE LIST\n\nBans an IP address or network from connecting to the server. If the duration is\ngiven then only for that long. The reason is shown to the user themselves, but\neveryone else will see a standard message. The oper reason is shown to\noperators getting info about the DLINEs that exist.\n\nBans are saved across subsequent launches of the server.\n\n\"ANDKILL\" means that all matching clients are also removed from the server.\n\n\"MYSELF\" is required when the DLINE matches the address the person applying it is connected\nfrom. If \"MYSELF\" is not given, trying to DLINE yourself will result in an error.\n\n[duration] can be of the following forms:\n\t1y 12mo 31d 10h 8m 13s\n\n<net> is specified in typical CIDR notation. For example:\n\t127.0.0.1/8\n\t8.8.8.8/24\n\nON <server> specifies that the ban is to be set on that specific server.\n\n[reason] and [oper reason], if they exist, are separated by a vertical bar (|).\n\nIf \"DLINE LIST\" is sent, the server sends back a list of our current DLINEs.": "",
+  "HELP <argument>\n\nGet an explanation of <argument>, or \"index\" for a list of help topics.": "",
+  "HELPOP <argument>\n\nGet an explanation of <argument>, or \"index\" for a list of help topics.": "",
+  "INFO\n\nSends information about the server, developers, etc.": "",
+  "INVITE <nickname> <channel>\n\nInvites the given user to the given channel, so long as you have the\nappropriate channel privs.": "",
+  "ISON <nickname>{ <nickname>}\n\nReturns whether the given nicks exist on the network.": "",
+  "JOIN <channel>{,<channel>} [<key>{,<key>}]\n\nJoins the given channels with the matching keys.": "",
+  "KICK <channel> <user> [reason]\n\nRemoves the user from the given channel, so long as you have the appropriate\nchannel privs.": "",
+  "KILL <nickname> [reason]\n\nRemoves the given user from the network, showing them the reason if it is\nsupplied.": "",
+  "KLINE [ANDKILL] [MYSELF] [duration] <mask> [ON <server>] [reason [| oper reason]]\nKLINE LIST\n\nBans a mask from connecting to the server. If the duration is given then only for that\nlong. The reason is shown to the user themselves, but everyone else will see a standard\nmessage. The oper reason is shown to operators getting info about the KLINEs that exist.\n\nBans are saved across subsequent launches of the server.\n\n\"ANDKILL\" means that all matching clients are also removed from the server.\n\n\"MYSELF\" is required when the KLINE matches the address the person applying it is connected\nfrom. If \"MYSELF\" is not given, trying to KLINE yourself will result in an error.\n\n[duration] can be of the following forms:\n\t1y 12mo 31d 10h 8m 13s\n\n<mask> is specified in typical IRC format. For example:\n\tdan\n\tdan!5*@127.*\n\nON <server> specifies that the ban is to be set on that specific server.\n\n[reason] and [oper reason], if they exist, are separated by a vertical bar (|).\n\nIf \"KLINE LIST\" is sent, the server sends back a list of our current KLINEs.": "",
+  "LANGUAGE <code>{ <code>}\n\nSets your preferred languages to the given ones.": "",
+  "LIST [<channel>{,<channel>}] [<elistcond>{,<elistcond>}]\n\nShows information on the given channels (or if none are given, then on all\nchannels). <elistcond>s modify how the channels are selected.": "",
+  "LUSERS [<mask> [<server>]]\n\nShows statistics about the size of the network. If <mask> is given, only\nreturns stats for servers matching the given mask.  If <server> is given, the\ncommand is processed by that server.": "",
+  "MODE <target> [<modestring> [<mode arguments>...]]\n\nSets and removes modes from the given target. For more specific information on\nmode characters, see the help for \"modes\".": "",
+  "MONITOR <subcmd>\n\nAllows the monitoring of nicknames, for alerts when they are online and\noffline. The subcommands are:\n\n    MONITOR + target{,target}\nAdds the given names to your list of monitored nicknames.\n\n    MONITOR - target{,target}\nRemoves the given names from your list of monitored nicknames.\n\n    MONITOR C\nClears your list of monitored nicknames.\n\n    MONITOR L\nLists all the nicknames you are currently monitoring.\n\n    MONITOR S\nLists whether each nick in your MONITOR list is online or offline.": "",
+  "MOTD [server]\n\nReturns the message of the day for this, or the given, server.": "",
+  "NAMES [<channel>{,<channel>}]\n\nViews the clients joined to a channel and their channel membership prefixes. To\nview the channel membership prefixes supported by this server, see the help for\n\"PREFIX\".": "",
+  "NICK <newnick>\n\nSets your nickname to the new given one.": "",
+  "NICKSERV <subcommand> [params]\n\nNickServ controls accounts and user registrations.": "",
+  "NOTICE <target>{,<target>} <text to be sent>\n\nSends the text to the given targets as a NOTICE.": "",
+  "NPC <target> <sourcenick> <text to be sent>\n\t\t\nThe NPC command is used to send a message to the target as the source.\n\nRequires the roleplay mode (+E) to be set on the target.": "",
+  "NPCA <target> <sourcenick> <text to be sent>\n\t\t\nThe NPC command is used to send an action to the target as the source.\n\nRequires the roleplay mode (+E) to be set on the target.": "",
+  "NS <subcommand> [params]\n\nNickServ controls accounts and user registrations.": "",
+  "OPER <name> <password>\n\nIf the correct details are given, gives you IRCop privs.": "",
+  "PART <channel>{,<channel>} [reason]\n\nLeaves the given channels and shows people the given reason.": "",
+  "PASS <password>\n\nWhen the server requires a connection password to join, used to send us the\npassword.": "",
+  "PING <args>...\n\nRequests a PONG. Used to check link connectivity.": "",
+  "PONG <args>...\n\nReplies to a PING. Used to check link connectivity.": "",
+  "PRIVMSG <target>{,<target>} <text to be sent>\n\nSends the text to the given targets as a PRIVMSG.": "",
+  "PROXY TCP4/6 <sourceip> <destip> <sourceport> <destport>\n\nUsed by haproxy's PROXY v1 protocol, to allow for alternate TLS support:\nhttp://www.haproxy.org/download/1.8/doc/proxy-protocol.txt": "",
+  "QUIT [reason]\n\nIndicates that you're leaving the server, and shows everyone the given reason.": "",
+  "REHASH\n\nReloads the config file and updates TLS certificates on listeners": "",
+  "RENAME <channel> <newname> [<reason>]\n\nRenames the given channel with the given reason, if possible.\n\nFor example:\n\tRENAME #ircv2 #ircv3 :Protocol upgrades!": "",
+  "RESUME <oldnick> [timestamp]\n\nSent before registration has completed, this indicates that the client wants to\nresume their old connection <oldnick>.": "",
+  "RPL_ISUPPORT CASEMAPPING\n\nOragono supports an experimental unicode casemapping designed for extended\nUnicode support. This casemapping is based off RFC 7613 and the draft rfc7613\ncasemapping spec here: https://oragono.io/specs.html": "",
+  "RPL_ISUPPORT PREFIX\n\nOragono supports the following channel membership prefixes:\n\n  +q (~)  |  Founder channel mode.\n  +a (&)  |  Admin channel mode.\n  +o (@)  |  Operator channel mode.\n  +h (%)  |  Halfop channel mode.\n  +v (+)  |  Voice channel mode.": "",
+  "SAMODE <target> [<modestring> [<mode arguments>...]]\n\nForcibly sets and removes modes from the given target -- only available to\nopers. For more specific information on mode characters, see the help for\n\"cmode\" and \"umode\".": "",
+  "SANICK <currentnick> <newnick>\n\nGives the given user a new nickname.": "",
+  "SCENE <target> <text to be sent>\n\nThe SCENE command is used to send a scene notification to the given target.": "",
+  "TIME [server]\n\nShows the time of the current, or the given, server.": "",
+  "TOPIC <channel> [topic]\n\nIf [topic] is given, sets the topic in the channel to that. If [topic] is not\ngiven, views the current topic on the channel.": "",
+  "UNDLINE <ip>/<net>\n\nRemoves an existing ban on an IP address or a network.\n\n<net> is specified in typical CIDR notation. For example:\n\t127.0.0.1/8\n\t8.8.8.8/24": "",
+  "UNKLINE <mask>\n\nRemoves an existing ban on a mask.\n\nFor example:\n\tdan\n\tdan!5*@127.*": "",
+  "USER <username> 0 * <realname>\n\nUsed in connection registration, sets your username and realname to the given\nvalues (though your username may also be looked up with Ident).": "",
+  "USERHOST <nickname>{ <nickname>}\n\t\t\nShows information about the given users. Takes up to 10 nicknames.": "",
+  "VERSION [server]\n\nViews the version of software and the RPL_ISUPPORT tokens for the given server.": "",
+  "WEBIRC <password> <gateway> <hostname> <ip> [:<flags>]\n\nUsed by web<->IRC gateways and bouncers, the WEBIRC command allows gateways to\npass-through the real IP addresses of clients:\nircv3.net/specs/extensions/webirc.html\n\n<flags> is a list of space-separated strings indicating various details about\nthe connection from the client to the gateway, such as:\n\n- tls: this flag indicates that the client->gateway connection is secure": "",
+  "WHO <name> [o]\n\nReturns information for the given user.": "",
+  "WHOIS <client>{,<client>}\n\nReturns information for the given user(s).": "",
+  "WHOWAS <nickname>\n\nReturns historical information on the last user with the given nickname.": ""
+}
\ No newline at end of file
diff --git a/languages/fr_FR-irc.lang.json b/languages/fr_FR-irc.lang.json
new file mode 100644
index 00000000..b5b587a7
--- /dev/null
+++ b/languages/fr_FR-irc.lang.json
@@ -0,0 +1,148 @@
+{
+  "%d IRC Operators online": "%d opérateurs IRC en ligne",
+  "%d channels formed": "%d chaînes crées",
+  "*** Could not find your username": "",
+  "*** Found your username": "",
+  "*** Got a malformed username, ignoring": "",
+  "*** Looking up your username": "",
+  "- %s Message of the day - ": "- %s Message du jour - ",
+  "Account already exists": "",
+  "Account created": "",
+  "Account name is not valid": "",
+  "Account registration is disabled": "",
+  "Actual user@host, Actual IP": "Utilise vraiment l'addresse",
+  "Added D-Line for %s": "",
+  "Added K-Line for %s": "",
+  "Added temporary (%[1]s) D-Line for %[2]s": "",
+  "Added temporary (%[1]s) K-Line for %[2]s": "",
+  "Authentication successful": "",
+  "Ban - %[1]s - added by %[2]s - %[3]s": "",
+  "Ban - %s - added by %s - %s": "",
+  "Callback namespace is not supported": "",
+  "Can't change modes for other users": "Impossible de modifier la mode des autres clients",
+  "Can't view modes for other users": "Impossible d'afficher la mode des autres clients",
+  "Cannot join channel (+%s)": "Impossible de joindre (+%s)",
+  "Cannot resume connection, connection registration has already been completed": "",
+  "Cannot resume connection, old and new clients must be logged into the same account": "",
+  "Cannot resume connection, old and new clients must have TLS": "",
+  "Cannot resume connection, old client not found": "",
+  "Cannot resume connection, old nickname contains spaces": "",
+  "Cannot send to channel": "Impossible d'envoyer à la chaîne",
+  "Channel %s successfully registered": "",
+  "Channel doesn't have roleplaying mode available": "",
+  "Channel list is full": "Vous êtes dans trop de chaînes",
+  "Channel name is not valid": "",
+  "Channel registration is not enabled": "",
+  "Channel renamed: %s": "",
+  "Client reconnected": "",
+  "Contributors and Former Developers:": "",
+  "Core Developers:": "",
+  "Could not apply mode changes: +%s": "",
+  "Could not parse IP address or CIDR network": "",
+  "Could not register": "",
+  "Could not remove ban [%s]": "",
+  "Could not set or change nickname: %s": "",
+  "Could not successfully save new D-LINE: %s": "",
+  "Could not successfully save new K-LINE: %s": "",
+  "Credential type is not supported": "",
+  "End of /HELPOP": "Fin de /HELPOP",
+  "End of /INFO": "Fin de liste /INFO",
+  "End of /WHOIS list": "Fin de liste /WHOIS",
+  "End of LIST": "Fin de /LIST",
+  "End of MOTD command": "Fin de commande /MOTD",
+  "End of NAMES list": "",
+  "End of WHO list": "Fin de liste /WHO",
+  "End of WHOWAS": "Fin de WHOWAS",
+  "End of list": "",
+  "Erroneous nickname": "Nom inapproprié",
+  "Fake source must be a valid nickname": "",
+  "First param must be a mask or channel": "",
+  "HELPOP <argument>\n\nGet an explanation of <argument>, or \"index\" for a list of help topics.": "",
+  "Help not found": "Ce renseignement n'existe pas",
+  "I have %[1]d clients and %[2]d servers": "J'ai %[1]d clients et %[2]d serveurs",
+  "Insufficient oper privs": "",
+  "Invalid CAP subcommand": "",
+  "JOIN 0 is not allowed": "",
+  "Language preferences have been set": "",
+  "Languages are not supported by this server": "",
+  "MOTD File is missing": "Fichier de message du jour manquant",
+  "Malformed username": "",
+  "Mask isn't valid": "",
+  "NickServ is not yet implemented, sorry! To register an account, check /HELPOP REG": "",
+  "Nickname is already in use": "Ce nom est déjà utilisé",
+  "No DLINEs have been set!": "",
+  "No command given": "",
+  "No masks given": "",
+  "No nickname given": "Aucun nom donné",
+  "No such channel": "Aucune chaîne",
+  "No such nick": "Aucun(e) client/chaîne",
+  "No such server": "",
+  "No topic is set": "Il n'y a pas de sujet",
+  "Not enough parameters": "Pas assez de paramètres",
+  "Only channel founders can change registered channels": "",
+  "Oragono is released under the MIT license.": "",
+  "PROXY command is not usable from your address": "",
+  "Password incorrect": "Faux mot de passe",
+  "Permission Denied": "",
+  "Permission Denied - You're not an IRC operator": "Vous n'avez pas ce droit puisque vous n'êtes pas un opérateur",
+  "Proxied IP address is not valid: [%s]": "",
+  "Received malformed line": "",
+  "Rehashing": "Le serveur relit le fichier de configuration",
+  "Remote servers not yet supported": "",
+  "Removed D-Line for %s": "",
+  "Removed K-Line for %s": "",
+  "SASL authentication aborted": "",
+  "SASL authentication failed": "",
+  "SASL authentication failed, you are not connecting with a certificate": "",
+  "SASL authentication failed: Bad account name": "",
+  "SASL authentication failed: Invalid auth blob": "",
+  "SASL authentication failed: Invalid b64 encoding": "",
+  "SASL authentication failed: Passphrase too long": "",
+  "SASL authentication failed: authcid and authzid should be the same": "",
+  "SASL authentication successful": "",
+  "SASL message too long": "",
+  "Server notice masks": "",
+  "Sorry, I don't know that command": "",
+  "Syntax: REGISTER <channel>": "",
+  "Thanks to Jeremy Latt for founding Ergonomadic, the project this is based on": "",
+  "There are %[1]d users and %[2]d invisible on %[3]d server(s)": "Il y a %[1]d clients et %[2]d invisibles sur %[3]d serveurs",
+  "There was no such nickname": "Il n'y avait pas un tel nom",
+  "They aren't on that channel": "Il n'est pas sur cette chaîne",
+  "This ban matches you. To DLINE yourself, you must use the command:  /DLINE MYSELF <arguments>": "",
+  "This ban matches you. To KLINE yourself, you must use the command:  /KLINE MYSELF <arguments>": "",
+  "This server is in debug mode and is logging all user I/O. If you do not wish for everything you send to be readable by the server owner(s), please disconnect.": "",
+  "This server was created %s": "Ce serveur a été crée %s",
+  "Timestamp is not in 2006-01-02T15:04:05.999Z format, ignoring it": "",
+  "Unknown command": "Commande inconnue",
+  "Unknown subcommand": "Sous-commande inconnue",
+  "User doesn't have roleplaying mode enabled": "",
+  "VERIFY is not yet implemented": "",
+  "WEBIRC command is not usable from your address or incorrect password given": "",
+  "Welcome to the Internet Relay Network %s": "",
+  "You are banned from this server (%s)": "Vous êtes interdit d'utiliser ce serveur (%s)",
+  "You are no longer marked as being away": "Vous n'êtes plus marqué 'absent'",
+  "You are not using a TLS certificate": "",
+  "You are now an IRC operator": "Vous êtes maintenant un opérateur IRC",
+  "You are now logged in as %s": "",
+  "You have been banned from this server (%s)": "Vous avez été interdit d'utiliser ce serveur (%s)",
+  "You have been marked as being away": "Vous êtes maintenant marqué 'absent'",
+  "You may not reregister": "Vous ne pouvez pas vous enregistrer à nouveau",
+  "You must be an oper on the channel to register it": "",
+  "You must be logged in to register a channel": "",
+  "You need to register before you can use that command": "Vous ne vous êtes pas enregistré",
+  "You need to run a command": "",
+  "You specified too many languages": "",
+  "You're already logged into an account": "",
+  "You're already opered-up!": "",
+  "You're not a channel operator": "Vous n'avez pas assez de pouvoir dans cette chaîne IRC pour faire ça",
+  "You're not on that channel": "Vous n'êtes pas sur cette chaîne",
+  "Your host is %[1]s, running version %[2]s": "Votre serveur est %[1]s, version %[2]s",
+  "are supported by this server": "sont supportés par ce serveur",
+  "can speak these languages": "",
+  "has client certificate fingerprint %s": "",
+  "is a $bBot$b on %s": "",
+  "is an unknown mode character to me": "m'est inconnu",
+  "is logged in as": "",
+  "is using a secure connection": "",
+  "seconds idle, signon time": ""
+}
\ No newline at end of file
diff --git a/languages/fr_FR.lang.yaml b/languages/fr_FR.lang.yaml
new file mode 100644
index 00000000..cd799855
--- /dev/null
+++ b/languages/fr_FR.lang.yaml
@@ -0,0 +1,5 @@
+---
+name: "Français"
+code: "fr_FR"
+contributors: "Joshua Kwan <joshk@triplehelix.org>"
+incomplete: true