[2.1.x] Removed issue reporter name from 2.1.15 release notes.

Backport of 368b8d20aaa16f0ef763759a0a87d986ef460584 from master
[2.1.x] Post-release version bump.
2019-12-02 10:04:16 +01:00 · 2019-12-02 09:29:11 +01:00 · 2019-12-02 09:20:52 +01:00 · 2019-12-02 09:14:54 +01:00 · 2019-12-02 08:58:35 +01:00 · 2019-12-02 08:19:18 +01:00
4314 changed files with 100245 additions and 66677 deletions
--- a/.editorconfig
+++ b/.editorconfig
@ -1,4 +1,4 @@
-# http://editorconfig.org
+# https://editorconfig.org/
 root = true
--- a/78
+++ b/78
@ -8,6 +8,11 @@ answer newbie questions, and generally made Django that much better:
    Aaron Cannon <cannona@fireantproductions.com>
    Aaron Swartz <http://www.aaronsw.com/>
    Aaron T. Myers <atmyers@gmail.com>
    Abeer Upadhyay <ab.esquarer@gmail.com>
    Abhishek Gautam <abhishekg1128@yahoo.com>
    Adam Allred <adam.w.allred@gmail.com>
    Adam Bogdał <adam@bogdal.pl>
    Adam Donaghy
    Adam Johnson <https://github.com/adamchainz>
    Adam Malinowski <http://adammalinowski.co.uk>
    Adam Vandenberg
@ -18,6 +23,7 @@ answer newbie questions, and generally made Django that much better:
    AgarFu <heaven@croasanaso.sytes.net>
    Ahmad Alhashemi <trans@ahmadh.com>
    Ahmad Al-Ibrahim
    Ahmed Eltawela <https://github.com/ahmedabt>
    ajs <adi@sieker.info>
    Akis Kesoglou <akiskesoglou@gmail.com>
    Aksel Ethem <aksel.ethem@gmail.com>
@ -92,6 +98,7 @@ answer newbie questions, and generally made Django that much better:
    Baptiste Mispelon <bmispelon@gmail.com>
    Barry Pederson <bp@barryp.org>
    Bartolome Sanchez Salado <i42sasab@uco.es>
    Bartosz Grabski <bartosz.grabski@gmail.com>
    Bashar Al-Abdulhadi
    Bastian Kleineidam <calvin@debian.org>
    Batiste Bieler <batiste.bieler@gmail.com>
@ -110,6 +117,8 @@ answer newbie questions, and generally made Django that much better:
    berto
    Bill Fenner <fenner@gmail.com>
    Bjørn Stabell <bjorn@exoweb.net>
    Bo Marchman <bo.marchman@gmail.com>
    Bogdan Mateescu
    Bojan Mihelac <bmihelac@mihelac.org>
    Bouke Haarsma <bouke@haarsma.eu>
    Božidar Benko <bbenko@gmail.com>
@ -117,6 +126,7 @@ answer newbie questions, and generally made Django that much better:
    Brandon Chinn <http://brandonchinn178.github.io>
    Brant Harris
    Brendan Hayward <brendanhayward85@gmail.com>
    Brendan Quinn <brendan@cluefulmedia.com>
    Brenton Simpson <http://theillustratedlife.com>
    Brett Cannon <brett@python.org>
    Brett Hoerner <bretthoerner@bretthoerner.com>
@ -135,12 +145,16 @@ answer newbie questions, and generally made Django that much better:
    btoll@bestweb.net
    C8E
    Calvin Spealman <ironfroggy@gmail.com>
    Cameron Curry
    Cameron Knight (ckknight)
    Can Burak Çilingir <canburak@cs.bilgi.edu.tr>
    Carl Meyer <carl@oddbird.net>
    Carles Pina i Estany <carles@pina.cat>
    Carlos Eduardo de Paula <carlosedp@gmail.com>
    Carlos Matías de la Torre <cmdelatorre@gmail.com>
    Carlton Gibson <carlton.gibson@noumenal.es>
    cedric@terramater.net
    Chad Whitman <chad.whitman@icloud.com>
    ChaosKCW
    Charlie Leifer <coleifer@gmail.com>
    charly.wilhelm@gmail.com
@ -232,6 +246,7 @@ answer newbie questions, and generally made Django that much better:
    dusk@woofle.net
    Ed Morley <https://github.com/edmorley>
    eibaan@gmail.com
    elky <http://elky.me/>
    Emmanuelle Delescolle <https://github.com/nanuxbe>
    Emil Stenström <em@kth.se>
    enlight
@ -248,6 +263,7 @@ answer newbie questions, and generally made Django that much better:
    Esdras Beleza <linux@esdrasbeleza.com>
    Espen Grindhaug <http://grindhaug.org/>
    Eugene Lazutkin <http://lazutkin.com/blog/>
    Evan Grim <https://github.com/egrim>
    Fabrice Aneche <akh@nobugware.com>
    favo@exoweb.net
    fdr <drfarina@gmail.com>
@ -255,9 +271,11 @@ answer newbie questions, and generally made Django that much better:
    Filip Noetzel <http://filip.noetzel.co.uk/>
    Filip Wasilewski <filip.wasilewski@gmail.com>
    Finn Gruwier Larsen <finn@gruwier.dk>
    Flávio Juvenal da Silva Junior <flavio@vinta.com.br>
    flavio.curella@gmail.com
    Florian Apolloner <florian@apolloner.eu>
    Francisco Albarran Cristobal <pahko.xd@gmail.com>
    François Freitag <mail@franek.fr>
    Frank Tegtmeyer <fte@fte.to>
    Frank Wierzbicki
    Frank Wiles <frank@revsys.com>
@ -290,6 +308,7 @@ answer newbie questions, and generally made Django that much better:
    Gonzalo Saavedra <gonzalosaavedra@gmail.com>
    Gopal Narayanan <gopastro@gmail.com>
    Graham Carlyle <graham.carlyle@maplecroft.net>
    Grant Jenks <contact@grantjenks.com>
    Greg Chapple <gregchapple1@gmail.com>
    Gregor Müllegger <gregor@muellegger.de>
    Grigory Fateyev <greg@dial.com.ru>
@ -303,6 +322,7 @@ answer newbie questions, and generally made Django that much better:
    Helen Sherwood-Taylor <helen@rrdlabs.co.uk>
    Henrique Romano <onaiort@gmail.com>
    Henry Dang <henrydangprg@gmail.com>
    Himanshu Chauhan <hchauhan1404@outlook.com>
    hipertracker@gmail.com
    Hiroki Kiyohara <hirokiky@gmail.com>
    Honza Král <honza.kral@gmail.com>
@ -317,10 +337,12 @@ answer newbie questions, and generally made Django that much better:
    Ian Lee <IanLee1521@gmail.com>
    Ibon <ibonso@gmail.com>
    Idan Gazit <idan@gazit.me>
    Idan Melamed
    Ifedapo Olarewaju <ifedapoolarewaju@gmail.com>
    Igor Kolar <ike@email.si>
    Illia Volochii <illia.volochii@gmail.com>
    Ilya Semenov <semenov@inetss.com>
    Ingo Klöcker <djangoproject@ingo-kloecker.de>
    I.S. van Oostveen <v.oostveen@idca.nl>
    ivan.chelubeev@gmail.com
    Ivan Sagalaev (Maniac) <http://www.softwaremaniacs.org/>
@ -350,6 +372,7 @@ answer newbie questions, and generally made Django that much better:
    Jason Yan <tailofthesun@gmail.com>
    Javier Mansilla <javimansilla@gmail.com>
    Jay Parlar <parlar@gmail.com>
    Jay Welborn <jesse.welborn@gmail.com>
    Jay Wineinger <jay.wineinger@gmail.com>
    J. Clifford Dyer <jcd@sdf.lonestar.org>
    jcrasta@gmail.com
@ -359,21 +382,25 @@ answer newbie questions, and generally made Django that much better:
    Jeff Hui <jeffkhui@gmail.com>
    Jeffrey Gelens <jeffrey@gelens.org>
    Jeff Triplett <jeff.triplett@gmail.com>
    Jeffrey Yancey <jeffrey.yancey@gmail.com>
    Jens Diemer <django@htfx.de>
    Jens Page
    Jensen Cochran <jensen.cochran@gmail.com>
    Jeong-Min Lee <falsetru@gmail.com>
    Jérémie Blaser <blaserje@gmail.com>
    Jeremy Bowman <https://github.com/jmbowman>
    Jeremy Carbaugh <jcarbaugh@gmail.com>
    Jeremy Dunck <jdunck@gmail.com>
    Jeremy Lainé <jeremy.laine@m4x.org>
    Jesse Young <adunar@gmail.com>
    Jezeniel Zapanta <jezeniel.zapanta@gmail.com>
    jhenry <jhenry@theonion.com>
    Jim Dalton <jim.dalton@gmail.com>
    Jimmy Song <jaejoon@gmail.com>
    Jiri Barton
    Joachim Jablon <ewjoachim@gmail.com>
    Joao Oliveira <joaoxsouls@gmail.com>
    Joao Pedro Silva <j.pedro004@gmail.com>
    Joe Heck <http://www.rhonabwy.com/wp/>
    Joel Bohman <mail@jbohman.com>
    Joel Heenan <joelh-django@planetjoel.com>
@ -383,6 +410,7 @@ answer newbie questions, and generally made Django that much better:
    Johann Queuniet <johann.queuniet@adh.naellia.eu>
    john@calixto.net
    John D'Agostino <john.dagostino@gmail.com>
    John D'Ambrosio <dambrosioj@gmail.com>
    John Huddleston <huddlej@wwu.edu>
    John Moses <moses.john.r@gmail.com>
    John Paulett <john@paulett.org>
@ -430,6 +458,7 @@ answer newbie questions, and generally made Django that much better:
    Keith Bussell <kbussell@gmail.com>
    Kenneth Love <kennethlove@gmail.com>
    Kent Hauser <kent@khauser.net>
    Kevin Grinberg <kevin@kevingrinberg.com>
    Kevin Kubasik <kevin@kubasik.net>
    Kevin McConnell <kevin.mcconnell@gmail.com>
    Kieran Holland <http://www.kieranholland.com>
@ -456,14 +485,18 @@ answer newbie questions, and generally made Django that much better:
    Leo Shklovskii
    Leo Soto <leo.soto@gmail.com>
    lerouxb@gmail.com
    Lex Berezhny <lex@damoti.com>
    Liang Feng <hutuworm@gmail.com>
    limodou
    Lincoln Smith <lincoln.smith@anu.edu.au>
    Loek van Gent <loek@barakken.nl>
    Loïc Bistuer <loic.bistuer@sixmedia.com>
    Lowe Thiderman <lowe.thiderman@gmail.com>
    Luan Pablo <luanpab@gmail.com>
    Lucas Connors <http://www.revolutiontech.ca>
    Luciano Ramalho
    Ludvig Ericson <ludvig.ericson@gmail.com>
    Luis C. Berrocal <luis.berrocal.1942@gmail.com>
    Łukasz Langa <lukasz@langa.pl>
    Łukasz Rekucki <lrekucki@gmail.com>
    Luke Granger-Brown <django@lukegb.com>
@ -489,17 +522,20 @@ answer newbie questions, and generally made Django that much better:
    Mario Gonzalez <gonzalemario@gmail.com>
    Mariusz Felisiak <felisiak.mariusz@gmail.com>
    Mark Biggers <biggers@utsl.com>
    Mark Gensler <mark.gensler@protonmail.com>
    mark@junklight.com
    Mark Lavin <markdlavin@gmail.com>
    Mark Sandstrom <mark@deliciouslynerdy.com>
    Markus Amalthea Magnuson <markus.magnuson@gmail.com>
    Markus Holtermann <https://markusholtermann.eu>
    Marten Kenbeek <marten.knbk+django@gmail.com>
    Marti Raudsepp <marti@juffo.org>
    martin.glueck@gmail.com
    Martin Green
    Martin Kosír <martin@martinkosir.net>
    Martin Mahner <http://www.mahner.org/>
    Martin Maney <http://www.chipy.org/Martin_Maney>
    Martin von Gagern <gagern@google.com>
    Mart Sõmermaa <http://mrts.pri.ee/>
    Marty Alchin <gulopine@gamemusic.org>
    masonsimon+django@gmail.com
@ -523,12 +559,14 @@ answer newbie questions, and generally made Django that much better:
    Matt Riggott
    Matt Robenolt <m@robenolt.com>
    Mattia Larentis <mattia@laretis.eu>
    Mattia Procopio <promat85@gmail.com>
    Mattias Loverot <mattias@stubin.se>
    mattycakes@gmail.com
    Max Burstein <http://maxburstein.com>
    Max Derkachev <mderk@yandex.ru>
    Maxime Lorant <maxime.lorant@gmail.com>
    Maxime Turcotte <maxocub@riseup.net>
    Maximilian Merz <django@mxmerz.de>
    Maximillian Dornseif <md@hudora.de>
    mccutchen@gmail.com
    Meir Kriheli <http://mksoft.co.il/>
@ -538,7 +576,9 @@ answer newbie questions, and generally made Django that much better:
    michael.mcewan@gmail.com
    Michael Placentra II <someone@michaelplacentra2.net>
    Michael Radziej <mir@noris.de>
    Michael Sanders <m.r.sanders@gmail.com>
    Michael Schwarz <michi.schwarz@gmail.com>
    Michael Sinov <sihaelov@gmail.com>
    Michael Thornhill <michael.thornhill@gmail.com>
    Michal Chruszcz <troll@pld-linux.org>
    michal@plovarna.cz
@ -554,6 +594,7 @@ answer newbie questions, and generally made Django that much better:
    Mikhail Korobov <kmike84@googlemail.com>
    Mikko Hellsing <mikko@sorl.net>
    Mikołaj Siedlarek <mikolaj.siedlarek@gmail.com>
    milkomeda
    Milton Waddams
    mitakummaa@gmail.com
    mmarshall
@ -572,12 +613,14 @@ answer newbie questions, and generally made Django that much better:
    Nebojša Dorđević
    Ned Batchelder <http://www.nedbatchelder.com/>
    Nena Kojadin <nena@kiberpipa.org>
    Niall Dalton <niall.dalton12@gmail.com>
    Niall Kelly <duke.sam.vimes@gmail.com>
    Nick Efford <nick@efford.org>
    Nick Lane <nick.lane.au@gmail.com>
    Nick Pope <nick@nickpope.me.uk>
    Nick Presta <nick@nickpresta.ca>
    Nick Sandford <nick.sandford@gmail.com>
    Nick Sarbicki <nick.a.sarbicki@gmail.com>
    Niclas Olofsson <n@niclasolofsson.se>
    Nicola Larosa <nico@teknico.net>
    Nicolas Lara <nicolaslara@gmail.com>
@ -591,6 +634,7 @@ answer newbie questions, and generally made Django that much better:
    Oliver Beattie <oliver@obeattie.com>
    Oliver Rutherfurd <http://rutherfurd.net/>
    Olivier Sels <olivier.sels@gmail.com>
    Olivier Tabone <olivier.tabone@ripplemotion.fr>
    Orestis Markou <orestis@orestis.gr>
    Orne Brocaar <http://brocaar.com/>
    Oscar Ramirez <tuxskar@gmail.com>
@ -603,13 +647,16 @@ answer newbie questions, and generally made Django that much better:
    Paul Bissex <http://e-scribe.com/>
    Paul Collier <paul@paul-collier.com>
    Paul Collins <paul.collins.iii@gmail.com>
    Paul Donohue <django@PaulSD.com>
    Paul Lanier <planier@google.com>
    Paul McLanahan <paul@mclanahan.net>
    Paul McMillan <Paul@McMillan.ws>
    Paulo Poiati <paulogpoiati@gmail.com>
    Paulo Scardine <paulo@scardine.com.br>
    Paul Smith <blinkylights23@gmail.com>
    Pavel Kulikov <kulikovpavel@gmail.com>
    pavithran s <pavithran.s@gmail.com>
    Pavlo Kapyshin <i@93z.org>
    permonik@mesias.brnonet.cz
    Petar Marić <http://www.petarmaric.com/>
    Pete Crosier <pete.crosier@gmail.com>
@ -632,8 +679,11 @@ answer newbie questions, and generally made Django that much better:
    pradeep.gowda@gmail.com
    Preston Holmes <preston@ptone.com>
    Preston Timmons <prestontimmons@gmail.com>
    Priyansh Saxena <askpriyansh@gmail.com>
    Rachel Tobin <rmtobin@me.com>
    Rachel Willmer <http://www.willmer.com/kb/>
    Radek Švarz <http://www.svarz.cz/translate/>
    Raffaele Salmaso <raffaele@salmaso.org>
    Rajesh Dhawan <rajesh.dhawan@gmail.com>
    Ramez Ashraf <ramezashraf@gmail.com>
    Ramin Farajpour Cami <ramin.blackhat@gmail.com>
@ -643,6 +693,7 @@ answer newbie questions, and generally made Django that much better:
    Raphaël Barrois <raphael.barrois@m4x.org>
    Raphael Michel <mail@raphaelmichel.de>
    Raúl Cumplido <raulcumplido@gmail.com>
    Rebecca Smith <rebkwok@gmail.com>
    Remco Wendt <remco.wendt@gmail.com>
    Renaud Parent <renaud.parent@gmail.com>
    Renbi Yu <averybigant@gmail.com>
@ -663,6 +714,7 @@ answer newbie questions, and generally made Django that much better:
    Robert Wittams
    Rob Hudson <http://rob.cogit8.org/>
    Robin Munn <http://www.geekforgod.com/>
    Rodrigo Pinheiro Marques de Araújo <fenrrir@gmail.com>
    Romain Garrigues <romain.garrigues.cs@gmail.com>
    Ronny Haryanto <http://ronny.haryan.to/>
    Ross Poulton <ross@rossp.org>
@ -677,9 +729,11 @@ answer newbie questions, and generally made Django that much better:
    ryankanno
    Ryan Kelly <ryan@rfk.id.au>
    Ryan Niemeyer <https://profiles.google.com/ryan.niemeyer/about>
    Ryan Rubin <ryanmrubin@gmail.com>
    Ryno Mathee <rmathee@gmail.com>
    Sam Newman <http://www.magpiebrain.com/>
    Sander Dijkhuis <sander.dijkhuis@gmail.com>
    Sanket Saurav <sanketsaurav@gmail.com>
    Sarthak Mehrish <sarthakmeh03@gmail.com>
    schwank@gmail.com
    Scot Hacker <shacker@birdhouse.org>
@ -709,19 +763,26 @@ answer newbie questions, and generally made Django that much better:
    Simon Meers <simon@simonmeers.com>
    Simon Williams
    Simon Willison <simon@simonwillison.net>
    Sjoerd Job Postmus
    Slawek Mikula <slawek dot mikula at gmail dot com>
    sloonz <simon.lipp@insa-lyon.fr>
    smurf@smurf.noris.de
    sopel
    Srinivas Reddy Thatiparthy <thatiparthysreenivas@gmail.com>
    Stanislas Guerra <stan@slashdev.me>
    Stanislaus Madueke
    Stanislav Karpov <work@stkrp.ru>
    starrynight <cmorgh@gmail.com>
    Stefan R. Filipek
    Stefane Fermgier <sf@fermigier.com>
    Stefano Rivera <stefano@rivera.za.net>
    Stéphane Raimbault <stephane.raimbault@gmail.com>
    Stephan Jaekel <steph@rdev.info>
    Stephen Burrows <stephen.r.burrows@gmail.com>
    Steven L. Smith (fvox13) <steven@stevenlsmith.com>
    Steven Noorbergen (Xaroth) <xaroth+django@xaroth.nl>
    Stuart Langridge <http://www.kryogenix.org/>
    Subhav Gautam <subhavgautam@yahoo.co.uk>
    Sujay S Kumar <sujay.skumar141295@gmail.com>
    Sune Kirkeby <http://ibofobi.dk/>
    Sung-Jin Hong <serialx.net@gmail.com>
@ -730,6 +791,7 @@ answer newbie questions, and generally made Django that much better:
    Sutrisno Efendi <kangfend@gmail.com>
    Swaroop C H <http://www.swaroopch.info>
    Szilveszter Farkas <szilveszter.farkas@gmail.com>
    Taavi Teska <taaviteska@gmail.com>
    Tai Lee <real.human@mrmachine.net>
    Takashi Matsuo <matsuo.takashi@gmail.com>
    Tareque Hossain <http://www.codexn.com>
@ -738,6 +800,7 @@ answer newbie questions, and generally made Django that much better:
    thebjorn <bp@datakortet.no>
    Thejaswi Puthraya <thejaswi.puthraya@gmail.com>
    Thijs van Dien <thijs@vandien.net>
    Thom Wiggers
    Thomas Chaumeny <t.chaumeny@gmail.com>
    Thomas Güttler <hv@tbz-pariv.de>
    Thomas Kerpe <thomas@kerpe.net>
@ -746,6 +809,7 @@ answer newbie questions, and generally made Django that much better:
    Thomas Stromberg <tstromberg@google.com>
    Thomas Tanner <tanner@gmx.net>
    tibimicu@gmx.net
    Tim Allen <tim@pyphilly.org>
    Tim Graham <timograham@gmail.com>
    Tim Heap <tim@timheap.me>
    Tim Saylor <tim.saylor@gmail.com>
@ -753,14 +817,16 @@ answer newbie questions, and generally made Django that much better:
    Tobias McNulty <http://www.caktusgroup.com/blog>
    tobias@neuyork.de
    Todd O'Bryan <toddobryan@mac.com>
    Tom Christie <tom@tomchristie.com>
    Tom Forbes <tom@tomforb.es>
    Tom Insam
    Tom Tobin
    Tomáš Ehrlich <tomas.ehrlich@gmail.com>
    Tomáš Kopeček <permonik@m6.cz>
    Tom Christie <tom@tomchristie.com>
    Tome Cvitan <tome@cvitan.com>
    Tomek Paczkowski <tomek@hauru.eu>
-    Tom Insam
+    Tomer Chachamu
    Tommy Beadle <tbeadle@gmail.com>
    Tom Tobin
    Tore Lundqvist <tore.lundqvist@gmail.com>
    torne-django@wolfpuppy.org.uk
    Travis Cline <travis.cline@gmail.com>
@ -796,6 +862,7 @@ answer newbie questions, and generally made Django that much better:
    Wiktor Kołodziej <wiktor@pykonik.org>
    Wiley Kestner <wiley.kestner@gmail.com>
    Wiliam Alves de Souza <wiliamsouza83@gmail.com>
    Will Ayd <william.ayd@icloud.com>
    William Schwartz <wkschwartz@gmail.com>
    Will Hardy <django@willhardy.com.au>
    Wilson Miner <wminer@gmail.com>
@ -809,7 +876,9 @@ answer newbie questions, and generally made Django that much better:
    ymasuda@ethercube.com
    Yoong Kang Lim <yoongkang.lim@gmail.com>
    Yusuke Miyazaki <miyazaki.dev@gmail.com>
    Zac Hatfield-Dodds <zac.hatfield.dodds@gmail.com>
    Zachary Voase <zacharyvoase@gmail.com>
    Zach Liu <zachliu@gmail.com>
    Zach Thompson <zthompson47@gmail.com>
    Zain Memon
    Zak Johnson <zakj@nox.cx>
@ -828,7 +897,6 @@ A big THANK YOU goes to:
    Ian Bicking for convincing Adrian to ditch code generation.
-    Mark Pilgrim for "Dive Into Python" (http://www.diveintopython.net,
+    Mark Pilgrim for "Dive Into Python" (https://www.diveinto.org/python3/).
    http://www.diveintopython3.net).
    Guido van Rossum for creating Python.
--- a/9
+++ b/9
@ -1,17 +1,10 @@
 Thanks for downloading Django.
-To install it, make sure you have Python 2.7 or greater installed. Then run
+To install it, make sure you have Python 3.5 or greater installed. Then run
 this command from the command prompt:
    python setup.py install
 If you're upgrading from a previous version, you need to remove it first.
 AS AN ALTERNATIVE, you can just copy the entire "django" directory to Python's
 site-packages directory, which is located wherever your Python installation
 lives. Some places you might check are:
    /usr/lib/python2.7/site-packages (Unix, Python 2.7)
    C:\\PYTHON\site-packages         (Windows)
 For more detailed instructions, see docs/intro/install.txt.
--- a/LICENSE.python
+++ b/LICENSE.python
@ -74,9 +74,9 @@ analyze, test, perform and/or display publicly, prepare derivative works,
 distribute, and otherwise use Python alone or in any derivative version,
 provided, however, that PSF's License Agreement and PSF's notice of copyright,
 i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-2011, 2012, 2013, 2014, 2015, 2016 Python Software Foundation; All Rights
+2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 Python Software Foundation; All
-Reserved" are retained in Python alone or in any derivative version prepared by
+Rights Reserved" are retained in Python alone or in any derivative version
-Licensee.
+prepared by Licensee.
 3. In the event Licensee prepares a derivative work that is based on
 or incorporates Python or any part thereof, and wants to make
--- a/README.rst
+++ b/README.rst
@ -25,8 +25,9 @@ ticket here: https://code.djangoproject.com/newticket
 To get more help:
-* Join the ``#django`` channel on irc.freenode.net. Lots of helpful people hang out
+* Join the ``#django`` channel on irc.freenode.net. Lots of helpful people hang
-  there. Read the archives at http://django-irc-logs.com/.
+  out there. See https://en.wikipedia.org/wiki/Wikipedia:IRC/Tutorial if you're
  new to IRC.
 * Join the django-users mailing list, or read the archives, at
  https://groups.google.com/group/django-users.
--- a/django/init.py
+++ b/django/init.py
@ -1,8 +1,6 @@
 from __future__ import unicode_literals
 from django.utils.version import get_version
-VERSION = (1, 11, 0, 'alpha', 0)
+VERSION = (2, 1, 16, 'alpha', 0)
 __version__ = get_version(VERSION)
@ -16,12 +14,11 @@ def setup(set_prefix=True):
    from django.apps import apps
    from django.conf import settings
    from django.urls import set_script_prefix
    from django.utils.encoding import force_text
    from django.utils.log import configure_logging
    configure_logging(settings.LOGGING_CONFIG, settings.LOGGING)
    if set_prefix:
        set_script_prefix(
-            '/' if settings.FORCE_SCRIPT_NAME is None else force_text(settings.FORCE_SCRIPT_NAME)
+            '/' if settings.FORCE_SCRIPT_NAME is None else settings.FORCE_SCRIPT_NAME
        )
    apps.populate(settings.INSTALLED_APPS)
--- a/django/apps/config.py
+++ b/django/apps/config.py
@ -2,23 +2,20 @@ import os
 from importlib import import_module
 from django.core.exceptions import ImproperlyConfigured
 from django.utils._os import upath
 from django.utils.module_loading import module_has_submodule
 MODELS_MODULE_NAME = 'models'
-class AppConfig(object):
+class AppConfig:
-    """
+    """Class representing a Django application and its configuration."""
    Class representing a Django application and its configuration.
    """
    def __init__(self, app_name, app_module):
-        # Full Python path to the application eg. 'django.contrib.admin'.
+        # Full Python path to the application e.g. 'django.contrib.admin'.
        self.name = app_name
-        # Root module for the application eg. <module 'django.contrib.admin'
+        # Root module for the application e.g. <module 'django.contrib.admin'
-        # from 'django/contrib/admin/__init__.pyc'>.
+        # from 'django/contrib/admin/__init__.py'>.
        self.module = app_module
        # Reference to the Apps registry that holds this AppConfig. Set by the
@ -28,23 +25,22 @@ class AppConfig(object):
        # The following attributes could be defined at the class level in a
        # subclass, hence the test-and-set pattern.
-        # Last component of the Python path to the application eg. 'admin'.
+        # Last component of the Python path to the application e.g. 'admin'.
        # This value must be unique across a Django project.
        if not hasattr(self, 'label'):
            self.label = app_name.rpartition(".")[2]
-        # Human-readable name for the application eg. "Admin".
+        # Human-readable name for the application e.g. "Admin".
        if not hasattr(self, 'verbose_name'):
            self.verbose_name = self.label.title()
-        # Filesystem path to the application directory eg.
+        # Filesystem path to the application directory e.g.
-        # u'/usr/lib/python2.7/dist-packages/django/contrib/admin'. Unicode on
+        # '/path/to/django/contrib/admin'.
        # Python 2 and a str on Python 3.
        if not hasattr(self, 'path'):
            self.path = self._path_from_module(app_module)
-        # Module containing models eg. <module 'django.contrib.admin.models'
+        # Module containing models e.g. <module 'django.contrib.admin.models'
-        # from 'django/contrib/admin/models.pyc'>. Set by import_models().
+        # from 'django/contrib/admin/models.py'>. Set by import_models().
        # None if the application doesn't have a models module.
        self.models_module = None
@ -59,8 +55,8 @@ class AppConfig(object):
        """Attempt to determine app's filesystem path from its module."""
        # See #21874 for extended discussion of the behavior of this method in
        # various cases.
-        # Convert paths to list because Python 3's _NamespacePath does not
+        # Convert paths to list because Python's _NamespacePath doesn't support
-        # support indexing.
+        # indexing.
        paths = list(getattr(module, '__path__', []))
        if len(paths) != 1:
            filename = getattr(module, '__file__', None)
@ -80,7 +76,7 @@ class AppConfig(object):
                "The app module %r has no filesystem location, "
                "you must configure this app with an AppConfig subclass "
                "with a 'path' class attribute." % (module,))
-        return upath(paths[0])
+        return paths[0]
    @classmethod
    def create(cls, entry):
@ -157,9 +153,9 @@ class AppConfig(object):
    def get_model(self, model_name, require_ready=True):
        """
-        Returns the model with the given case-insensitive model_name.
+        Return the model with the given case-insensitive model_name.
-        Raises LookupError if no model exists with this name.
+        Raise LookupError if no model exists with this name.
        """
        if require_ready:
            self.apps.check_models_ready()
@ -173,7 +169,7 @@ class AppConfig(object):
    def get_models(self, include_auto_created=False, include_swapped=False):
        """
-        Returns an iterable of models.
+        Return an iterable of models.
        By default, the following models aren't included:
--- a/django/apps/registry.py
+++ b/django/apps/registry.py
@ -1,3 +1,4 @@
 import functools
 import sys
 import threading
 import warnings
@ -5,16 +6,15 @@ from collections import Counter, OrderedDict, defaultdict
 from functools import partial
 from django.core.exceptions import AppRegistryNotReady, ImproperlyConfigured
 from django.utils import lru_cache
 from .config import AppConfig
-class Apps(object):
+class Apps:
    """
    A registry that stores the configuration of installed applications.
-    It also keeps track of models eg. to provide reverse-relations.
+    It also keeps track of models, e.g. to provide reverse relations.
    """
    def __init__(self, installed_apps=()):
@ -44,7 +44,8 @@ class Apps(object):
        self.apps_ready = self.models_ready = self.ready = False
        # Lock for thread-safe population.
-        self._lock = threading.Lock()
+        self._lock = threading.RLock()
        self.loading = False
        # Maps ("app_label", "modelname") tuples to lists of functions to be
        # called when the corresponding model is ready. Used by this class's
@ -57,11 +58,11 @@ class Apps(object):
    def populate(self, installed_apps=None):
        """
-        Loads application configurations and models.
+        Load application configurations and models.
-        This method imports each application module and then each model module.
+        Import each application module and then each model module.
-        It is thread safe and idempotent, but not reentrant.
+        It is thread-safe and idempotent, but not reentrant.
        """
        if self.ready:
            return
@ -72,10 +73,13 @@ class Apps(object):
            if self.ready:
                return
-            # app_config should be pristine, otherwise the code below won't
+            # An RLock prevents other threads from entering this section. The
-            # guarantee that the order matches the order in INSTALLED_APPS.
+            # compare and set operation below is atomic.
-            if self.app_configs:
+            if self.loading:
                # Prevent reentrant calls to avoid running AppConfig.ready()
                # methods twice.
                raise RuntimeError("populate() isn't reentrant")
            self.loading = True
            # Phase 1: initialize app configs and import app modules.
            for entry in installed_apps:
@ -118,31 +122,30 @@ class Apps(object):
            self.ready = True
    def check_apps_ready(self):
-        """
+        """Raise an exception if all apps haven't been imported yet."""
        Raises an exception if all apps haven't been imported yet.
        """
        if not self.apps_ready:
            from django.conf import settings
            # If "not ready" is due to unconfigured settings, accessing
            # INSTALLED_APPS raises a more helpful ImproperlyConfigured
            # exception.
            settings.INSTALLED_APPS
            raise AppRegistryNotReady("Apps aren't loaded yet.")
    def check_models_ready(self):
-        """
+        """Raise an exception if all models haven't been imported yet."""
        Raises an exception if all models haven't been imported yet.
        """
        if not self.models_ready:
            raise AppRegistryNotReady("Models aren't loaded yet.")
    def get_app_configs(self):
-        """
+        """Import applications and return an iterable of app configs."""
        Imports applications and returns an iterable of app configs.
        """
        self.check_apps_ready()
        return self.app_configs.values()
    def get_app_config(self, app_label):
        """
-        Imports applications and returns an app config for the given label.
+        Import applications and returns an app config for the given label.
-        Raises LookupError if no application exists with this label.
+        Raise LookupError if no application exists with this label.
        """
        self.check_apps_ready()
        try:
@ -156,10 +159,10 @@ class Apps(object):
            raise LookupError(message)
    # This method is performance-critical at least for Django's test suite.
-    @lru_cache.lru_cache(maxsize=None)
+    @functools.lru_cache(maxsize=None)
    def get_models(self, include_auto_created=False, include_swapped=False):
        """
-        Returns a list of all installed models.
+        Return a list of all installed models.
        By default, the following models aren't included:
@ -178,15 +181,14 @@ class Apps(object):
    def get_model(self, app_label, model_name=None, require_ready=True):
        """
-        Returns the model matching the given app_label and model_name.
+        Return the model matching the given app_label and model_name.
-        As a shortcut, this function also accepts a single argument in the
+        As a shortcut, app_label may be in the form <app_label>.<model_name>.
        form <app_label>.<model_name>.
        model_name is case-insensitive.
-        Raises LookupError if no application exists with this label, or no
+        Raise LookupError if no application exists with this label, or no
-        model exists with this name in the application. Raises ValueError if
+        model exists with this name in the application. Raise ValueError if
        called with a single argument that doesn't contain exactly one dot.
        """
        if require_ready:
@ -228,9 +230,9 @@ class Apps(object):
    def is_installed(self, app_name):
        """
-        Checks whether an application with this name exists in the registry.
+        Check whether an application with this name exists in the registry.
-        app_name is the full name of the app eg. 'django.contrib.admin'.
+        app_name is the full name of the app e.g. 'django.contrib.admin'.
        """
        self.check_apps_ready()
        return any(ac.name == app_name for ac in self.app_configs.values())
@ -241,8 +243,8 @@ class Apps(object):
        object_name is the dotted Python path to the object.
-        Returns the app config for the inner application in case of nesting.
+        Return the app config for the inner application in case of nesting.
-        Returns None if the object isn't in any registered app config.
+        Return None if the object isn't in any registered app config.
        """
        self.check_apps_ready()
        candidates = []
@ -268,7 +270,7 @@ class Apps(object):
                "Model '%s.%s' not registered." % (app_label, model_name))
        return model
-    @lru_cache.lru_cache(maxsize=None)
+    @functools.lru_cache(maxsize=None)
    def get_swappable_settings_name(self, to_string):
        """
        For a given model string (e.g. "auth.User"), return the name of the
@ -292,7 +294,7 @@ class Apps(object):
    def set_available_apps(self, available):
        """
-        Restricts the set of installed apps used by get_app_config[s].
+        Restrict the set of installed apps used by get_app_config[s].
        available must be an iterable of application names.
@ -300,10 +302,10 @@ class Apps(object):
        Primarily used for performance optimization in TransactionTestCase.
-        This method is safe is the sense that it doesn't trigger any imports.
+        This method is safe in the sense that it doesn't trigger any imports.
        """
        available = set(available)
-        installed = set(app_config.name for app_config in self.get_app_configs())
+        installed = {app_config.name for app_config in self.get_app_configs()}
        if not available.issubset(installed):
            raise ValueError(
                "Available apps isn't a subset of installed apps, extra apps: %s"
@ -318,15 +320,13 @@ class Apps(object):
        self.clear_cache()
    def unset_available_apps(self):
-        """
+        """Cancel a previous call to set_available_apps()."""
        Cancels a previous call to set_available_apps().
        """
        self.app_configs = self.stored_app_configs.pop()
        self.clear_cache()
    def set_installed_apps(self, installed):
        """
-        Enables a different set of installed apps for get_app_config[s].
+        Enable a different set of installed apps for get_app_config[s].
        installed must be an iterable in the same format as INSTALLED_APPS.
@ -338,28 +338,26 @@ class Apps(object):
        This method may trigger new imports, which may add new models to the
        registry of all imported models. They will stay in the registry even
        after unset_installed_apps(). Since it isn't possible to replay
-        imports safely (eg. that could lead to registering listeners twice),
+        imports safely (e.g. that could lead to registering listeners twice),
        models are registered when they're imported and never removed.
        """
        if not self.ready:
            raise AppRegistryNotReady("App registry isn't ready yet.")
        self.stored_app_configs.append(self.app_configs)
        self.app_configs = OrderedDict()
-        self.apps_ready = self.models_ready = self.ready = False
+        self.apps_ready = self.models_ready = self.loading = self.ready = False
        self.clear_cache()
        self.populate(installed)
    def unset_installed_apps(self):
-        """
+        """Cancel a previous call to set_installed_apps()."""
        Cancels a previous call to set_installed_apps().
        """
        self.app_configs = self.stored_app_configs.pop()
        self.apps_ready = self.models_ready = self.ready = True
        self.clear_cache()
    def clear_cache(self):
        """
-        Clears all internal caches, for methods that alter the app registry.
+        Clear all internal caches, for methods that alter the app registry.
        This is mostly used in tests.
        """
@ -415,7 +413,7 @@ class Apps(object):
    def do_pending_operations(self, model):
        """
        Take a newly-prepared model and pass it to each function waiting for
-        it. This is called at the very end of `Apps.register_model()`.
+        it. This is called at the very end of Apps.register_model().
        """
        key = model._meta.app_label, model._meta.model_name
        for function in self._pending_operations.pop(key, []):
--- a/django/conf/init.py
+++ b/django/conf/init.py
@ -1,17 +1,20 @@
 """
 Settings and configuration for Django.
-Values will be read from the module specified by the DJANGO_SETTINGS_MODULE environment
+Read values from the module specified by the DJANGO_SETTINGS_MODULE environment
-variable, and then from django.conf.global_settings; see the global settings file for
+variable, and then from django.conf.global_settings; see the global_settings.py
-a list of all possible variables.
+for a list of all possible variables.
 """
 import importlib
 import os
 import time
 import warnings
 from pathlib import Path
 from django.conf import global_settings
 from django.core.exceptions import ImproperlyConfigured
 from django.utils.deprecation import RemovedInDjango30Warning
 from django.utils.functional import LazyObject, empty
 ENVIRONMENT_VARIABLE = "DJANGO_SETTINGS_MODULE"
@ -26,8 +29,8 @@ class LazySettings(LazyObject):
    def _setup(self, name=None):
        """
        Load the settings module pointed to by the environment variable. This
-        is used the first time we need any settings at all, if the user has not
+        is used the first time settings are needed, if the user hasn't
-        previously configured the settings manually.
+        configured settings manually.
        """
        settings_module = os.environ.get(ENVIRONMENT_VARIABLE)
        if not settings_module:
@ -49,9 +52,7 @@ class LazySettings(LazyObject):
        }
    def __getattr__(self, name):
-        """
+        """Return the value of a setting and cache it in self.__dict__."""
        Return the value of a setting and cache it in self.__dict__.
        """
        if self._wrapped is empty:
            self._setup(name)
        val = getattr(self._wrapped, name)
@ -67,13 +68,11 @@ class LazySettings(LazyObject):
            self.__dict__.clear()
        else:
            self.__dict__.pop(name, None)
-        super(LazySettings, self).__setattr__(name, value)
+        super().__setattr__(name, value)
    def __delattr__(self, name):
-        """
+        """Delete a setting and clear it from cache if needed."""
-        Delete a setting and clear it from cache if needed.
+        super().__delattr__(name)
        """
        super(LazySettings, self).__delattr__(name)
        self.__dict__.pop(name, None)
    def configure(self, default_settings=global_settings, **options):
@ -91,13 +90,11 @@ class LazySettings(LazyObject):
    @property
    def configured(self):
-        """
+        """Return True if the settings have already been configured."""
        Returns True if the settings have already been configured.
        """
        return self._wrapped is not empty
-class Settings(object):
+class Settings:
    def __init__(self, settings_module):
        # update this dict from global settings (but only for ALL_CAPS settings)
        for setting in dir(global_settings):
@ -128,12 +125,15 @@ class Settings(object):
        if not self.SECRET_KEY:
            raise ImproperlyConfigured("The SECRET_KEY setting must not be empty.")
        if self.is_overridden('DEFAULT_CONTENT_TYPE'):
            warnings.warn('The DEFAULT_CONTENT_TYPE setting is deprecated.', RemovedInDjango30Warning)
        if hasattr(time, 'tzset') and self.TIME_ZONE:
            # When we can, attempt to validate the timezone. If we can't find
            # this file, no check happens and it's harmless.
-            zoneinfo_root = '/usr/share/zoneinfo'
+            zoneinfo_root = Path('/usr/share/zoneinfo')
-            if (os.path.exists(zoneinfo_root) and not
+            zone_info_file = zoneinfo_root.joinpath(*self.TIME_ZONE.split('/'))
-                    os.path.exists(os.path.join(zoneinfo_root, *(self.TIME_ZONE.split('/'))))):
+            if zoneinfo_root.exists() and not zone_info_file.exists():
                raise ValueError("Incorrect timezone setting: %s" % self.TIME_ZONE)
            # Move the time zone info into os.environ. See ticket #2315 for why
            # we don't do this unconditionally (breaks Windows).
@ -150,10 +150,8 @@ class Settings(object):
        }
-class UserSettingsHolder(object):
+class UserSettingsHolder:
-    """
+    """Holder for user configured settings."""
    Holder for user configured settings.
    """
    # SETTINGS_MODULE doesn't make much sense in the manually configured
    # (standalone) case.
    SETTINGS_MODULE = None
@ -173,12 +171,14 @@ class UserSettingsHolder(object):
    def __setattr__(self, name, value):
        self._deleted.discard(name)
-        super(UserSettingsHolder, self).__setattr__(name, value)
+        if name == 'DEFAULT_CONTENT_TYPE':
            warnings.warn('The DEFAULT_CONTENT_TYPE setting is deprecated.', RemovedInDjango30Warning)
        super().__setattr__(name, value)
    def __delattr__(self, name):
        self._deleted.add(name)
        if hasattr(self, name):
-            super(UserSettingsHolder, self).__delattr__(name)
+            super().__delattr__(name)
    def __dir__(self):
        return sorted(
@ -190,7 +190,7 @@ class UserSettingsHolder(object):
        deleted = (setting in self._deleted)
        set_locally = (setting in self.__dict__)
        set_on_default = getattr(self.default_settings, 'is_overridden', lambda s: False)(setting)
-        return (deleted or set_locally or set_on_default)
+        return deleted or set_locally or set_on_default
    def __repr__(self):
        return '<%(cls)s>' % {
--- a/django/conf/app_template/admin.py-tpl
+++ b/django/conf/app_template/admin.py-tpl
@ -1,3 +1,3 @@
-{{ unicode_literals }}from django.contrib import admin
+from django.contrib import admin
 # Register your models here.
--- a/django/conf/app_template/apps.py-tpl
+++ b/django/conf/app_template/apps.py-tpl
@ -1,4 +1,4 @@
-{{ unicode_literals }}from django.apps import AppConfig
+from django.apps import AppConfig
 class {{ camel_case_app_name }}Config(AppConfig):
--- a/django/conf/app_template/models.py-tpl
+++ b/django/conf/app_template/models.py-tpl
@ -1,3 +1,3 @@
-{{ unicode_literals }}from django.db import models
+from django.db import models
 # Create your models here.
--- a/django/conf/app_template/tests.py-tpl
+++ b/django/conf/app_template/tests.py-tpl
@ -1,3 +1,3 @@
-{{ unicode_literals }}from django.test import TestCase
+from django.test import TestCase
 # Create your tests here.
--- a/django/conf/app_template/views.py-tpl
+++ b/django/conf/app_template/views.py-tpl
@ -1,3 +1,3 @@
-{{ unicode_literals }}from django.shortcuts import render
+from django.shortcuts import render
 # Create your views here.
--- a/django/conf/global_settings.py
+++ b/django/conf/global_settings.py
@ -1,9 +1,7 @@
 # -*- coding: utf-8 -*-
 """
 Default Django settings. Override these with settings in the module pointed to
 by the DJANGO_SETTINGS_MODULE environment variable.
 """
 from __future__ import unicode_literals
 # This is defined here as a do-nothing function because we can't import
@ -23,11 +21,6 @@ DEBUG = False
 # on a live site.
 DEBUG_PROPAGATE_EXCEPTIONS = False
 # Whether to use the "ETag" header. This saves bandwidth but slows down performance.
 # Deprecated (RemovedInDjango21Warning) in favor of ConditionalGetMiddleware
 # which sets the ETag regardless of this setting.
 USE_ETAGS = False
 # People who get code error notifications.
 # In the format [('Full Name', 'email@example.com'), ('Full Name', 'anotheremail@example.com')]
 ADMINS = []
@ -103,6 +96,7 @@ LANGUAGES = [
    ('it', gettext_noop('Italian')),
    ('ja', gettext_noop('Japanese')),
    ('ka', gettext_noop('Georgian')),
    ('kab', gettext_noop('Kabyle')),
    ('kk', gettext_noop('Kazakh')),
    ('km', gettext_noop('Khmer')),
    ('kn', gettext_noop('Kannada')),
@ -244,7 +238,7 @@ FORCE_SCRIPT_NAME = None
 #         re.compile(r'^NaverBot.*'),
 #         re.compile(r'^EmailSiphon.*'),
 #         re.compile(r'^SiteSucker.*'),
-#         re.compile(r'^sohu-search')
+#         re.compile(r'^sohu-search'),
 #     ]
 DISALLOWED_USER_AGENTS = []
@ -255,9 +249,9 @@ ABSOLUTE_URL_OVERRIDES = {}
 #    import re
 #    IGNORABLE_404_URLS = [
 #        re.compile(r'^/apple-touch-icon.*\.png$'),
-#        re.compile(r'^/favicon.ico$),
+#        re.compile(r'^/favicon.ico$'),
-#        re.compile(r'^/robots.txt$),
+#        re.compile(r'^/robots.txt$'),
-#        re.compile(r'^/phpmyadmin/),
+#        re.compile(r'^/phpmyadmin/'),
 #        re.compile(r'\.(cgi|php|pl)$'),
 #    ]
 IGNORABLE_404_URLS = []
@ -310,12 +304,12 @@ DATA_UPLOAD_MAX_NUMBER_FIELDS = 1000
 FILE_UPLOAD_TEMP_DIR = None
 # The numeric mode to set newly-uploaded files to. The value should be a mode
-# you'd pass directly to os.chmod; see https://docs.python.org/3/library/os.html#files-and-directories.
+# you'd pass directly to os.chmod; see https://docs.python.org/library/os.html#files-and-directories.
 FILE_UPLOAD_PERMISSIONS = None
 # The numeric mode to assign to newly-created directories, when uploading files.
 # The value should be a mode as you'd pass to os.chmod;
-# see https://docs.python.org/3/library/os.html#files-and-directories.
+# see https://docs.python.org/library/os.html#files-and-directories.
 FILE_UPLOAD_DIRECTORY_PERMISSIONS = None
 # Python module path where user will place custom format definition.
@ -325,39 +319,39 @@ FILE_UPLOAD_DIRECTORY_PERMISSIONS = None
 FORMAT_MODULE_PATH = None
 # Default formatting for date objects. See all available format strings here:
-# http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
+# https://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
 DATE_FORMAT = 'N j, Y'
 # Default formatting for datetime objects. See all available format strings here:
-# http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
+# https://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
 DATETIME_FORMAT = 'N j, Y, P'
 # Default formatting for time objects. See all available format strings here:
-# http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
+# https://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
 TIME_FORMAT = 'P'
 # Default formatting for date objects when only the year and month are relevant.
 # See all available format strings here:
-# http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
+# https://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
 YEAR_MONTH_FORMAT = 'F Y'
 # Default formatting for date objects when only the month and day are relevant.
 # See all available format strings here:
-# http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
+# https://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
 MONTH_DAY_FORMAT = 'F j'
 # Default short formatting for date objects. See all available format strings here:
-# http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
+# https://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
 SHORT_DATE_FORMAT = 'm/d/Y'
 # Default short formatting for datetime objects.
 # See all available format strings here:
-# http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
+# https://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
 SHORT_DATETIME_FORMAT = 'm/d/Y P'
 # Default formats to be used when parsing dates from input boxes, in order
 # See all available format string here:
-# http://docs.python.org/library/datetime.html#strftime-behavior
+# https://docs.python.org/library/datetime.html#strftime-behavior
 # * Note that these format strings are different from the ones to display dates
 DATE_INPUT_FORMATS = [
    '%Y-%m-%d', '%m/%d/%Y', '%m/%d/%y',  # '2006-10-25', '10/25/2006', '10/25/06'
@ -369,7 +363,7 @@ DATE_INPUT_FORMATS = [
 # Default formats to be used when parsing times from input boxes, in order
 # See all available format string here:
-# http://docs.python.org/library/datetime.html#strftime-behavior
+# https://docs.python.org/library/datetime.html#strftime-behavior
 # * Note that these format strings are different from the ones to display dates
 TIME_INPUT_FORMATS = [
    '%H:%M:%S',     # '14:30:59'
@ -380,7 +374,7 @@ TIME_INPUT_FORMATS = [
 # Default formats to be used when parsing dates and times from input boxes,
 # in order
 # See all available format string here:
-# http://docs.python.org/library/datetime.html#strftime-behavior
+# https://docs.python.org/library/datetime.html#strftime-behavior
 # * Note that these format strings are different from the ones to display dates
 DATETIME_INPUT_FORMATS = [
    '%Y-%m-%d %H:%M:%S',     # '2006-10-25 14:30:59'
@ -447,12 +441,7 @@ SECURE_PROXY_SSL_HEADER = None
 # List of middleware to use. Order is important; in the request phase, these
 # middleware will be applied in the order given, and in the response
 # phase the middleware will be applied in reverse order.
-MIDDLEWARE_CLASSES = [
+MIDDLEWARE = []
    'django.middleware.common.CommonMiddleware',
    'django.middleware.csrf.CsrfViewMiddleware',
 ]
 MIDDLEWARE = None
 ############
 # SESSIONS #
@ -464,7 +453,7 @@ SESSION_CACHE_ALIAS = 'default'
 SESSION_COOKIE_NAME = 'sessionid'
 # Age of cookie, in seconds (default: 2 weeks).
 SESSION_COOKIE_AGE = 60 * 60 * 24 * 7 * 2
-# A string like ".example.com", or None for standard domain cookie.
+# A string like "example.com", or None for standard domain cookie.
 SESSION_COOKIE_DOMAIN = None
 # Whether the session cookie should be secure (https:// only).
 SESSION_COOKIE_SECURE = False
@ -472,6 +461,9 @@ SESSION_COOKIE_SECURE = False
 SESSION_COOKIE_PATH = '/'
 # Whether to use the non-RFC standard httpOnly flag (IE, FF3+, others)
 SESSION_COOKIE_HTTPONLY = True
 # Whether to set the flag restricting cookie leaks on cross-site requests.
 # This can be 'Lax', 'Strict', or None to disable the flag.
 SESSION_COOKIE_SAMESITE = 'Lax'
 # Whether to save the session data on every request.
 SESSION_SAVE_EVERY_REQUEST = False
 # Whether a user's session cookie expires when the Web browser is closed.
@ -523,7 +515,6 @@ PASSWORD_HASHERS = [
    'django.contrib.auth.hashers.PBKDF2SHA1PasswordHasher',
    'django.contrib.auth.hashers.Argon2PasswordHasher',
    'django.contrib.auth.hashers.BCryptSHA256PasswordHasher',
    'django.contrib.auth.hashers.BCryptPasswordHasher',
 ]
 AUTH_PASSWORD_VALIDATORS = []
@ -549,6 +540,7 @@ CSRF_COOKIE_DOMAIN = None
 CSRF_COOKIE_PATH = '/'
 CSRF_COOKIE_SECURE = False
 CSRF_COOKIE_HTTPONLY = False
 CSRF_COOKIE_SAMESITE = 'Lax'
 CSRF_HEADER_NAME = 'HTTP_X_CSRFTOKEN'
 CSRF_TRUSTED_ORIGINS = []
 CSRF_USE_SESSIONS = False
--- a/django/conf/locale/init.py
+++ b/django/conf/locale/init.py
@ -1,6 +1,3 @@
 # -*- encoding: utf-8 -*-
 from __future__ import unicode_literals
 """
 LANG_INFO is a dictionary structure to provide meta information about languages.
@ -293,6 +290,12 @@ LANG_INFO = {
        'name': 'Georgian',
        'name_local': 'ქართული',
    },
    'kab': {
        'bidi': False,
        'code': 'kab',
        'name': 'Kabyle',
        'name_local': 'taqbaylit',
    },
    'kk': {
        'bidi': False,
        'code': 'kk',
--- a/django/conf/locale/af/LC_MESSAGES/django.mo
+++ b/django/conf/locale/af/LC_MESSAGES/django.mo
--- a/django/conf/locale/af/LC_MESSAGES/django.po
+++ b/django/conf/locale/af/LC_MESSAGES/django.po
@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-29 20:57+0200\n"
+"POT-Creation-Date: 2017-11-15 16:15+0100\n"
-"PO-Revision-Date: 2016-06-30 08:31+0000\n"
+"PO-Revision-Date: 2017-11-16 01:13+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
 "Language-Team: Afrikaans (http://www.transifex.com/django/django/language/"
 "af/)\n"
@ -294,6 +294,15 @@ msgstr ""
 msgid "Syndication"
 msgstr "Sindikasie"
 msgid "That page number is not an integer"
 msgstr ""
 msgid "That page number is less than 1"
 msgstr ""
 msgid "That page contains no results"
 msgstr ""
 msgid "Enter a valid value."
 msgstr "Sleutel 'n geldige waarde in."
@ -306,6 +315,7 @@ msgstr "Sleutel 'n geldige heelgetal in."
 msgid "Enter a valid email address."
 msgstr "Sleutel 'n geldige e-pos adres in."
 #. Translators: "letters" means latin letters: a-z and A-Z.
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
@ -394,6 +404,15 @@ msgstr[0] ""
 msgstr[1] ""
 "Maak seker dat daar nie meer as %(max)s syfers voor die desimale punt is nie."
 #, python-format
 msgid ""
 "File extension '%(extension)s' is not allowed. Allowed extensions are: "
 "'%(allowed_extensions)s'."
 msgstr ""
 msgid "Null characters are not allowed."
 msgstr ""
 msgid "and"
 msgstr "en"
@ -723,9 +742,8 @@ msgstr ""
 msgid "Please correct the duplicate values below."
 msgstr "Korrigeer die dubbele waardes hieronder."
-msgid "The inline foreign key did not match the parent instance primary key."
+msgid "The inline value did not match the parent instance."
 msgstr ""
 "Die inlyn vreemde sleutel stem nie ooreen met die ouer primêre sleutel."
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr ""
@ -733,8 +751,8 @@ msgstr ""
 "nie."
 #, python-format
-msgid "\"%(pk)s\" is not a valid value for a primary key."
+msgid "\"%(pk)s\" is not a valid value."
-msgstr "\"%(pk)s\" is nie 'n geldige waarde vir 'n primêre sleutel nie."
+msgstr ""
 #, python-format
 msgid ""
@ -744,15 +762,15 @@ msgstr ""
 "%(datetime)s kon nie in tydsone %(current_timezone)s vertolk word nie; dit "
 "mag dubbelsinnig wees, of nie bestaan nie."
 msgid "Clear"
 msgstr "Maak skoon"
 msgid "Currently"
 msgstr "Tans"
 msgid "Change"
 msgstr "Verander"
 msgid "Clear"
 msgstr "Maak skoon"
 msgid "Unknown"
 msgstr "Onbekend"
@ -1092,6 +1110,14 @@ msgid ""
 "origin' requests."
 msgstr ""
 msgid ""
 "If you are using the <meta name=\"referrer\" content=\"no-referrer\"> tag or "
 "including the 'Referrer-Policy: no-referrer' header, please remove them. The "
 "CSRF protection requires the 'Referer' header to do strict referer checking. "
 "If you're concerned about privacy, use alternatives like <a rel=\"noreferrer"
 "\" ...> for links to third-party sites."
 msgstr ""
 msgid ""
 "You are seeing this message because this site requires a CSRF cookie when "
 "submitting forms. This cookie is required for security reasons, to ensure "
@ -1106,28 +1132,12 @@ msgstr ""
 msgid "More information is available with DEBUG=True."
 msgstr "Meer inligting is beskikbaar met DEBUG=True."
 msgid "Welcome to Django"
 msgstr ""
 msgid "It worked!"
 msgstr ""
 msgid "Congratulations on your first Django-powered page."
 msgstr ""
 msgid ""
 "Of course, you haven't actually done any work yet. Next, start your first "
 "app by running <code>python manage.py startapp [app_label]</code>."
 msgstr ""
 msgid ""
 "You're seeing this message because you have <code>DEBUG = True</code> in "
 "your Django settings file and you haven't configured any URLs. Get to work!"
 msgstr ""
 msgid "No year specified"
 msgstr "Geen jaar gespesifiseer"
 msgid "Date out of range"
 msgstr ""
 msgid "No month specified"
 msgstr "Geen maand gespesifiseer"
@ -1181,3 +1191,41 @@ msgstr "\"%(path)s\" bestaan nie"
 #, python-format
 msgid "Index of %(directory)s"
 msgstr "Indeks van %(directory)s"
 msgid "Django: the Web framework for perfectionists with deadlines."
 msgstr ""
 #, python-format
 msgid ""
 "View <a href=\"https://docs.djangoproject.com/en/%(version)s/releases/\" "
 "target=\"_blank\" rel=\"noopener\">release notes</a> for Django %(version)s"
 msgstr ""
 msgid "The install worked successfully! Congratulations!"
 msgstr ""
 #, python-format
 msgid ""
 "You are seeing this page because <a href=\"https://docs.djangoproject.com/en/"
 "%(version)s/ref/settings/#debug\" target=\"_blank\" rel=\"noopener"
 "\">DEBUG=True</a> is in your settings file and you have not configured any "
 "URLs."
 msgstr ""
 msgid "Django Documentation"
 msgstr ""
 msgid "Topics, references, &amp; how-to's"
 msgstr ""
 msgid "Tutorial: A Polling App"
 msgstr ""
 msgid "Get started with Django"
 msgstr ""
 msgid "Django Community"
 msgstr ""
 msgid "Connect, get help, or contribute"
 msgstr ""
--- a/django/conf/locale/ar/LC_MESSAGES/django.mo
+++ b/django/conf/locale/ar/LC_MESSAGES/django.mo
--- a/django/conf/locale/ar/LC_MESSAGES/django.po
+++ b/django/conf/locale/ar/LC_MESSAGES/django.po
@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-29 20:57+0200\n"
+"POT-Creation-Date: 2017-11-15 16:15+0100\n"
-"PO-Revision-Date: 2016-07-18 08:41+0000\n"
+"PO-Revision-Date: 2017-11-16 01:13+0000\n"
-"Last-Translator: Bashar Al-Abdulhadi\n"
+"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
 "Language-Team: Arabic (http://www.transifex.com/django/django/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@ -297,6 +297,15 @@ msgstr "الملفات الثابتة"
 msgid "Syndication"
 msgstr "توظيف النشر"
 msgid "That page number is not an integer"
 msgstr ""
 msgid "That page number is less than 1"
 msgstr ""
 msgid "That page contains no results"
 msgstr ""
 msgid "Enter a valid value."
 msgstr "أدخل قيمة صحيحة."
@ -309,6 +318,7 @@ msgstr "أدخل رقم صالح."
 msgid "Enter a valid email address."
 msgstr "أدخل عنوان بريد إلكتروني صحيح."
 #. Translators: "letters" means latin letters: a-z and A-Z.
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr "أدخل اختصار 'slug' صحيح يتكوّن من أحرف، أرقام، شرطات سفلية وعاديّة."
@ -426,6 +436,15 @@ msgstr[3] "تحقق من أن تدخل %(max)s أرقام قبل الفاصل ا
 msgstr[4] "تحقق من أن تدخل %(max)s أرقام قبل الفاصل العشري لا أكثر."
 msgstr[5] "تحقق من أن تدخل %(max)s أرقام قبل الفاصل العشري لا أكثر."
 #, python-format
 msgid ""
 "File extension '%(extension)s' is not allowed. Allowed extensions are: "
 "'%(allowed_extensions)s'."
 msgstr ""
 msgid "Null characters are not allowed."
 msgstr ""
 msgid "and"
 msgstr "و"
@ -772,15 +791,15 @@ msgstr ""
 msgid "Please correct the duplicate values below."
 msgstr "رجاءً صحّح القيم المُكرّرة أدناه."
-msgid "The inline foreign key did not match the parent instance primary key."
+msgid "The inline value did not match the parent instance."
-msgstr "حقل foreign key المحدد لا يطابق الحقل الرئيسي له."
+msgstr ""
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr "انتق خياراً صحيحاً. اختيارك ليس أحد الخيارات المتاحة."
 #, python-format
-msgid "\"%(pk)s\" is not a valid value for a primary key."
+msgid "\"%(pk)s\" is not a valid value."
-msgstr "\"%(pk)s\" قيمة غير صحيحة للرقم المرجعي."
+msgstr ""
 #, python-format
 msgid ""
@ -790,15 +809,15 @@ msgstr ""
 "%(datetime)s لا يمكن تفسيرها في المنطقة الزمنية %(current_timezone)s; قد "
 "تكون غامضة أو أنها غير موجودة."
 msgid "Clear"
 msgstr "تفريغ"
 msgid "Currently"
 msgstr "حالياً"
 msgid "Change"
 msgstr "عدّل"
 msgid "Clear"
 msgstr "تفريغ"
 msgid "Unknown"
 msgstr "مجهول"
@ -1172,6 +1191,14 @@ msgstr ""
 "بالنسبة لهذا الموقع، أو لاتصالات HTTPS، أو للطلبات من نفس المنشأ 'same-"
 "origin'."
 msgid ""
 "If you are using the <meta name=\"referrer\" content=\"no-referrer\"> tag or "
 "including the 'Referrer-Policy: no-referrer' header, please remove them. The "
 "CSRF protection requires the 'Referer' header to do strict referer checking. "
 "If you're concerned about privacy, use alternatives like <a rel=\"noreferrer"
 "\" ...> for links to third-party sites."
 msgstr ""
 msgid ""
 "You are seeing this message because this site requires a CSRF cookie when "
 "submitting forms. This cookie is required for security reasons, to ensure "
@ -1191,33 +1218,12 @@ msgstr ""
 msgid "More information is available with DEBUG=True."
 msgstr "يتوفر مزيد من المعلومات عند ضبط الخيار DEBUG=True."
 msgid "Welcome to Django"
 msgstr "مرحبا بك في جانغو"
 msgid "It worked!"
 msgstr "أنه فعّال!"
 msgid "Congratulations on your first Django-powered page."
 msgstr "تهانينا على صفحتك الأولى بدعم من جانغو."
 msgid ""
 "Of course, you haven't actually done any work yet. Next, start your first "
 "app by running <code>python manage.py startapp [app_label]</code>."
 msgstr ""
 "وبطبيعة الحال، لم يتم عمل أي عمل فعلي حتى الآن. الخطوة التالية هي تشغيل أول "
 "تطبيق لك عبر الأمر التالي\n"
 " <code>python manage.py startapp [app_label]</code> ."
 msgid ""
 "You're seeing this message because you have <code>DEBUG = True</code> in "
 "your Django settings file and you haven't configured any URLs. Get to work!"
 msgstr ""
 "تظهر لك هذه الرسالة لأنه لديك <code>DEBUG = True</code> في ملف إعدادات جانغو "
 "الخاص بك، و ايضا لعدم تكوين أي عناوين المواقع. إبدأ العمل!"
 msgid "No year specified"
 msgstr "لم تحدد السنة"
 msgid "Date out of range"
 msgstr ""
 msgid "No month specified"
 msgstr "لم تحدد الشهر"
@ -1268,3 +1274,41 @@ msgstr "المسار \"%(path)s\" غير موجود."
 #, python-format
 msgid "Index of %(directory)s"
 msgstr "فهرس لـ %(directory)s"
 msgid "Django: the Web framework for perfectionists with deadlines."
 msgstr ""
 #, python-format
 msgid ""
 "View <a href=\"https://docs.djangoproject.com/en/%(version)s/releases/\" "
 "target=\"_blank\" rel=\"noopener\">release notes</a> for Django %(version)s"
 msgstr ""
 msgid "The install worked successfully! Congratulations!"
 msgstr ""
 #, python-format
 msgid ""
 "You are seeing this page because <a href=\"https://docs.djangoproject.com/en/"
 "%(version)s/ref/settings/#debug\" target=\"_blank\" rel=\"noopener"
 "\">DEBUG=True</a> is in your settings file and you have not configured any "
 "URLs."
 msgstr ""
 msgid "Django Documentation"
 msgstr ""
 msgid "Topics, references, &amp; how-to's"
 msgstr ""
 msgid "Tutorial: A Polling App"
 msgstr ""
 msgid "Get started with Django"
 msgstr ""
 msgid "Django Community"
 msgstr ""
 msgid "Connect, get help, or contribute"
 msgstr ""
--- a/django/conf/locale/ar/formats.py
+++ b/django/conf/locale/ar/formats.py
@ -1,10 +1,7 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
 from __future__ import unicode_literals
 # The *_FORMAT strings use the Django date format syntax,
-# see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
+# see https://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
 DATE_FORMAT = 'j F، Y'
 TIME_FORMAT = 'g:i A'
 # DATETIME_FORMAT =
@ -15,7 +12,7 @@ SHORT_DATE_FORMAT = 'd‏/m‏/Y'
 # FIRST_DAY_OF_WEEK =
 # The *_INPUT_FORMATS strings use the Python strftime format syntax,
-# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
+# see https://docs.python.org/library/datetime.html#strftime-strptime-behavior
 # DATE_INPUT_FORMATS =
 # TIME_INPUT_FORMATS =
 # DATETIME_INPUT_FORMATS =
--- a/django/conf/locale/ast/LC_MESSAGES/django.mo
+++ b/django/conf/locale/ast/LC_MESSAGES/django.mo
--- a/django/conf/locale/ast/LC_MESSAGES/django.po
+++ b/django/conf/locale/ast/LC_MESSAGES/django.po
@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-29 20:57+0200\n"
+"POT-Creation-Date: 2017-11-15 16:15+0100\n"
-"PO-Revision-Date: 2016-06-30 08:31+0000\n"
+"PO-Revision-Date: 2017-11-16 01:13+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
 "Language-Team: Asturian (http://www.transifex.com/django/django/language/"
 "ast/)\n"
@ -293,6 +293,15 @@ msgstr ""
 msgid "Syndication"
 msgstr ""
 msgid "That page number is not an integer"
 msgstr ""
 msgid "That page number is less than 1"
 msgstr ""
 msgid "That page contains no results"
 msgstr ""
 msgid "Enter a valid value."
 msgstr "Introduz un valor válidu."
@ -305,6 +314,7 @@ msgstr ""
 msgid "Enter a valid email address."
 msgstr "Introduz una direición de corréu válida."
 #. Translators: "letters" means latin letters: a-z and A-Z.
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
@ -390,6 +400,15 @@ msgstr[0] ""
 msgstr[1] ""
 "Asegúrate que nun hai más de %(max)s díxitos enantes del puntu decimal."
 #, python-format
 msgid ""
 "File extension '%(extension)s' is not allowed. Allowed extensions are: "
 "'%(allowed_extensions)s'."
 msgstr ""
 msgid "Null characters are not allowed."
 msgstr ""
 msgid "and"
 msgstr "y"
@ -707,9 +726,8 @@ msgstr ""
 msgid "Please correct the duplicate values below."
 msgstr "Por favor, igua los valores duplicaos embaxo"
-msgid "The inline foreign key did not match the parent instance primary key."
+msgid "The inline value did not match the parent instance."
 msgstr ""
 "La calve foriata en llinia nun concasa cola clave primaria d'instancia pá."
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr ""
@ -717,8 +735,8 @@ msgstr ""
 "disponibles."
 #, python-format
-msgid "\"%(pk)s\" is not a valid value for a primary key."
+msgid "\"%(pk)s\" is not a valid value."
-msgstr "\"%(pk)s\" nun ye un valor válidu pa la clave primaria."
+msgstr ""
 #, python-format
 msgid ""
@ -728,15 +746,15 @@ msgstr ""
 "Nun pudo interpretase %(datetime)s nel fusu horariu %(current_timezone)s; "
 "pue ser ambiguu o pue nun esistir."
 msgid "Clear"
 msgstr "Llimpiar"
 msgid "Currently"
 msgstr "Anguaño"
 msgid "Change"
 msgstr "Camudar"
 msgid "Clear"
 msgstr "Llimpiar"
 msgid "Unknown"
 msgstr "Desconocíu"
@ -1076,6 +1094,14 @@ msgid ""
 "origin' requests."
 msgstr ""
 msgid ""
 "If you are using the <meta name=\"referrer\" content=\"no-referrer\"> tag or "
 "including the 'Referrer-Policy: no-referrer' header, please remove them. The "
 "CSRF protection requires the 'Referer' header to do strict referer checking. "
 "If you're concerned about privacy, use alternatives like <a rel=\"noreferrer"
 "\" ...> for links to third-party sites."
 msgstr ""
 msgid ""
 "You are seeing this message because this site requires a CSRF cookie when "
 "submitting forms. This cookie is required for security reasons, to ensure "
@ -1090,28 +1116,12 @@ msgstr ""
 msgid "More information is available with DEBUG=True."
 msgstr ""
 msgid "Welcome to Django"
 msgstr ""
 msgid "It worked!"
 msgstr ""
 msgid "Congratulations on your first Django-powered page."
 msgstr ""
 msgid ""
 "Of course, you haven't actually done any work yet. Next, start your first "
 "app by running <code>python manage.py startapp [app_label]</code>."
 msgstr ""
 msgid ""
 "You're seeing this message because you have <code>DEBUG = True</code> in "
 "your Django settings file and you haven't configured any URLs. Get to work!"
 msgstr ""
 msgid "No year specified"
 msgstr "Nun s'especificó l'añu"
 msgid "Date out of range"
 msgstr ""
 msgid "No month specified"
 msgstr "Nun s'especificó'l mes"
@ -1162,3 +1172,41 @@ msgstr "\"%(path)s\" nun esiste"
 #, python-format
 msgid "Index of %(directory)s"
 msgstr "Índiz de %(directory)s"
 msgid "Django: the Web framework for perfectionists with deadlines."
 msgstr ""
 #, python-format
 msgid ""
 "View <a href=\"https://docs.djangoproject.com/en/%(version)s/releases/\" "
 "target=\"_blank\" rel=\"noopener\">release notes</a> for Django %(version)s"
 msgstr ""
 msgid "The install worked successfully! Congratulations!"
 msgstr ""
 #, python-format
 msgid ""
 "You are seeing this page because <a href=\"https://docs.djangoproject.com/en/"
 "%(version)s/ref/settings/#debug\" target=\"_blank\" rel=\"noopener"
 "\">DEBUG=True</a> is in your settings file and you have not configured any "
 "URLs."
 msgstr ""
 msgid "Django Documentation"
 msgstr ""
 msgid "Topics, references, &amp; how-to's"
 msgstr ""
 msgid "Tutorial: A Polling App"
 msgstr ""
 msgid "Get started with Django"
 msgstr ""
 msgid "Django Community"
 msgstr ""
 msgid "Connect, get help, or contribute"
 msgstr ""
--- a/django/conf/locale/az/LC_MESSAGES/django.mo
+++ b/django/conf/locale/az/LC_MESSAGES/django.mo
--- a/django/conf/locale/az/LC_MESSAGES/django.po
+++ b/django/conf/locale/az/LC_MESSAGES/django.po
@ -1,14 +1,15 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
 # Emin Mastizada <emin@linux.com>, 2018
 # Emin Mastizada <emin@linux.com>, 2015-2016
 # Metin Amiroff <amiroff@gmail.com>, 2011
 msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-29 20:57+0200\n"
+"POT-Creation-Date: 2018-05-17 11:49+0200\n"
-"PO-Revision-Date: 2016-08-05 11:00+0000\n"
+"PO-Revision-Date: 2018-09-09 12:46+0000\n"
 "Last-Translator: Emin Mastizada <emin@linux.com>\n"
 "Language-Team: Azerbaijani (http://www.transifex.com/django/django/language/"
 "az/)\n"
@ -159,6 +160,9 @@ msgstr "Yaponca"
 msgid "Georgian"
 msgstr "Gürcücə"
 msgid "Kabyle"
 msgstr "Kabile"
 msgid "Kazakh"
 msgstr "Qazax"
@ -294,6 +298,15 @@ msgstr "Statik Fayllar"
 msgid "Syndication"
 msgstr "Sindikasiya"
 msgid "That page number is not an integer"
 msgstr "Səhifə nömrəsi rəqəm deyil"
 msgid "That page number is less than 1"
 msgstr "Səhifə nömrəsi 1-dən balacadır"
 msgid "That page contains no results"
 msgstr "Səhifədə nəticə yoxdur"
 msgid "Enter a valid value."
 msgstr "Düzgün qiymət daxil edin."
@ -306,6 +319,7 @@ msgstr "Düzgün rəqəm daxil edin."
 msgid "Enter a valid email address."
 msgstr "Düzgün e-poçt ünvanı daxil edin."
 #. Translators: "letters" means latin letters: a-z and A-Z.
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
@ -373,6 +387,9 @@ msgstr[1] ""
 "Bu dəyərin ən çox %(limit_value)d simvol olduğuna əmin olun (%(show_value)d "
 "var)"
 msgid "Enter a number."
 msgstr "Ədəd daxil edin."
 #, python-format
 msgid "Ensure that there are no more than %(max)s digit in total."
 msgid_plural "Ensure that there are no more than %(max)s digits in total."
@ -393,6 +410,17 @@ msgid_plural ""
 msgstr[0] "Onluq hissədən əvvəl %(max)s rəqəmdən çox olmadığına əmin olun."
 msgstr[1] "Onluq hissədən əvvəl %(max)s rəqəmdən çox olmadığına əmin olun."
 #, python-format
 msgid ""
 "File extension '%(extension)s' is not allowed. Allowed extensions are: "
 "'%(allowed_extensions)s'."
 msgstr ""
 "'%(extension)s' fayl uzantısına icazə verilmir. İcazə verilən fayl "
 "uzantıları: '%(allowed_extensions)s'"
 msgid "Null characters are not allowed."
 msgstr "Null simvollara icazə verilmir."
 msgid "and"
 msgstr "və"
@ -441,6 +469,10 @@ msgstr "Böyük (8 bayt) tam ədəd"
 msgid "'%(value)s' value must be either True or False."
 msgstr "'%(value)s' dəyəri True və ya False olmalıdır."
 #, python-format
 msgid "'%(value)s' value must be either True, False, or None."
 msgstr "'%(value)s' dəyəri True, False və ya None olmalıdır."
 msgid "Boolean (Either True or False)"
 msgstr "Bul (ya Doğru, ya Yalan)"
@ -456,15 +488,14 @@ msgid ""
 "'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
 "format."
 msgstr ""
-"'%(value)s' dəyəri səhv tarix formatındadır. Bu İİİİ-AA-GG formatında "
+"'%(value)s' dəyəri səhv tarix formatındadır. Formatı YYYY-MM-DD olmalıdır."
 "olmalıdır."
 #, python-format
 msgid ""
 "'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
 "date."
 msgstr ""
-"'%(value)s dəyəri düzgün formatdadır (İİİİ-AA-GG) amma bu xətalı tarixdir."
+"'%(value)s dəyəri düzgün formatdadır (YYYY-MM-DD) amma bu xətalı tarixdir."
 msgid "Date (without time)"
 msgstr "Tarix (saatsız)"
@ -474,19 +505,23 @@ msgid ""
 "'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
 "uuuuuu]][TZ] format."
 msgstr ""
 "'%(value)s' dəyərinin formatı səhvdir. Formatı YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
 "[TZ] olmalıdır."
 #, python-format
 msgid ""
 "'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
 "[TZ]) but it is an invalid date/time."
 msgstr ""
 "'%(value)s' dəyərinin formatı düzgündür (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) "
 "ancaq tarix səhvdir."
 msgid "Date (with time)"
 msgstr "Tarix (vaxt ilə)"
 #, python-format
 msgid "'%(value)s' value must be a decimal number."
-msgstr ""
+msgstr "'%(value)s' dəyəri decimal rəqəm olmalıdır."
 msgid "Decimal number"
 msgstr "Rasional ədəd"
@ -496,6 +531,8 @@ msgid ""
 "'%(value)s' value has an invalid format. It must be in [DD] [HH:[MM:]]ss[."
 "uuuuuu] format."
 msgstr ""
 "'%(value)s' dəyərinin formatı səhvdir. Formatı [DD] [HH:[MM:]]ss[.uuuuuu] "
 "olmalıdır."
 msgid "Duration"
 msgstr "Müddət"
@ -508,7 +545,7 @@ msgstr "Faylın ünvanı"
 #, python-format
 msgid "'%(value)s' value must be a float."
-msgstr ""
+msgstr "'%(value)s' dəyəri float olmalıdır."
 msgid "Floating point number"
 msgstr "Sürüşən vergüllü ədəd"
@ -521,7 +558,7 @@ msgstr "IP ünvan"
 #, python-format
 msgid "'%(value)s' value must be either None, True or False."
-msgstr ""
+msgstr "'%(value)s' dəyəri None, True və ya False olmalıdır."
 msgid "Boolean (Either True, False or None)"
 msgstr "Bul (Ya Doğru, ya Yalan, ya da Heç nə)"
@ -547,12 +584,15 @@ msgid ""
 "'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
 "format."
 msgstr ""
 "'%(value)s' dəyərinin formatı səhvdir. Formatı HH:MM[:ss[.uuuuuu]] olmalıdır."
 #, python-format
 msgid ""
 "'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
 "invalid time."
 msgstr ""
 "'%(value)s' dəyəri düzgün formatdadır (HH:MM[:ss[.uuuuuu]]), ancaq vaxtı "
 "səhvdir."
 msgid "Time"
 msgstr "Vaxt"
@ -561,7 +601,7 @@ msgid "URL"
 msgstr "URL"
 msgid "Raw binary data"
-msgstr ""
+msgstr "Düz ikili (binary) məlumat"
 #, python-format
 msgid "'%(value)s' is not a valid UUID."
@ -575,7 +615,7 @@ msgstr "Şəkil"
 #, python-format
 msgid "%(model)s instance with %(field)s %(value)r does not exist."
-msgstr ""
+msgstr "%(field)s dəyəri %(value)r olan %(model)s mövcud deyil."
 msgid "Foreign Key (type determined by related field)"
 msgstr "Xarici açar (bağlı olduğu sahəyə uyğun tipi alır)"
@ -585,11 +625,11 @@ msgstr "Birin-birə münasibət"
 #, python-format
 msgid "%(from)s-%(to)s relationship"
-msgstr ""
+msgstr "%(from)s-%(to)s əlaqəsi"
 #, python-format
 msgid "%(from)s-%(to)s relationships"
-msgstr ""
+msgstr "%(from)s-%(to)s əlaqələri"
 msgid "Many-to-many relationship"
 msgstr "Çoxun-çoxa münasibət"
@ -606,9 +646,6 @@ msgstr "Bu sahə vacibdir."
 msgid "Enter a whole number."
 msgstr "Tam ədəd daxil edin."
 msgid "Enter a number."
 msgstr "Ədəd daxil edin."
 msgid "Enter a valid date."
 msgstr "Düzgün tarix daxil edin."
@ -621,6 +658,10 @@ msgstr "Düzgün tarix/vaxt daxil edin."
 msgid "Enter a valid duration."
 msgstr "Keçərli müddət daxil edin."
 #, python-brace-format
 msgid "The number of days must be between {min_days} and {max_days}."
 msgstr "Günlərin sayı {min_days} ilə {max_days} arasında olmalıdır."
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr "Fayl göndərilməyib. Vərəqənin (\"form\") şifrələmə tipini yoxlayın."
@ -635,7 +676,9 @@ msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
 msgid_plural ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
 msgstr[0] ""
 "Bu fayl adının ən çox %(max)d simvol olduğuna əmin olun (%(length)d var)."
 msgstr[1] ""
 "Bu fayl adının ən çox %(max)d simvol olduğuna əmin olun (%(length)d var)."
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr ""
@ -670,7 +713,7 @@ msgid "(Hidden field %(name)s) %(error)s"
 msgstr "(Gizli %(name)s sahəsi) %(error)s"
 msgid "ManagementForm data is missing or has been tampered with"
-msgstr ""
+msgstr "ManagementForm məlumatları əksikdir və ya korlanıb"
 #, python-format
 msgid "Please submit %d or fewer forms."
@ -711,15 +754,15 @@ msgstr ""
 msgid "Please correct the duplicate values below."
 msgstr "Aşağıda təkrarlanan qiymətlərə düzəliş edin."
-msgid "The inline foreign key did not match the parent instance primary key."
+msgid "The inline value did not match the parent instance."
-msgstr "Xarici açar ana obyektin əsas açarı ilə üst-üstə düşmür."
+msgstr "Sətiriçi dəyər ana nüsxəyə uyğun deyil."
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr "Düzgün seçim edin. Bu seçim mümkün deyil."
 #, python-format
-msgid "\"%(pk)s\" is not a valid value for a primary key."
+msgid "\"%(pk)s\" is not a valid value."
-msgstr "\"%(pk)s\" əsas açar üçün keçərli dəyər deyil."
+msgstr "\"%(pk)s\" düzgün dəyər deyil."
 #, python-format
 msgid ""
@ -729,15 +772,15 @@ msgstr ""
 "%(datetime)s %(current_timezone)s zaman qurşağında ifadə oluna bilmir; ya "
 "duallıq, ya da yanlışlıq var."
 msgid "Clear"
 msgstr "Təmizlə"
 msgid "Currently"
 msgstr "Hal-hazırda"
 msgid "Change"
 msgstr "Dəyiş"
 msgid "Clear"
 msgstr "Təmizlə"
 msgid "Unknown"
 msgstr "Məlum deyil"
@ -1070,49 +1113,57 @@ msgid ""
 "required for security reasons, to ensure that your browser is not being "
 "hijacked by third parties."
 msgstr ""
 "Bu HTTPS sayt səyyahınız tərəfindən 'Referer header' göndərilməsini tələb "
 "edir, amma göndərilmir. Bu başlıq səyyahınızın üçüncü biri tərəfindən hack-"
 "lənmədiyinə əmin olmaq üçün istifadə edilir."
 msgid ""
 "If you have configured your browser to disable 'Referer' headers, please re-"
 "enable them, at least for this site, or for HTTPS connections, or for 'same-"
 "origin' requests."
 msgstr ""
 "Əgər səyyahınızın 'Referer' başlığını göndərməsini söndürmüsünüzsə, lütfən "
 "bu sayt üçün, HTTPS əlaqələr üçün və ya 'same-origin' sorğular üçün aktiv "
 "edin."
 msgid ""
 "If you are using the <meta name=\"referrer\" content=\"no-referrer\"> tag or "
 "including the 'Referrer-Policy: no-referrer' header, please remove them. The "
 "CSRF protection requires the 'Referer' header to do strict referer checking. "
 "If you're concerned about privacy, use alternatives like <a rel=\"noreferrer"
 "\" ...> for links to third-party sites."
 msgstr ""
 "Əgər <meta name=\"referrer\" content=\"no-referrer\"> etiketini və ya "
 "'Referrer-Policy: no-referrer' başlığını işlədirsinizsə, lütfən silin. CSRF "
 "qoruma dəqiq yönləndirən yoxlaması üçün 'Referer' başlığını tələb edir. Əgər "
 "məxfilik üçün düşünürsünüzsə, üçüncü tərəf sayt keçidləri üçün <a rel="
 "\"noreferrer\" ...> kimi bir alternativ işlədin."
 msgid ""
 "You are seeing this message because this site requires a CSRF cookie when "
 "submitting forms. This cookie is required for security reasons, to ensure "
 "that your browser is not being hijacked by third parties."
 msgstr ""
 "Bu sayt formaları göndərmək üçün CSRF çərəzini işlədir. Bu çərəz "
 "səyyahınızın üçüncü biri tərəfindən hack-lənmədiyinə əmin olmaq üçün "
 "istifadə edilir. "
 msgid ""
 "If you have configured your browser to disable cookies, please re-enable "
 "them, at least for this site, or for 'same-origin' requests."
 msgstr ""
 "Əgər səyyahınızda çərəzlər söndürülübsə, lütfən bu sayt və ya 'same-origin' "
 "sorğular üçün aktiv edin."
 msgid "More information is available with DEBUG=True."
 msgstr "Daha ətraflı məlumat DEBUG=True ilə mövcuddur."
 msgid "Welcome to Django"
 msgstr "Djangoya Xoş Gəldiniz"
 msgid "It worked!"
 msgstr "İşlədi!"
 msgid "Congratulations on your first Django-powered page."
 msgstr "İlk Django ilə işləyən səhifəniz münasibəti ilə təbrik edirik."
 msgid ""
 "Of course, you haven't actually done any work yet. Next, start your first "
 "app by running <code>python manage.py startapp [app_label]</code>."
 msgstr ""
 msgid ""
 "You're seeing this message because you have <code>DEBUG = True</code> in "
 "your Django settings file and you haven't configured any URLs. Get to work!"
 msgstr ""
 msgid "No year specified"
 msgstr "İl göstərilməyib"
 msgid "Date out of range"
 msgstr "Tarix aralığın xaricindədir"
 msgid "No month specified"
 msgstr "Ay göstərilməyib"
@ -1163,3 +1214,47 @@ msgstr "\"%(path)s\" mövcud deyil"
 #, python-format
 msgid "Index of %(directory)s"
 msgstr "%(directory)s-nin indeksi"
 msgid "Django: the Web framework for perfectionists with deadlines."
 msgstr "Django: tələsən mükəmməlləkçilər üçün Web framework."
 #, python-format
 msgid ""
 "View <a href=\"https://docs.djangoproject.com/en/%(version)s/releases/\" "
 "target=\"_blank\" rel=\"noopener\">release notes</a> for Django %(version)s"
 msgstr ""
 "Django %(version)s üçün <a href=\"https://docs.djangoproject.com/en/"
 "%(version)s/releases/\" target=\"_blank\" rel=\"noopener\">buraxılış "
 "qeydlərinə</a> baxın"
 msgid "The install worked successfully! Congratulations!"
 msgstr "Quruluş uğurla tamamlandı! Təbriklər!"
 #, python-format
 msgid ""
 "You are seeing this page because <a href=\"https://docs.djangoproject.com/en/"
 "%(version)s/ref/settings/#debug\" target=\"_blank\" rel=\"noopener"
 "\">DEBUG=True</a> is in your settings file and you have not configured any "
 "URLs."
 msgstr ""
 "Tənzimləmə faylınızda <a href=\"https://docs.djangoproject.com/en/"
 "%(version)s/ref/settings/#debug\" target=\"_blank\" rel=\"noopener"
 "\">DEBUG=True</a> və heç bir URL qurmadığınız üçün bu səhifəni görürsünüz."
 msgid "Django Documentation"
 msgstr "Django Sənədləri"
 msgid "Topics, references, &amp; how-to's"
 msgstr "Mövzular, istinadlar və nümunələr"
 msgid "Tutorial: A Polling App"
 msgstr "Məşğələ: Səsvermə Tətbiqi"
 msgid "Get started with Django"
 msgstr "Django-ya başla"
 msgid "Django Community"
 msgstr "Django İcması"
 msgid "Connect, get help, or contribute"
 msgstr "Qoşul, kömək al və dəstək ol"
--- a/django/conf/locale/az/formats.py
+++ b/django/conf/locale/az/formats.py
@ -1,10 +1,7 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
 from __future__ import unicode_literals
 # The *_FORMAT strings use the Django date format syntax,
-# see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
+# see https://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
 DATE_FORMAT = 'j E Y'
 TIME_FORMAT = 'G:i'
 DATETIME_FORMAT = 'j E Y, G:i'
@ -15,7 +12,7 @@ SHORT_DATETIME_FORMAT = 'd.m.Y H:i'
 FIRST_DAY_OF_WEEK = 1  # Monday
 # The *_INPUT_FORMATS strings use the Python strftime format syntax,
-# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
+# see https://docs.python.org/library/datetime.html#strftime-strptime-behavior
 DATE_INPUT_FORMATS = [
    '%d.%m.%Y',  # '25.10.2006'
    '%d.%m.%y',  # '25.10.06'
--- a/django/conf/locale/be/LC_MESSAGES/django.mo
+++ b/django/conf/locale/be/LC_MESSAGES/django.mo
--- a/django/conf/locale/be/LC_MESSAGES/django.po
+++ b/django/conf/locale/be/LC_MESSAGES/django.po
@ -2,14 +2,14 @@
 #
 # Translators:
 # Viktar Palstsiuk <vipals@gmail.com>, 2014-2015
-# znotdead <zhirafchik@gmail.com>, 2016
+# znotdead <zhirafchik@gmail.com>, 2016-2017
 # Дмитрий Шатера <mr.bobsans@gmail.com>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-29 20:57+0200\n"
+"POT-Creation-Date: 2017-12-01 21:10+0100\n"
-"PO-Revision-Date: 2016-09-15 07:39+0000\n"
+"PO-Revision-Date: 2017-12-02 06:40+0000\n"
 "Last-Translator: znotdead <zhirafchik@gmail.com>\n"
 "Language-Team: Belarusian (http://www.transifex.com/django/django/language/"
 "be/)\n"
@ -162,6 +162,9 @@ msgstr "Японская"
 msgid "Georgian"
 msgstr "Грузінская"
 msgid "Kabyle"
 msgstr "Кабільскі"
 msgid "Kazakh"
 msgstr "Казаская"
@ -297,6 +300,15 @@ msgstr "Cтатычныя файлы"
 msgid "Syndication"
 msgstr "Сындыкацыя"
 msgid "That page number is not an integer"
 msgstr "Лік гэтай старонкі не з'яўляецца цэлым лікам"
 msgid "That page number is less than 1"
 msgstr "Лік старонкі менш чым 1"
 msgid "That page contains no results"
 msgstr "Гэтая старонка не мае ніякіх вынікаў"
 msgid "Enter a valid value."
 msgstr "Пазначце правільнае значэньне."
@ -309,6 +321,7 @@ msgstr "Увядзіце цэлы лік."
 msgid "Enter a valid email address."
 msgstr "Увядзіце сапраўдны адрас электроннай пошты."
 #. Translators: "letters" means latin letters: a-z and A-Z.
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr "Бірка можа зьмяшчаць літары, лічбы, знакі падкрэсьліваньня ды злучкі."
@ -412,6 +425,17 @@ msgstr[1] "Упэўніцеся, што набралі ня болей за %(ma
 msgstr[2] "Упэўніцеся, што набралі ня болей за %(max)s лічбаў да коскі."
 msgstr[3] "Упэўніцеся, што набралі ня болей за %(max)s лічбаў да коскі."
 #, python-format
 msgid ""
 "File extension '%(extension)s' is not allowed. Allowed extensions are: "
 "'%(allowed_extensions)s'."
 msgstr ""
 "Пашырэнне файла '%(extension)s' не дапускаецца. Дапушчальныя пашырэння: "
 "'%(allowed_extensions)s'."
 msgid "Null characters are not allowed."
 msgstr "Null сімвалы не дапускаюцца."
 msgid "and"
 msgstr "і"
@ -753,15 +777,15 @@ msgstr ""
 msgid "Please correct the duplicate values below."
 msgstr "Выпраўце зьвесткі, якія паўтараюцца (гл. ніжэй)."
-msgid "The inline foreign key did not match the parent instance primary key."
+msgid "The inline value did not match the parent instance."
-msgstr "Вонкавы ключ не супадае з бацькоўскім першасным ключом."
+msgstr "Убудаванае значэнне не супадае з бацькоўскім значэннем."
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr "Абярыце дазволенае. Абранага няма ў даступных значэньнях."
 #, python-format
-msgid "\"%(pk)s\" is not a valid value for a primary key."
+msgid "\"%(pk)s\" is not a valid value."
-msgstr "\"%(pk)s\" мае недапушчальнае значэнне для першаснага ключа."
+msgstr "\"%(pk)s\" не сапраўднае значэнне"
 #, python-format
 msgid ""
@ -771,15 +795,15 @@ msgstr ""
 "У часавым абсягу «%(current_timezone)s» нельга зразумець дату %(datetime)s: "
 "яна можа быць неадназначнаю або яе можа не існаваць."
 msgid "Clear"
 msgstr "Ачысьціць"
 msgid "Currently"
 msgstr "Зараз"
 msgid "Change"
 msgstr "Зьмяніць"
 msgid "Clear"
 msgstr "Ачысьціць"
 msgid "Unknown"
 msgstr "Невядома"
@ -1140,6 +1164,19 @@ msgstr ""
 "загалоўкамі, калі ласка дазвольце іх хаця б для гэтага сайту, ці для HTTPS "
 "злучэнняў, ці для 'same-origin' запытаў."
 msgid ""
 "If you are using the <meta name=\"referrer\" content=\"no-referrer\"> tag or "
 "including the 'Referrer-Policy: no-referrer' header, please remove them. The "
 "CSRF protection requires the 'Referer' header to do strict referer checking. "
 "If you're concerned about privacy, use alternatives like <a rel=\"noreferrer"
 "\" ...> for links to third-party sites."
 msgstr ""
 "Калі вы выкарыстоўваеце <meta name=\"referrer\" content=\"no-referrer\"> тэг "
 "ці дадалі загаловак 'Referrer-Policy: no-referrer', калі ласка выдаліце іх. "
 "CSRF абароне неабходны 'Referer' загаловак для строгай праверкі. Калі Вы "
 "турбуецеся аб прыватнасці, выкарыстоўвайце альтэрнатывы, напрыклад <a rel="
 "\"noreferrer\" ...>, для спасылкі на сайты трэціх асоб."
 msgid ""
 "You are seeing this message because this site requires a CSRF cookie when "
 "submitting forms. This cookie is required for security reasons, to ensure "
@ -1159,33 +1196,12 @@ msgstr ""
 msgid "More information is available with DEBUG=True."
 msgstr "Больш падрабязная інфармацыя даступная з DEBUG=True."
 msgid "Welcome to Django"
 msgstr "Вітаем у Django"
 msgid "It worked!"
 msgstr "Гэта спрацавала!"
 msgid "Congratulations on your first Django-powered page."
 msgstr "Віншуем Вас з першай старонкай на базе Django."
 msgid ""
 "Of course, you haven't actually done any work yet. Next, start your first "
 "app by running <code>python manage.py startapp [app_label]</code>."
 msgstr ""
 "Канешне вы не зрабілі яшчэ ніякай работы. Далей, пачніце вашу першую "
 "праграму выканаўшы <code>python manage.py startapp [app_label]</code>."
 msgid ""
 "You're seeing this message because you have <code>DEBUG = True</code> in "
 "your Django settings file and you haven't configured any URLs. Get to work!"
 msgstr ""
 "Вы бачыце гэта паведамленне, таму што вы маеце <code>DEBUG = True</code> у "
 "вашым файлу настройцы Django і вы не сканфігуравалі ніякіх спасылак URL. За "
 "працу!"
 msgid "No year specified"
 msgstr "Не пазначылі год"
 msgid "Date out of range"
 msgstr "Дата выходзіць за межы дыяпазону"
 msgid "No month specified"
 msgstr "Не пазначылі месяц"
@ -1239,3 +1255,47 @@ msgstr "Шлях «%(path)s» не існуе."
 #, python-format
 msgid "Index of %(directory)s"
 msgstr "Файлы каталёґа «%(directory)s»"
 msgid "Django: the Web framework for perfectionists with deadlines."
 msgstr "Джанга: Web рамкі для перфекцыяністаў з крайнімі тэрмінамі."
 #, python-format
 msgid ""
 "View <a href=\"https://docs.djangoproject.com/en/%(version)s/releases/\" "
 "target=\"_blank\" rel=\"noopener\">release notes</a> for Django %(version)s"
 msgstr ""
 "Паглядзець <a href=\"https://docs.djangoproject.com/en/%(version)s/releases/"
 "\" target=\"_blank\" rel=\"noopener\">заўвагі да выпуску</a> для Джангі "
 "%(version)s"
 msgid "The install worked successfully! Congratulations!"
 msgstr "Усталяванне прайшло паспяхова! Віншаванні!"
 #, python-format
 msgid ""
 "You are seeing this page because <a href=\"https://docs.djangoproject.com/en/"
 "%(version)s/ref/settings/#debug\" target=\"_blank\" rel=\"noopener"
 "\">DEBUG=True</a> is in your settings file and you have not configured any "
 "URLs."
 msgstr ""
 "Вы бачыце гэту старонку таму што <a href=\"https://docs.djangoproject.com/en/"
 "%(version)s/ref/settings/#debug\" target=\"_blank\" rel=\"noopener"
 "\">DEBUG=True </a> у вашым файле налад і вы не сканфігурыравалі ніякіх URL."
 msgid "Django Documentation"
 msgstr "Дакументацыя Джангі"
 msgid "Topics, references, &amp; how-to's"
 msgstr "Тэмы, спасылкі, &amp; як зрабіць"
 msgid "Tutorial: A Polling App"
 msgstr "Падручнік: Дадатак для галасавання"
 msgid "Get started with Django"
 msgstr "Пачніце з Джангаю"
 msgid "Django Community"
 msgstr "Джанга супольнасць"
 msgid "Connect, get help, or contribute"
 msgstr "Злучайцеся, атрымлівайце дапамогу, ці спрыяйце"
--- a/django/conf/locale/bg/LC_MESSAGES/django.mo
+++ b/django/conf/locale/bg/LC_MESSAGES/django.mo
--- a/django/conf/locale/bg/LC_MESSAGES/django.po
+++ b/django/conf/locale/bg/LC_MESSAGES/django.po
@ -5,15 +5,15 @@
 # Jannis Leidel <jannis@leidel.info>, 2011
 # Lyuboslav  Petrov <petrov.lyuboslav@gmail.com>, 2014
 # Todor Lubenov <tgl.sysdev@gmail.com>, 2013-2015
-# Venelin Stoykov <vkstoykov@gmail.com>, 2015-2016
+# Venelin Stoykov <vkstoykov@gmail.com>, 2015-2017
 # vestimir <vestimir@gmail.com>, 2014
 # Alexander Atanasov <aatanasov@gmail.com>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-29 20:57+0200\n"
+"POT-Creation-Date: 2017-11-15 16:15+0100\n"
-"PO-Revision-Date: 2016-06-30 17:31+0000\n"
+"PO-Revision-Date: 2017-11-17 09:05+0000\n"
 "Last-Translator: Venelin Stoykov <vkstoykov@gmail.com>\n"
 "Language-Team: Bulgarian (http://www.transifex.com/django/django/language/"
 "bg/)\n"
@ -299,6 +299,15 @@ msgstr "Статични файлове"
 msgid "Syndication"
 msgstr "Syndication"
 msgid "That page number is not an integer"
 msgstr "Номерът на страницата не е цяло число"
 msgid "That page number is less than 1"
 msgstr "Номерът на страницата е по-малък от 1"
 msgid "That page contains no results"
 msgstr "В тази страница няма резултати"
 msgid "Enter a valid value."
 msgstr "Въведете валидна стойност.  "
@ -311,6 +320,7 @@ msgstr "Въведете валидно число."
 msgid "Enter a valid email address."
 msgstr "Въведете валиден имейл адрес."
 #. Translators: "letters" means latin letters: a-z and A-Z.
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
@ -355,10 +365,10 @@ msgid_plural ""
 "Ensure this value has at least %(limit_value)d characters (it has "
 "%(show_value)d)."
 msgstr[0] ""
-"Уверете се, тази стойност е най-малко %(limit_value)d знака (тя има "
+"Уверете се, че тази стойност е най-малко %(limit_value)d знака (тя има "
 "%(show_value)d )."
 msgstr[1] ""
-"Уверете се, тази стойност е най-малко %(limit_value)d знака (тя има "
+"Уверете се, че тази стойност е най-малко %(limit_value)d знака (тя има "
 "%(show_value)d)."
 #, python-format
@ -372,7 +382,7 @@ msgstr[0] ""
 "Уверете се, тази стойност има най-много %(limit_value)d знака (тя има "
 "%(show_value)d)."
 msgstr[1] ""
-"Уверете се, тази стойност има най-много %(limit_value)d знака (тя има "
+"Уверете се, че тази стойност има най-много %(limit_value)d знака (тя има "
 "%(show_value)d)."
 #, python-format
@ -399,6 +409,17 @@ msgstr[0] ""
 msgstr[1] ""
 "Уверете се, че има не повече от %(max)s цифри преди десетичната запетая."
 #, python-format
 msgid ""
 "File extension '%(extension)s' is not allowed. Allowed extensions are: "
 "'%(allowed_extensions)s'."
 msgstr ""
 "Не са разрешени файлове с раширение '%(extension)s'. Позволените разширения "
 "са:  '%(allowed_extensions)s'."
 msgid "Null characters are not allowed."
 msgstr ""
 msgid "and"
 msgstr "и"
@ -654,7 +675,8 @@ msgid_plural ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
 msgstr[0] "Уверете се, това име е най-много %(max)d знака (то има %(length)d)."
 msgstr[1] ""
-"Уверете се, това файлово име има най-много  %(max)d знаци (има %(length)d)."
+"Уверете се, че това файлово име има най-много  %(max)d знаци (има "
 "%(length)d)."
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr ""
@ -730,15 +752,15 @@ msgstr ""
 msgid "Please correct the duplicate values below."
 msgstr "Моля, коригирайте повтарящите се стойности по-долу."
-msgid "The inline foreign key did not match the parent instance primary key."
+msgid "The inline value did not match the parent instance."
-msgstr "Невалидна избрана стойност."
+msgstr ""
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr "Направете валиден избор. Този не е един от възможните избори.  "
 #, python-format
-msgid "\"%(pk)s\" is not a valid value for a primary key."
+msgid "\"%(pk)s\" is not a valid value."
-msgstr "\"%(pk)s\" не е валидна стойност за първичен ключ."
+msgstr ""
 #, python-format
 msgid ""
@ -748,15 +770,15 @@ msgstr ""
 "%(datetime)s не може да бъде разчетено в  %(current_timezone)s; може да е "
 "двусмислен или да не съществува"
 msgid "Clear"
 msgstr "Изчисти"
 msgid "Currently"
 msgstr "Сега"
 msgid "Change"
 msgstr "Промени"
 msgid "Clear"
 msgstr "Изчисти"
 msgid "Unknown"
 msgstr "Неизвестно"
@ -1103,6 +1125,14 @@ msgstr ""
 "ги активирате отново, поне за този сайт, или за HTTPS връзки, или за 'same-"
 "origin' заявки."
 msgid ""
 "If you are using the <meta name=\"referrer\" content=\"no-referrer\"> tag or "
 "including the 'Referrer-Policy: no-referrer' header, please remove them. The "
 "CSRF protection requires the 'Referer' header to do strict referer checking. "
 "If you're concerned about privacy, use alternatives like <a rel=\"noreferrer"
 "\" ...> for links to third-party sites."
 msgstr ""
 msgid ""
 "You are seeing this message because this site requires a CSRF cookie when "
 "submitting forms. This cookie is required for security reasons, to ensure "
@ -1123,28 +1153,12 @@ msgstr ""
 msgid "More information is available with DEBUG=True."
 msgstr "Повече информация е на разположение с DEBUG=True."
 msgid "Welcome to Django"
 msgstr "Добре дошли в Django"
 msgid "It worked!"
 msgstr "Той работи!"
 msgid "Congratulations on your first Django-powered page."
 msgstr "Поздравления за първата си Django страница."
 msgid ""
 "Of course, you haven't actually done any work yet. Next, start your first "
 "app by running <code>python manage.py startapp [app_label]</code>."
 msgstr ""
 msgid ""
 "You're seeing this message because you have <code>DEBUG = True</code> in "
 "your Django settings file and you haven't configured any URLs. Get to work!"
 msgstr ""
 msgid "No year specified"
 msgstr "Не е посочена година"
 msgid "Date out of range"
 msgstr ""
 msgid "No month specified"
 msgstr "Не е посочен месец"
@ -1195,3 +1209,45 @@ msgstr "\"%(path)s\" не съществува"
 #, python-format
 msgid "Index of %(directory)s"
 msgstr "Индекс %(directory)s"
 msgid "Django: the Web framework for perfectionists with deadlines."
 msgstr "Django: Фреймуоркът за перфекционисти с крайни срокове."
 #, python-format
 msgid ""
 "View <a href=\"https://docs.djangoproject.com/en/%(version)s/releases/\" "
 "target=\"_blank\" rel=\"noopener\">release notes</a> for Django %(version)s"
 msgstr ""
 msgid "The install worked successfully! Congratulations!"
 msgstr ""
 #, python-format
 msgid ""
 "You are seeing this page because <a href=\"https://docs.djangoproject.com/en/"
 "%(version)s/ref/settings/#debug\" target=\"_blank\" rel=\"noopener"
 "\">DEBUG=True</a> is in your settings file and you have not configured any "
 "URLs."
 msgstr ""
 "Вие виждате тази страница защото <a href=\"https://docs.djangoproject.com/en/"
 "%(version)s/ref/settings/#debug\" target=\"_blank\" rel=\"noopener"
 "\">DEBUG=True</a> е във вашият settings файл и не сте конфигурирали никакви "
 "URL-и"
 msgid "Django Documentation"
 msgstr "Django Документация"
 msgid "Topics, references, &amp; how-to's"
 msgstr ""
 msgid "Tutorial: A Polling App"
 msgstr ""
 msgid "Get started with Django"
 msgstr "Започнете с Django"
 msgid "Django Community"
 msgstr ""
 msgid "Connect, get help, or contribute"
 msgstr ""
--- a/django/conf/locale/bg/formats.py
+++ b/django/conf/locale/bg/formats.py
@ -1,10 +1,7 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
 from __future__ import unicode_literals
 # The *_FORMAT strings use the Django date format syntax,
-# see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
+# see https://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
 DATE_FORMAT = 'd F Y'
 TIME_FORMAT = 'H:i'
 # DATETIME_FORMAT =
@ -15,7 +12,7 @@ SHORT_DATE_FORMAT = 'd.m.Y'
 # FIRST_DAY_OF_WEEK =
 # The *_INPUT_FORMATS strings use the Python strftime format syntax,
-# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
+# see https://docs.python.org/library/datetime.html#strftime-strptime-behavior
 # DATE_INPUT_FORMATS =
 # TIME_INPUT_FORMATS =
 # DATETIME_INPUT_FORMATS =
--- a/django/conf/locale/bn/LC_MESSAGES/django.mo
+++ b/django/conf/locale/bn/LC_MESSAGES/django.mo
--- a/django/conf/locale/bn/LC_MESSAGES/django.po
+++ b/django/conf/locale/bn/LC_MESSAGES/django.po
@ -2,15 +2,15 @@
 #
 # Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011
-# nsmgr8 <nasim.haque@gmail.com>, 2013
+# M Nasimul Haque <nasim.haque@gmail.com>, 2013
 # Tahmid Rafi <rafi.tahmid@gmail.com>, 2012-2013
 # Tahmid Rafi <rafi.tahmid@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-29 20:57+0200\n"
+"POT-Creation-Date: 2017-11-15 16:15+0100\n"
-"PO-Revision-Date: 2016-06-30 08:31+0000\n"
+"PO-Revision-Date: 2017-11-16 01:13+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
 "Language-Team: Bengali (http://www.transifex.com/django/django/language/"
 "bn/)\n"
@ -296,6 +296,15 @@ msgstr ""
 msgid "Syndication"
 msgstr ""
 msgid "That page number is not an integer"
 msgstr ""
 msgid "That page number is less than 1"
 msgstr ""
 msgid "That page contains no results"
 msgstr ""
 msgid "Enter a valid value."
 msgstr "একটি বৈধ মান দিন।"
@ -308,6 +317,7 @@ msgstr ""
 msgid "Enter a valid email address."
 msgstr "একটি বৈধ ইমেইল ঠিকানা লিখুন."
 #. Translators: "letters" means latin letters: a-z and A-Z.
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
@ -383,6 +393,15 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 #, python-format
 msgid ""
 "File extension '%(extension)s' is not allowed. Allowed extensions are: "
 "'%(allowed_extensions)s'."
 msgstr ""
 msgid "Null characters are not allowed."
 msgstr ""
 msgid "and"
 msgstr "এবং"
@ -692,14 +711,14 @@ msgstr ""
 msgid "Please correct the duplicate values below."
 msgstr ""
-msgid "The inline foreign key did not match the parent instance primary key."
+msgid "The inline value did not match the parent instance."
-msgstr "ইনলাইন ফরেন কি টি প্যারেন্ট ইনস্ট্যান্সের প্রাইমারি কি এর সমান নয়।"
+msgstr ""
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr "এটি বৈধ নয়। অনুগ্রহ করে আরেকটি সিলেক্ট করুন।"
 #, python-format
-msgid "\"%(pk)s\" is not a valid value for a primary key."
+msgid "\"%(pk)s\" is not a valid value."
 msgstr ""
 #, python-format
@ -708,15 +727,15 @@ msgid ""
 "may be ambiguous or it may not exist."
 msgstr ""
 msgid "Clear"
 msgstr "পরিষ্কার করুন"
 msgid "Currently"
 msgstr "এই মুহুর্তে"
 msgid "Change"
 msgstr "পরিবর্তন"
 msgid "Clear"
 msgstr "পরিষ্কার করুন"
 msgid "Unknown"
 msgstr "অজানা"
@ -1056,6 +1075,14 @@ msgid ""
 "origin' requests."
 msgstr ""
 msgid ""
 "If you are using the <meta name=\"referrer\" content=\"no-referrer\"> tag or "
 "including the 'Referrer-Policy: no-referrer' header, please remove them. The "
 "CSRF protection requires the 'Referer' header to do strict referer checking. "
 "If you're concerned about privacy, use alternatives like <a rel=\"noreferrer"
 "\" ...> for links to third-party sites."
 msgstr ""
 msgid ""
 "You are seeing this message because this site requires a CSRF cookie when "
 "submitting forms. This cookie is required for security reasons, to ensure "
@ -1070,28 +1097,12 @@ msgstr ""
 msgid "More information is available with DEBUG=True."
 msgstr ""
 msgid "Welcome to Django"
 msgstr ""
 msgid "It worked!"
 msgstr ""
 msgid "Congratulations on your first Django-powered page."
 msgstr ""
 msgid ""
 "Of course, you haven't actually done any work yet. Next, start your first "
 "app by running <code>python manage.py startapp [app_label]</code>."
 msgstr ""
 msgid ""
 "You're seeing this message because you have <code>DEBUG = True</code> in "
 "your Django settings file and you haven't configured any URLs. Get to work!"
 msgstr ""
 msgid "No year specified"
 msgstr "কোন বছর উল্লেখ করা হয়নি"
 msgid "Date out of range"
 msgstr ""
 msgid "No month specified"
 msgstr "কোন মাস উল্লেখ করা হয়নি"
@ -1140,3 +1151,41 @@ msgstr "\"%(path)s\" এর অস্তিত্ব নেই"
 #, python-format
 msgid "Index of %(directory)s"
 msgstr "%(directory)s এর ইনডেক্স"
 msgid "Django: the Web framework for perfectionists with deadlines."
 msgstr ""
 #, python-format
 msgid ""
 "View <a href=\"https://docs.djangoproject.com/en/%(version)s/releases/\" "
 "target=\"_blank\" rel=\"noopener\">release notes</a> for Django %(version)s"
 msgstr ""
 msgid "The install worked successfully! Congratulations!"
 msgstr ""
 #, python-format
 msgid ""
 "You are seeing this page because <a href=\"https://docs.djangoproject.com/en/"
 "%(version)s/ref/settings/#debug\" target=\"_blank\" rel=\"noopener"
 "\">DEBUG=True</a> is in your settings file and you have not configured any "
 "URLs."
 msgstr ""
 msgid "Django Documentation"
 msgstr ""
 msgid "Topics, references, &amp; how-to's"
 msgstr ""
 msgid "Tutorial: A Polling App"
 msgstr ""
 msgid "Get started with Django"
 msgstr ""
 msgid "Django Community"
 msgstr ""
 msgid "Connect, get help, or contribute"
 msgstr ""
--- a/django/conf/locale/bn/formats.py
+++ b/django/conf/locale/bn/formats.py
@ -1,10 +1,7 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
 from __future__ import unicode_literals
 # The *_FORMAT strings use the Django date format syntax,
-# see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
+# see https://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
 DATE_FORMAT = 'j F, Y'
 TIME_FORMAT = 'g:i A'
 # DATETIME_FORMAT =
@ -12,13 +9,24 @@ YEAR_MONTH_FORMAT = 'F Y'
 MONTH_DAY_FORMAT = 'j F'
 SHORT_DATE_FORMAT = 'j M, Y'
 # SHORT_DATETIME_FORMAT =
-# FIRST_DAY_OF_WEEK =
+FIRST_DAY_OF_WEEK = 6  # Saturday
 # The *_INPUT_FORMATS strings use the Python strftime format syntax,
-# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
+# see https://docs.python.org/library/datetime.html#strftime-strptime-behavior
-# DATE_INPUT_FORMATS =
+DATE_INPUT_FORMATS = [
-# TIME_INPUT_FORMATS =
+    '%d/%m/%Y',  # 25/10/2016
-# DATETIME_INPUT_FORMATS =
+    '%d/%m/%y',  # 25/10/16
    '%d-%m-%Y',  # 25-10-2016
    '%d-%m-%y',  # 25-10-16
 ]
 TIME_INPUT_FORMATS = [
    '%H:%M:%S',  # 14:30:59
    '%H:%M',  # 14:30
 ]
 DATETIME_INPUT_FORMATS = [
    '%d/%m/%Y %H:%M:%S',  # 25/10/2006 14:30:59
    '%d/%m/%Y %H:%M',  # 25/10/2006 14:30
 ]
 DECIMAL_SEPARATOR = '.'
 THOUSAND_SEPARATOR = ','
 # NUMBER_GROUPING =
--- a/django/conf/locale/br/LC_MESSAGES/django.mo
+++ b/django/conf/locale/br/LC_MESSAGES/django.mo
--- a/django/conf/locale/br/LC_MESSAGES/django.po
+++ b/django/conf/locale/br/LC_MESSAGES/django.po
@ -6,15 +6,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-29 20:57+0200\n"
+"POT-Creation-Date: 2018-05-17 11:49+0200\n"
-"PO-Revision-Date: 2016-06-30 08:31+0000\n"
+"PO-Revision-Date: 2018-05-18 00:21+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
 "Language-Team: Breton (http://www.transifex.com/django/django/language/br/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: br\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Plural-Forms: nplurals=5; plural=((n%10 == 1) && (n%100 != 11) && (n%100 !"
 "=71) && (n%100 !=91) ? 0 :(n%10 == 2) && (n%100 != 12) && (n%100 !=72) && (n"
 "%100 !=92) ? 1 :(n%10 ==3 || n%10==4 || n%10==9) && (n%100 < 10 || n% 100 > "
 "19) && (n%100 < 70 || n%100 > 79) && (n%100 < 90 || n%100 > 99) ? 2 :(n != 0 "
 "&& n % 1000000 == 0) ? 3 : 4);\n"
 msgid "Afrikaans"
 msgstr "Afrikaneg"
@ -157,6 +161,9 @@ msgstr "Japaneg"
 msgid "Georgian"
 msgstr "Jorjianeg"
 msgid "Kabyle"
 msgstr ""
 msgid "Kazakh"
 msgstr "kazak"
@ -292,6 +299,15 @@ msgstr "Restroù statek"
 msgid "Syndication"
 msgstr "Sindikadur"
 msgid "That page number is not an integer"
 msgstr ""
 msgid "That page number is less than 1"
 msgstr ""
 msgid "That page contains no results"
 msgstr ""
 msgid "Enter a valid value."
 msgstr "Merkit un talvoud reizh"
@ -304,6 +320,7 @@ msgstr ""
 msgid "Enter a valid email address."
 msgstr "Merkit ur chomlec'h postel reizh"
 #. Translators: "letters" means latin letters: a-z and A-Z.
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
@ -350,6 +367,9 @@ msgid_plural ""
 "%(show_value)d)."
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 msgstr[4] ""
 #, python-format
 msgid ""
@ -360,18 +380,30 @@ msgid_plural ""
 "%(show_value)d)."
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 msgstr[4] ""
 msgid "Enter a number."
 msgstr "Merkit un niver."
 #, python-format
 msgid "Ensure that there are no more than %(max)s digit in total."
 msgid_plural "Ensure that there are no more than %(max)s digits in total."
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 msgstr[4] ""
 #, python-format
 msgid "Ensure that there are no more than %(max)s decimal place."
 msgid_plural "Ensure that there are no more than %(max)s decimal places."
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 msgstr[4] ""
 #, python-format
 msgid ""
@ -380,6 +412,18 @@ msgid_plural ""
 "Ensure that there are no more than %(max)s digits before the decimal point."
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 msgstr[4] ""
 #, python-format
 msgid ""
 "File extension '%(extension)s' is not allowed. Allowed extensions are: "
 "'%(allowed_extensions)s'."
 msgstr ""
 msgid "Null characters are not allowed."
 msgstr ""
 msgid "and"
 msgstr "ha"
@ -427,6 +471,10 @@ msgstr "Anterin bras (8 okted)"
 msgid "'%(value)s' value must be either True or False."
 msgstr ""
 #, python-format
 msgid "'%(value)s' value must be either True, False, or None."
 msgstr ""
 msgid "Boolean (Either True or False)"
 msgstr "Boulean (gwir pe gaou)"
@ -589,9 +637,6 @@ msgstr "Rekis eo leuniañ ar vaezienn."
 msgid "Enter a whole number."
 msgstr "Merkit un niver anterin."
 msgid "Enter a number."
 msgstr "Merkit un niver."
 msgid "Enter a valid date."
 msgstr "Merkit un deiziad reizh"
@ -604,6 +649,10 @@ msgstr "Merkit un eur/deiziad reizh"
 msgid "Enter a valid duration."
 msgstr ""
 #, python-brace-format
 msgid "The number of days must be between {min_days} and {max_days}."
 msgstr ""
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr "N'eus ket kaset restr ebet. Gwiriit ar seurt enkodañ evit ar restr"
@ -619,6 +668,9 @@ msgid_plural ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 msgstr[4] ""
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr "Kasit ur restr pe askit al log riñsañ; an eil pe egile"
@ -659,12 +711,18 @@ msgid "Please submit %d or fewer forms."
 msgid_plural "Please submit %d or fewer forms."
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 msgstr[4] ""
 #, python-format
 msgid "Please submit %d or more forms."
 msgid_plural "Please submit %d or more forms."
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 msgstr[4] ""
 msgid "Order"
 msgstr "Urzh"
@ -693,16 +751,14 @@ msgstr ""
 msgid "Please correct the duplicate values below."
 msgstr "Reizhañ ar roadennoù e doubl zo a-is"
-msgid "The inline foreign key did not match the parent instance primary key."
+msgid "The inline value did not match the parent instance."
 msgstr ""
 "Ne glot ket an alc'hwez estren enlinenn gant alc'hwez-mamm an urzhiataer "
 "galloudel kar"
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr "Diuzit un dibab reizh. N'emañ ket an dibab-mañ e-touez ar re bosupl."
 #, python-format
-msgid "\"%(pk)s\" is not a valid value for a primary key."
+msgid "\"%(pk)s\" is not a valid value."
 msgstr ""
 #, python-format
@ -713,15 +769,15 @@ msgstr ""
 "N'eo ket bete komprenet an talvoud %(datetime)s er werzhid eur "
 "%(current_timezone)s; pe eo amjestr pe n'eus ket anezhañ."
 msgid "Clear"
 msgstr "Riñsañ"
 msgid "Currently"
 msgstr "Evit ar mare"
 msgid "Change"
 msgstr "Kemmañ"
 msgid "Clear"
 msgstr "Riñsañ"
 msgid "Unknown"
 msgstr "Dianav"
@ -739,6 +795,9 @@ msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] "%(size)d okted"
 msgstr[1] "%(size)d okted"
 msgstr[2] "%(size)d okted"
 msgstr[3] "%(size)d okted"
 msgstr[4] "%(size)d okted"
 #, python-format
 msgid "%s KB"
@ -1008,36 +1067,54 @@ msgid "%d year"
 msgid_plural "%d years"
 msgstr[0] "%d bloaz"
 msgstr[1] "%d bloaz"
 msgstr[2] "%d bloaz"
 msgstr[3] "%d bloaz"
 msgstr[4] "%d bloaz"
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
 msgstr[0] "%d miz"
 msgstr[1] "%d miz"
 msgstr[2] "%d miz"
 msgstr[3] "%d miz"
 msgstr[4] "%d miz"
 #, python-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d sizhun"
 msgstr[1] "%d sizhun"
 msgstr[2] "%d sizhun"
 msgstr[3] "%d sizhun"
 msgstr[4] "%d sizhun"
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d deiz"
 msgstr[1] "%d deiz"
 msgstr[2] "%d deiz"
 msgstr[3] "%d deiz"
 msgstr[4] "%d deiz"
 #, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d eur"
 msgstr[1] "%d eur"
 msgstr[2] "%d eur"
 msgstr[3] "%d eur"
 msgstr[4] "%d eur"
 #, python-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d munud"
 msgstr[1] "%d munud"
 msgstr[2] "%d munud"
 msgstr[3] "%d munud"
 msgstr[4] "%d munud"
 msgid "0 minutes"
 msgstr "0 munud"
@ -1061,6 +1138,14 @@ msgid ""
 "origin' requests."
 msgstr ""
 msgid ""
 "If you are using the <meta name=\"referrer\" content=\"no-referrer\"> tag or "
 "including the 'Referrer-Policy: no-referrer' header, please remove them. The "
 "CSRF protection requires the 'Referer' header to do strict referer checking. "
 "If you're concerned about privacy, use alternatives like <a rel=\"noreferrer"
 "\" ...> for links to third-party sites."
 msgstr ""
 msgid ""
 "You are seeing this message because this site requires a CSRF cookie when "
 "submitting forms. This cookie is required for security reasons, to ensure "
@ -1075,28 +1160,12 @@ msgstr ""
 msgid "More information is available with DEBUG=True."
 msgstr ""
 msgid "Welcome to Django"
 msgstr ""
 msgid "It worked!"
 msgstr ""
 msgid "Congratulations on your first Django-powered page."
 msgstr ""
 msgid ""
 "Of course, you haven't actually done any work yet. Next, start your first "
 "app by running <code>python manage.py startapp [app_label]</code>."
 msgstr ""
 msgid ""
 "You're seeing this message because you have <code>DEBUG = True</code> in "
 "your Django settings file and you haven't configured any URLs. Get to work!"
 msgstr ""
 msgid "No year specified"
 msgstr "N'eus bet resisaet bloavezh ebet"
 msgid "Date out of range"
 msgstr ""
 msgid "No month specified"
 msgstr "N'eus bet resisaet miz ebet"
@ -1150,3 +1219,41 @@ msgstr "N'eus ket eus \"%(path)s\""
 #, python-format
 msgid "Index of %(directory)s"
 msgstr "Meneger %(directory)s"
 msgid "Django: the Web framework for perfectionists with deadlines."
 msgstr ""
 #, python-format
 msgid ""
 "View <a href=\"https://docs.djangoproject.com/en/%(version)s/releases/\" "
 "target=\"_blank\" rel=\"noopener\">release notes</a> for Django %(version)s"
 msgstr ""
 msgid "The install worked successfully! Congratulations!"
 msgstr ""
 #, python-format
 msgid ""
 "You are seeing this page because <a href=\"https://docs.djangoproject.com/en/"
 "%(version)s/ref/settings/#debug\" target=\"_blank\" rel=\"noopener"
 "\">DEBUG=True</a> is in your settings file and you have not configured any "
 "URLs."
 msgstr ""
 msgid "Django Documentation"
 msgstr ""
 msgid "Topics, references, &amp; how-to's"
 msgstr ""
 msgid "Tutorial: A Polling App"
 msgstr ""
 msgid "Get started with Django"
 msgstr ""
 msgid "Django Community"
 msgstr ""
 msgid "Connect, get help, or contribute"
 msgstr ""
--- a/django/conf/locale/bs/LC_MESSAGES/django.mo
+++ b/django/conf/locale/bs/LC_MESSAGES/django.mo
--- a/django/conf/locale/bs/LC_MESSAGES/django.po
+++ b/django/conf/locale/bs/LC_MESSAGES/django.po
@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-29 20:57+0200\n"
+"POT-Creation-Date: 2017-11-15 16:15+0100\n"
-"PO-Revision-Date: 2016-06-30 08:31+0000\n"
+"PO-Revision-Date: 2017-11-16 01:13+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
 "Language-Team: Bosnian (http://www.transifex.com/django/django/language/"
 "bs/)\n"
@ -295,6 +295,15 @@ msgstr ""
 msgid "Syndication"
 msgstr ""
 msgid "That page number is not an integer"
 msgstr ""
 msgid "That page number is less than 1"
 msgstr ""
 msgid "That page contains no results"
 msgstr ""
 msgid "Enter a valid value."
 msgstr "Unesite ispravnu vrijednost."
@ -307,6 +316,7 @@ msgstr ""
 msgid "Enter a valid email address."
 msgstr ""
 #. Translators: "letters" means latin letters: a-z and A-Z.
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
@ -389,6 +399,15 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 #, python-format
 msgid ""
 "File extension '%(extension)s' is not allowed. Allowed extensions are: "
 "'%(allowed_extensions)s'."
 msgstr ""
 msgid "Null characters are not allowed."
 msgstr ""
 msgid "and"
 msgstr "i"
@ -704,15 +723,15 @@ msgstr ""
 msgid "Please correct the duplicate values below."
 msgstr "Ispravite duple vrijednosti dole."
-msgid "The inline foreign key did not match the parent instance primary key."
+msgid "The inline value did not match the parent instance."
-msgstr "Strani ključ se nije poklopio sa instancom roditeljskog ključa."
+msgstr ""
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr ""
 "Odabrana vrijednost nije među ponuđenima. Odaberite jednu od ponuđenih."
 #, python-format
-msgid "\"%(pk)s\" is not a valid value for a primary key."
+msgid "\"%(pk)s\" is not a valid value."
 msgstr ""
 #, python-format
@ -721,15 +740,15 @@ msgid ""
 "may be ambiguous or it may not exist."
 msgstr ""
 msgid "Clear"
 msgstr "Očisti"
 msgid "Currently"
 msgstr "Trenutno"
 msgid "Change"
 msgstr "Izmjeni"
 msgid "Clear"
 msgstr "Očisti"
 msgid "Unknown"
 msgstr "Nepoznato"
@ -1076,6 +1095,14 @@ msgid ""
 "origin' requests."
 msgstr ""
 msgid ""
 "If you are using the <meta name=\"referrer\" content=\"no-referrer\"> tag or "
 "including the 'Referrer-Policy: no-referrer' header, please remove them. The "
 "CSRF protection requires the 'Referer' header to do strict referer checking. "
 "If you're concerned about privacy, use alternatives like <a rel=\"noreferrer"
 "\" ...> for links to third-party sites."
 msgstr ""
 msgid ""
 "You are seeing this message because this site requires a CSRF cookie when "
 "submitting forms. This cookie is required for security reasons, to ensure "
@ -1090,28 +1117,12 @@ msgstr ""
 msgid "More information is available with DEBUG=True."
 msgstr ""
 msgid "Welcome to Django"
 msgstr ""
 msgid "It worked!"
 msgstr ""
 msgid "Congratulations on your first Django-powered page."
 msgstr ""
 msgid ""
 "Of course, you haven't actually done any work yet. Next, start your first "
 "app by running <code>python manage.py startapp [app_label]</code>."
 msgstr ""
 msgid ""
 "You're seeing this message because you have <code>DEBUG = True</code> in "
 "your Django settings file and you haven't configured any URLs. Get to work!"
 msgstr ""
 msgid "No year specified"
 msgstr "Godina nije naznačena"
 msgid "Date out of range"
 msgstr ""
 msgid "No month specified"
 msgstr "Mjesec nije naznačen"
@ -1160,3 +1171,41 @@ msgstr ""
 #, python-format
 msgid "Index of %(directory)s"
 msgstr ""
 msgid "Django: the Web framework for perfectionists with deadlines."
 msgstr ""
 #, python-format
 msgid ""
 "View <a href=\"https://docs.djangoproject.com/en/%(version)s/releases/\" "
 "target=\"_blank\" rel=\"noopener\">release notes</a> for Django %(version)s"
 msgstr ""
 msgid "The install worked successfully! Congratulations!"
 msgstr ""
 #, python-format
 msgid ""
 "You are seeing this page because <a href=\"https://docs.djangoproject.com/en/"
 "%(version)s/ref/settings/#debug\" target=\"_blank\" rel=\"noopener"
 "\">DEBUG=True</a> is in your settings file and you have not configured any "
 "URLs."
 msgstr ""
 msgid "Django Documentation"
 msgstr ""
 msgid "Topics, references, &amp; how-to's"
 msgstr ""
 msgid "Tutorial: A Polling App"
 msgstr ""
 msgid "Get started with Django"
 msgstr ""
 msgid "Django Community"
 msgstr ""
 msgid "Connect, get help, or contribute"
 msgstr ""
--- a/django/conf/locale/bs/formats.py
+++ b/django/conf/locale/bs/formats.py
@ -1,10 +1,7 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
 from __future__ import unicode_literals
 # The *_FORMAT strings use the Django date format syntax,
-# see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
+# see https://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
 DATE_FORMAT = 'j. N Y.'
 TIME_FORMAT = 'G:i'
 DATETIME_FORMAT = 'j. N. Y. G:i T'
@ -15,7 +12,7 @@ SHORT_DATE_FORMAT = 'Y M j'
 # FIRST_DAY_OF_WEEK =
 # The *_INPUT_FORMATS strings use the Python strftime format syntax,
-# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
+# see https://docs.python.org/library/datetime.html#strftime-strptime-behavior
 # DATE_INPUT_FORMATS =
 # TIME_INPUT_FORMATS =
 # DATETIME_INPUT_FORMATS =
--- a/django/conf/locale/ca/LC_MESSAGES/django.mo
+++ b/django/conf/locale/ca/LC_MESSAGES/django.mo
--- a/django/conf/locale/ca/LC_MESSAGES/django.po
+++ b/django/conf/locale/ca/LC_MESSAGES/django.po
@ -1,7 +1,7 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
-# Antoni Aloy <aaloy@apsl.net>, 2012,2015-2016
+# Antoni Aloy <aaloy@apsl.net>, 2012,2015-2017
 # Carles Barrobés <carles@barrobes.com>, 2011-2012,2014
 # duub qnnp, 2015
 # Jannis Leidel <jannis@leidel.info>, 2011
@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-29 20:57+0200\n"
+"POT-Creation-Date: 2017-11-15 16:15+0100\n"
-"PO-Revision-Date: 2016-06-30 08:31+0000\n"
+"PO-Revision-Date: 2017-11-16 01:13+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
 "Language-Team: Catalan (http://www.transifex.com/django/django/language/"
 "ca/)\n"
@ -65,7 +65,7 @@ msgid "German"
 msgstr "alemany"
 msgid "Lower Sorbian"
-msgstr ""
+msgstr "Lower Sorbian"
 msgid "Greek"
 msgstr "grec"
@ -137,7 +137,7 @@ msgid "Croatian"
 msgstr "croat"
 msgid "Upper Sorbian"
-msgstr ""
+msgstr "Upper Sorbian"
 msgid "Hungarian"
 msgstr "hongarès"
@ -200,7 +200,7 @@ msgid "Burmese"
 msgstr "Burmès"
 msgid "Norwegian Bokmål"
-msgstr ""
+msgstr "Norwegian Bokmål"
 msgid "Nepali"
 msgstr "Nepalí"
@ -298,6 +298,15 @@ msgstr "Arxius estàtics"
 msgid "Syndication"
 msgstr "Sindicació"
 msgid "That page number is not an integer"
 msgstr "Aquesta plana no és un sencer"
 msgid "That page number is less than 1"
 msgstr "El nombre de plana és inferior a 1"
 msgid "That page contains no results"
 msgstr "La plana no conté cap resultat"
 msgid "Enter a valid value."
 msgstr "Introduïu un valor vàlid."
@ -310,6 +319,7 @@ msgstr "Introduïu un enter vàlid."
 msgid "Enter a valid email address."
 msgstr "Introdueix una adreça de correu electrònic vàlida"
 #. Translators: "letters" means latin letters: a-z and A-Z.
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
@ -399,6 +409,17 @@ msgstr[0] ""
 msgstr[1] ""
 "Assegureu-vos que no hi ha més de %(max)s dígits abans de la coma decimal."
 #, python-format
 msgid ""
 "File extension '%(extension)s' is not allowed. Allowed extensions are: "
 "'%(allowed_extensions)s'."
 msgstr ""
 "L'extensió d'arxiu  '%(extension)s' no es permesa. Les extensions permeses "
 "són: '%(allowed_extensions)s'."
 msgid "Null characters are not allowed."
 msgstr ""
 msgid "and"
 msgstr "i"
@ -601,11 +622,11 @@ msgstr "Inter-relació un-a-un"
 #, python-format
 msgid "%(from)s-%(to)s relationship"
-msgstr ""
+msgstr "relació %(from)s-%(to)s "
 #, python-format
 msgid "%(from)s-%(to)s relationships"
-msgstr ""
+msgstr "relacions %(from)s-%(to)s "
 msgid "Many-to-many relationship"
 msgstr "Inter-relació molts-a-molts"
@ -733,18 +754,16 @@ msgstr ""
 msgid "Please correct the duplicate values below."
 msgstr "Si us plau, corregiu els valors duplicats a sota."
-msgid "The inline foreign key did not match the parent instance primary key."
+msgid "The inline value did not match the parent instance."
 msgstr ""
 "La clau forana en línia no coincideix amb la clau primària de la instància "
 "mare."
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr ""
 "Esculli una opció vàlida. Aquesta opció no és una de les opcions disponibles."
 #, python-format
-msgid "\"%(pk)s\" is not a valid value for a primary key."
+msgid "\"%(pk)s\" is not a valid value."
-msgstr "\"%(pk)s\" no és un valor vàlid per a una clau primària."
+msgstr ""
 #, python-format
 msgid ""
@ -754,15 +773,15 @@ msgstr ""
 "No s'ha pogut interpretar %(datetime)s a la zona horària "
 "%(current_timezone)s; potser és ambigua o no existeix."
 msgid "Clear"
 msgstr "Netejar"
 msgid "Currently"
 msgstr "Actualment"
 msgid "Change"
 msgstr "Modificar"
 msgid "Clear"
 msgstr "Netejar"
 msgid "Unknown"
 msgstr "Desconegut"
@ -1109,6 +1128,14 @@ msgstr ""
 "sisplau torna-les a habilitar, com a mínim per a aquest lloc, o per a "
 "connexions HTTPs, o per a peticions amb el mateix orígen."
 msgid ""
 "If you are using the <meta name=\"referrer\" content=\"no-referrer\"> tag or "
 "including the 'Referrer-Policy: no-referrer' header, please remove them. The "
 "CSRF protection requires the 'Referer' header to do strict referer checking. "
 "If you're concerned about privacy, use alternatives like <a rel=\"noreferrer"
 "\" ...> for links to third-party sites."
 msgstr ""
 msgid ""
 "You are seeing this message because this site requires a CSRF cookie when "
 "submitting forms. This cookie is required for security reasons, to ensure "
@ -1130,33 +1157,12 @@ msgstr ""
 msgid "More information is available with DEBUG=True."
 msgstr "Més informació disponible amb DEBUG=True."
 msgid "Welcome to Django"
 msgstr "Benvingut a Django"
 msgid "It worked!"
 msgstr "Funciona!"
 msgid "Congratulations on your first Django-powered page."
 msgstr "Enhorabona per la teva primera plana amb Django."
 msgid ""
 "Of course, you haven't actually done any work yet. Next, start your first "
 "app by running <code>python manage.py startapp [app_label]</code>."
 msgstr ""
 "Per suposat, encara no has fet cap feina real encara. Seguidament crea la "
 "teva primera aplicació executant <code>python manage.py startapp "
 "[app_label]</code>."
 msgid ""
 "You're seeing this message because you have <code>DEBUG = True</code> in "
 "your Django settings file and you haven't configured any URLs. Get to work!"
 msgstr ""
 "Veieu aquest missatge perquè teniu <code>DEBUG = True</code> a la "
 "configuració del Django settings i no heu configurat cap URL. A treballar!"
 msgid "No year specified"
 msgstr "No s'ha especificat any"
 msgid "Date out of range"
 msgstr ""
 msgid "No month specified"
 msgstr "No s'ha especificat mes"
@ -1207,3 +1213,41 @@ msgstr "\"%(path)s\" no existeix"
 #, python-format
 msgid "Index of %(directory)s"
 msgstr "Índex de %(directory)s"
 msgid "Django: the Web framework for perfectionists with deadlines."
 msgstr ""
 #, python-format
 msgid ""
 "View <a href=\"https://docs.djangoproject.com/en/%(version)s/releases/\" "
 "target=\"_blank\" rel=\"noopener\">release notes</a> for Django %(version)s"
 msgstr ""
 msgid "The install worked successfully! Congratulations!"
 msgstr ""
 #, python-format
 msgid ""
 "You are seeing this page because <a href=\"https://docs.djangoproject.com/en/"
 "%(version)s/ref/settings/#debug\" target=\"_blank\" rel=\"noopener"
 "\">DEBUG=True</a> is in your settings file and you have not configured any "
 "URLs."
 msgstr ""
 msgid "Django Documentation"
 msgstr ""
 msgid "Topics, references, &amp; how-to's"
 msgstr ""
 msgid "Tutorial: A Polling App"
 msgstr ""
 msgid "Get started with Django"
 msgstr ""
 msgid "Django Community"
 msgstr ""
 msgid "Connect, get help, or contribute"
 msgstr ""
--- a/django/conf/locale/ca/formats.py
+++ b/django/conf/locale/ca/formats.py
@ -1,10 +1,7 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
 from __future__ import unicode_literals
 # The *_FORMAT strings use the Django date format syntax,
-# see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
+# see https://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
 DATE_FORMAT = r'j \d\e F \d\e Y'
 TIME_FORMAT = 'G:i'
 DATETIME_FORMAT = r'j \d\e F \d\e Y \a \l\e\s G:i'
@ -15,7 +12,7 @@ SHORT_DATETIME_FORMAT = 'd/m/Y G:i'
 FIRST_DAY_OF_WEEK = 1  # Monday
 # The *_INPUT_FORMATS strings use the Python strftime format syntax,
-# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
+# see https://docs.python.org/library/datetime.html#strftime-strptime-behavior
 DATE_INPUT_FORMATS = [
    # '31/12/2009', '31/12/09'
    '%d/%m/%Y', '%d/%m/%y'
--- a/django/conf/locale/cs/LC_MESSAGES/django.mo
+++ b/django/conf/locale/cs/LC_MESSAGES/django.mo
--- a/django/conf/locale/cs/LC_MESSAGES/django.po
+++ b/django/conf/locale/cs/LC_MESSAGES/django.po
@ -6,20 +6,21 @@
 # Jirka Vejrazka <Jirka.Vejrazka@gmail.com>, 2011
 # Tomáš Ehrlich <tomas.ehrlich@gmail.com>, 2015
 # Vláďa Macek <macek@sandbox.cz>, 2012-2014
-# Vláďa Macek <macek@sandbox.cz>, 2015-2016
+# Vláďa Macek <macek@sandbox.cz>, 2015-2018
 msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-29 20:57+0200\n"
+"POT-Creation-Date: 2018-05-17 11:49+0200\n"
-"PO-Revision-Date: 2016-09-16 22:28+0000\n"
+"PO-Revision-Date: 2018-07-15 18:02+0000\n"
 "Last-Translator: Vláďa Macek <macek@sandbox.cz>\n"
 "Language-Team: Czech (http://www.transifex.com/django/django/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n "
 "<= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 msgid "Afrikaans"
 msgstr "afrikánsky"
@ -28,10 +29,10 @@ msgid "Arabic"
 msgstr "arabsky"
 msgid "Asturian"
-msgstr "Asturian"
+msgstr "asturštinou"
 msgid "Azerbaijani"
-msgstr "Ázerbájdžánština"
+msgstr "ázerbájdžánštinou"
 msgid "Bulgarian"
 msgstr "bulharsky"
@ -64,7 +65,7 @@ msgid "German"
 msgstr "německy"
 msgid "Lower Sorbian"
-msgstr "Dolnolužická srbština"
+msgstr "dolnolužickou srbštinou"
 msgid "Greek"
 msgstr "řecky"
@ -91,10 +92,10 @@ msgid "Colombian Spanish"
 msgstr "kolumbijskou španělštinou"
 msgid "Mexican Spanish"
-msgstr "Mexická španělština"
+msgstr "mexickou španělštinou"
 msgid "Nicaraguan Spanish"
-msgstr "Nikaragujskou španělštinou"
+msgstr "nikaragujskou španělštinou"
 msgid "Venezuelan Spanish"
 msgstr "venezuelskou španělštinou"
@ -136,7 +137,7 @@ msgid "Croatian"
 msgstr "chorvatsky"
 msgid "Upper Sorbian"
-msgstr "Hornolužická srbština"
+msgstr "hornolužickou srbštinou"
 msgid "Hungarian"
 msgstr "maďarsky"
@ -160,7 +161,10 @@ msgid "Japanese"
 msgstr "japonsky"
 msgid "Georgian"
-msgstr "gruzínsky"
+msgstr "gruzínštinou"
 msgid "Kabyle"
 msgstr "kabylštinou"
 msgid "Kazakh"
 msgstr "kazašsky"
@ -193,13 +197,13 @@ msgid "Mongolian"
 msgstr "mongolsky"
 msgid "Marathi"
-msgstr "Marathi"
+msgstr "marathi"
 msgid "Burmese"
 msgstr "barmštinou"
 msgid "Norwegian Bokmål"
-msgstr "Bokmål Norština"
+msgstr "bokmål norštinou"
 msgid "Nepali"
 msgstr "nepálsky"
@ -274,7 +278,7 @@ msgid "Ukrainian"
 msgstr "ukrajinsky"
 msgid "Urdu"
-msgstr "Urdština"
+msgstr "urdsky"
 msgid "Vietnamese"
 msgstr "vietnamsky"
@ -297,6 +301,15 @@ msgstr "Statické soubory"
 msgid "Syndication"
 msgstr "Syndikace"
 msgid "That page number is not an integer"
 msgstr "Číslo stránky není celé číslo."
 msgid "That page number is less than 1"
 msgstr "Číslo stránky je menší než 1"
 msgid "That page contains no results"
 msgstr "Stránka je bez výsledků"
 msgid "Enter a valid value."
 msgstr "Zadejte platnou hodnotu."
@ -309,6 +322,7 @@ msgstr "Zadejte platné celé číslo."
 msgid "Enter a valid email address."
 msgstr "Zadejte platnou e-mailovou adresu."
 #. Translators: "letters" means latin letters: a-z and A-Z.
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
@ -359,6 +373,8 @@ msgstr[1] ""
 "Tato hodnota má mít nejméně %(limit_value)d znaky (nyní má %(show_value)d)."
 msgstr[2] ""
 "Tato hodnota má mít nejméně %(limit_value)d znaků (nyní má %(show_value)d)."
 msgstr[3] ""
 "Tato hodnota má mít nejméně %(limit_value)d znaků (nyní má %(show_value)d)."
 #, python-format
 msgid ""
@ -373,6 +389,11 @@ msgstr[1] ""
 "Tato hodnota má mít nejvýše %(limit_value)d znaky (nyní má %(show_value)d)."
 msgstr[2] ""
 "Tato hodnota má mít nejvýše %(limit_value)d znaků (nyní má %(show_value)d)."
 msgstr[3] ""
 "Tato hodnota má mít nejvýše %(limit_value)d znaků (nyní má %(show_value)d)."
 msgid "Enter a number."
 msgstr "Zadejte číslo."
 #, python-format
 msgid "Ensure that there are no more than %(max)s digit in total."
@ -380,6 +401,7 @@ msgid_plural "Ensure that there are no more than %(max)s digits in total."
 msgstr[0] "Ujistěte se, že pole neobsahuje celkem více než %(max)s číslici."
 msgstr[1] "Ujistěte se, že pole neobsahuje celkem více než %(max)s číslice."
 msgstr[2] "Ujistěte se, že pole neobsahuje celkem více než %(max)s číslic."
 msgstr[3] "Ujistěte se, že pole neobsahuje celkem více než %(max)s číslic."
 #, python-format
 msgid "Ensure that there are no more than %(max)s decimal place."
@ -387,6 +409,7 @@ msgid_plural "Ensure that there are no more than %(max)s decimal places."
 msgstr[0] "Ujistěte se, že pole neobsahuje více než %(max)s desetinné místo."
 msgstr[1] "Ujistěte se, že pole neobsahuje více než %(max)s desetinná místa."
 msgstr[2] "Ujistěte se, že pole neobsahuje více než %(max)s desetinných míst."
 msgstr[3] "Ujistěte se, že pole neobsahuje více než %(max)s desetinných míst."
 #, python-format
 msgid ""
@ -402,6 +425,20 @@ msgstr[1] ""
 msgstr[2] ""
 "Ujistěte se, že hodnota neobsahuje více než %(max)s míst před desetinnou "
 "čárkou (tečkou)."
 msgstr[3] ""
 "Ujistěte se, že hodnota neobsahuje více než %(max)s míst před desetinnou "
 "čárkou (tečkou)."
 #, python-format
 msgid ""
 "File extension '%(extension)s' is not allowed. Allowed extensions are: "
 "'%(allowed_extensions)s'."
 msgstr ""
 "Přípona souboru '%(extension)s' není povolena. Povolené jsou tyto: "
 "'%(allowed_extensions)s'."
 msgid "Null characters are not allowed."
 msgstr "Nulové znaky nejsou povoleny."
 msgid "and"
 msgstr "a"
@ -454,6 +491,10 @@ msgstr "Velké číslo (8 bajtů)"
 msgid "'%(value)s' value must be either True or False."
 msgstr "Hodnota '%(value)s' musí být buď True nebo False."
 #, python-format
 msgid "'%(value)s' value must be either True, False, or None."
 msgstr "Hodnota '%(value)s' musí být buď True, False nebo None."
 msgid "Boolean (Either True or False)"
 msgstr "Pravdivost (buď Ano (True), nebo Ne (False))"
@ -628,9 +669,6 @@ msgstr "Toto pole je třeba vyplnit."
 msgid "Enter a whole number."
 msgstr "Zadejte celé číslo."
 msgid "Enter a number."
 msgstr "Zadejte číslo."
 msgid "Enter a valid date."
 msgstr "Zadejte platné datum."
@ -643,6 +681,10 @@ msgstr "Zadejte platné datum a čas."
 msgid "Enter a valid duration."
 msgstr "Zadejte platnou délku trvání."
 #, python-brace-format
 msgid "The number of days must be between {min_days} and {max_days}."
 msgstr "Počet dní musí být mezi {min_days} a {max_days}."
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr ""
 "Soubor nebyl odeslán. Zkontrolujte parametr \"encoding type\" formuláře."
@ -663,6 +705,8 @@ msgstr[1] ""
 "Tento název souboru má mít nejvýše %(max)d znaky (nyní má %(length)d)."
 msgstr[2] ""
 "Tento název souboru má mít nejvýše %(max)d znaků (nyní má %(length)d)."
 msgstr[3] ""
 "Tento název souboru má mít nejvýše %(max)d znaků (nyní má %(length)d)."
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr "Musíte vybrat cestu k souboru nebo vymazat výběr, ne obojí."
@ -703,6 +747,7 @@ msgid_plural "Please submit %d or fewer forms."
 msgstr[0] "Odešlete %d nebo méně formulářů."
 msgstr[1] "Odešlete %d nebo méně formulářů."
 msgstr[2] "Odešlete %d nebo méně formulářů."
 msgstr[3] "Odešlete %d nebo méně formulářů."
 #, python-format
 msgid "Please submit %d or more forms."
@ -710,6 +755,7 @@ msgid_plural "Please submit %d or more forms."
 msgstr[0] "Odešlete %d nebo více formulářů."
 msgstr[1] "Odešlete %d nebo více formulářů."
 msgstr[2] "Odešlete %d nebo více formulářů."
 msgstr[3] "Odešlete %d nebo více formulářů."
 msgid "Order"
 msgstr "Pořadí"
@ -736,16 +782,15 @@ msgstr ""
 msgid "Please correct the duplicate values below."
 msgstr "Odstraňte duplicitní hodnoty níže."
-msgid "The inline foreign key did not match the parent instance primary key."
+msgid "The inline value did not match the parent instance."
-msgstr ""
+msgstr "Hodnota typu inline neodpovídá rodičovské položce."
 "Cizí klíč typu inline neodpovídá primárnímu klíči v rodičovské položce."
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr "Vyberte platnou možnost. Tato není k dispozici."
 #, python-format
-msgid "\"%(pk)s\" is not a valid value for a primary key."
+msgid "\"%(pk)s\" is not a valid value."
-msgstr "Hodnota \"%(pk)s\" není platný primární klíč."
+msgstr "\"%(pk)s\" není platná hodnota."
 #, python-format
 msgid ""
@ -755,15 +800,15 @@ msgstr ""
 "Hodnotu %(datetime)s nelze interpretovat v časové zóně %(current_timezone)s; "
 "může to být nejednoznačné nebo nemusí existovat."
 msgid "Clear"
 msgstr "Zrušit"
 msgid "Currently"
 msgstr "Aktuálně"
 msgid "Change"
 msgstr "Změnit"
 msgid "Clear"
 msgstr "Zrušit"
 msgid "Unknown"
 msgstr "Neznámé"
@ -782,6 +827,7 @@ msgid_plural "%(size)d bytes"
 msgstr[0] "%(size)d bajt"
 msgstr[1] "%(size)d bajty"
 msgstr[2] "%(size)d bajtů"
 msgstr[3] "%(size)d bajtů"
 #, python-format
 msgid "%s KB"
@ -1052,6 +1098,7 @@ msgid_plural "%d years"
 msgstr[0] "%d rok"
 msgstr[1] "%d roky"
 msgstr[2] "%d let"
 msgstr[3] "%d let"
 #, python-format
 msgid "%d month"
@ -1059,6 +1106,7 @@ msgid_plural "%d months"
 msgstr[0] "%d měsíc"
 msgstr[1] "%d měsíce"
 msgstr[2] "%d měsíců"
 msgstr[3] "%d měsíců"
 #, python-format
 msgid "%d week"
@ -1066,6 +1114,7 @@ msgid_plural "%d weeks"
 msgstr[0] "%d týden"
 msgstr[1] "%d týdny"
 msgstr[2] "%d týdnů"
 msgstr[3] "%d týdnů"
 #, python-format
 msgid "%d day"
@ -1073,6 +1122,7 @@ msgid_plural "%d days"
 msgstr[0] "%d den"
 msgstr[1] "%d dny"
 msgstr[2] "%d dní"
 msgstr[3] "%d dní"
 #, python-format
 msgid "%d hour"
@ -1080,6 +1130,7 @@ msgid_plural "%d hours"
 msgstr[0] "%d hodina"
 msgstr[1] "%d hodiny"
 msgstr[2] "%d hodin"
 msgstr[3] "%d hodin"
 #, python-format
 msgid "%d minute"
@ -1087,6 +1138,7 @@ msgid_plural "%d minutes"
 msgstr[0] "%d minuta"
 msgstr[1] "%d minuty"
 msgstr[2] "%d minut"
 msgstr[3] "%d minut"
 msgid "0 minutes"
 msgstr "0 minut"
@ -1117,6 +1169,19 @@ msgstr ""
 "alespoň pro tento web nebo pro spojení typu HTTPS nebo pro požadavky typu "
 "\"stejný původ\" (same origin)."
 msgid ""
 "If you are using the <meta name=\"referrer\" content=\"no-referrer\"> tag or "
 "including the 'Referrer-Policy: no-referrer' header, please remove them. The "
 "CSRF protection requires the 'Referer' header to do strict referer checking. "
 "If you're concerned about privacy, use alternatives like <a rel=\"noreferrer"
 "\" ...> for links to third-party sites."
 msgstr ""
 "Pokud používáte značku <meta name=\"referrer\" content=\"no-referrer\"> nebo "
 "záhlaví 'Referrer-Policy: no-referrer', odeberte je. Ochrana typu CSRF "
 "vyžaduje, aby záhlaví zajišťovalo striktní hlídání refereru. Pokud je pro "
 "vás soukromí důležité, použije k odkazům na cizí weby alternativní možnosti "
 "jako například <a rel=\"noreferrer\" ...>."
 msgid ""
 "You are seeing this message because this site requires a CSRF cookie when "
 "submitting forms. This cookie is required for security reasons, to ensure "
@ -1136,34 +1201,12 @@ msgstr ""
 msgid "More information is available with DEBUG=True."
 msgstr "V případě zapnutí volby DEBUG=True bude k dispozici více informací."
 msgid "Welcome to Django"
 msgstr "Vítejte v systému Django"
 msgid "It worked!"
 msgstr "Funguje to!"
 msgid "Congratulations on your first Django-powered page."
 msgstr "Gratulujeme, toto je vaše první stránka generována v prostředí Django."
 msgid ""
 "Of course, you haven't actually done any work yet. Next, start your first "
 "app by running <code>python manage.py startapp [app_label]</code>."
 msgstr ""
 "Samozřejmě máte před sebou ještě spoustu práce. Začněte vytvořením Vaší "
 "první aplikace pomocí příkazu <code>python manage.py startapp [app_label]</"
 "code>. "
 msgid ""
 "You're seeing this message because you have <code>DEBUG = True</code> in "
 "your Django settings file and you haven't configured any URLs. Get to work!"
 msgstr ""
 "Tuto zprávu vidíte, protože máte v nastavení Djanga zapnutý vývojový režim "
 "<code>DEBUG = True</code> a zatím nemáte nastavena žádná URL. S chutí do "
 "práce!"
 msgid "No year specified"
 msgstr "Nebyl specifikován rok"
 msgid "Date out of range"
 msgstr "Datum je mimo rozsah"
 msgid "No month specified"
 msgstr "Nebyl specifikován měsíc"
@ -1214,3 +1257,48 @@ msgstr "\"%(path)s\" neexistuje"
 #, python-format
 msgid "Index of %(directory)s"
 msgstr "Index adresáře %(directory)s"
 msgid "Django: the Web framework for perfectionists with deadlines."
 msgstr "Django: Webový framework pro perfekcionisty, kteří mají termín"
 #, python-format
 msgid ""
 "View <a href=\"https://docs.djangoproject.com/en/%(version)s/releases/\" "
 "target=\"_blank\" rel=\"noopener\">release notes</a> for Django %(version)s"
 msgstr ""
 "Zobrazit <a href=\"https://docs.djangoproject.com/en/%(version)s/releases/\" "
 "target=\"_blank\" rel=\"noopener\">poznámky k vydání</a> frameworku Django "
 "%(version)s"
 msgid "The install worked successfully! Congratulations!"
 msgstr "Instalace proběhla úspěšně, gratulujeme!"
 #, python-format
 msgid ""
 "You are seeing this page because <a href=\"https://docs.djangoproject.com/en/"
 "%(version)s/ref/settings/#debug\" target=\"_blank\" rel=\"noopener"
 "\">DEBUG=True</a> is in your settings file and you have not configured any "
 "URLs."
 msgstr ""
 "Tuto zprávu vidíte, protože máte v nastavení Djanga zapnutý vývojový režim "
 "<a href=\"https://docs.djangoproject.com/en/%(version)s/ref/settings/#debug"
 "\" target=\"_blank\" rel=\"noopener\">DEBUG=True</a> a zatím nemáte "
 "nastavena žádná URL."
 msgid "Django Documentation"
 msgstr "Dokumentace frameworku Django"
 msgid "Topics, references, &amp; how-to's"
 msgstr "Témata, odkazy &amp; how-to"
 msgid "Tutorial: A Polling App"
 msgstr "Tutoriál: Hlasovací aplikace"
 msgid "Get started with Django"
 msgstr "Začínáme s frameworkem Django"
 msgid "Django Community"
 msgstr "Komunita kolem frameworku Django"
 msgid "Connect, get help, or contribute"
 msgstr "Propojte se, získejte pomoc, podílejte se"
--- a/django/conf/locale/cs/formats.py
+++ b/django/conf/locale/cs/formats.py
@ -1,10 +1,7 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
 from __future__ import unicode_literals
 # The *_FORMAT strings use the Django date format syntax,
-# see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
+# see https://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
 DATE_FORMAT = 'j. E Y'
 TIME_FORMAT = 'G:i'
 DATETIME_FORMAT = 'j. E Y G:i'
@ -15,7 +12,7 @@ SHORT_DATETIME_FORMAT = 'd.m.Y G:i'
 FIRST_DAY_OF_WEEK = 1  # Monday
 # The *_INPUT_FORMATS strings use the Python strftime format syntax,
-# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
+# see https://docs.python.org/library/datetime.html#strftime-strptime-behavior
 DATE_INPUT_FORMATS = [
    '%d.%m.%Y', '%d.%m.%y',     # '05.01.2006', '05.01.06'
    '%d. %m. %Y', '%d. %m. %y',  # '5. 1. 2006', '5. 1. 06'
--- a/django/conf/locale/cy/LC_MESSAGES/django.mo
+++ b/django/conf/locale/cy/LC_MESSAGES/django.mo
--- a/django/conf/locale/cy/LC_MESSAGES/django.po
+++ b/django/conf/locale/cy/LC_MESSAGES/django.po
@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-29 20:57+0200\n"
+"POT-Creation-Date: 2017-11-15 16:15+0100\n"
-"PO-Revision-Date: 2016-06-30 08:31+0000\n"
+"PO-Revision-Date: 2017-11-16 01:13+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
 "Language-Team: Welsh (http://www.transifex.com/django/django/language/cy/)\n"
 "MIME-Version: 1.0\n"
@ -294,6 +294,15 @@ msgstr "Ffeiliau Statig"
 msgid "Syndication"
 msgstr "Syndicetiad"
 msgid "That page number is not an integer"
 msgstr ""
 msgid "That page number is less than 1"
 msgstr ""
 msgid "That page contains no results"
 msgstr ""
 msgid "Enter a valid value."
 msgstr "Rhowch werth dilys."
@ -306,6 +315,7 @@ msgstr "Rhowch gyfanrif dilys."
 msgid "Enter a valid email address."
 msgstr "Rhowch gyfeiriad ebost dilys."
 #. Translators: "letters" means latin letters: a-z and A-Z.
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
@ -408,6 +418,15 @@ msgstr[1] "Sicrhewch nad oes mwy na %(max)s ddigid cyn y pwynt degol."
 msgstr[2] "Sicrhewch nad oes mwy na %(max)s digid cyn y pwynt degol."
 msgstr[3] "Sicrhewch nad oes mwy na %(max)s digid cyn y pwynt degol."
 #, python-format
 msgid ""
 "File extension '%(extension)s' is not allowed. Allowed extensions are: "
 "'%(allowed_extensions)s'."
 msgstr ""
 msgid "Null characters are not allowed."
 msgstr ""
 msgid "and"
 msgstr "a"
@ -743,10 +762,8 @@ msgstr ""
 msgid "Please correct the duplicate values below."
 msgstr "Cywirwch y gwerthoedd dyblyg isod."
-msgid "The inline foreign key did not match the parent instance primary key."
+msgid "The inline value did not match the parent instance."
 msgstr ""
 "Nid yw'r allwedd estron mewnlin yn cydfynd gyda allwedd gynradd enghraifft y "
 "rhiant."
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr ""
@ -754,8 +771,8 @@ msgstr ""
 "gael."
 #, python-format
-msgid "\"%(pk)s\" is not a valid value for a primary key."
+msgid "\"%(pk)s\" is not a valid value."
-msgstr "Nid yw \"%(pk)s\" yn werth dilys ar gyfer allwedd cynradd."
+msgstr ""
 #, python-format
 msgid ""
@ -765,15 +782,15 @@ msgstr ""
 "Ni ellir dehongli %(datetime)s yn y gylchfa amser %(current_timezone)s; "
 "mae'n amwys neu ddim yn bodoli."
 msgid "Clear"
 msgstr "Clirio"
 msgid "Currently"
 msgstr "Ar hyn o bryd"
 msgid "Change"
 msgstr "Newid"
 msgid "Clear"
 msgstr "Clirio"
 msgid "Unknown"
 msgstr "Anhysbys"
@ -1133,6 +1150,14 @@ msgstr ""
 "oleiaf ar gyfer y safle hwn neu ar gyfer cysylltiadau HTTPS neu ar gyfer "
 "ceisiadau 'same-origin'."
 msgid ""
 "If you are using the <meta name=\"referrer\" content=\"no-referrer\"> tag or "
 "including the 'Referrer-Policy: no-referrer' header, please remove them. The "
 "CSRF protection requires the 'Referer' header to do strict referer checking. "
 "If you're concerned about privacy, use alternatives like <a rel=\"noreferrer"
 "\" ...> for links to third-party sites."
 msgstr ""
 msgid ""
 "You are seeing this message because this site requires a CSRF cookie when "
 "submitting forms. This cookie is required for security reasons, to ensure "
@ -1152,28 +1177,12 @@ msgstr ""
 msgid "More information is available with DEBUG=True."
 msgstr "Mae mwy o wybodaeth ar gael gyda DEBUG=True"
 msgid "Welcome to Django"
 msgstr ""
 msgid "It worked!"
 msgstr ""
 msgid "Congratulations on your first Django-powered page."
 msgstr ""
 msgid ""
 "Of course, you haven't actually done any work yet. Next, start your first "
 "app by running <code>python manage.py startapp [app_label]</code>."
 msgstr ""
 msgid ""
 "You're seeing this message because you have <code>DEBUG = True</code> in "
 "your Django settings file and you haven't configured any URLs. Get to work!"
 msgstr ""
 msgid "No year specified"
 msgstr "Dim blwyddyn wedi’i bennu"
 msgid "Date out of range"
 msgstr ""
 msgid "No month specified"
 msgstr "Dim mis wedi’i bennu"
@ -1225,3 +1234,41 @@ msgstr "Nid yw \"%(path)s\" yn bodoli"
 #, python-format
 msgid "Index of %(directory)s"
 msgstr "Mynegai %(directory)s"
 msgid "Django: the Web framework for perfectionists with deadlines."
 msgstr ""
 #, python-format
 msgid ""
 "View <a href=\"https://docs.djangoproject.com/en/%(version)s/releases/\" "
 "target=\"_blank\" rel=\"noopener\">release notes</a> for Django %(version)s"
 msgstr ""
 msgid "The install worked successfully! Congratulations!"
 msgstr ""
 #, python-format
 msgid ""
 "You are seeing this page because <a href=\"https://docs.djangoproject.com/en/"
 "%(version)s/ref/settings/#debug\" target=\"_blank\" rel=\"noopener"
 "\">DEBUG=True</a> is in your settings file and you have not configured any "
 "URLs."
 msgstr ""
 msgid "Django Documentation"
 msgstr ""
 msgid "Topics, references, &amp; how-to's"
 msgstr ""
 msgid "Tutorial: A Polling App"
 msgstr ""
 msgid "Get started with Django"
 msgstr ""
 msgid "Django Community"
 msgstr ""
 msgid "Connect, get help, or contribute"
 msgstr ""
--- a/django/conf/locale/cy/formats.py
+++ b/django/conf/locale/cy/formats.py
@ -1,10 +1,7 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
 from __future__ import unicode_literals
 # The *_FORMAT strings use the Django date format syntax,
-# see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
+# see https://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
 DATE_FORMAT = 'j F Y'                   # '25 Hydref 2006'
 TIME_FORMAT = 'P'                       # '2:30 y.b.'
 DATETIME_FORMAT = 'j F Y, P'            # '25 Hydref 2006, 2:30 y.b.'
@ -15,7 +12,7 @@ SHORT_DATETIME_FORMAT = 'd/m/Y P'       # '25/10/2006 2:30 y.b.'
 FIRST_DAY_OF_WEEK = 1                   # 'Dydd Llun'
 # The *_INPUT_FORMATS strings use the Python strftime format syntax,
-# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
+# see https://docs.python.org/library/datetime.html#strftime-strptime-behavior
 DATE_INPUT_FORMATS = [
    '%d/%m/%Y', '%d/%m/%y',             # '25/10/2006', '25/10/06'
 ]
--- a/django/conf/locale/da/LC_MESSAGES/django.mo
+++ b/django/conf/locale/da/LC_MESSAGES/django.mo
--- a/django/conf/locale/da/LC_MESSAGES/django.po
+++ b/django/conf/locale/da/LC_MESSAGES/django.po
@ -3,7 +3,7 @@
 # Translators:
 # Christian Joergensen <christian@gmta.info>, 2012
 # Danni Randeris <danniranderis+djangocore@gmail.com>, 2014
-# Erik Wognsen <r4mses@gmail.com>, 2013-2016
+# Erik Wognsen <r4mses@gmail.com>, 2013-2018
 # Finn Gruwier Larsen, 2011
 # Jannis Leidel <jannis@leidel.info>, 2011
 # jonaskoelker <jonaskoelker@gnu.org>, 2012
@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-29 20:57+0200\n"
+"POT-Creation-Date: 2018-05-17 11:49+0200\n"
-"PO-Revision-Date: 2016-06-30 19:27+0000\n"
+"PO-Revision-Date: 2018-05-18 20:46+0000\n"
 "Last-Translator: Erik Wognsen <r4mses@gmail.com>\n"
 "Language-Team: Danish (http://www.transifex.com/django/django/language/da/)\n"
 "MIME-Version: 1.0\n"
@ -164,6 +164,9 @@ msgstr "japansk"
 msgid "Georgian"
 msgstr "georgisk"
 msgid "Kabyle"
 msgstr "kabylsk"
 msgid "Kazakh"
 msgstr "kasakhisk"
@ -299,6 +302,15 @@ msgstr "Static Files"
 msgid "Syndication"
 msgstr "Syndication"
 msgid "That page number is not an integer"
 msgstr "Det sidetal er ikke et heltal"
 msgid "That page number is less than 1"
 msgstr "Det sidetal er mindre end 1"
 msgid "That page contains no results"
 msgstr "Den side indeholder ingen resultater"
 msgid "Enter a valid value."
 msgstr "Indtast en gyldig værdi."
@ -311,6 +323,7 @@ msgstr "Indtast et gyldigt heltal."
 msgid "Enter a valid email address."
 msgstr "Indtast en gyldig e-mail-adresse."
 #. Translators: "letters" means latin letters: a-z and A-Z.
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
@ -372,6 +385,9 @@ msgstr[0] ""
 msgstr[1] ""
 "Denne værdi må højst have %(limit_value)d tegn (den har %(show_value)d)."
 msgid "Enter a number."
 msgstr "Indtast et tal."
 #, python-format
 msgid "Ensure that there are no more than %(max)s digit in total."
 msgid_plural "Ensure that there are no more than %(max)s digits in total."
@ -392,6 +408,17 @@ msgid_plural ""
 msgstr[0] "Der må maksimalt være %(max)s ciffer før kommaet."
 msgstr[1] "Der må maksimalt være %(max)s cifre før kommaet."
 #, python-format
 msgid ""
 "File extension '%(extension)s' is not allowed. Allowed extensions are: "
 "'%(allowed_extensions)s'."
 msgstr ""
 "Filendelse '%(extension)s' er ikke tilladt. Tilladte filendelser er: "
 "'%(allowed_extensions)s'."
 msgid "Null characters are not allowed."
 msgstr "Null-tegn er ikke tilladte."
 msgid "and"
 msgstr "og"
@ -439,6 +466,10 @@ msgstr "Stort heltal (8 byte)"
 msgid "'%(value)s' value must be either True or False."
 msgstr "'%(value)s'-værdien skal være enten True eller False."
 #, python-format
 msgid "'%(value)s' value must be either True, False, or None."
 msgstr "'%(value)s' værdien skal være enten True, False eller None."
 msgid "Boolean (Either True or False)"
 msgstr "Boolsk (enten True eller False)"
@ -615,9 +646,6 @@ msgstr "Dette felt er påkrævet."
 msgid "Enter a whole number."
 msgstr "Indtast et heltal."
 msgid "Enter a number."
 msgstr "Indtast et tal."
 msgid "Enter a valid date."
 msgstr "Indtast en gyldig dato."
@ -630,6 +658,10 @@ msgstr "Indtast gyldig dato/tid."
 msgid "Enter a valid duration."
 msgstr "Indtast en gyldig varighed."
 #, python-brace-format
 msgid "The number of days must be between {min_days} and {max_days}."
 msgstr "Antallet af dage skal være mellem {min_days} og {max_days}."
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr "Ingen fil blev indsendt. Kontroller kodningstypen i formularen."
@ -721,9 +753,8 @@ msgstr ""
 msgid "Please correct the duplicate values below."
 msgstr "Ret venligst de duplikerede data herunder."
-msgid "The inline foreign key did not match the parent instance primary key."
+msgid "The inline value did not match the parent instance."
-msgstr ""
+msgstr "Den indlejrede værdi passede ikke med forældreinstansen."
 "Den indlejrede fremmednøgle passede ikke med forælderinstansens primærnøgle."
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr ""
@ -731,8 +762,8 @@ msgstr ""
 "tilgængelige valgmuligheder."
 #, python-format
-msgid "\"%(pk)s\" is not a valid value for a primary key."
+msgid "\"%(pk)s\" is not a valid value."
-msgstr "\"%(pk)s\" er ikke en gyldig værdi for en primærnøgle."
+msgstr "\"%(pk)s\" er ikke en gyldig værdi."
 #, python-format
 msgid ""
@ -742,15 +773,15 @@ msgstr ""
 "%(datetime)s kunne ikke fortolkes i tidszonen %(current_timezone)s; den kan "
 "være tvetydig eller den eksisterer måske ikke."
 msgid "Clear"
 msgstr "Afmarkér"
 msgid "Currently"
 msgstr "Aktuelt"
 msgid "Change"
 msgstr "Ret"
 msgid "Clear"
 msgstr "Afmarkér"
 msgid "Unknown"
 msgstr "Ukendt"
@ -1097,6 +1128,19 @@ msgstr ""
 "dig slå dem til igen, i hvert fald for denne webside, eller for HTTPS-"
 "forbindelser, eller for 'same-origin'-forespørgsler."
 msgid ""
 "If you are using the <meta name=\"referrer\" content=\"no-referrer\"> tag or "
 "including the 'Referrer-Policy: no-referrer' header, please remove them. The "
 "CSRF protection requires the 'Referer' header to do strict referer checking. "
 "If you're concerned about privacy, use alternatives like <a rel=\"noreferrer"
 "\" ...> for links to third-party sites."
 msgstr ""
 "Hvis du bruger tagget <meta name=\"referrer\" content=\"no-referrer\"> eller "
 "inkluderer headeren 'Referrer-Policy: no-referrer', så fjern dem venligst. "
 "CSRF-beskyttelsen afhænger af at 'Referer'-headeren udfører stringent "
 "referer-kontrol. Hvis du er bekymret om privatliv, så brug alternativer så "
 "som <a rel=\"noreferrer\" ...> for links til tredjepartswebsider."
 msgid ""
 "You are seeing this message because this site requires a CSRF cookie when "
 "submitting forms. This cookie is required for security reasons, to ensure "
@ -1116,32 +1160,12 @@ msgstr ""
 msgid "More information is available with DEBUG=True."
 msgstr "Mere information er tilgængeligt med DEBUG=True."
 msgid "Welcome to Django"
 msgstr "Velkommen til Django"
 msgid "It worked!"
 msgstr "Det virkede!"
 msgid "Congratulations on your first Django-powered page."
 msgstr "Tillykke med din første Django-drevne side."
 msgid ""
 "Of course, you haven't actually done any work yet. Next, start your first "
 "app by running <code>python manage.py startapp [app_label]</code>."
 msgstr ""
 "Du har dog ikke gjort noget endnu. Start din første app ved at køre  "
 "<code>python manage.py startapp [app_label]</code>."
 msgid ""
 "You're seeing this message because you have <code>DEBUG = True</code> in "
 "your Django settings file and you haven't configured any URLs. Get to work!"
 msgstr ""
 "Du ser denne besked fordi du har <code>DEBUG = True</code> i din Django "
 "indstillingsfil og du har ikke konfigureret nogen URLs endnu. Kom i sving!"
 msgid "No year specified"
 msgstr "Intet år specificeret"
 msgid "Date out of range"
 msgstr "Dato uden for rækkevidde"
 msgid "No month specified"
 msgstr "Ingen måned specificeret"
@ -1192,3 +1216,46 @@ msgstr "\" %(path)s\" eksisterer ikke"
 #, python-format
 msgid "Index of %(directory)s"
 msgstr "Indeks for %(directory)s"
 msgid "Django: the Web framework for perfectionists with deadlines."
 msgstr "Django: Webframework'et for perfektionister med deadlines."
 #, python-format
 msgid ""
 "View <a href=\"https://docs.djangoproject.com/en/%(version)s/releases/\" "
 "target=\"_blank\" rel=\"noopener\">release notes</a> for Django %(version)s"
 msgstr ""
 "Vis <a href=\"https://docs.djangoproject.com/en/%(version)s/releases/\" "
 "target=\"_blank\" rel=\"noopener\">udgivelsesnoter</a> for Django %(version)s"
 msgid "The install worked successfully! Congratulations!"
 msgstr "Installationen virkede! Tillykke!"
 #, python-format
 msgid ""
 "You are seeing this page because <a href=\"https://docs.djangoproject.com/en/"
 "%(version)s/ref/settings/#debug\" target=\"_blank\" rel=\"noopener"
 "\">DEBUG=True</a> is in your settings file and you have not configured any "
 "URLs."
 msgstr ""
 "Du ser denne side fordi du har <a href=\"https://docs.djangoproject.com/en/"
 "%(version)s/ref/settings/#debug\" target=\"_blank\" rel=\"noopener"
 "\">DEBUG=True</a> i din settings-fil og ikke har opsat nogen URL'er."
 msgid "Django Documentation"
 msgstr "Django-dokumentation"
 msgid "Topics, references, &amp; how-to's"
 msgstr "Emner, referencer &amp; how-to's"
 msgid "Tutorial: A Polling App"
 msgstr "Gennemgang: En afstemnings-app"
 msgid "Get started with Django"
 msgstr "Kom i gang med Django"
 msgid "Django Community"
 msgstr "Django-fællesskabet"
 msgid "Connect, get help, or contribute"
 msgstr "Forbind, få hjælp eller bidrag"
--- a/django/conf/locale/da/formats.py
+++ b/django/conf/locale/da/formats.py
@ -1,10 +1,7 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
 from __future__ import unicode_literals
 # The *_FORMAT strings use the Django date format syntax,
-# see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
+# see https://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
 DATE_FORMAT = 'j. F Y'
 TIME_FORMAT = 'H:i'
 DATETIME_FORMAT = 'j. F Y H:i'
@ -15,7 +12,7 @@ SHORT_DATETIME_FORMAT = 'd.m.Y H:i'
 FIRST_DAY_OF_WEEK = 1
 # The *_INPUT_FORMATS strings use the Python strftime format syntax,
-# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
+# see https://docs.python.org/library/datetime.html#strftime-strptime-behavior
 DATE_INPUT_FORMATS = [
    '%d.%m.%Y',                         # '25.10.2006'
 ]
--- a/django/conf/locale/de/LC_MESSAGES/django.mo
+++ b/django/conf/locale/de/LC_MESSAGES/django.mo
--- a/django/conf/locale/de/LC_MESSAGES/django.po
+++ b/django/conf/locale/de/LC_MESSAGES/django.po
@ -3,18 +3,19 @@
 # Translators:
 # André Hagenbruch, 2011-2012
 # Florian Apolloner <florian@apolloner.eu>, 2011
-# Dunedan <dunedan@phoenitydawn.de>, 2016
+# Daniel Roschka <dunedan@phoenitydawn.de>, 2016
 # Florian Apolloner <florian@apolloner.eu>, 2018
 # Jannis Vajen, 2011,2013
-# Jannis Leidel <jannis@leidel.info>, 2013-2016
+# Jannis Leidel <jannis@leidel.info>, 2013-2018
 # Jannis Vajen, 2016
-# Markus Holtermann <inyoka@markusholtermann.eu>, 2013,2015
+# Markus Holtermann <info@markusholtermann.eu>, 2013,2015
 msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-29 20:57+0200\n"
+"POT-Creation-Date: 2018-05-17 11:49+0200\n"
-"PO-Revision-Date: 2016-07-26 11:37+0000\n"
+"PO-Revision-Date: 2018-08-14 08:25+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
+"Last-Translator: Florian Apolloner <florian@apolloner.eu>\n"
 "Language-Team: German (http://www.transifex.com/django/django/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@ -163,6 +164,9 @@ msgstr "Japanisch"
 msgid "Georgian"
 msgstr "Georgisch"
 msgid "Kabyle"
 msgstr "Kabylisch"
 msgid "Kazakh"
 msgstr "Kasachisch"
@ -206,7 +210,7 @@ msgid "Nepali"
 msgstr "Nepali"
 msgid "Dutch"
-msgstr "Holländisch"
+msgstr "Niederländisch"
 msgid "Norwegian Nynorsk"
 msgstr "Norwegisch (Nynorsk)"
@ -298,6 +302,15 @@ msgstr "Statische Dateien"
 msgid "Syndication"
 msgstr "Syndication"
 msgid "That page number is not an integer"
 msgstr "Diese Seitennummer ist keine Ganzzahl"
 msgid "That page number is less than 1"
 msgstr "Diese Seitennummer ist kleiner als 1"
 msgid "That page contains no results"
 msgstr "Diese Seite enthält keine Ergebnisse"
 msgid "Enter a valid value."
 msgstr "Bitte einen gültigen Wert eingeben."
@ -310,6 +323,7 @@ msgstr "Bitte eine gültige Ganzzahl eingeben."
 msgid "Enter a valid email address."
 msgstr "Bitte gültige E-Mail-Adresse eingeben."
 #. Translators: "letters" means latin letters: a-z and A-Z.
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
@ -339,7 +353,7 @@ msgstr "Bitte nur durch Komma getrennte Ziffern eingeben."
 msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
 msgstr ""
 "Bitte sicherstellen, dass der Wert %(limit_value)s ist. (Er ist "
-"%(show_value)s)"
+"%(show_value)s.)"
 #, python-format
 msgid "Ensure this value is less than or equal to %(limit_value)s."
@ -358,10 +372,10 @@ msgid_plural ""
 "%(show_value)d)."
 msgstr[0] ""
 "Bitte sicherstellen, dass der Wert aus mindestens %(limit_value)d Zeichen "
-"besteht. (Er besteht aus %(show_value)d Zeichen)."
+"besteht. (Er besteht aus %(show_value)d Zeichen.)"
 msgstr[1] ""
 "Bitte sicherstellen, dass der Wert aus mindestens %(limit_value)d Zeichen "
-"besteht. (Er besteht aus %(show_value)d Zeichen)."
+"besteht. (Er besteht aus %(show_value)d Zeichen.)"
 #, python-format
 msgid ""
@ -372,10 +386,13 @@ msgid_plural ""
 "%(show_value)d)."
 msgstr[0] ""
 "Bitte sicherstellen, dass der Wert aus höchstens %(limit_value)d Zeichen "
-"besteht. (Er besteht aus %(show_value)d Zeichen)."
+"besteht. (Er besteht aus %(show_value)d Zeichen.)"
 msgstr[1] ""
 "Bitte sicherstellen, dass der Wert aus höchstens %(limit_value)d Zeichen "
-"besteht. (Er besteht aus %(show_value)d Zeichen)."
+"besteht. (Er besteht aus %(show_value)d Zeichen.)"
 msgid "Enter a number."
 msgstr "Bitte eine Zahl eingeben."
 #, python-format
 msgid "Ensure that there are no more than %(max)s digit in total."
@ -405,6 +422,17 @@ msgstr[1] ""
 "Bitte sicherstellen, dass der Wert höchstens %(max)s Ziffern vor dem Komma "
 "enthält."
 #, python-format
 msgid ""
 "File extension '%(extension)s' is not allowed. Allowed extensions are: "
 "'%(allowed_extensions)s'."
 msgstr ""
 "Dateiendung „%(extension)s“ ist nicht erlaubt. Erlaubte Dateiendungen sind: "
 "„%(allowed_extensions)s“."
 msgid "Null characters are not allowed."
 msgstr "Nullzeichen sind nicht erlaubt."
 msgid "and"
 msgstr "und"
@ -443,14 +471,18 @@ msgstr "Ganzzahl"
 #, python-format
 msgid "'%(value)s' value must be an integer."
-msgstr "‚%(value)s‛ Wert muss eine Ganzzahl sein."
+msgstr "„%(value)s“ Wert muss eine Ganzzahl sein."
 msgid "Big (8 byte) integer"
 msgstr "Große Ganzzahl (8 Byte)"
 #, python-format
 msgid "'%(value)s' value must be either True or False."
-msgstr "‚%(value)s‛ Wert muss entweder True oder False sein."
+msgstr "„%(value)s“ Wert muss entweder True oder False sein."
 #, python-format
 msgid "'%(value)s' value must be either True, False, or None."
 msgstr "„%(value)s“ Wert muss True, False oder None sein."
 msgid "Boolean (Either True or False)"
 msgstr "Boolescher Wert (True oder False)"
@ -467,7 +499,7 @@ msgid ""
 "'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
 "format."
 msgstr ""
-"‚%(value)s‛ Wert hat ein ungültiges Datumsformat. Es muss YYYY-MM-DD "
+"„%(value)s“ Wert hat ein ungültiges Datumsformat. Es muss YYYY-MM-DD "
 "entsprechen."
 #, python-format
@ -475,7 +507,7 @@ msgid ""
 "'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
 "date."
 msgstr ""
-"‚%(value)s‛ hat das korrekte Format (YYYY-MM-DD) aber ein ungültiges Datum."
+"„%(value)s“ hat das korrekte Format (YYYY-MM-DD) aber ein ungültiges Datum."
 msgid "Date (without time)"
 msgstr "Datum (ohne Uhrzeit)"
@ -485,7 +517,7 @@ msgid ""
 "'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
 "uuuuuu]][TZ] format."
 msgstr ""
-"‚%(value)s‛ Wert hat ein ungültiges Format. Es muss YYYY-MM-DD HH:MM[:ss[."
+"„%(value)s“ Wert hat ein ungültiges Format. Es muss YYYY-MM-DD HH:MM[:ss[."
 "uuuuuu]][TZ] entsprechen."
 #, python-format
@ -493,7 +525,7 @@ msgid ""
 "'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
 "[TZ]) but it is an invalid date/time."
 msgstr ""
-"‚%(value)s‛ Wert hat das korrekte Format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
+"„%(value)s“ Wert hat das korrekte Format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
 "[TZ]) aber eine ungültige Zeit-/Datumsangabe."
 msgid "Date (with time)"
@ -501,7 +533,7 @@ msgstr "Datum (mit Uhrzeit)"
 #, python-format
 msgid "'%(value)s' value must be a decimal number."
-msgstr "‚%(value)s‛ Wert muss eine Dezimalzahl sein."
+msgstr "„%(value)s“ Wert muss eine Dezimalzahl sein."
 msgid "Decimal number"
 msgstr "Dezimalzahl"
@ -511,7 +543,7 @@ msgid ""
 "'%(value)s' value has an invalid format. It must be in [DD] [HH:[MM:]]ss[."
 "uuuuuu] format."
 msgstr ""
-"'%(value)s' Wert hat ein ungültiges Format. Es muss der Form [DD] [HH:"
+"„%(value)s“ Wert hat ein ungültiges Format. Es muss der Form [DD] [HH:"
 "[MM:]]ss[.uuuuuu] entsprechen."
 msgid "Duration"
@ -525,7 +557,7 @@ msgstr "Dateipfad"
 #, python-format
 msgid "'%(value)s' value must be a float."
-msgstr "‚%(value)s‛ Wert muss eine Fließkommazahl sein."
+msgstr "„%(value)s“ Wert muss eine Fließkommazahl sein."
 msgid "Floating point number"
 msgstr "Gleitkommazahl"
@ -538,7 +570,7 @@ msgstr "IP-Adresse"
 #, python-format
 msgid "'%(value)s' value must be either None, True or False."
-msgstr "‚%(value)s‛ Wert muss entweder None, True oder False sein."
+msgstr "„%(value)s“ Wert muss entweder None, True oder False sein."
 msgid "Boolean (Either True, False or None)"
 msgstr "Boolescher Wert (True, False oder None)"
@ -564,7 +596,7 @@ msgid ""
 "'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
 "format."
 msgstr ""
-"‚%(value)s‛ Wert hat ein ungültiges Format. Es muss HH:MM[:ss[.uuuuuu]] "
+"„%(value)s“ Wert hat ein ungültiges Format. Es muss HH:MM[:ss[.uuuuuu]] "
 "entsprechen."
 #, python-format
@ -572,7 +604,7 @@ msgid ""
 "'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
 "invalid time."
 msgstr ""
-"‚%(value)s‛ Wert hat das korrekte Format (HH:MM[:ss[.uuuuuu]]) aber ist eine "
+"„%(value)s“ Wert hat das korrekte Format (HH:MM[:ss[.uuuuuu]]) aber ist eine "
 "ungültige Zeitangabe."
 msgid "Time"
@ -586,7 +618,7 @@ msgstr "Binärdaten"
 #, python-format
 msgid "'%(value)s' is not a valid UUID."
-msgstr "Wert '%(value)s' ist keine gültige UUID."
+msgstr "Wert „%(value)s“ ist keine gültige UUID."
 msgid "File"
 msgstr "Datei"
@ -627,9 +659,6 @@ msgstr "Dieses Feld ist zwingend erforderlich."
 msgid "Enter a whole number."
 msgstr "Bitte eine ganze Zahl eingeben."
 msgid "Enter a number."
 msgstr "Bitte eine Zahl eingeben."
 msgid "Enter a valid date."
 msgstr "Bitte ein gültiges Datum eingeben."
@ -642,6 +671,10 @@ msgstr "Bitte ein gültiges Datum und Uhrzeit eingeben."
 msgid "Enter a valid duration."
 msgstr "Bitte eine gültige Zeitspanne eingeben."
 #, python-brace-format
 msgid "The number of days must be between {min_days} and {max_days}."
 msgstr "Die Anzahl der Tage muss zwischen {min_days} und {max_days} sein."
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr ""
 "Es wurde keine Datei übertragen. Überprüfen Sie das Encoding des Formulars."
@ -658,10 +691,10 @@ msgid_plural ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
 msgstr[0] ""
 "Bitte sicherstellen, dass der Dateiname aus höchstens %(max)d Zeichen "
-"besteht. (Er besteht aus %(length)d Zeichen)."
+"besteht. (Er besteht aus %(length)d Zeichen.)"
 msgstr[1] ""
 "Bitte sicherstellen, dass der Dateiname aus höchstens %(max)d Zeichen "
-"besteht. (Er besteht aus %(length)d Zeichen)."
+"besteht. (Er besteht aus %(length)d Zeichen.)"
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr ""
@ -738,17 +771,15 @@ msgstr ""
 msgid "Please correct the duplicate values below."
 msgstr "Bitte die unten aufgeführten doppelten Werte korrigieren."
-msgid "The inline foreign key did not match the parent instance primary key."
+msgid "The inline value did not match the parent instance."
-msgstr ""
+msgstr "Der Inline-Wert passt nicht zur übergeordneten Instanz."
 "Der Inline-Fremdschlüssel passt nicht zum Primärschlüssel der übergeordneten "
 "Instanz."
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr "Bitte eine gültige Auswahl treffen. Dies ist keine gültige Auswahl."
 #, python-format
-msgid "\"%(pk)s\" is not a valid value for a primary key."
+msgid "\"%(pk)s\" is not a valid value."
-msgstr "\"%(pk)s\" ist kein gültiger Wert für einen Primärschlüssel."
+msgstr "„%(pk)s“ ist kein gültiger Wert."
 #, python-format
 msgid ""
@ -758,15 +789,15 @@ msgstr ""
 "%(datetime)s konnte mit der Zeitzone %(current_timezone)s nicht eindeutig "
 "interpretiert werden, da es doppeldeutig oder eventuell inkorrekt ist."
 msgid "Clear"
 msgstr "Zurücksetzen"
 msgid "Currently"
 msgstr "Derzeit"
 msgid "Change"
 msgstr "Ändern"
 msgid "Clear"
 msgstr "Zurücksetzen"
 msgid "Unknown"
 msgstr "Unbekannt"
@ -1114,6 +1145,19 @@ msgstr ""
 "für sichere HTTPS-Verbindungen oder für „Same-Origin“-Verbindungen "
 "reaktivieren."
 msgid ""
 "If you are using the <meta name=\"referrer\" content=\"no-referrer\"> tag or "
 "including the 'Referrer-Policy: no-referrer' header, please remove them. The "
 "CSRF protection requires the 'Referer' header to do strict referer checking. "
 "If you're concerned about privacy, use alternatives like <a rel=\"noreferrer"
 "\" ...> for links to third-party sites."
 msgstr ""
 "Wenn der Tag „<meta name=\"referrer\" content=\"no-referrer\">“ oder der "
 "„Referrer-Policy: no-referrer“-Header verwendet wird, entfernen Sie sie "
 "bitte. Der „Referer“-Header wird zur korrekten CSRF-Verifizierung benötigt. "
 "Falls es datenschutzrechtliche Gründe gibt, benutzen Sie bitte Alternativen "
 "wie „<a rel=\"noreferrer\" ...>“ für Links zu Drittseiten."
 msgid ""
 "You are seeing this message because this site requires a CSRF cookie when "
 "submitting forms. This cookie is required for security reasons, to ensure "
@ -1134,33 +1178,12 @@ msgstr ""
 msgid "More information is available with DEBUG=True."
 msgstr "Mehr Information ist verfügbar mit DEBUG=True."
 msgid "Welcome to Django"
 msgstr "Willkommen zu Django"
 msgid "It worked!"
 msgstr "Es hat geklappt!"
 msgid "Congratulations on your first Django-powered page."
 msgstr "Herzlichen Glückwunsch zur ersten Django-basierten Seite."
 msgid ""
 "Of course, you haven't actually done any work yet. Next, start your first "
 "app by running <code>python manage.py startapp [app_label]</code>."
 msgstr ""
 "Natürlich ist hier noch nichts weiter zu sehen. Bitte als Nächstes eine neue "
 "Anwendung durch Ausführen von <code>python manage.py startapp [app_label]</"
 "code> anlegen."
 msgid ""
 "You're seeing this message because you have <code>DEBUG = True</code> in "
 "your Django settings file and you haven't configured any URLs. Get to work!"
 msgstr ""
 "Diese Mitteiling ist sichtbar weil in der settings.py-Datei <code>DEBUG = "
 "True</code> steht und die URLs noch nicht konfiguriert sind."
 msgid "No year specified"
 msgstr "Kein Jahr angegeben"
 msgid "Date out of range"
 msgstr "Datum außerhalb des zulässigen Bereichs"
 msgid "No month specified"
 msgstr "Kein Monat angegeben"
@ -1184,7 +1207,7 @@ msgstr ""
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
-msgstr "Ungültiges Datum '%(datestr)s' für das Format '%(format)s'"
+msgstr "Ungültiges Datum „%(datestr)s“ für das Format „%(format)s“"
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
@ -1192,7 +1215,7 @@ msgstr "Konnte keine %(verbose_name)s mit diesen Parametern finden."
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr ""
-"Weder ist dies die letzte Seite ('last') noch konnte sie in einen "
+"Weder ist dies die letzte Seite („last“) noch konnte sie in einen "
 "ganzzahligen Wert umgewandelt werden."
 #, python-format
@ -1201,15 +1224,60 @@ msgstr "Ungültige Seite (%(page_number)s): %(message)s"
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
-msgstr "Leere Liste und '%(class_name)s.allow_empty' ist False."
+msgstr "Leere Liste und „%(class_name)s.allow_empty“ ist False."
 msgid "Directory indexes are not allowed here."
 msgstr "Dateilisten sind untersagt."
 #, python-format
 msgid "\"%(path)s\" does not exist"
-msgstr "\"%(path)s\" ist nicht vorhanden"
+msgstr "„%(path)s“ ist nicht vorhanden"
 #, python-format
 msgid "Index of %(directory)s"
 msgstr "Verzeichnis %(directory)s"
 msgid "Django: the Web framework for perfectionists with deadlines."
 msgstr "Django: Das Webframework für Perfektionisten mit Termindruck."
 #, python-format
 msgid ""
 "View <a href=\"https://docs.djangoproject.com/en/%(version)s/releases/\" "
 "target=\"_blank\" rel=\"noopener\">release notes</a> for Django %(version)s"
 msgstr ""
 "<a href=\"https://docs.djangoproject.com/en/%(version)s/releases/\" target="
 "\"_blank\" rel=\"noopener\">Versionshinweise</a> für Django %(version)s "
 "anzeigen"
 msgid "The install worked successfully! Congratulations!"
 msgstr "Die Installation war erfolgreich. Herzlichen Glückwunsch!"
 #, python-format
 msgid ""
 "You are seeing this page because <a href=\"https://docs.djangoproject.com/en/"
 "%(version)s/ref/settings/#debug\" target=\"_blank\" rel=\"noopener"
 "\">DEBUG=True</a> is in your settings file and you have not configured any "
 "URLs."
 msgstr ""
 "Diese Seite ist sichtbar weil in der Settings-Datei <a href=\"https://docs."
 "djangoproject.com/en/%(version)s/ref/settings/#debug\" target=\"_blank\" rel="
 "\"noopener\">DEBUG = True</a> steht und die URLs noch nicht konfiguriert "
 "sind."
 msgid "Django Documentation"
 msgstr "Django-Dokumentation"
 msgid "Topics, references, &amp; how-to's"
 msgstr "Themen, Referenz, &amp; Kurzanleitungen"
 msgid "Tutorial: A Polling App"
 msgstr "Tutorial: Eine Umfrage-App"
 msgid "Get started with Django"
 msgstr "Los geht's mit Django"
 msgid "Django Community"
 msgstr "Django-Community"
 msgid "Connect, get help, or contribute"
 msgstr "Nimm Kontakt auf, erhalte Hilfe oder arbeite an Django mit"
--- a/django/conf/locale/de/formats.py
+++ b/django/conf/locale/de/formats.py
@ -1,10 +1,7 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
 from __future__ import unicode_literals
 # The *_FORMAT strings use the Django date format syntax,
-# see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
+# see https://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
 DATE_FORMAT = 'j. F Y'
 TIME_FORMAT = 'H:i'
 DATETIME_FORMAT = 'j. F Y H:i'
@ -15,7 +12,7 @@ SHORT_DATETIME_FORMAT = 'd.m.Y H:i'
 FIRST_DAY_OF_WEEK = 1  # Monday
 # The *_INPUT_FORMATS strings use the Python strftime format syntax,
-# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
+# see https://docs.python.org/library/datetime.html#strftime-strptime-behavior
 DATE_INPUT_FORMATS = [
    '%d.%m.%Y', '%d.%m.%y',     # '25.10.2006', '25.10.06'
    # '%d. %B %Y', '%d. %b. %Y',  # '25. October 2006', '25. Oct. 2006'
--- a/django/conf/locale/de_CH/formats.py
+++ b/django/conf/locale/de_CH/formats.py
@ -1,11 +1,7 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
 # The *_FORMAT strings use the Django date format syntax,
-# see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
+# see https://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
 from __future__ import unicode_literals
 DATE_FORMAT = 'j. F Y'
 TIME_FORMAT = 'H:i'
 DATETIME_FORMAT = 'j. F Y H:i'
@ -16,7 +12,7 @@ SHORT_DATETIME_FORMAT = 'd.m.Y H:i'
 FIRST_DAY_OF_WEEK = 1  # Monday
 # The *_INPUT_FORMATS strings use the Python strftime format syntax,
-# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
+# see https://docs.python.org/library/datetime.html#strftime-strptime-behavior
 DATE_INPUT_FORMATS = [
    '%d.%m.%Y', '%d.%m.%y',     # '25.10.2006', '25.10.06'
    # '%d. %B %Y', '%d. %b. %Y',  # '25. October 2006', '25. Oct. 2006'
--- a/django/conf/locale/dsb/LC_MESSAGES/django.mo
+++ b/django/conf/locale/dsb/LC_MESSAGES/django.mo
--- a/django/conf/locale/dsb/LC_MESSAGES/django.po
+++ b/django/conf/locale/dsb/LC_MESSAGES/django.po
@ -1,13 +1,13 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
-# Michael Wolf <milupo@sorbzilla.de>, 2016
+# Michael Wolf <milupo@sorbzilla.de>, 2016-2018
 msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-29 20:57+0200\n"
+"POT-Creation-Date: 2018-05-17 11:49+0200\n"
-"PO-Revision-Date: 2016-07-01 21:52+0000\n"
+"PO-Revision-Date: 2018-05-26 10:19+0000\n"
 "Last-Translator: Michael Wolf <milupo@sorbzilla.de>\n"
 "Language-Team: Lower Sorbian (http://www.transifex.com/django/django/"
 "language/dsb/)\n"
@ -159,6 +159,9 @@ msgstr "Japańšćina"
 msgid "Georgian"
 msgstr "Georgišćina"
 msgid "Kabyle"
 msgstr "Kabylšćina"
 msgid "Kazakh"
 msgstr "Kazachšćina"
@ -294,6 +297,15 @@ msgstr "Statiske dataje"
 msgid "Syndication"
 msgstr "Syndikacija"
 msgid "That page number is not an integer"
 msgstr "Toś ten numer boka njejo ceła licba"
 msgid "That page number is less than 1"
 msgstr "Numer boka jo mjeńšy ako 1"
 msgid "That page contains no results"
 msgstr "Toś ten bok njewopśimujo wuslědki"
 msgid "Enter a valid value."
 msgstr "Zapódajśo płaśiwu gódnotu."
@ -306,6 +318,7 @@ msgstr "Zapódajśo płaśiwu cełu licbu."
 msgid "Enter a valid email address."
 msgstr "Zapódajśo płaśiwu e-mailowu adresu."
 #. Translators: "letters" means latin letters: a-z and A-Z.
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
@ -385,6 +398,9 @@ msgstr[3] ""
 "Zawěććo, až toś ta gódnota ma maksimalnje %(limit_value)d znamuškow (ma "
 "%(show_value)d)."
 msgid "Enter a number."
 msgstr "Zapódajśo licbu."
 #, python-format
 msgid "Ensure that there are no more than %(max)s digit in total."
 msgid_plural "Ensure that there are no more than %(max)s digits in total."
@ -411,6 +427,17 @@ msgstr[1] "Zawěsććo, až njejo wěcej ako %(max)s cyfrowu pśed decimalneju k
 msgstr[2] "Zawěsććo, až njejo wěcej ako %(max)s cyfrow pśed decimalneju komu."
 msgstr[3] "Zawěsććo, až njejo wěcej ako %(max)s cyfrow pśed decimalneju komu."
 #, python-format
 msgid ""
 "File extension '%(extension)s' is not allowed. Allowed extensions are: "
 "'%(allowed_extensions)s'."
 msgstr ""
 "Datajowy sufiks ' %(extension)s' njejo dowólony. Dowólone sufikse su: ' "
 "%(allowed_extensions)s'."
 msgid "Null characters are not allowed."
 msgstr "Znamuška nul njejsu dowólone."
 msgid "and"
 msgstr "a"
@ -458,6 +485,10 @@ msgstr "Big (8 bajtow) integer"
 msgid "'%(value)s' value must be either True or False."
 msgstr "Gódnota '%(value)s musy pak True pak False byś."
 #, python-format
 msgid "'%(value)s' value must be either True, False, or None."
 msgstr "Gódnota '%(value)s' musy pak True, False pak None byś."
 msgid "Boolean (Either True or False)"
 msgstr "Boolean (pak True pak False)"
@ -633,9 +664,6 @@ msgstr "Toś to pólo jo trěbne."
 msgid "Enter a whole number."
 msgstr "Zapódajśo cełu licbu."
 msgid "Enter a number."
 msgstr "Zapódajśo licbu."
 msgid "Enter a valid date."
 msgstr "Zapódajśo płaśiwy datum."
@ -648,6 +676,10 @@ msgstr "Zapódajśo płaśiwy datum/cas."
 msgid "Enter a valid duration."
 msgstr "Zapódaśe płaśiwe traśe."
 #, python-brace-format
 msgid "The number of days must be between {min_days} and {max_days}."
 msgstr "Licba dnjow musy mjazy  {min_days} a {max_days} byś."
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr ""
 "Dataja njejo se wótpósłała. Pśeglědujśo koděrowański typ na formularje. "
@ -755,10 +787,8 @@ msgstr ""
 msgid "Please correct the duplicate values below."
 msgstr "Pšosym korigěrujśo slědujuce dwójne gódnoty."
-msgid "The inline foreign key did not match the parent instance primary key."
+msgid "The inline value did not match the parent instance."
-msgstr ""
+msgstr "Gódnota inline nadrědowanej instance njewótpowědujo."
 "Nutśkowny cuzy kluc njejo primarnemu klucoju nadrědowaneje instance "
 "wótpowědował."
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr ""
@ -766,8 +796,8 @@ msgstr ""
 "wóleńskich móžnosćow."
 #, python-format
-msgid "\"%(pk)s\" is not a valid value for a primary key."
+msgid "\"%(pk)s\" is not a valid value."
-msgstr "\"%(pk)s\" njejo płaśiwa gódnota za primarny kluc."
+msgstr "\"%(pk)s\" njejo płaśiwa gódnota."
 #, python-format
 msgid ""
@ -777,15 +807,15 @@ msgstr ""
 "%(datetime)s njedajo se w casowej conje %(current_timezone)s "
 "interpretěrowaś; jo dwójozmysłowy abo snaź njeeksistěrujo."
 msgid "Clear"
 msgstr "Lašowaś"
 msgid "Currently"
 msgstr "Tuchylu"
 msgid "Change"
 msgstr "Změniś"
 msgid "Clear"
 msgstr "Lašowaś"
 msgid "Unknown"
 msgstr "Njeznaty"
@ -1146,6 +1176,19 @@ msgstr ""
 "znjemóžnili, zmóžniśo je pšosym zasej, nanejmjenjej za toś to sedło, za "
 "HTTPS-zwiski abo za napšašowanja 'same-origin'."
 msgid ""
 "If you are using the <meta name=\"referrer\" content=\"no-referrer\"> tag or "
 "including the 'Referrer-Policy: no-referrer' header, please remove them. The "
 "CSRF protection requires the 'Referer' header to do strict referer checking. "
 "If you're concerned about privacy, use alternatives like <a rel=\"noreferrer"
 "\" ...> for links to third-party sites."
 msgstr ""
 "Jolic woznamjenje <meta name=\"referrer\" content=\"no-referrer\"> wužywaśo "
 "abo głowu 'Referrer-Policy: no-referrer' zapśimujośo, wótwónoźćo je. CSRF-"
 "šćit pomina se głowu 'Referer', aby striktnu kontrolu referera pśewjasć. "
 "Jolic se wó swóju priwatnosć staraśo, wužywajśo alternatiwy ako <a rel="
 "\"noreferrer\" ...> za wótkazy k sedłam tśeśich."
 msgid ""
 "You are seeing this message because this site requires a CSRF cookie when "
 "submitting forms. This cookie is required for security reasons, to ensure "
@ -1166,33 +1209,12 @@ msgstr ""
 msgid "More information is available with DEBUG=True."
 msgstr "Dalšne informacije su k dispoziciji  z DEBUG=True."
 msgid "Welcome to Django"
 msgstr "Witajśo k Django"
 msgid "It worked!"
 msgstr "Jo funkcioněrowało!"
 msgid "Congratulations on your first Django-powered page."
 msgstr "Glukužycenje za waš prědny bok, kótaryž spěchujo se wót Django."
 msgid ""
 "Of course, you haven't actually done any work yet. Next, start your first "
 "app by running <code>python manage.py startapp [app_label]</code>."
 msgstr ""
 "Zawěsće, pópšawem hyšći njejsćo žedno źěło gótował. Wuwjeźćo ako pśiduce "
 "<code>python manage.py startapp [app_label]</code>, aby swójo prědne "
 "nałoženje startował."
 msgid ""
 "You're seeing this message because you have <code>DEBUG = True</code> in "
 "your Django settings file and you haven't configured any URLs. Get to work!"
 msgstr ""
 "Wiźiśo toś tu powěźeńku, dokulaž maśo <code>DEBUG = True</code> w swójej "
 "dataji nastajenjow Django a njejsćo URL konfigurěrował. Dajśo se na źěło!"
 msgid "No year specified"
 msgstr "Žedno lěto pódane"
 msgid "Date out of range"
 msgstr "Datum zwenka wobcerka"
 msgid "No month specified"
 msgstr "Žeden mjasec pódany"
@ -1244,3 +1266,48 @@ msgstr "\"%(path)s\" njeeksistěrujo"
 #, python-format
 msgid "Index of %(directory)s"
 msgstr "Indeks %(directory)s"
 msgid "Django: the Web framework for perfectionists with deadlines."
 msgstr "Django? Web-framework za perfekcionisty z terminami."
 #, python-format
 msgid ""
 "View <a href=\"https://docs.djangoproject.com/en/%(version)s/releases/\" "
 "target=\"_blank\" rel=\"noopener\">release notes</a> for Django %(version)s"
 msgstr ""
 "<a href=\"https://docs.djangoproject.com/en/%(version)s/releases/\" target="
 "\"_blank\" rel=\"noopener\">Wersijowe informacije</a> za Django %(version)s "
 "pokazaś"
 msgid "The install worked successfully! Congratulations!"
 msgstr "Instalacija jo była wuspěšna! Gratulacija!"
 #, python-format
 msgid ""
 "You are seeing this page because <a href=\"https://docs.djangoproject.com/en/"
 "%(version)s/ref/settings/#debug\" target=\"_blank\" rel=\"noopener"
 "\">DEBUG=True</a> is in your settings file and you have not configured any "
 "URLs."
 msgstr ""
 "Wiźiśo toś ten bok, dokulaž <a href=\"https://docs.djangoproject.com/en/"
 "%(version)s/ref/settings/#debug\" target=\"_blank\" rel=\"noopener"
 "\">DEBUG=True</a> jo w swójej dataji nastajenjow a njejsćo konfigurěrował "
 "URL."
 msgid "Django Documentation"
 msgstr "Dokumentacija Django"
 msgid "Topics, references, &amp; how-to's"
 msgstr "Temy, reference a rozpokazanja"
 msgid "Tutorial: A Polling App"
 msgstr "Rozpokazanje: Napšašowańske nałoženje"
 msgid "Get started with Django"
 msgstr "Prědne kšace z Django"
 msgid "Django Community"
 msgstr "Zgromaźeństwo Django"
 msgid "Connect, get help, or contribute"
 msgstr "Zwězajśo, wobsarajśo se pomoc abo źěłajśo sobu"
--- a/django/conf/locale/el/LC_MESSAGES/django.mo
+++ b/django/conf/locale/el/LC_MESSAGES/django.mo
--- a/django/conf/locale/el/LC_MESSAGES/django.po
+++ b/django/conf/locale/el/LC_MESSAGES/django.po
@ -2,9 +2,10 @@
 #
 # Translators:
 # Apostolis Bessas <mpessas+txc@transifex.com>, 2013
-# Dimitris Glezos <glezos@transifex.com>, 2011,2013
+# Dimitris Glezos <glezos@transifex.com>, 2011,2013,2017
 # Giannis Meletakis <meletakis@gmail.com>, 2015
 # Jannis Leidel <jannis@leidel.info>, 2011
 # Nick Mavrakis <mavrakis.n@gmail.com>, 2017-2018
 # Nikolas Demiridis <nikolas@demiridis.gr>, 2014
 # Nick Mavrakis <mavrakis.n@gmail.com>, 2016
 # Pãnoș <panos.laganakos@gmail.com>, 2014
@ -16,8 +17,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-29 20:57+0200\n"
+"POT-Creation-Date: 2018-05-17 11:49+0200\n"
-"PO-Revision-Date: 2016-07-14 16:48+0000\n"
+"PO-Revision-Date: 2018-09-22 10:11+0000\n"
 "Last-Translator: Nick Mavrakis <mavrakis.n@gmail.com>\n"
 "Language-Team: Greek (http://www.transifex.com/django/django/language/el/)\n"
 "MIME-Version: 1.0\n"
@ -167,6 +168,9 @@ msgstr "Γιαπωνέζικα"
 msgid "Georgian"
 msgstr "Γεωργιανά"
 msgid "Kabyle"
 msgstr "Kabyle"
 msgid "Kazakh"
 msgstr "Καζακστά"
@ -302,6 +306,15 @@ msgstr "Στατικά Αρχεία"
 msgid "Syndication"
 msgstr "Syndication"
 msgid "That page number is not an integer"
 msgstr "Ο αριθμός αυτής της σελίδας δεν είναι ακέραιος"
 msgid "That page number is less than 1"
 msgstr "Ο αριθμός αυτής της σελίδας είναι μικρότερος του 1"
 msgid "That page contains no results"
 msgstr "Η σελίδα αυτή δεν περιέχει αποτελέσματα"
 msgid "Enter a valid value."
 msgstr "Εισάγετε μια έγκυρη τιμή."
@ -314,6 +327,7 @@ msgstr "Εισάγετε έναν έγκυρο ακέραιο."
 msgid "Enter a valid email address."
 msgstr "Εισάγετε μια έγκυρη διεύθυνση ηλ. ταχυδρομείου."
 #. Translators: "letters" means latin letters: a-z and A-Z.
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
@ -364,8 +378,8 @@ msgstr[0] ""
 "Βεβαιωθείται πως η τιμή αυτή έχει τουλάχιστον %(limit_value)d χαρακτήρες "
 "(έχει %(show_value)d)."
 msgstr[1] ""
-"Βεβαιωθείται πως η τιμή αυτή έχει τουλάχιστον %(limit_value)d χαρακτήρες "
+"Βεβαιωθείτε πως η τιμή έχει τουλάχιστον %(limit_value)d χαρακτήρες (έχει "
-"(έχει %(show_value)d)."
+"%(show_value)d)."
 #, python-format
 msgid ""
@ -378,8 +392,11 @@ msgstr[0] ""
 "Βεβαιωθείται πως η τιμή αυτή έχει τοπολύ %(limit_value)d χαρακτήρες (έχει "
 "%(show_value)d)."
 msgstr[1] ""
-"Βεβαιωθείται πως η τιμή αυτή έχει τουλάχιστον %(limit_value)d χαρακτήρες "
+"Βεβαιωθείτε πως η τιμή έχει το πολύ %(limit_value)d χαρακτήρες (έχει "
-"(έχει %(show_value)d)."
+"%(show_value)d)."
 msgid "Enter a number."
 msgstr "Εισάγετε έναν αριθμό."
 #, python-format
 msgid "Ensure that there are no more than %(max)s digit in total."
@ -405,6 +422,17 @@ msgstr[0] ""
 msgstr[1] ""
 "Βεβαιωθείτε ότι δεν υπάρχουν πάνω από %(max)s ψηφία πριν την υποδιαστολή."
 #, python-format
 msgid ""
 "File extension '%(extension)s' is not allowed. Allowed extensions are: "
 "'%(allowed_extensions)s'."
 msgstr ""
 "Η επέκταση '%(extension)s' του αρχείου δεν επιτρέπεται. Οι επιτρεπόμενες "
 "επεκτάσεις είναι: '%(allowed_extensions)s'."
 msgid "Null characters are not allowed."
 msgstr "Δεν επιτρέπονται null (μηδενικοί) χαρακτήρες"
 msgid "and"
 msgstr "και"
@ -453,6 +481,10 @@ msgstr "Μεγάλος ακέραιος - big integer (8 bytes)"
 msgid "'%(value)s' value must be either True or False."
 msgstr "Η τιμή '%(value)s' πρέπει να είναι είτε True ή False."
 #, python-format
 msgid "'%(value)s' value must be either True, False, or None."
 msgstr "Η τιμή '%(value)s' πρέπει να είναι True, False, ή None."
 msgid "Boolean (Either True or False)"
 msgstr "Boolean (Είτε Αληθές ή Ψευδές)"
@ -630,9 +662,6 @@ msgstr "Αυτό το πεδίο είναι απαραίτητο."
 msgid "Enter a whole number."
 msgstr "Εισάγετε έναν ακέραιο αριθμό."
 msgid "Enter a number."
 msgstr "Εισάγετε έναν αριθμό."
 msgid "Enter a valid date."
 msgstr "Εισάγετε μια έγκυρη ημερομηνία."
@ -645,6 +674,10 @@ msgstr "Εισάγετε μια έγκυρη ημερομηνία/ώρα."
 msgid "Enter a valid duration."
 msgstr "Εισάγετε μια έγκυρη διάρκεια."
 #, python-brace-format
 msgid "The number of days must be between {min_days} and {max_days}."
 msgstr "Ο αριθμός των ημερών πρέπει να είναι μεταξύ {min_days} και {max_days}."
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr ""
 "Δεν έχει υποβληθεί κάποιο αρχείο. Ελέγξτε τον τύπο κωδικοποίησης στη φόρμα."
@ -744,10 +777,8 @@ msgstr ""
 msgid "Please correct the duplicate values below."
 msgstr "Έχετε ξαναεισάγει την ίδια τιμη. Βεβαιωθείτε ότι είναι μοναδική."
-msgid "The inline foreign key did not match the parent instance primary key."
+msgid "The inline value did not match the parent instance."
-msgstr ""
+msgstr "Η τιμή δεν είναι ίση με την αντίστοιχη τιμή του γονικού object."
 "Το inline foreign key δεν αντιστοιχεί με το primary κλειδί του γονικού "
 "object."
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr ""
@ -755,8 +786,8 @@ msgstr ""
 "επιλογές."
 #, python-format
-msgid "\"%(pk)s\" is not a valid value for a primary key."
+msgid "\"%(pk)s\" is not a valid value."
-msgstr "Το \"%(pk)s\" δεν είναι έγκυρη τιμή για πρωτεύων κλειδί"
+msgstr "Το \"%(pk)s\" δεν είναι έγκυρη τιμή."
 #, python-format
 msgid ""
@ -766,15 +797,15 @@ msgstr ""
 "Η ημερομηνία %(datetime)s δεν μπόρεσε να μετατραπεί στην ζώνη ώρας "
 "%(current_timezone)s; ίσως να είναι ασαφής ή να μην υπάρχει."
 msgid "Clear"
 msgstr "Εκκαθάριση"
 msgid "Currently"
 msgstr "Τώρα"
 msgid "Change"
 msgstr "Επεξεργασία"
 msgid "Clear"
 msgstr "Εκκαθάριση"
 msgid "Unknown"
 msgstr "Άγνωστο"
@ -1121,6 +1152,20 @@ msgstr ""
 "παρακαλούμε να τους ξανά-ενεργοποιήσετε, τουλάχιστον για αυτό το site ή για "
 "τις συνδέσεις HTTPS ή για τα 'same-origin' requests."
 msgid ""
 "If you are using the <meta name=\"referrer\" content=\"no-referrer\"> tag or "
 "including the 'Referrer-Policy: no-referrer' header, please remove them. The "
 "CSRF protection requires the 'Referer' header to do strict referer checking. "
 "If you're concerned about privacy, use alternatives like <a rel=\"noreferrer"
 "\" ...> for links to third-party sites."
 msgstr ""
 "Αν χρησιμοποιείτε την ετικέτα <meta name=\"referrer\" content=\"no-referrer"
 "\"> ή συμπεριλαμβάνετε την κεφαλίδα (header) 'Referrer-Policy: no-referrer', "
 "παρακαλούμε αφαιρέστε τα. Η προστασία CSRF απαιτεί την κεφαλίδα 'Referer' να "
 "κάνει αυστηρό έλεγχο στον referer. Αν κύριο μέλημα σας είναι η ιδιωτικότητα, "
 "σκεφτείτε να χρησιμοποιήσετε εναλλακτικές μεθόδους όπως <a rel=\"noreferrer"
 "\" ...> για συνδέσμους από άλλες ιστοσελίδες."
 msgid ""
 "You are seeing this message because this site requires a CSRF cookie when "
 "submitting forms. This cookie is required for security reasons, to ensure "
@ -1141,33 +1186,12 @@ msgstr ""
 msgid "More information is available with DEBUG=True."
 msgstr "Περισσότερες πληροφορίες είναι διαθέσιμες με DEBUG=True."
 msgid "Welcome to Django"
 msgstr "Καλωσήρθατε στο Django"
 msgid "It worked!"
 msgstr "Δούλεψε!"
 msgid "Congratulations on your first Django-powered page."
 msgstr "Συγχαρητήρια στην πρώτη Django-τροφοδοτούμενη σελίδα σας."
 msgid ""
 "Of course, you haven't actually done any work yet. Next, start your first "
 "app by running <code>python manage.py startapp [app_label]</code>."
 msgstr ""
 "Φυσίκα, δεν έχετε κάνει καμία δουλειά ακόμα. Ξεκινήστε την πρώτη σας "
 "εφαρμογή εκτελώντας <code>python manage.py startapp [app_label]</code>."
 msgid ""
 "You're seeing this message because you have <code>DEBUG = True</code> in "
 "your Django settings file and you haven't configured any URLs. Get to work!"
 msgstr ""
 "Βλέπετε αυτό το μήνυμα επείδη έχετε <code>DEBUG = True</code> στο αρχείο "
 "settings του Django σας και δεν έχετε ρυθμίσει καμία URL. Στρωθείτε στην "
 "δουλειά!"
 msgid "No year specified"
 msgstr "Δεν έχει οριστεί χρονιά"
 msgid "Date out of range"
 msgstr "Ημερομηνία εκτός εύρους"
 msgid "No month specified"
 msgstr "Δεν έχει οριστεί μήνας"
@ -1222,3 +1246,48 @@ msgstr "Το \"%(path)s\" δεν υπάρχει"
 #, python-format
 msgid "Index of %(directory)s"
 msgstr "Ευρετήριο του %(directory)s"
 msgid "Django: the Web framework for perfectionists with deadlines."
 msgstr "Django: το Web framework για τελειομανείς με προθεσμίες."
 #, python-format
 msgid ""
 "View <a href=\"https://docs.djangoproject.com/en/%(version)s/releases/\" "
 "target=\"_blank\" rel=\"noopener\">release notes</a> for Django %(version)s"
 msgstr ""
 "Δείτε τις <a href=\"https://docs.djangoproject.com/en/%(version)s/releases/"
 "\" target=\"_blank\" rel=\"noopener\">σημειώσεις κυκλοφορίας</a> για το "
 "Django %(version)s"
 msgid "The install worked successfully! Congratulations!"
 msgstr "Η εγκατάσταση δούλεψε με επιτυχία! Συγχαρητήρια!"
 #, python-format
 msgid ""
 "You are seeing this page because <a href=\"https://docs.djangoproject.com/en/"
 "%(version)s/ref/settings/#debug\" target=\"_blank\" rel=\"noopener"
 "\">DEBUG=True</a> is in your settings file and you have not configured any "
 "URLs."
 msgstr ""
 "Βλέπετε αυτό το μήνυμα επειδή έχετε <a href=\"https://docs.djangoproject.com/"
 "en/%(version)s/ref/settings/#debug\" target=\"_blank\" rel=\"noopener"
 "\">DEBUG=True</a> στο αρχείο settings και δεν έχετε ρυθμίσει κανένα URL στο "
 "αρχείο urls.py. Στρωθείτε στην δουλειά!"
 msgid "Django Documentation"
 msgstr "Εγχειρίδιο Django"
 msgid "Topics, references, &amp; how-to's"
 msgstr "Θέματα, αναφορές &amp; \"πως να...\""
 msgid "Tutorial: A Polling App"
 msgstr "Εγχειρίδιο: Ένα App Ψηφοφορίας"
 msgid "Get started with Django"
 msgstr "Ξεκινήστε με το Django"
 msgid "Django Community"
 msgstr "Κοινότητα Django"
 msgid "Connect, get help, or contribute"
 msgstr "Συνδεθείτε, λάβετε βοήθεια, ή συνεισφέρετε"
--- a/django/conf/locale/el/formats.py
+++ b/django/conf/locale/el/formats.py
@ -1,10 +1,7 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
 from __future__ import unicode_literals
 # The *_FORMAT strings use the Django date format syntax,
-# see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
+# see https://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
 DATE_FORMAT = 'd/m/Y'
 TIME_FORMAT = 'P'
 DATETIME_FORMAT = 'd/m/Y P'
@ -15,7 +12,7 @@ SHORT_DATETIME_FORMAT = 'd/m/Y P'
 FIRST_DAY_OF_WEEK = 0  # Sunday
 # The *_INPUT_FORMATS strings use the Python strftime format syntax,
-# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
+# see https://docs.python.org/library/datetime.html#strftime-strptime-behavior
 DATE_INPUT_FORMATS = [
    '%d/%m/%Y', '%d/%m/%y', '%Y-%m-%d',  # '25/10/2006', '25/10/06', '2006-10-25',
 ]
--- a/django/conf/locale/en/LC_MESSAGES/django.po
+++ b/django/conf/locale/en/LC_MESSAGES/django.po
--- a/django/conf/locale/en/formats.py
+++ b/django/conf/locale/en/formats.py
@ -1,10 +1,7 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
 from __future__ import unicode_literals
 # The *_FORMAT strings use the Django date format syntax,
-# see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
+# see https://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
 DATE_FORMAT = 'N j, Y'
 TIME_FORMAT = 'P'
 DATETIME_FORMAT = 'N j, Y, P'
@ -15,7 +12,7 @@ SHORT_DATETIME_FORMAT = 'm/d/Y P'
 FIRST_DAY_OF_WEEK = 0  # Sunday
 # The *_INPUT_FORMATS strings use the Python strftime format syntax,
-# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
+# see https://docs.python.org/library/datetime.html#strftime-strptime-behavior
 # Kept ISO formats as they are in first position
 DATE_INPUT_FORMATS = [
    '%Y-%m-%d', '%m/%d/%Y', '%m/%d/%y',  # '2006-10-25', '10/25/2006', '10/25/06'
--- a/django/conf/locale/en_AU/LC_MESSAGES/django.mo
+++ b/django/conf/locale/en_AU/LC_MESSAGES/django.mo
--- a/django/conf/locale/en_AU/LC_MESSAGES/django.po
+++ b/django/conf/locale/en_AU/LC_MESSAGES/django.po
@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-29 20:57+0200\n"
+"POT-Creation-Date: 2017-11-15 16:15+0100\n"
-"PO-Revision-Date: 2016-06-30 08:31+0000\n"
+"PO-Revision-Date: 2017-11-16 01:13+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
 "Language-Team: English (Australia) (http://www.transifex.com/django/django/"
 "language/en_AU/)\n"
@ -293,6 +293,15 @@ msgstr ""
 msgid "Syndication"
 msgstr ""
 msgid "That page number is not an integer"
 msgstr ""
 msgid "That page number is less than 1"
 msgstr ""
 msgid "That page contains no results"
 msgstr ""
 msgid "Enter a valid value."
 msgstr "Enter a valid value."
@ -305,6 +314,7 @@ msgstr ""
 msgid "Enter a valid email address."
 msgstr "Enter a valid email address."
 #. Translators: "letters" means latin letters: a-z and A-Z.
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
@ -389,6 +399,15 @@ msgstr[0] ""
 msgstr[1] ""
 "Ensure that there are no more than %(max)s digits before the decimal point."
 #, python-format
 msgid ""
 "File extension '%(extension)s' is not allowed. Allowed extensions are: "
 "'%(allowed_extensions)s'."
 msgstr ""
 msgid "Null characters are not allowed."
 msgstr ""
 msgid "and"
 msgstr "and"
@ -701,16 +720,16 @@ msgstr ""
 msgid "Please correct the duplicate values below."
 msgstr "Please correct the duplicate values below."
-msgid "The inline foreign key did not match the parent instance primary key."
+msgid "The inline value did not match the parent instance."
-msgstr "The inline foreign key did not match the parent instance primary key."
+msgstr ""
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr ""
 "Select a valid choice. That choice is not one of the available choices."
 #, python-format
-msgid "\"%(pk)s\" is not a valid value for a primary key."
+msgid "\"%(pk)s\" is not a valid value."
-msgstr "\"%(pk)s\" is not a valid value for a primary key."
+msgstr ""
 #, python-format
 msgid ""
@ -720,15 +739,15 @@ msgstr ""
 "%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
 "may be ambiguous or it may not exist."
 msgid "Clear"
 msgstr "Clear"
 msgid "Currently"
 msgstr "Currently"
 msgid "Change"
 msgstr "Change"
 msgid "Clear"
 msgstr "Clear"
 msgid "Unknown"
 msgstr "Unknown"
@ -1068,6 +1087,14 @@ msgid ""
 "origin' requests."
 msgstr ""
 msgid ""
 "If you are using the <meta name=\"referrer\" content=\"no-referrer\"> tag or "
 "including the 'Referrer-Policy: no-referrer' header, please remove them. The "
 "CSRF protection requires the 'Referer' header to do strict referer checking. "
 "If you're concerned about privacy, use alternatives like <a rel=\"noreferrer"
 "\" ...> for links to third-party sites."
 msgstr ""
 msgid ""
 "You are seeing this message because this site requires a CSRF cookie when "
 "submitting forms. This cookie is required for security reasons, to ensure "
@ -1082,28 +1109,12 @@ msgstr ""
 msgid "More information is available with DEBUG=True."
 msgstr ""
 msgid "Welcome to Django"
 msgstr ""
 msgid "It worked!"
 msgstr ""
 msgid "Congratulations on your first Django-powered page."
 msgstr ""
 msgid ""
 "Of course, you haven't actually done any work yet. Next, start your first "
 "app by running <code>python manage.py startapp [app_label]</code>."
 msgstr ""
 msgid ""
 "You're seeing this message because you have <code>DEBUG = True</code> in "
 "your Django settings file and you haven't configured any URLs. Get to work!"
 msgstr ""
 msgid "No year specified"
 msgstr "No year specified"
 msgid "Date out of range"
 msgstr ""
 msgid "No month specified"
 msgstr "No month specified"
@ -1154,3 +1165,41 @@ msgstr "\"%(path)s\" does not exist"
 #, python-format
 msgid "Index of %(directory)s"
 msgstr "Index of %(directory)s"
 msgid "Django: the Web framework for perfectionists with deadlines."
 msgstr ""
 #, python-format
 msgid ""
 "View <a href=\"https://docs.djangoproject.com/en/%(version)s/releases/\" "
 "target=\"_blank\" rel=\"noopener\">release notes</a> for Django %(version)s"
 msgstr ""
 msgid "The install worked successfully! Congratulations!"
 msgstr ""
 #, python-format
 msgid ""
 "You are seeing this page because <a href=\"https://docs.djangoproject.com/en/"
 "%(version)s/ref/settings/#debug\" target=\"_blank\" rel=\"noopener"
 "\">DEBUG=True</a> is in your settings file and you have not configured any "
 "URLs."
 msgstr ""
 msgid "Django Documentation"
 msgstr ""
 msgid "Topics, references, &amp; how-to's"
 msgstr ""
 msgid "Tutorial: A Polling App"
 msgstr ""
 msgid "Get started with Django"
 msgstr ""
 msgid "Django Community"
 msgstr ""
 msgid "Connect, get help, or contribute"
 msgstr ""
--- a/django/conf/locale/en_AU/formats.py
+++ b/django/conf/locale/en_AU/formats.py
@ -1,10 +1,7 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
 from __future__ import unicode_literals
 # The *_FORMAT strings use the Django date format syntax,
-# see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
+# see https://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
 DATE_FORMAT = 'j M Y'                   # '25 Oct 2006'
 TIME_FORMAT = 'P'                       # '2:30 p.m.'
 DATETIME_FORMAT = 'j M Y, P'            # '25 Oct 2006, 2:30 p.m.'
@ -15,7 +12,7 @@ SHORT_DATETIME_FORMAT = 'd/m/Y P'       # '25/10/2006 2:30 p.m.'
 FIRST_DAY_OF_WEEK = 0                   # Sunday
 # The *_INPUT_FORMATS strings use the Python strftime format syntax,
-# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
+# see https://docs.python.org/library/datetime.html#strftime-strptime-behavior
 DATE_INPUT_FORMATS = [
    '%d/%m/%Y', '%d/%m/%y',             # '25/10/2006', '25/10/06'
    # '%b %d %Y', '%b %d, %Y',          # 'Oct 25 2006', 'Oct 25, 2006'
--- a/django/conf/locale/en_GB/LC_MESSAGES/django.mo
+++ b/django/conf/locale/en_GB/LC_MESSAGES/django.mo
--- a/django/conf/locale/en_GB/LC_MESSAGES/django.po
+++ b/django/conf/locale/en_GB/LC_MESSAGES/django.po
@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-29 20:57+0200\n"
+"POT-Creation-Date: 2017-11-15 16:15+0100\n"
-"PO-Revision-Date: 2016-06-30 08:31+0000\n"
+"PO-Revision-Date: 2017-11-16 01:13+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/django/"
 "django/language/en_GB/)\n"
@ -295,6 +295,15 @@ msgstr ""
 msgid "Syndication"
 msgstr ""
 msgid "That page number is not an integer"
 msgstr ""
 msgid "That page number is less than 1"
 msgstr ""
 msgid "That page contains no results"
 msgstr ""
 msgid "Enter a valid value."
 msgstr "Enter a valid value."
@ -307,6 +316,7 @@ msgstr ""
 msgid "Enter a valid email address."
 msgstr ""
 #. Translators: "letters" means latin letters: a-z and A-Z.
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
@ -381,6 +391,15 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 #, python-format
 msgid ""
 "File extension '%(extension)s' is not allowed. Allowed extensions are: "
 "'%(allowed_extensions)s'."
 msgstr ""
 msgid "Null characters are not allowed."
 msgstr ""
 msgid "and"
 msgstr "and"
@ -691,15 +710,15 @@ msgstr ""
 msgid "Please correct the duplicate values below."
 msgstr "Please correct the duplicate values below."
-msgid "The inline foreign key did not match the parent instance primary key."
+msgid "The inline value did not match the parent instance."
-msgstr "The inline foreign key did not match the parent instance primary key."
+msgstr ""
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr ""
 "Select a valid choice. That choice is not one of the available choices."
 #, python-format
-msgid "\"%(pk)s\" is not a valid value for a primary key."
+msgid "\"%(pk)s\" is not a valid value."
 msgstr ""
 #, python-format
@ -710,15 +729,15 @@ msgstr ""
 "%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
 "may be ambiguous or it may not exist."
 msgid "Clear"
 msgstr "Clear"
 msgid "Currently"
 msgstr "Currently"
 msgid "Change"
 msgstr "Change"
 msgid "Clear"
 msgstr "Clear"
 msgid "Unknown"
 msgstr "Unknown"
@ -1058,6 +1077,14 @@ msgid ""
 "origin' requests."
 msgstr ""
 msgid ""
 "If you are using the <meta name=\"referrer\" content=\"no-referrer\"> tag or "
 "including the 'Referrer-Policy: no-referrer' header, please remove them. The "
 "CSRF protection requires the 'Referer' header to do strict referer checking. "
 "If you're concerned about privacy, use alternatives like <a rel=\"noreferrer"
 "\" ...> for links to third-party sites."
 msgstr ""
 msgid ""
 "You are seeing this message because this site requires a CSRF cookie when "
 "submitting forms. This cookie is required for security reasons, to ensure "
@ -1072,28 +1099,12 @@ msgstr ""
 msgid "More information is available with DEBUG=True."
 msgstr ""
 msgid "Welcome to Django"
 msgstr ""
 msgid "It worked!"
 msgstr ""
 msgid "Congratulations on your first Django-powered page."
 msgstr ""
 msgid ""
 "Of course, you haven't actually done any work yet. Next, start your first "
 "app by running <code>python manage.py startapp [app_label]</code>."
 msgstr ""
 msgid ""
 "You're seeing this message because you have <code>DEBUG = True</code> in "
 "your Django settings file and you haven't configured any URLs. Get to work!"
 msgstr ""
 msgid "No year specified"
 msgstr "No year specified"
 msgid "Date out of range"
 msgstr ""
 msgid "No month specified"
 msgstr "No month specified"
@ -1144,3 +1155,41 @@ msgstr "\"%(path)s\" does not exist"
 #, python-format
 msgid "Index of %(directory)s"
 msgstr "Index of %(directory)s"
 msgid "Django: the Web framework for perfectionists with deadlines."
 msgstr ""
 #, python-format
 msgid ""
 "View <a href=\"https://docs.djangoproject.com/en/%(version)s/releases/\" "
 "target=\"_blank\" rel=\"noopener\">release notes</a> for Django %(version)s"
 msgstr ""
 msgid "The install worked successfully! Congratulations!"
 msgstr ""
 #, python-format
 msgid ""
 "You are seeing this page because <a href=\"https://docs.djangoproject.com/en/"
 "%(version)s/ref/settings/#debug\" target=\"_blank\" rel=\"noopener"
 "\">DEBUG=True</a> is in your settings file and you have not configured any "
 "URLs."
 msgstr ""
 msgid "Django Documentation"
 msgstr ""
 msgid "Topics, references, &amp; how-to's"
 msgstr ""
 msgid "Tutorial: A Polling App"
 msgstr ""
 msgid "Get started with Django"
 msgstr ""
 msgid "Django Community"
 msgstr ""
 msgid "Connect, get help, or contribute"
 msgstr ""
--- a/django/conf/locale/en_GB/formats.py
+++ b/django/conf/locale/en_GB/formats.py
@ -1,10 +1,7 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
 from __future__ import unicode_literals
 # The *_FORMAT strings use the Django date format syntax,
-# see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
+# see https://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
 DATE_FORMAT = 'j M Y'                   # '25 Oct 2006'
 TIME_FORMAT = 'P'                       # '2:30 p.m.'
 DATETIME_FORMAT = 'j M Y, P'            # '25 Oct 2006, 2:30 p.m.'
@ -15,7 +12,7 @@ SHORT_DATETIME_FORMAT = 'd/m/Y P'       # '25/10/2006 2:30 p.m.'
 FIRST_DAY_OF_WEEK = 1                   # Monday
 # The *_INPUT_FORMATS strings use the Python strftime format syntax,
-# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
+# see https://docs.python.org/library/datetime.html#strftime-strptime-behavior
 DATE_INPUT_FORMATS = [
    '%d/%m/%Y', '%d/%m/%y',             # '25/10/2006', '25/10/06'
    # '%b %d %Y', '%b %d, %Y',          # 'Oct 25 2006', 'Oct 25, 2006'
--- a/django/conf/locale/eo/LC_MESSAGES/django.mo
+++ b/django/conf/locale/eo/LC_MESSAGES/django.mo
--- a/django/conf/locale/eo/LC_MESSAGES/django.po
+++ b/django/conf/locale/eo/LC_MESSAGES/django.po
@ -2,17 +2,18 @@
 #
 # Translators:
 # Baptiste Darthenay <baptiste+transifex@darthenay.fr>, 2012-2013
-# Baptiste Darthenay <baptiste+transifex@darthenay.fr>, 2013-2016
+# Baptiste Darthenay <baptiste+transifex@darthenay.fr>, 2013-2018
 # batisteo <bapdarth@yahoo·fr>, 2011
 # Dinu Gherman <gherman@darwin.in-berlin.de>, 2011
 # kristjan <kristjan.schmidt@googlemail.com>, 2011
 # Nikolay Korotkiy <sikmir@gmail.com>, 2017-2018
 # Adamo Mesha <adam.raizen@gmail.com>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-29 20:57+0200\n"
+"POT-Creation-Date: 2018-05-17 11:49+0200\n"
-"PO-Revision-Date: 2016-09-29 18:22+0000\n"
+"PO-Revision-Date: 2018-07-30 21:46+0000\n"
 "Last-Translator: Baptiste Darthenay <baptiste+transifex@darthenay.fr>\n"
 "Language-Team: Esperanto (http://www.transifex.com/django/django/language/"
 "eo/)\n"
@ -163,6 +164,9 @@ msgstr "Japana"
 msgid "Georgian"
 msgstr "Kartvela"
 msgid "Kabyle"
 msgstr "Kabila"
 msgid "Kazakh"
 msgstr "Kazaĥa"
@ -298,6 +302,15 @@ msgstr "Statikaj dosieroj"
 msgid "Syndication"
 msgstr "Abonrilato"
 msgid "That page number is not an integer"
 msgstr "Tuo paĝnumero ne estas entjero"
 msgid "That page number is less than 1"
 msgstr "Tuo paĝnumero estas malpli ol 1"
 msgid "That page contains no results"
 msgstr "Tiu paĝo ne enhavas rezultojn"
 msgid "Enter a valid value."
 msgstr "Enigu validan valoron."
@ -310,6 +323,7 @@ msgstr "Enigu validan entjero."
 msgid "Enter a valid email address."
 msgstr "Enigu validan retpoŝtan adreson."
 #. Translators: "letters" means latin letters: a-z and A-Z.
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
@ -375,6 +389,9 @@ msgstr[1] ""
 "Certigu, ke tio valuto maksimume havas %(limit_value)d karakterojn (ĝi havas "
 "%(show_value)d)."
 msgid "Enter a number."
 msgstr "Enigu nombron."
 #, python-format
 msgid "Ensure that there are no more than %(max)s digit in total."
 msgid_plural "Ensure that there are no more than %(max)s digits in total."
@ -395,6 +412,17 @@ msgid_plural ""
 msgstr[0] "Certigu ke ne estas pli ol %(max)s ciferoj antaŭ la dekuma punkto."
 msgstr[1] "Certigu ke ne estas pli ol %(max)s ciferoj antaŭ la dekuma punkto."
 #, python-format
 msgid ""
 "File extension '%(extension)s' is not allowed. Allowed extensions are: "
 "'%(allowed_extensions)s'."
 msgstr ""
 "dosiersufikso '%(extension)s' ne estas permesita. Permesitaj dosiersufiksoj "
 "estas: '%(allowed_extensions)s'."
 msgid "Null characters are not allowed."
 msgstr "Nulsignoj ne estas permesitaj."
 msgid "and"
 msgstr "kaj"
@ -442,6 +470,10 @@ msgstr "Granda (8 bitoka) entjero"
 msgid "'%(value)s' value must be either True or False."
 msgstr "'%(value)s' valoro devas esti Vera aŭ Malvera"
 #, python-format
 msgid "'%(value)s' value must be either True, False, or None."
 msgstr "“%(value)s” valoro devas esti Vera, Malvera aŭ Neniu."
 msgid "Boolean (Either True or False)"
 msgstr "Bulea (Vera aŭ Malvera)"
@ -618,9 +650,6 @@ msgstr "Ĉi tiu kampo estas deviga."
 msgid "Enter a whole number."
 msgstr "Enigu plenan nombron."
 msgid "Enter a number."
 msgstr "Enigu nombron."
 msgid "Enter a valid date."
 msgstr "Enigu validan daton."
@ -633,6 +662,10 @@ msgstr "Enigu validan daton/tempon."
 msgid "Enter a valid duration."
 msgstr "Enigu validan daŭron."
 #, python-brace-format
 msgid "The number of days must be between {min_days} and {max_days}."
 msgstr "La nombro da tagoj devas esti inter {min_days} kaj {max_days}."
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr ""
 "Neniu dosiero estis alŝutita. Kontrolu la kodoprezentan tipon en la "
@ -728,15 +761,15 @@ msgstr ""
 msgid "Please correct the duplicate values below."
 msgstr "Bonvolu ĝustigi la duoblan valoron sube."
-msgid "The inline foreign key did not match the parent instance primary key."
+msgid "The inline value did not match the parent instance."
-msgstr "La enteksta fremda ŝlosilo ne egalis la ĉefŝlosilon de patra apero."
+msgstr "La enteksta valoro ne egalas la patran aperon."
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr "Elektu validan elekton. Ĉi tiu elekto ne estas el la eblaj elektoj."
 #, python-format
-msgid "\"%(pk)s\" is not a valid value for a primary key."
+msgid "\"%(pk)s\" is not a valid value."
-msgstr "\"%(pk)s\" ne estas valida valuto por la ĉefa ŝlosilo."
+msgstr "\"%(pk)s\" ne estas valida valoro."
 #, python-format
 msgid ""
@ -746,15 +779,15 @@ msgstr ""
 "%(datetime)s ne povus esti interpretita en horzono %(current_timezone)s; ĝi "
 "povas esti plursenca aŭ ne ekzistas."
 msgid "Clear"
 msgstr "Vakigi"
 msgid "Currently"
 msgstr "Nuntempe"
 msgid "Change"
 msgstr "Ŝanĝi"
 msgid "Clear"
 msgstr "Vakigi"
 msgid "Unknown"
 msgstr "Nekonate"
@ -1101,6 +1134,19 @@ msgstr ""
 "reaktivigi ilin, almenaŭ por tiu ĉi retejo, aŭ por HTTPS rilatoj, aŭ por "
 "“samoriginaj” petoj."
 msgid ""
 "If you are using the <meta name=\"referrer\" content=\"no-referrer\"> tag or "
 "including the 'Referrer-Policy: no-referrer' header, please remove them. The "
 "CSRF protection requires the 'Referer' header to do strict referer checking. "
 "If you're concerned about privacy, use alternatives like <a rel=\"noreferrer"
 "\" ...> for links to third-party sites."
 msgstr ""
 "Se vi uzas la <meta name=\"referrer\" content=\"no-referrer\">markon aŭ "
 "inkluzivante la 'Referrer-Policy: no-referrer' titolo, bonvolu forigi ilin. "
 "La CSRFa protekto postulas ke la 'Referer' titolo faru striktan "
 "referencantan kontroladon. Se vi estas koncernita pri privateco, uzu "
 "alternativojn kiel <a rel=\"noreferrer\" ...> por ligoj al aliaj retejoj."
 msgid ""
 "You are seeing this message because this site requires a CSRF cookie when "
 "submitting forms. This cookie is required for security reasons, to ensure "
@ -1120,33 +1166,12 @@ msgstr ""
 msgid "More information is available with DEBUG=True."
 msgstr "Pliaj informoj estas videblaj kun DEBUG=True."
 msgid "Welcome to Django"
 msgstr "Bonvenon en Dĵango"
 msgid "It worked!"
 msgstr "Sukcesis!"
 msgid "Congratulations on your first Django-powered page."
 msgstr "Gratulojn por via unua Dĵanga paĝo."
 msgid ""
 "Of course, you haven't actually done any work yet. Next, start your first "
 "app by running <code>python manage.py startapp [app_label]</code>."
 msgstr ""
 "Kompreneble, vi ankoraŭ ne reale faris ajnan laboron. Poste, komencu vian "
 "unuan aplikaĵon lanĉante <code>python manage.py startapp [aplikaĵo_etikedo]</"
 "code>."
 msgid ""
 "You're seeing this message because you have <code>DEBUG = True</code> in "
 "your Django settings file and you haven't configured any URLs. Get to work!"
 msgstr ""
 "Vi vidas ĉi tiun mesaĝon ĉar vi havas <code>DEBUG = True</code> en viaj "
 "Dĵangaj agordaj dosieron kaj vi ne agordis ajna URLoj. Eklaboru!"
 msgid "No year specified"
 msgstr "Neniu jaro specifita"
 msgid "Date out of range"
 msgstr "Dato ne en la intervalo"
 msgid "No month specified"
 msgstr "Neniu monato specifita"
@ -1199,3 +1224,46 @@ msgstr "\"%(path)s\" ne ekzistas"
 #, python-format
 msgid "Index of %(directory)s"
 msgstr "Indekso de %(directory)s"
 msgid "Django: the Web framework for perfectionists with deadlines."
 msgstr "Dĵango: la retframo por perfektemuloj kun limdatoj"
 #, python-format
 msgid ""
 "View <a href=\"https://docs.djangoproject.com/en/%(version)s/releases/\" "
 "target=\"_blank\" rel=\"noopener\">release notes</a> for Django %(version)s"
 msgstr ""
 "Vidu <a href=\"https://docs.djangoproject.com/en/%(version)s/releases/\" "
 "target=\"_blank\" rel=\"noopener\">eldonajn notojn</a> por Dĵango %(version)s"
 msgid "The install worked successfully! Congratulations!"
 msgstr "La instalado sukcesis! Gratulojn!"
 #, python-format
 msgid ""
 "You are seeing this page because <a href=\"https://docs.djangoproject.com/en/"
 "%(version)s/ref/settings/#debug\" target=\"_blank\" rel=\"noopener"
 "\">DEBUG=True</a> is in your settings file and you have not configured any "
 "URLs."
 msgstr ""
 "Vi vidas ĉi tiun paĝon ĉar <a href=\"https://docs.djangoproject.com/en/"
 "%(version)s/ref/settings/#debug\" target=\"_blank\" rel=\"noopener\">DEBUG = "
 "True</a> estas en via agorda dosiero kaj vi ne agordis ajnan URL."
 msgid "Django Documentation"
 msgstr "Djanga dokumentaro"
 msgid "Topics, references, &amp; how-to's"
 msgstr "Temoj, referencoj &amp; manlibroj"
 msgid "Tutorial: A Polling App"
 msgstr "Instruilo: apo pri enketoj"
 msgid "Get started with Django"
 msgstr "Komencu kun Dĵango"
 msgid "Django Community"
 msgstr "Djanga komunumo"
 msgid "Connect, get help, or contribute"
 msgstr "Konektiĝu, ricevu helpon aŭ kontribuu"
--- a/django/conf/locale/eo/formats.py
+++ b/django/conf/locale/eo/formats.py
@ -1,10 +1,7 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
 from __future__ import unicode_literals
 # The *_FORMAT strings use the Django date format syntax,
-# see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
+# see https://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
 DATE_FORMAT = r'j\-\a \d\e F Y'         # '26-a de julio 1887'
 TIME_FORMAT = 'H:i'                     # '18:59'
 DATETIME_FORMAT = r'j\-\a \d\e F Y\, \j\e H:i'  # '26-a de julio 1887, je 18:59'
@ -15,7 +12,7 @@ SHORT_DATETIME_FORMAT = 'Y-m-d H:i'     # '1887-07-26 18:59'
 FIRST_DAY_OF_WEEK = 1  # Monday (lundo)
 # The *_INPUT_FORMATS strings use the Python strftime format syntax,
-# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
+# see https://docs.python.org/library/datetime.html#strftime-strptime-behavior
 DATE_INPUT_FORMATS = [
    '%Y-%m-%d',                         # '1887-07-26'
    '%y-%m-%d',                         # '87-07-26'
--- a/django/conf/locale/es/LC_MESSAGES/django.mo
+++ b/django/conf/locale/es/LC_MESSAGES/django.mo
--- a/django/conf/locale/es/LC_MESSAGES/django.po
+++ b/django/conf/locale/es/LC_MESSAGES/django.po
@ -1,17 +1,19 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
-# Abraham Estrada <abraham.estrada@gmail.com>, 2013
+# Abraham Estrada, 2013
 # albertoalcolea <albertoalcolea@gmail.com>, 2014
-# Antoni Aloy <aaloy@apsl.net>, 2011-2014
+# Amanda Copete, 2017
 # Antoni Aloy <aaloy@apsl.net>, 2011-2014,2017
 # Diego Andres Sanabria Martin <diegueus9@gmail.com>, 2012
 # Diego Schulz <dschulz@gmail.com>, 2012
 # Ernesto Avilés Vázquez <whippiii@gmail.com>, 2015-2016
 # Ernesto Avilés Vázquez <whippiii@gmail.com>, 2014
 # Ernesto Rico-Schmidt <e.rico.schmidt@gmail.com>, 2017
 # franchukelly <inactive+franchukelly@transifex.com>, 2011
 # Igor Támara <igor@tamarapatino.org>, 2015
 # Jannis Leidel <jannis@leidel.info>, 2011
-# Yusuf (Josè) Luis <alagunajs@gmail.com>, 2016
+# José Luis <alagunajs@gmail.com>, 2016
 # Josue Naaman Nistal Guerra <josuenistal@hotmail.com>, 2014
 # Leonardo J. Caballero G. <leonardocaballero@gmail.com>, 2011,2013
 # Marc Garcia <garcia.marc@gmail.com>, 2011
@ -19,15 +21,15 @@
 # ntrrgc <ntrrgc@gmail.com>, 2013
 # ntrrgc <ntrrgc@gmail.com>, 2013
 # Pablo, 2015
-# Sebastián Ramírez Magrí <sebasmagri@gmail.com>, 2013
+# Sebastián Magrí <sebasmagri@gmail.com>, 2013
 # Veronicabh <vero.blazher@gmail.com>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-29 20:57+0200\n"
+"POT-Creation-Date: 2017-11-15 16:15+0100\n"
-"PO-Revision-Date: 2016-08-03 15:35+0000\n"
+"PO-Revision-Date: 2017-11-16 14:56+0000\n"
-"Last-Translator: Ernesto Avilés Vázquez <whippiii@gmail.com>\n"
+"Last-Translator: Ernesto Rico-Schmidt <e.rico.schmidt@gmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/django/django/language/"
 "es/)\n"
 "MIME-Version: 1.0\n"
@ -37,7 +39,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 msgid "Afrikaans"
-msgstr "Afrikaans"
+msgstr "Africano"
 msgid "Arabic"
 msgstr "Árabe"
@ -312,8 +314,17 @@ msgstr "Archivos estáticos"
 msgid "Syndication"
 msgstr "Sindicación"
 msgid "That page number is not an integer"
 msgstr "Este número de página no es un entero"
 msgid "That page number is less than 1"
 msgstr "Este número de página es menor que 1"
 msgid "That page contains no results"
 msgstr "Esa página no contiene resultados"
 msgid "Enter a valid value."
-msgstr "Introduzca un valor correcto."
+msgstr "Introduzca un valor válido."
 msgid "Enter a valid URL."
 msgstr "Introduzca una URL válida."
@ -324,6 +335,7 @@ msgstr "Introduzca un número entero válido."
 msgid "Enter a valid email address."
 msgstr "Introduzca una dirección de correo electrónico válida."
 #. Translators: "letters" means latin letters: a-z and A-Z.
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
@ -334,8 +346,7 @@ msgid ""
 "Enter a valid 'slug' consisting of Unicode letters, numbers, underscores, or "
 "hyphens."
 msgstr ""
-"Ingrese un 'slug' consistente en letras, números, subrayados o guiones "
+"Introduzca un 'slug' consistente en letras, números, subrayados o guiones."
 "Unicodes."
 msgid "Enter a valid IPv4 address."
 msgstr "Introduzca una dirección IPv4 válida."
@ -413,6 +424,17 @@ msgstr[0] ""
 msgstr[1] ""
 "Asegúrese de que no haya más de %(max)s dígitos antes del punto decimal."
 #, python-format
 msgid ""
 "File extension '%(extension)s' is not allowed. Allowed extensions are: "
 "'%(allowed_extensions)s'."
 msgstr ""
 "La extensión de fichero '%(extension)s' no está permitida.  Únicamente se "
 "permiten: '%(allowed_extensions)s'."
 msgid "Null characters are not allowed."
 msgstr "Los caracteres nulos no están permitidos."
 msgid "and"
 msgstr "y"
@ -608,7 +630,7 @@ msgid "%(model)s instance with %(field)s %(value)r does not exist."
 msgstr "La instancia de %(model)s con %(field)s %(value)r no existe."
 msgid "Foreign Key (type determined by related field)"
-msgstr "Llave foránea (tipo determinado por el campo relacionado)"
+msgstr "Clave foránea (tipo determinado por el campo relacionado)"
 msgid "One-to-one relationship"
 msgstr "Relación uno-a-uno"
@ -704,7 +726,7 @@ msgstr ":"
 #, python-format
 msgid "(Hidden field %(name)s) %(error)s"
-msgstr "(Compo oculto %(name)s) *%(error)s"
+msgstr "(Campo oculto %(name)s) *%(error)s"
 msgid "ManagementForm data is missing or has been tampered with"
 msgstr "Los datos de ManagementForm faltan o han sido manipulados"
@ -712,14 +734,14 @@ msgstr "Los datos de ManagementForm faltan o han sido manipulados"
 #, python-format
 msgid "Please submit %d or fewer forms."
 msgid_plural "Please submit %d or fewer forms."
-msgstr[0] "Por favor, envíe %d o menos formas."
+msgstr[0] "Por favor, envíe %d formulario o menos."
-msgstr[1] "Por favor, envíe %d o menos formas."
+msgstr[1] "Por favor, envíe %d formularios o menos"
 #, python-format
 msgid "Please submit %d or more forms."
 msgid_plural "Please submit %d or more forms."
-msgstr[0] "Por favor, envíe %d o más formas."
+msgstr[0] "Por favor, envíe %d formulario o más."
-msgstr[1] "Por favor, envíe %d o más formas."
+msgstr[1] "Por favor, envíe %d formularios o más."
 msgid "Order"
 msgstr "Orden"
@ -747,17 +769,15 @@ msgstr ""
 msgid "Please correct the duplicate values below."
 msgstr "Por favor, corrija los valores duplicados abajo."
-msgid "The inline foreign key did not match the parent instance primary key."
+msgid "The inline value did not match the parent instance."
-msgstr ""
+msgstr "El valor en línea no coincide con la instancia principal."
 "La clave foránea en linea no coincide con la clave primaria de la instancia "
 "padre."
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr "Escoja una opción válida. Esa opción no está entre las disponibles."
 #, python-format
-msgid "\"%(pk)s\" is not a valid value for a primary key."
+msgid "\"%(pk)s\" is not a valid value."
-msgstr "\"%(pk)s\" no es un valor válido para una llave primaria."
+msgstr "\"%(pk)s\" no es un valor válido."
 #, python-format
 msgid ""
@ -767,15 +787,15 @@ msgstr ""
 "%(datetime)s no puede interpretarse en la zona temporal "
 "%(current_timezone)s; puede ser ambiguo o puede no existir."
 msgid "Clear"
 msgstr "Limpiar"
 msgid "Currently"
 msgstr "Actualmente"
 msgid "Change"
 msgstr "Modificar"
 msgid "Clear"
 msgstr "Limpiar"
 msgid "Unknown"
 msgstr "Desconocido"
@ -920,7 +940,7 @@ msgid "mar"
 msgstr "mar"
 msgid "apr"
-msgstr "apr"
+msgstr "abr"
 msgid "may"
 msgstr "may"
@ -1122,6 +1142,20 @@ msgstr ""
 "favor vuélvelas a activar, al menos para esta web, o para conexiones HTTPS, "
 "o para peticiones 'mismo-origen'."
 msgid ""
 "If you are using the <meta name=\"referrer\" content=\"no-referrer\"> tag or "
 "including the 'Referrer-Policy: no-referrer' header, please remove them. The "
 "CSRF protection requires the 'Referer' header to do strict referer checking. "
 "If you're concerned about privacy, use alternatives like <a rel=\"noreferrer"
 "\" ...> for links to third-party sites."
 msgstr ""
 "Si estás usando la etiqueta <meta name=\"referrer\" content=\"no-referrer\"> "
 "o incluyendo el encabezamiento 'Referrer-Policy: no-referrer' , por favor "
 "retíralos. La protección CSRF requiere del encabezamiento 'Referer' para "
 "hacer control estricto de referencia . Si estás preocupado por la "
 "privacidad, usa alternativas como <a rel=\"noreferrer\" ...> para enlaces a "
 "sitios de terceros."
 msgid ""
 "You are seeing this message because this site requires a CSRF cookie when "
 "submitting forms. This cookie is required for security reasons, to ensure "
@ -1141,33 +1175,12 @@ msgstr ""
 msgid "More information is available with DEBUG=True."
 msgstr "Se puede ver más información si se establece DEBUG=True."
 msgid "Welcome to Django"
 msgstr "Bienvenido a Django"
 msgid "It worked!"
 msgstr "¡Funcionó!"
 msgid "Congratulations on your first Django-powered page."
 msgstr "Enhorabuena por tu primer página hecha en Django."
 msgid ""
 "Of course, you haven't actually done any work yet. Next, start your first "
 "app by running <code>python manage.py startapp [app_label]</code>."
 msgstr ""
 "Por supuesto, todavía no has hecho ningún trabajo. Para continuar, inicia tu "
 "primera aplicación ejecutando <code>python manage.py startapp [app_label]</"
 "code>."
 msgid ""
 "You're seeing this message because you have <code>DEBUG = True</code> in "
 "your Django settings file and you haven't configured any URLs. Get to work!"
 msgstr ""
 "Ves este mensaje porque tienes <code>DEBUG = True</code> en el archivo de "
 "configuración de Django y no has configurado ninguna URL. ¡A trabajar!"
 msgid "No year specified"
 msgstr "No se ha indicado el año"
 msgid "Date out of range"
 msgstr "Fecha fuera de rango"
 msgid "No month specified"
 msgstr "No se ha indicado el mes"
@ -1218,3 +1231,48 @@ msgstr "\"%(path)s\" no existe"
 #, python-format
 msgid "Index of %(directory)s"
 msgstr "Índice de %(directory)s"
 msgid "Django: the Web framework for perfectionists with deadlines."
 msgstr "Django: el marco web para perfeccionistas con plazos."
 #, python-format
 msgid ""
 "View <a href=\"https://docs.djangoproject.com/en/%(version)s/releases/\" "
 "target=\"_blank\" rel=\"noopener\">release notes</a> for Django %(version)s"
 msgstr ""
 "Ve <a href=\"https://docs.djangoproject.com/en/%(version)s/releases/\" "
 "target=\"_blank\" rel=\"noopener\">la notas de la versión</a>  de Django "
 "%(version)s"
 msgid "The install worked successfully! Congratulations!"
 msgstr "¡La instalación funcionó con éxito! ¡Felicitaciones!"
 #, python-format
 msgid ""
 "You are seeing this page because <a href=\"https://docs.djangoproject.com/en/"
 "%(version)s/ref/settings/#debug\" target=\"_blank\" rel=\"noopener"
 "\">DEBUG=True</a> is in your settings file and you have not configured any "
 "URLs."
 msgstr ""
 "Estás viendo esta página porque <a href=\"https://docs.djangoproject.com/en/"
 "%(version)s/ref/settings/#debug\" target=\"_blank\" rel=\"noopener"
 "\">DEBUG=True</a> está en tu archivo de configuración y no has configurado "
 "ningún URL."
 msgid "Django Documentation"
 msgstr "Documentación de Django"
 msgid "Topics, references, &amp; how-to's"
 msgstr "Temas, referencias y cómo hacerlos"
 msgid "Tutorial: A Polling App"
 msgstr "Tutorial: Una aplicación de encuesta"
 msgid "Get started with Django"
 msgstr "Comienza con Django"
 msgid "Django Community"
 msgstr "Comunidad Django"
 msgid "Connect, get help, or contribute"
 msgstr "Conéctate, obtén ayuda o contribuye"
--- a/django/conf/locale/es/formats.py
+++ b/django/conf/locale/es/formats.py
@ -1,10 +1,7 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
 from __future__ import unicode_literals
 # The *_FORMAT strings use the Django date format syntax,
-# see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
+# see https://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
 DATE_FORMAT = r'j \d\e F \d\e Y'
 TIME_FORMAT = 'H:i'
 DATETIME_FORMAT = r'j \d\e F \d\e Y \a \l\a\s H:i'
@ -15,7 +12,7 @@ SHORT_DATETIME_FORMAT = 'd/m/Y H:i'
 FIRST_DAY_OF_WEEK = 1  # Monday
 # The *_INPUT_FORMATS strings use the Python strftime format syntax,
-# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
+# see https://docs.python.org/library/datetime.html#strftime-strptime-behavior
 DATE_INPUT_FORMATS = [
    # '31/12/2009', '31/12/09'
    '%d/%m/%Y', '%d/%m/%y'
--- a/django/conf/locale/es_AR/LC_MESSAGES/django.mo
+++ b/django/conf/locale/es_AR/LC_MESSAGES/django.mo
--- a/django/conf/locale/es_AR/LC_MESSAGES/django.po
+++ b/django/conf/locale/es_AR/LC_MESSAGES/django.po
@ -4,13 +4,13 @@
 # Jannis Leidel <jannis@leidel.info>, 2011
 # lardissone <lardissone@gmail.com>, 2014
 # poli <poli@devartis.com>, 2014
-# Ramiro Morales, 2013-2016
+# Ramiro Morales, 2013-2018
 msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-29 20:57+0200\n"
+"POT-Creation-Date: 2018-05-17 11:49+0200\n"
-"PO-Revision-Date: 2016-07-30 23:44+0000\n"
+"PO-Revision-Date: 2018-06-18 20:22+0000\n"
 "Last-Translator: Ramiro Morales\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/django/django/"
 "language/es_AR/)\n"
@ -161,6 +161,9 @@ msgstr "japonés"
 msgid "Georgian"
 msgstr "georgiano"
 msgid "Kabyle"
 msgstr "cabilio"
 msgid "Kazakh"
 msgstr "kazajo"
@ -296,6 +299,15 @@ msgstr "Archivos estáticos"
 msgid "Syndication"
 msgstr "Sindicación"
 msgid "That page number is not an integer"
 msgstr "El número de página no es un entero"
 msgid "That page number is less than 1"
 msgstr "El número de página es menor a 1"
 msgid "That page contains no results"
 msgstr "Esa página no contiene resultados"
 msgid "Enter a valid value."
 msgstr "Introduzca un valor válido."
@ -308,6 +320,7 @@ msgstr "Introduzca un valor numérico entero válido."
 msgid "Enter a valid email address."
 msgstr "Introduzca una dirección de email válida."
 #. Translators: "letters" means latin letters: a-z and A-Z.
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
@ -375,6 +388,9 @@ msgstr[1] ""
 "Asegúrese de que este valor tenga como máximo %(limit_value)d caracteres "
 "(tiene %(show_value)d)."
 msgid "Enter a number."
 msgstr "Introduzca un número."
 #, python-format
 msgid "Ensure that there are no more than %(max)s digit in total."
 msgid_plural "Ensure that there are no more than %(max)s digits in total."
@ -397,6 +413,17 @@ msgstr[0] ""
 msgstr[1] ""
 "Asegúrese de que no existan mas de %(max)s dígitos antes del punto decimal."
 #, python-format
 msgid ""
 "File extension '%(extension)s' is not allowed. Allowed extensions are: "
 "'%(allowed_extensions)s'."
 msgstr ""
 "La extensión de archivo '%(extension)s' no está permitida. Las extensiones "
 "aceptadas son: '%(allowed_extensions)s'."
 msgid "Null characters are not allowed."
 msgstr "No se admiten caracteres nulos."
 msgid "and"
 msgstr "y"
@ -445,6 +472,10 @@ msgstr "Entero grande (8 bytes)"
 msgid "'%(value)s' value must be either True or False."
 msgstr "El valor de '%(value)s' debe ser Verdadero o Falso."
 #, python-format
 msgid "'%(value)s' value must be either True, False, or None."
 msgstr "El valor de '%(value)s' debe ser Verdadero, Falso o None."
 msgid "Boolean (Either True or False)"
 msgstr "Booleano (Verdadero o Falso)"
@ -621,9 +652,6 @@ msgstr "Este campo es obligatorio."
 msgid "Enter a whole number."
 msgstr "Introduzca un número entero."
 msgid "Enter a number."
 msgstr "Introduzca un número."
 msgid "Enter a valid date."
 msgstr "Introduzca una fecha válida."
@ -636,6 +664,10 @@ msgstr "Introduzca un valor de fecha/hora válido."
 msgid "Enter a valid duration."
 msgstr "Introduzca una duración válida."
 #, python-brace-format
 msgid "The number of days must be between {min_days} and {max_days}."
 msgstr "La cantidad de días debe tener valores entre {min_days} y {max_days}."
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr ""
 "No se envió un archivo. Verifique el tipo de codificación en el formulario."
@ -733,10 +765,8 @@ msgstr ""
 msgid "Please correct the duplicate values below."
 msgstr "Por favor, corrija los valores duplicados detallados mas abajo."
-msgid "The inline foreign key did not match the parent instance primary key."
+msgid "The inline value did not match the parent instance."
-msgstr ""
+msgstr "El valor inline no coincide con el de la instancia padre."
 "La clave foránea del modelo inline no coincide con la clave primaria de la "
 "instancia padre."
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr ""
@ -744,8 +774,8 @@ msgstr ""
 "disponibles."
 #, python-format
-msgid "\"%(pk)s\" is not a valid value for a primary key."
+msgid "\"%(pk)s\" is not a valid value."
-msgstr "\"%(pk)s\" no es un valor válido para una clave primaria."
+msgstr "\"%(pk)s\" no es un valor válido."
 #, python-format
 msgid ""
@ -755,15 +785,15 @@ msgstr ""
 "%(datetime)s no puede ser interpretado en la zona horaria "
 "%(current_timezone)s; ya que podría ser ambiguo o podría no existir."
 msgid "Clear"
 msgstr "Eliminar"
 msgid "Currently"
 msgstr "Actualmente"
 msgid "Change"
 msgstr "Modificar"
 msgid "Clear"
 msgstr "Eliminar"
 msgid "Unknown"
 msgstr "Desconocido"
@ -984,54 +1014,54 @@ msgstr "Dic."
 msgctxt "alt. month"
 msgid "January"
-msgstr "Enero"
+msgstr "enero"
 msgctxt "alt. month"
 msgid "February"
-msgstr "Febrero"
+msgstr "febrero"
 msgctxt "alt. month"
 msgid "March"
-msgstr "Marzo"
+msgstr "marzo"
 msgctxt "alt. month"
 msgid "April"
-msgstr "Abril"
+msgstr "abril"
 msgctxt "alt. month"
 msgid "May"
-msgstr "Mayo"
+msgstr "mayo"
 msgctxt "alt. month"
 msgid "June"
-msgstr "Junio"
+msgstr "junio"
 msgctxt "alt. month"
 msgid "July"
-msgstr "Julio"
+msgstr "julio"
 msgctxt "alt. month"
 msgid "August"
-msgstr "Agosto"
+msgstr "agosto"
 msgctxt "alt. month"
 msgid "September"
-msgstr "Setiembre"
+msgstr "setiembre"
 msgctxt "alt. month"
 msgid "October"
-msgstr "Octubre"
+msgstr "octubre"
 msgctxt "alt. month"
 msgid "November"
-msgstr "Noviembre"
+msgstr "noviembre"
 msgctxt "alt. month"
 msgid "December"
-msgstr "Diciembre"
+msgstr "diciembre"
 msgid "This is not a valid IPv6 address."
-msgstr "Esta no es una direción IPv6 válida."
+msgstr "Esta no es una dirección IPv6 válida."
 #, python-format
 msgctxt "String to return when truncating text"
@ -1111,6 +1141,20 @@ msgstr ""
 "favor activelas al menos para este sitio, o para conexiones HTTPS o para "
 "peticiones generadas desde el mismo origen."
 msgid ""
 "If you are using the <meta name=\"referrer\" content=\"no-referrer\"> tag or "
 "including the 'Referrer-Policy: no-referrer' header, please remove them. The "
 "CSRF protection requires the 'Referer' header to do strict referer checking. "
 "If you're concerned about privacy, use alternatives like <a rel=\"noreferrer"
 "\" ...> for links to third-party sites."
 msgstr ""
 "Si está usando la etiqueta <meta name=\"referrer\" content=\"no-referrer\"> "
 "o está incluyendo el encabezado 'Referrer-Policy: no-referrer' por favor "
 "quítelos. La protección CSRF necesita el encabezado 'Referer' para realizar "
 "una comprobación estricta de los referers. Si le preocupa la privacidad "
 "tiene alternativas tales como usar <a rel=\"noreferrer\" ...> en los enlaces "
 "a sitios de terceros."
 msgid ""
 "You are seeing this message because this site requires a CSRF cookie when "
 "submitting forms. This cookie is required for security reasons, to ensure "
@ -1132,33 +1176,12 @@ msgstr ""
 msgid "More information is available with DEBUG=True."
 msgstr "Hay mas información disponible. Para ver la misma use DEBUG=True."
 msgid "Welcome to Django"
 msgstr "Bienvenido a Django"
 msgid "It worked!"
 msgstr "¡Funcionó!"
 msgid "Congratulations on your first Django-powered page."
 msgstr "Felicitationes por tu primera página Django-powered."
 msgid ""
 "Of course, you haven't actually done any work yet. Next, start your first "
 "app by running <code>python manage.py startapp [app_label]</code>."
 msgstr ""
 "Obviamente en realidad todavia no has hecho nada. Ahora crea tu primera "
 "aplicación ejecutando <code>python manage.py startapp [app_label]</code>."
 msgid ""
 "You're seeing this message because you have <code>DEBUG = True</code> in "
 "your Django settings file and you haven't configured any URLs. Get to work!"
 msgstr ""
 "Estás viendo este mensaje porque tienes <code>DEBUG = True</code> en tu "
 "archivo de settings Django y porque no has configurado ninguna URL. ¡A "
 "trabajar!"
 msgid "No year specified"
 msgstr "No se ha especificado el valor año"
 msgid "Date out of range"
 msgstr "Fecha fuera de rango"
 msgid "No month specified"
 msgstr "No se ha especificado el valor mes"
@ -1211,3 +1234,46 @@ msgstr "\"%(path)s\" no existe"
 #, python-format
 msgid "Index of %(directory)s"
 msgstr "Listado de %(directory)s"
 msgid "Django: the Web framework for perfectionists with deadlines."
 msgstr "Django: El framework Web para perfeccionistas con deadlines."
 #, python-format
 msgid ""
 "View <a href=\"https://docs.djangoproject.com/en/%(version)s/releases/\" "
 "target=\"_blank\" rel=\"noopener\">release notes</a> for Django %(version)s"
 msgstr ""
 "Ver las <a href=\"https://docs.djangoproject.com/en/%(version)s/releases/\" "
 "target=\"_blank\" rel=\"noopener\">release notes</a> de Django %(version)s"
 msgid "The install worked successfully! Congratulations!"
 msgstr "La instalación ha sido exitosa. ¡Felicitaciones!"
 #, python-format
 msgid ""
 "You are seeing this page because <a href=\"https://docs.djangoproject.com/en/"
 "%(version)s/ref/settings/#debug\" target=\"_blank\" rel=\"noopener"
 "\">DEBUG=True</a> is in your settings file and you have not configured any "
 "URLs."
 msgstr ""
 "Está viendo esta página porque el archivo de configuración contiene <a href="
 "\"https://docs.djangoproject.com/en/%(version)s/ref/settings/#debug\" target="
 "\"_blank\" rel=\"noopener\">DEBUG=True</a> y no ha configurado ninguna URL."
 msgid "Django Documentation"
 msgstr "Documentación de Django"
 msgid "Topics, references, &amp; how-to's"
 msgstr "Tópicos, referencia &amp; how-to's"
 msgid "Tutorial: A Polling App"
 msgstr "Tutorial: Una app de encuesta"
 msgid "Get started with Django"
 msgstr "Comience a aprender Django"
 msgid "Django Community"
 msgstr "Comunidad Django"
 msgid "Connect, get help, or contribute"
 msgstr "Conéctese, consiga ayuda o contribuya"
--- a/django/conf/locale/es_AR/formats.py
+++ b/django/conf/locale/es_AR/formats.py
@ -1,10 +1,7 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
 from __future__ import unicode_literals
 # The *_FORMAT strings use the Django date format syntax,
-# see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
+# see https://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
 DATE_FORMAT = r'j N Y'
 TIME_FORMAT = r'H:i'
 DATETIME_FORMAT = r'j N Y H:i'
@ -15,7 +12,7 @@ SHORT_DATETIME_FORMAT = r'd/m/Y H:i'
 FIRST_DAY_OF_WEEK = 0  # 0: Sunday, 1: Monday
 # The *_INPUT_FORMATS strings use the Python strftime format syntax,
-# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
+# see https://docs.python.org/library/datetime.html#strftime-strptime-behavior
 DATE_INPUT_FORMATS = [
    '%d/%m/%Y',  # '31/12/2009'
    '%d/%m/%y',  # '31/12/09'
--- a/django/conf/locale/es_CO/LC_MESSAGES/django.mo
+++ b/django/conf/locale/es_CO/LC_MESSAGES/django.mo
--- a/django/conf/locale/es_CO/LC_MESSAGES/django.po
+++ b/django/conf/locale/es_CO/LC_MESSAGES/django.po
@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-29 20:57+0200\n"
+"POT-Creation-Date: 2017-11-15 16:15+0100\n"
-"PO-Revision-Date: 2016-06-30 08:31+0000\n"
+"PO-Revision-Date: 2017-11-16 01:13+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/django/django/"
 "language/es_CO/)\n"
@ -293,6 +293,15 @@ msgstr "Archivos estáticos"
 msgid "Syndication"
 msgstr "Sindicación"
 msgid "That page number is not an integer"
 msgstr ""
 msgid "That page number is less than 1"
 msgstr ""
 msgid "That page contains no results"
 msgstr ""
 msgid "Enter a valid value."
 msgstr "Ingrese un valor válido."
@ -305,6 +314,7 @@ msgstr "Ingrese un entero válido."
 msgid "Enter a valid email address."
 msgstr "Ingrese una dirección de correo electrónico válida."
 #. Translators: "letters" means latin letters: a-z and A-Z.
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
@ -392,6 +402,15 @@ msgstr[0] ""
 msgstr[1] ""
 "Asegúrese de que no hayan más de %(max)s dígitos antes del punto decimal"
 #, python-format
 msgid ""
 "File extension '%(extension)s' is not allowed. Allowed extensions are: "
 "'%(allowed_extensions)s'."
 msgstr ""
 msgid "Null characters are not allowed."
 msgstr ""
 msgid "and"
 msgstr "y"
@ -726,17 +745,15 @@ msgstr ""
 msgid "Please correct the duplicate values below."
 msgstr "Por favor, corrija los valores duplicados abajo."
-msgid "The inline foreign key did not match the parent instance primary key."
+msgid "The inline value did not match the parent instance."
 msgstr ""
 "La clave foránea en linea no coincide con la clave primaria de la instancia "
 "padre."
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr "Escoja una opción válida. Esa opción no está entre las disponibles."
 #, python-format
-msgid "\"%(pk)s\" is not a valid value for a primary key."
+msgid "\"%(pk)s\" is not a valid value."
-msgstr "\"%(pk)s\" no es un valor válido para una llave primaria."
+msgstr ""
 #, python-format
 msgid ""
@ -746,15 +763,15 @@ msgstr ""
 "%(datetime)s no puede interpretarse en el huso horario %(current_timezone)s; "
 "puede ser ambiguo o puede no existir."
 msgid "Clear"
 msgstr "Limpiar"
 msgid "Currently"
 msgstr "Actualmente"
 msgid "Change"
 msgstr "Cambiar"
 msgid "Clear"
 msgstr "Limpiar"
 msgid "Unknown"
 msgstr "Desconocido"
@ -1101,6 +1118,14 @@ msgstr ""
 "favor vuélvelas a activar, al menos para esta web, o para conexiones HTTPS, "
 "o para peticiones 'same-origin'."
 msgid ""
 "If you are using the <meta name=\"referrer\" content=\"no-referrer\"> tag or "
 "including the 'Referrer-Policy: no-referrer' header, please remove them. The "
 "CSRF protection requires the 'Referer' header to do strict referer checking. "
 "If you're concerned about privacy, use alternatives like <a rel=\"noreferrer"
 "\" ...> for links to third-party sites."
 msgstr ""
 msgid ""
 "You are seeing this message because this site requires a CSRF cookie when "
 "submitting forms. This cookie is required for security reasons, to ensure "
@ -1120,33 +1145,12 @@ msgstr ""
 msgid "More information is available with DEBUG=True."
 msgstr "Se puede ver más información si se establece DEBUG=True."
 msgid "Welcome to Django"
 msgstr "Bienvenido a Django"
 msgid "It worked!"
 msgstr "¡Funcionó!"
 msgid "Congratulations on your first Django-powered page."
 msgstr "Enhorabuena por tu primer página hecha en Django."
 msgid ""
 "Of course, you haven't actually done any work yet. Next, start your first "
 "app by running <code>python manage.py startapp [app_label]</code>."
 msgstr ""
 "Por supuesto, todavía no has hecho ningún trabajo. Para continuar, inicia tu "
 "primera aplicación ejecutando <code>python manage.py startapp [app_label]</"
 "code>."
 msgid ""
 "You're seeing this message because you have <code>DEBUG = True</code> in "
 "your Django settings file and you haven't configured any URLs. Get to work!"
 msgstr ""
 "Ves este mensaje porque tienes <code>DEBUG = True</code> en el archivo de "
 "configuración de Django y no has configurado ninguna URL. ¡A trabajar!"
 msgid "No year specified"
 msgstr "No se ha indicado el año"
 msgid "Date out of range"
 msgstr ""
 msgid "No month specified"
 msgstr "No se ha indicado el mes"
@ -1197,3 +1201,41 @@ msgstr "\"%(path)s\" no existe"
 #, python-format
 msgid "Index of %(directory)s"
 msgstr "Índice de %(directory)s"
 msgid "Django: the Web framework for perfectionists with deadlines."
 msgstr ""
 #, python-format
 msgid ""
 "View <a href=\"https://docs.djangoproject.com/en/%(version)s/releases/\" "
 "target=\"_blank\" rel=\"noopener\">release notes</a> for Django %(version)s"
 msgstr ""
 msgid "The install worked successfully! Congratulations!"
 msgstr ""
 #, python-format
 msgid ""
 "You are seeing this page because <a href=\"https://docs.djangoproject.com/en/"
 "%(version)s/ref/settings/#debug\" target=\"_blank\" rel=\"noopener"
 "\">DEBUG=True</a> is in your settings file and you have not configured any "
 "URLs."
 msgstr ""
 msgid "Django Documentation"
 msgstr ""
 msgid "Topics, references, &amp; how-to's"
 msgstr ""
 msgid "Tutorial: A Polling App"
 msgstr ""
 msgid "Get started with Django"
 msgstr ""
 msgid "Django Community"
 msgstr ""
 msgid "Connect, get help, or contribute"
 msgstr ""
--- a/django/conf/locale/es_CO/formats.py
+++ b/django/conf/locale/es_CO/formats.py
@ -1,8 +1,5 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
 from __future__ import unicode_literals
 DATE_FORMAT = r'j \d\e F \d\e Y'
 TIME_FORMAT = 'H:i'
 DATETIME_FORMAT = r'j \d\e F \d\e Y \a \l\a\s H:i'
--- a/django/conf/locale/es_MX/LC_MESSAGES/django.mo
+++ b/django/conf/locale/es_MX/LC_MESSAGES/django.mo
--- a/django/conf/locale/es_MX/LC_MESSAGES/django.po
+++ b/django/conf/locale/es_MX/LC_MESSAGES/django.po
@ -1,14 +1,14 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
-# Abraham Estrada <abraham.estrada@gmail.com>, 2011-2013
+# Abraham Estrada, 2011-2013
 # zodman <zodman@gmail.com>, 2011
 msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-29 20:57+0200\n"
+"POT-Creation-Date: 2017-11-15 16:15+0100\n"
-"PO-Revision-Date: 2016-06-30 08:31+0000\n"
+"PO-Revision-Date: 2017-11-16 01:13+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
 "Language-Team: Spanish (Mexico) (http://www.transifex.com/django/django/"
 "language/es_MX/)\n"
@ -294,6 +294,15 @@ msgstr ""
 msgid "Syndication"
 msgstr ""
 msgid "That page number is not an integer"
 msgstr ""
 msgid "That page number is less than 1"
 msgstr ""
 msgid "That page contains no results"
 msgstr ""
 msgid "Enter a valid value."
 msgstr "Introduzca un valor válido."
@ -306,6 +315,7 @@ msgstr ""
 msgid "Enter a valid email address."
 msgstr "Introduzca una dirección de correo electrónico válida."
 #. Translators: "letters" means latin letters: a-z and A-Z.
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
@ -385,6 +395,15 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 #, python-format
 msgid ""
 "File extension '%(extension)s' is not allowed. Allowed extensions are: "
 "'%(allowed_extensions)s'."
 msgstr ""
 msgid "Null characters are not allowed."
 msgstr ""
 msgid "and"
 msgstr "y"
@ -699,10 +718,8 @@ msgstr ""
 msgid "Please correct the duplicate values below."
 msgstr "Por favor, corrija los valores duplicados detallados mas abajo."
-msgid "The inline foreign key did not match the parent instance primary key."
+msgid "The inline value did not match the parent instance."
 msgstr ""
 "La clave foránea del modelo inline no coincide con la clave primaria de la "
 "instancia padre."
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr ""
@ -710,7 +727,7 @@ msgstr ""
 "disponibles."
 #, python-format
-msgid "\"%(pk)s\" is not a valid value for a primary key."
+msgid "\"%(pk)s\" is not a valid value."
 msgstr ""
 #, python-format
@ -721,15 +738,15 @@ msgstr ""
 "La fecha %(datetime)s no puede se interpretada en la zona horaria  "
 "%(current_timezone)s; ya que puede ser ambigua o que no pueden existir."
 msgid "Clear"
 msgstr "Borrar"
 msgid "Currently"
 msgstr "Actualmente"
 msgid "Change"
 msgstr "Modificar"
 msgid "Clear"
 msgstr "Borrar"
 msgid "Unknown"
 msgstr "Desconocido"
@ -1069,6 +1086,14 @@ msgid ""
 "origin' requests."
 msgstr ""
 msgid ""
 "If you are using the <meta name=\"referrer\" content=\"no-referrer\"> tag or "
 "including the 'Referrer-Policy: no-referrer' header, please remove them. The "
 "CSRF protection requires the 'Referer' header to do strict referer checking. "
 "If you're concerned about privacy, use alternatives like <a rel=\"noreferrer"
 "\" ...> for links to third-party sites."
 msgstr ""
 msgid ""
 "You are seeing this message because this site requires a CSRF cookie when "
 "submitting forms. This cookie is required for security reasons, to ensure "
@ -1083,28 +1108,12 @@ msgstr ""
 msgid "More information is available with DEBUG=True."
 msgstr ""
 msgid "Welcome to Django"
 msgstr ""
 msgid "It worked!"
 msgstr ""
 msgid "Congratulations on your first Django-powered page."
 msgstr ""
 msgid ""
 "Of course, you haven't actually done any work yet. Next, start your first "
 "app by running <code>python manage.py startapp [app_label]</code>."
 msgstr ""
 msgid ""
 "You're seeing this message because you have <code>DEBUG = True</code> in "
 "your Django settings file and you haven't configured any URLs. Get to work!"
 msgstr ""
 msgid "No year specified"
 msgstr "No se ha especificado el valor año"
 msgid "Date out of range"
 msgstr ""
 msgid "No month specified"
 msgstr "No se ha especificado el valor mes"
@ -1155,3 +1164,41 @@ msgstr "\"%(path)s\" no existe"
 #, python-format
 msgid "Index of %(directory)s"
 msgstr "Índice de %(directory)s"
 msgid "Django: the Web framework for perfectionists with deadlines."
 msgstr ""
 #, python-format
 msgid ""
 "View <a href=\"https://docs.djangoproject.com/en/%(version)s/releases/\" "
 "target=\"_blank\" rel=\"noopener\">release notes</a> for Django %(version)s"
 msgstr ""
 msgid "The install worked successfully! Congratulations!"
 msgstr ""
 #, python-format
 msgid ""
 "You are seeing this page because <a href=\"https://docs.djangoproject.com/en/"
 "%(version)s/ref/settings/#debug\" target=\"_blank\" rel=\"noopener"
 "\">DEBUG=True</a> is in your settings file and you have not configured any "
 "URLs."
 msgstr ""
 msgid "Django Documentation"
 msgstr ""
 msgid "Topics, references, &amp; how-to's"
 msgstr ""
 msgid "Tutorial: A Polling App"
 msgstr ""
 msgid "Get started with Django"
 msgstr ""
 msgid "Django Community"
 msgstr ""
 msgid "Connect, get help, or contribute"
 msgstr ""
--- a/django/conf/locale/es_MX/formats.py
+++ b/django/conf/locale/es_MX/formats.py
@ -1,8 +1,5 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
 from __future__ import unicode_literals
 DATE_FORMAT = r'j \d\e F \d\e Y'
 TIME_FORMAT = 'H:i'
 DATETIME_FORMAT = r'j \d\e F \d\e Y \a \l\a\s H:i'
@ -24,5 +21,5 @@ DATETIME_INPUT_FORMATS = [
    '%d/%m/%y %H:%M',
 ]
 DECIMAL_SEPARATOR = '.'   # ',' is also official (less common): NOM-008-SCFI-2002
-THOUSAND_SEPARATOR = '\xa0'  # non-breaking space
+THOUSAND_SEPARATOR = ','
 NUMBER_GROUPING = 3
--- a/django/conf/locale/es_NI/formats.py
+++ b/django/conf/locale/es_NI/formats.py
@ -1,8 +1,5 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
 from __future__ import unicode_literals
 DATE_FORMAT = r'j \d\e F \d\e Y'
 TIME_FORMAT = 'H:i'
 DATETIME_FORMAT = r'j \d\e F \d\e Y \a \l\a\s H:i'
--- a/django/conf/locale/es_PR/formats.py
+++ b/django/conf/locale/es_PR/formats.py
@ -1,8 +1,5 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
 from __future__ import unicode_literals
 DATE_FORMAT = r'j \d\e F \d\e Y'
 TIME_FORMAT = 'H:i'
 DATETIME_FORMAT = r'j \d\e F \d\e Y \a \l\a\s H:i'
--- a/django/conf/locale/es_VE/LC_MESSAGES/django.mo
+++ b/django/conf/locale/es_VE/LC_MESSAGES/django.mo
--- a/django/conf/locale/es_VE/LC_MESSAGES/django.po
+++ b/django/conf/locale/es_VE/LC_MESSAGES/django.po
@ -1,14 +1,16 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
 # Eduardo <edos21@gmail.com>, 2017
 # Leonardo J. Caballero G. <leonardocaballero@gmail.com>, 2016
-# Sebastián Ramírez Magrí <sebasmagri@gmail.com>, 2011
+# Sebastián Magrí <sebasmagri@gmail.com>, 2011
 # Yoel Acevedo, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-29 20:57+0200\n"
+"POT-Creation-Date: 2017-11-15 16:15+0100\n"
-"PO-Revision-Date: 2016-06-30 08:31+0000\n"
+"PO-Revision-Date: 2017-11-16 01:13+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/django/django/"
 "language/es_VE/)\n"
@ -61,7 +63,7 @@ msgid "German"
 msgstr "Alemán"
 msgid "Lower Sorbian"
-msgstr ""
+msgstr "Sorbio Inferior"
 msgid "Greek"
 msgstr "Griego"
@ -133,7 +135,7 @@ msgid "Croatian"
 msgstr "Croata"
 msgid "Upper Sorbian"
-msgstr ""
+msgstr "Sorbio Superior"
 msgid "Hungarian"
 msgstr "Húngaro"
@ -196,7 +198,7 @@ msgid "Burmese"
 msgstr "Birmano"
 msgid "Norwegian Bokmål"
-msgstr ""
+msgstr "Noruego"
 msgid "Nepali"
 msgstr "Nepalí"
@ -294,6 +296,15 @@ msgstr "Archivos estáticos"
 msgid "Syndication"
 msgstr "Sindicación"
 msgid "That page number is not an integer"
 msgstr "Ese número de página no es un número entero"
 msgid "That page number is less than 1"
 msgstr "Ese número de página es menor que 1"
 msgid "That page contains no results"
 msgstr "Esa página no contiene resultados"
 msgid "Enter a valid value."
 msgstr "Introduzca un valor válido."
@ -306,6 +317,7 @@ msgstr "Ingrese un valor válido."
 msgid "Enter a valid email address."
 msgstr "Ingrese una dirección de correo electrónico válida."
 #. Translators: "letters" means latin letters: a-z and A-Z.
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
@ -393,6 +405,17 @@ msgstr[0] ""
 msgstr[1] ""
 "Asegúrese de que no hayan más de %(max)s dígitos antes del punto decimal."
 #, python-format
 msgid ""
 "File extension '%(extension)s' is not allowed. Allowed extensions are: "
 "'%(allowed_extensions)s'."
 msgstr ""
 "La extensión de archivo  '%(extension)s' no está permitida. Las extensiones "
 "permitidas son ' %(allowed_extensions)s'."
 msgid "Null characters are not allowed."
 msgstr ""
 msgid "and"
 msgstr "y"
@ -595,11 +618,11 @@ msgstr "Relación uno a uno"
 #, python-format
 msgid "%(from)s-%(to)s relationship"
-msgstr ""
+msgstr "Relación %(from)s - %(to)s "
 #, python-format
 msgid "%(from)s-%(to)s relationships"
-msgstr ""
+msgstr "Relaciones  %(from)s - %(to)s"
 msgid "Many-to-many relationship"
 msgstr "Relación muchos a muchos"
@ -725,18 +748,16 @@ msgstr ""
 msgid "Please correct the duplicate values below."
 msgstr "Por favor, corrija los valores duplicados abajo."
-msgid "The inline foreign key did not match the parent instance primary key."
+msgid "The inline value did not match the parent instance."
 msgstr ""
 "La clave foránea en linea no coincide con la clave primaria de la instancia "
 "padre."
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr ""
 "Escoja una opción válida. Esa opción no está entre las opciones disponibles."
 #, python-format
-msgid "\"%(pk)s\" is not a valid value for a primary key."
+msgid "\"%(pk)s\" is not a valid value."
-msgstr "\"%(pk)s\" no es un valor válido para una llave primaria."
+msgstr ""
 #, python-format
 msgid ""
@ -746,15 +767,15 @@ msgstr ""
 "%(datetime)s no puede interpretarse en la zona horaria %(current_timezone)s; "
 "puede ser ambiguo o puede no existir."
 msgid "Clear"
 msgstr "Limpiar"
 msgid "Currently"
 msgstr "Actualmente"
 msgid "Change"
 msgstr "Cambiar"
 msgid "Clear"
 msgstr "Limpiar"
 msgid "Unknown"
 msgstr "Desconocido"
@ -1101,6 +1122,14 @@ msgstr ""
 "favor vuélvelas a activar, al menos para esta web, o para conexiones HTTPS, "
 "o para peticiones 'same-origin'."
 msgid ""
 "If you are using the <meta name=\"referrer\" content=\"no-referrer\"> tag or "
 "including the 'Referrer-Policy: no-referrer' header, please remove them. The "
 "CSRF protection requires the 'Referer' header to do strict referer checking. "
 "If you're concerned about privacy, use alternatives like <a rel=\"noreferrer"
 "\" ...> for links to third-party sites."
 msgstr ""
 msgid ""
 "You are seeing this message because this site requires a CSRF cookie when "
 "submitting forms. This cookie is required for security reasons, to ensure "
@ -1120,33 +1149,12 @@ msgstr ""
 msgid "More information is available with DEBUG=True."
 msgstr "Se puede ver más información si se establece DEBUG=True."
 msgid "Welcome to Django"
 msgstr "Bienvenido a Django"
 msgid "It worked!"
 msgstr "¡Funcionó!"
 msgid "Congratulations on your first Django-powered page."
 msgstr "Felicitaciones por su primera página con Django."
 msgid ""
 "Of course, you haven't actually done any work yet. Next, start your first "
 "app by running <code>python manage.py startapp [app_label]</code>."
 msgstr ""
 "Por supuesto, todavía no has hecho ningún trabajo. Para continuar, inicia tu "
 "primera aplicación ejecutando <code>python manage.py startapp [app_label]</"
 "code>."
 msgid ""
 "You're seeing this message because you have <code>DEBUG = True</code> in "
 "your Django settings file and you haven't configured any URLs. Get to work!"
 msgstr ""
 "Ves este mensaje porque tienes <code>DEBUG = True</code> en el archivo de "
 "configuración de Django y no has configurado ninguna URL. ¡A trabajar!"
 msgid "No year specified"
 msgstr "No se ha indicado el año"
 msgid "Date out of range"
 msgstr ""
 msgid "No month specified"
 msgstr "No se ha indicado el mes"
@ -1197,3 +1205,41 @@ msgstr "\"%(path)s\" no existe"
 #, python-format
 msgid "Index of %(directory)s"
 msgstr "Índice de %(directory)s"
 msgid "Django: the Web framework for perfectionists with deadlines."
 msgstr ""
 #, python-format
 msgid ""
 "View <a href=\"https://docs.djangoproject.com/en/%(version)s/releases/\" "
 "target=\"_blank\" rel=\"noopener\">release notes</a> for Django %(version)s"
 msgstr ""
 msgid "The install worked successfully! Congratulations!"
 msgstr ""
 #, python-format
 msgid ""
 "You are seeing this page because <a href=\"https://docs.djangoproject.com/en/"
 "%(version)s/ref/settings/#debug\" target=\"_blank\" rel=\"noopener"
 "\">DEBUG=True</a> is in your settings file and you have not configured any "
 "URLs."
 msgstr ""
 msgid "Django Documentation"
 msgstr ""
 msgid "Topics, references, &amp; how-to's"
 msgstr ""
 msgid "Tutorial: A Polling App"
 msgstr ""
 msgid "Get started with Django"
 msgstr ""
 msgid "Django Community"
 msgstr ""
 msgid "Connect, get help, or contribute"
 msgstr ""
--- a/django/conf/locale/et/LC_MESSAGES/django.mo
+++ b/django/conf/locale/et/LC_MESSAGES/django.mo
--- a/django/conf/locale/et/LC_MESSAGES/django.po
+++ b/django/conf/locale/et/LC_MESSAGES/django.po
@ -6,15 +6,15 @@
 # Janno Liivak <jannolii@gmail.com>, 2013-2015
 # madisvain <madisvain@gmail.com>, 2011
 # Martin Pajuste <martinpajuste@gmail.com>, 2014-2015
-# Martin Pajuste <martinpajuste@gmail.com>, 2016
+# Martin Pajuste <martinpajuste@gmail.com>, 2016-2017
 # Marti Raudsepp <marti@juffo.org>, 2014,2016
 msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-29 20:57+0200\n"
+"POT-Creation-Date: 2017-11-15 16:15+0100\n"
-"PO-Revision-Date: 2016-07-18 21:42+0000\n"
+"PO-Revision-Date: 2017-11-16 10:26+0000\n"
-"Last-Translator: Marti Raudsepp <marti@juffo.org>\n"
+"Last-Translator: Martin Pajuste <martinpajuste@gmail.com>\n"
 "Language-Team: Estonian (http://www.transifex.com/django/django/language/"
 "et/)\n"
 "MIME-Version: 1.0\n"
@ -299,6 +299,15 @@ msgstr "Staatilised failid"
 msgid "Syndication"
 msgstr "Sündikeerimine"
 msgid "That page number is not an integer"
 msgstr "See lehe number ei ole täisarv"
 msgid "That page number is less than 1"
 msgstr "See lehe number on väiksem kui 1"
 msgid "That page contains no results"
 msgstr "See leht ei sisalda tulemusi"
 msgid "Enter a valid value."
 msgstr "Sisestage korrektne väärtus."
@ -311,6 +320,7 @@ msgstr "Sisestage korrektne täisarv."
 msgid "Enter a valid email address."
 msgstr "Sisestage korrektne e-posti aadress."
 #. Translators: "letters" means latin letters: a-z and A-Z.
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
@ -397,6 +407,17 @@ msgstr[0] ""
 msgstr[1] ""
 "Veenduge, et komast vasakul olevaid numbreid ei oleks rohkem kui %(max)s."
 #, python-format
 msgid ""
 "File extension '%(extension)s' is not allowed. Allowed extensions are: "
 "'%(allowed_extensions)s'."
 msgstr ""
 "Faililaiend '%(extension)s' ei ole lubatud. Lubatud laiendid on: "
 "'%(allowed_extensions)s'."
 msgid "Null characters are not allowed."
 msgstr ""
 msgid "and"
 msgstr "ja"
@ -727,15 +748,15 @@ msgstr ""
 msgid "Please correct the duplicate values below."
 msgstr "Palun parandage allolevad duplikaat-väärtused"
-msgid "The inline foreign key did not match the parent instance primary key."
+msgid "The inline value did not match the parent instance."
-msgstr "Pesastatud välisvõti ei sobi ülemobjekti primaarvõtmega."
+msgstr "Pesastatud väärtus ei sobi ülemobjektiga."
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr "Valige korrektne väärtus. Valitud väärtus ei ole valitav."
 #, python-format
-msgid "\"%(pk)s\" is not a valid value for a primary key."
+msgid "\"%(pk)s\" is not a valid value."
-msgstr "\"%(pk)s\" ei ole sobiv väärtus primaarvõtmeks."
+msgstr "\"%(pk)s\" ei ole korrektne väärtus."
 #, python-format
 msgid ""
@ -745,15 +766,15 @@ msgstr ""
 "%(datetime)s ei saanud tõlgendada ajavööndis %(current_timezone)s; see on "
 "kas puudu või mitmetähenduslik."
 msgid "Clear"
 msgstr "Tühjenda"
 msgid "Currently"
 msgstr "Hetkel"
 msgid "Change"
 msgstr "Muuda"
 msgid "Clear"
 msgstr "Tühjenda"
 msgid "Unknown"
 msgstr "Tundmatu"
@ -1100,6 +1121,14 @@ msgstr ""
 "lülitage need taas sisse vähemalt antud lehe jaoks või HTTPS üheduste jaoks "
 "või 'sama-allika' päringute jaoks."
 msgid ""
 "If you are using the <meta name=\"referrer\" content=\"no-referrer\"> tag or "
 "including the 'Referrer-Policy: no-referrer' header, please remove them. The "
 "CSRF protection requires the 'Referer' header to do strict referer checking. "
 "If you're concerned about privacy, use alternatives like <a rel=\"noreferrer"
 "\" ...> for links to third-party sites."
 msgstr ""
 msgid ""
 "You are seeing this message because this site requires a CSRF cookie when "
 "submitting forms. This cookie is required for security reasons, to ensure "
@ -1119,32 +1148,12 @@ msgstr ""
 msgid "More information is available with DEBUG=True."
 msgstr "Saadaval on rohkem infot kasutades DEBUG=True"
 msgid "Welcome to Django"
 msgstr "Teretulemast Django juurde"
 msgid "It worked!"
 msgstr "See töötas!"
 msgid "Congratulations on your first Django-powered page."
 msgstr "Õnnitleme Teie esimese Django-põhise lehe puhul."
 msgid ""
 "Of course, you haven't actually done any work yet. Next, start your first "
 "app by running <code>python manage.py startapp [app_label]</code>."
 msgstr ""
 "Muidugi ei ole sa veel midagi tegelikult teinud. Järgmiseks käivita oma "
 "rakendus käsuga <code>python manage.py startapp [app_label]</code>."
 msgid ""
 "You're seeing this message because you have <code>DEBUG = True</code> in "
 "your Django settings file and you haven't configured any URLs. Get to work!"
 msgstr ""
 "Näete seda teadet, kuna teil on määratud <code>DEBUG = True</code> Django "
 "seadete failis ja te ei ole ühtki URLi seadistanud. Ruttu tööle!"
 msgid "No year specified"
 msgstr "Aasta on valimata"
 msgid "Date out of range"
 msgstr ""
 msgid "No month specified"
 msgstr "Kuu on valimata"
@ -1195,3 +1204,44 @@ msgstr "\"%(path)s\" ei eksisteeri"
 #, python-format
 msgid "Index of %(directory)s"
 msgstr "%(directory)s sisuloend"
 msgid "Django: the Web framework for perfectionists with deadlines."
 msgstr ""
 #, python-format
 msgid ""
 "View <a href=\"https://docs.djangoproject.com/en/%(version)s/releases/\" "
 "target=\"_blank\" rel=\"noopener\">release notes</a> for Django %(version)s"
 msgstr ""
 msgid "The install worked successfully! Congratulations!"
 msgstr ""
 #, python-format
 msgid ""
 "You are seeing this page because <a href=\"https://docs.djangoproject.com/en/"
 "%(version)s/ref/settings/#debug\" target=\"_blank\" rel=\"noopener"
 "\">DEBUG=True</a> is in your settings file and you have not configured any "
 "URLs."
 msgstr ""
 "Näete seda lehte, kuna teil on määratud <a href=\"https://docs.djangoproject."
 "com/en/%(version)s/ref/settings/#debug\" target=\"_blank\" rel=\"noopener"
 "\">DEBUG=True</a> Django seadete failis ja te ei ole ühtki URLi seadistanud."
 msgid "Django Documentation"
 msgstr "Django dokumentatsioon"
 msgid "Topics, references, &amp; how-to's"
 msgstr ""
 msgid "Tutorial: A Polling App"
 msgstr ""
 msgid "Get started with Django"
 msgstr ""
 msgid "Django Community"
 msgstr ""
 msgid "Connect, get help, or contribute"
 msgstr ""
--- a/django/conf/locale/et/formats.py
+++ b/django/conf/locale/et/formats.py
@ -1,10 +1,7 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
 from __future__ import unicode_literals
 # The *_FORMAT strings use the Django date format syntax,
-# see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
+# see https://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
 DATE_FORMAT = 'j. F Y'
 TIME_FORMAT = 'G:i'
 # DATETIME_FORMAT =
@ -15,7 +12,7 @@ SHORT_DATE_FORMAT = 'd.m.Y'
 # FIRST_DAY_OF_WEEK =
 # The *_INPUT_FORMATS strings use the Python strftime format syntax,
-# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
+# see https://docs.python.org/library/datetime.html#strftime-strptime-behavior
 # DATE_INPUT_FORMATS =
 # TIME_INPUT_FORMATS =
 # DATETIME_INPUT_FORMATS =
--- a/django/conf/locale/eu/LC_MESSAGES/django.mo
+++ b/django/conf/locale/eu/LC_MESSAGES/django.mo
--- a/django/conf/locale/eu/LC_MESSAGES/django.po
+++ b/django/conf/locale/eu/LC_MESSAGES/django.po
@ -1,21 +1,23 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
-# Aitzol Naberan <anaberan@codesyntax.com>, 2013
+# Aitzol Naberan <anaberan@codesyntax.com>, 2013,2016
 # Ander Martínez <ander.basaundi@gmail.com>, 2013-2014
 # Eneko Illarramendi <eneko@illarra.com>, 2017-2018
 # Jannis Leidel <jannis@leidel.info>, 2011
 # jazpillaga <jazpillaga@codesyntax.com>, 2011
-# julen <julenx@gmail.com>, 2011-2012
+# julen, 2011-2012
-# julen <julenx@gmail.com>, 2013,2015
+# julen, 2013,2015
 # totorika93 <totorika93@gmail.com>, 2012
 # Unai Zalakain <inactive+unaizalakain@transifex.com>, 2013
 # Urtzi Odriozola <urtzi.odriozola@gmail.com>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-29 20:57+0200\n"
+"POT-Creation-Date: 2018-05-17 11:49+0200\n"
-"PO-Revision-Date: 2016-06-30 08:31+0000\n"
+"PO-Revision-Date: 2018-08-23 14:04+0000\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
+"Last-Translator: Eneko Illarramendi <eneko@illarra.com>\n"
 "Language-Team: Basque (http://www.transifex.com/django/django/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@ -30,16 +32,16 @@ msgid "Arabic"
 msgstr "Arabiera"
 msgid "Asturian"
-msgstr ""
+msgstr "Asturiera"
 msgid "Azerbaijani"
-msgstr "Azerbaianera"
+msgstr "Azerbaijanera"
 msgid "Bulgarian"
 msgstr "Bulgariera"
 msgid "Belarusian"
-msgstr "Belarusiera"
+msgstr "Bielorrusiera"
 msgid "Bengali"
 msgstr "Bengalera"
@ -57,16 +59,16 @@ msgid "Czech"
 msgstr "Txekiera"
 msgid "Welsh"
-msgstr "Gales"
+msgstr "Galesa"
 msgid "Danish"
 msgstr "Daniera"
 msgid "German"
-msgstr "Alemaniera"
+msgstr "Alemana"
 msgid "Lower Sorbian"
-msgstr ""
+msgstr "Behe-sorbiera"
 msgid "Greek"
 msgstr "Greziera"
@ -75,7 +77,7 @@ msgid "English"
 msgstr "Ingelesa"
 msgid "Australian English"
-msgstr ""
+msgstr "Australiar ingelesa"
 msgid "British English"
 msgstr "Ingelesa"
@ -84,22 +86,22 @@ msgid "Esperanto"
 msgstr "Esperantoa"
 msgid "Spanish"
-msgstr "Espainola"
+msgstr "Gaztelania"
 msgid "Argentinian Spanish"
-msgstr "Espainola (Argentina)"
+msgstr "Gaztelania (Argentina)"
 msgid "Colombian Spanish"
-msgstr ""
+msgstr "Gaztelania (Kolonbia)"
 msgid "Mexican Spanish"
-msgstr "Espainola (Mexiko)"
+msgstr "Gaztelania (Mexiko)"
 msgid "Nicaraguan Spanish"
-msgstr "Espainola (Nikaragua)"
+msgstr "Gaztelania (Nikaragua)"
 msgid "Venezuelan Spanish"
-msgstr "Venezuelako gaztelera"
+msgstr "Gaztelania (Venezuela)"
 msgid "Estonian"
 msgstr "Estoniera"
@ -120,10 +122,10 @@ msgid "Frisian"
 msgstr "Frisiera"
 msgid "Irish"
-msgstr "Irlandako gaelera"
+msgstr "Irlandako gaelikoa"
 msgid "Scottish Gaelic"
-msgstr ""
+msgstr "Eskoziako gaelikoa"
 msgid "Galician"
 msgstr "Galiziera"
@ -135,10 +137,10 @@ msgid "Hindi"
 msgstr "Hindi"
 msgid "Croatian"
-msgstr "Kroaziarra"
+msgstr "Kroaziera"
 msgid "Upper Sorbian"
-msgstr ""
+msgstr "Goi-sorbiera"
 msgid "Hungarian"
 msgstr "Hungariera"
@ -150,7 +152,7 @@ msgid "Indonesian"
 msgstr "Indonesiera"
 msgid "Ido"
-msgstr ""
+msgstr "Ido"
 msgid "Icelandic"
 msgstr "Islandiera"
@ -164,14 +166,17 @@ msgstr "Japoniera"
 msgid "Georgian"
 msgstr "Georgiera"
 msgid "Kabyle"
 msgstr "Kabylera"
 msgid "Kazakh"
 msgstr "Kazakhera"
 msgid "Khmer"
-msgstr "Khemerera"
+msgstr "Khmerera"
 msgid "Kannada"
-msgstr "Kanadiera"
+msgstr "Kannada"
 msgid "Korean"
 msgstr "Koreera"
@ -195,22 +200,22 @@ msgid "Mongolian"
 msgstr "Mongoliera"
 msgid "Marathi"
-msgstr ""
+msgstr "Marathera"
 msgid "Burmese"
 msgstr "Birmaniera"
 msgid "Norwegian Bokmål"
-msgstr ""
+msgstr "Bokmåla (Norvegia)"
 msgid "Nepali"
 msgstr "Nepalera"
 msgid "Dutch"
-msgstr "Holandera"
+msgstr "Nederlandera"
 msgid "Norwegian Nynorsk"
-msgstr "Nynorsk"
+msgstr "Nynorsk (Norvegia)"
 msgid "Ossetic"
 msgstr "Osetiera"
@ -222,10 +227,10 @@ msgid "Polish"
 msgstr "Poloniera"
 msgid "Portuguese"
-msgstr "Portugalera"
+msgstr "Portugesa"
 msgid "Brazilian Portuguese"
-msgstr "Portugalera (Brazil)"
+msgstr "Portugesa (Brazil)"
 msgid "Romanian"
 msgstr "Errumaniera"
@ -258,7 +263,7 @@ msgid "Tamil"
 msgstr "Tamilera"
 msgid "Telugu"
-msgstr "Telegu hizkuntza"
+msgstr "Telugua"
 msgid "Thai"
 msgstr "Thailandiera"
@ -270,7 +275,7 @@ msgid "Tatar"
 msgstr "Tatarera"
 msgid "Udmurt"
-msgstr "Udmurt"
+msgstr "Udmurtera"
 msgid "Ukrainian"
 msgstr "Ukrainera"
@ -279,7 +284,7 @@ msgid "Urdu"
 msgstr "Urdua"
 msgid "Vietnamese"
-msgstr "Vietnamamera"
+msgstr "Vietnamera"
 msgid "Simplified Chinese"
 msgstr "Txinera (sinpletua)"
@ -288,29 +293,39 @@ msgid "Traditional Chinese"
 msgstr "Txinera (tradizionala)"
 msgid "Messages"
-msgstr ""
+msgstr "Mezuak"
 msgid "Site Maps"
-msgstr ""
+msgstr "Sitemap-ak"
 msgid "Static Files"
 msgstr "Fitxategi estatikoak"
 msgid "Syndication"
-msgstr ""
+msgstr "Sindikazioa"
 msgid "That page number is not an integer"
 msgstr "Orrialde hori ez da zenbaki bat"
 msgid "That page number is less than 1"
 msgstr "Orrialde zenbaki hori 1 baino txikiagoa da"
 msgid "That page contains no results"
 msgstr "Orrialde horrek ez du emaitzarik"
 msgid "Enter a valid value."
-msgstr "Idatzi balio zuzena."
+msgstr "Idatzi baleko balio bat."
 msgid "Enter a valid URL."
-msgstr "Idatzi baliozko URL bat."
+msgstr "Idatzi baleko URL bat."
 msgid "Enter a valid integer."
-msgstr "Idatzi baliozko osoko zenbakia."
+msgstr "Idatzi baleko zenbaki bat."
 msgid "Enter a valid email address."
-msgstr "Gehitu baleko email helbide bat"
+msgstr "Idatzi baleko helbide elektroniko bat."
 #. Translators: "letters" means latin letters: a-z and A-Z.
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
@ -320,15 +335,17 @@ msgid ""
 "Enter a valid 'slug' consisting of Unicode letters, numbers, underscores, or "
 "hyphens."
 msgstr ""
 "Idatzi Unicode hizki, zenbaki, azpimarra edo marratxoz osatutako baleko "
 "'slug' bat."
 msgid "Enter a valid IPv4 address."
-msgstr "Sartu IPv4 helbide zuzena."
+msgstr "Idatzi baleko IPv4 sare-helbide bat."
 msgid "Enter a valid IPv6 address."
-msgstr "Sartu IPv6 helbide zuzena"
+msgstr "Idatzi baleko IPv6 sare-helbide bat."
 msgid "Enter a valid IPv4 or IPv6 address."
-msgstr "Sartu IPv4 edo IPv6 helbide zuzena."
+msgstr "Idatzi baleko IPv4 edo IPv6 sare-helbide bat."
 msgid "Enter only digits separated by commas."
 msgstr "Idatzi komaz bereizitako digitoak soilik."
@ -336,8 +353,7 @@ msgstr "Idatzi komaz bereizitako digitoak soilik."
 #, python-format
 msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
 msgstr ""
-"Ziurtatu balioak %(limit_value)s gutxienez karaktere dituela  (orain "
+"Ziurtatu balio hau gutxienez %(limit_value)s dela (orain %(show_value)s da)."
 "%(show_value)s dauzka)."
 #, python-format
 msgid "Ensure this value is less than or equal to %(limit_value)s."
@ -375,6 +391,9 @@ msgstr[1] ""
 "Ziurtatu balio honek gehienez %(limit_value)d karaktere dituela "
 "(%(show_value)d ditu)."
 msgid "Enter a number."
 msgstr "Idatzi zenbaki bat."
 #, python-format
 msgid "Ensure that there are no more than %(max)s digit in total."
 msgid_plural "Ensure that there are no more than %(max)s digits in total."
@ -395,22 +414,33 @@ msgid_plural ""
 msgstr[0] "Ziurtatu ez dagoela digitu %(max)s baino gehiago komaren aurretik."
 msgstr[1] "Ziurtatu ez dagoela %(max)s digitu baino gehiago komaren aurretik."
 #, python-format
 msgid ""
 "File extension '%(extension)s' is not allowed. Allowed extensions are: "
 "'%(allowed_extensions)s'."
 msgstr ""
 "'%(extension)s' fitxategi-luzapena ez da balekoa. Hauek dira onartutako "
 "fitxategi-luzapenak: '%(allowed_extensions)s'."
 msgid "Null characters are not allowed."
 msgstr "Null karaktereak ez daude baimenduta."
 msgid "and"
 msgstr "eta"
 #, python-format
 msgid "%(model_name)s with this %(field_labels)s already exists."
-msgstr ""
+msgstr "%(field_labels)s hauek dauzkan %(model_name)s dagoeneko existitzen da."
 #, python-format
 msgid "Value %(value)r is not a valid choice."
-msgstr "%(value)r balioa ez da baliozko aukera."
+msgstr "%(value)r balioa ez da baleko aukera bat."
 msgid "This field cannot be null."
 msgstr "Eremu hau ezin daiteke hutsa izan (null)."
 msgid "This field cannot be blank."
-msgstr "Eremu hau ezin da hutsik egon."
+msgstr "Eremu honek ezin du hutsik egon."
 #, python-format
 msgid "%(model_name)s with this %(field_label)s already exists."
@ -422,6 +452,7 @@ msgstr "%(field_label)s hori daukan %(model_name)s dagoeneko existitzen da."
 msgid ""
 "%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
 msgstr ""
 "%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
 #, python-format
 msgid "Field of type: %(field_type)s"
@ -432,21 +463,25 @@ msgstr "Zenbaki osoa"
 #, python-format
 msgid "'%(value)s' value must be an integer."
-msgstr ""
+msgstr "'%(value)s' balioak integer bat izan behar du."
 msgid "Big (8 byte) integer"
 msgstr "Zenbaki osoa (handia 8 byte)"
 #, python-format
 msgid "'%(value)s' value must be either True or False."
-msgstr ""
+msgstr "'%(value)s' balioak True edo False izan behar du."
 #, python-format
 msgid "'%(value)s' value must be either True, False, or None."
 msgstr "'%(value)s' balioak True, False edo None izan behar du."
 msgid "Boolean (Either True or False)"
-msgstr "Boolearra (egia ala gezurra)"
+msgstr "Boolearra (True edo False)"
 #, python-format
 msgid "String (up to %(max_length)s)"
-msgstr "Katea (%(max_length)s gehienez)"
+msgstr "String-a (%(max_length)s gehienez)"
 msgid "Comma-separated integers"
 msgstr "Komaz bereiztutako zenbaki osoak"
@ -456,12 +491,16 @@ msgid ""
 "'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
 "format."
 msgstr ""
 "'%(value)s' balioak ez dauka data formatu zuzena. Formatu zuzena UUUU-HH-EE "
 "da."
 #, python-format
 msgid ""
 "'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
 "date."
 msgstr ""
 "'%(value)s' balioak formatu zuzena (UUUU-HH-EE) dauka, baina ez da data "
 "zuzen bat."
 msgid "Date (without time)"
 msgstr "Data (ordurik gabe)"
@ -471,19 +510,24 @@ msgid ""
 "'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
 "uuuuuu]][TZ] format."
 msgstr ""
 "'%(value)s' balioak ez dauka formatu zuzena. Formatu zuzena UUUU-HH-EE OO:"
 "MM[:ss[.uuuuuu]][TZ] da."
 #, python-format
 msgid ""
 "'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
 "[TZ]) but it is an invalid date/time."
 msgstr ""
 "'%(value)s' balioak formatu zuzena dauka (UUUU-HH-EE OO:MM[:ss[.uuuuuu]]"
 "[TZ]),\n"
 "baina ez da data/ordu zuzena."
 msgid "Date (with time)"
 msgstr "Data (orduarekin)"
 #, python-format
 msgid "'%(value)s' value must be a decimal number."
-msgstr ""
+msgstr "'%(value)s' balioak zenbaki hamartarra izan behar du."
 msgid "Decimal number"
 msgstr "Zenbaki hamartarra"
@ -493,35 +537,37 @@ msgid ""
 "'%(value)s' value has an invalid format. It must be in [DD] [HH:[MM:]]ss[."
 "uuuuuu] format."
 msgstr ""
 "'%(value)s' balioak ez dauka foramtu zuzena.  [EE] [OO:[MM:]]ss[.uuuuuu] "
 "formatuan egon behar da."
 msgid "Duration"
-msgstr ""
+msgstr "Iraupena"
 msgid "Email address"
-msgstr "Eposta helbidea"
+msgstr "Helbide elektronikoa"
 msgid "File path"
 msgstr "Fitxategiaren bidea"
 #, python-format
 msgid "'%(value)s' value must be a float."
-msgstr ""
+msgstr "'%(value)s' balioak float bat izan behar du."
 msgid "Floating point number"
 msgstr "Koma higikorreko zenbakia (float)"
 msgid "IPv4 address"
-msgstr "IPv4 helbidea"
+msgstr "IPv4 sare-helbidea"
 msgid "IP address"
 msgstr "IP helbidea"
 #, python-format
 msgid "'%(value)s' value must be either None, True or False."
-msgstr ""
+msgstr "'%(value)s' balioak None, True, edo False izan behar du."
 msgid "Boolean (Either True, False or None)"
-msgstr "Boolearra (egia, gezurra edo hutsa[None])"
+msgstr "Boolearra (True, False edo None)"
 msgid "Positive integer"
 msgstr "Osoko positiboa"
@ -544,12 +590,17 @@ msgid ""
 "'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
 "format."
 msgstr ""
 "'%(value)s' balioak ez dauka formatu zuzena. OO:MM[:ss[.uuuuuu]] formatuan "
 "egon behar du."
 #, python-format
 msgid ""
 "'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
 "invalid time."
 msgstr ""
 "'%(value)s' balioak formatu zuzena dauka (OO:MM[:ss[.uuuuuu]]) baina ez da "
 "ordu \n"
 "zuzena"
 msgid "Time"
 msgstr "Ordua"
@ -562,7 +613,7 @@ msgstr "Datu bitar gordinak"
 #, python-format
 msgid "'%(value)s' is not a valid UUID."
-msgstr ""
+msgstr "'%(value)s' ez da baleko UUID bat."
 msgid "File"
 msgstr "Fitxategia"
@ -573,6 +624,8 @@ msgstr "Irudia"
 #, python-format
 msgid "%(model)s instance with %(field)s %(value)r does not exist."
 msgstr ""
 "%(field)s %(value)r edukidun %(model)s modeloko instantziarik ez da "
 "exiistitzen."
 msgid "Foreign Key (type determined by related field)"
 msgstr "1-N (mota erlazionatutako eremuaren arabera)"
@ -582,11 +635,11 @@ msgstr "Bat-bat erlazioa"
 #, python-format
 msgid "%(from)s-%(to)s relationship"
-msgstr ""
+msgstr "%(from)s-%(to)s erlazioa"
 #, python-format
 msgid "%(from)s-%(to)s relationships"
-msgstr ""
+msgstr "%(from)s-%(to)s erlazioak"
 msgid "Many-to-many relationship"
 msgstr "M:N erlazioa"
@ -603,23 +656,24 @@ msgstr "Eremu hau beharrezkoa da."
 msgid "Enter a whole number."
 msgstr "Idatzi zenbaki oso bat."
 msgid "Enter a number."
 msgstr "Idatzi zenbaki bat."
 msgid "Enter a valid date."
-msgstr "Idatzi baliozko data bat."
+msgstr "Idatzi baleko data bat."
 msgid "Enter a valid time."
-msgstr "Idatzi baliozko ordu bat."
+msgstr "Idatzi baleko ordu bat."
 msgid "Enter a valid date/time."
-msgstr "Idatzi baliozko data/ordua."
+msgstr "Idatzi baleko data/ordu bat."
 msgid "Enter a valid duration."
-msgstr ""
+msgstr "Idatzi baleko iraupen bat."
 #, python-brace-format
 msgid "The number of days must be between {min_days} and {max_days}."
 msgstr "Egun kopuruak {min_days} eta {max_days} artean egon behar du."
 msgid "No file was submitted. Check the encoding type on the form."
-msgstr "Ez da fitxategirik bidali. Egiaztatu inprimakiaren kodeketa-mota."
+msgstr "Ez da fitxategirik bidali. Egiaztatu formularioaren kodeketa-mota."
 msgid "No file was submitted."
 msgstr "Ez da fitxategirik bidali."
@ -645,21 +699,21 @@ msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr ""
-"Bidali baliozko irudia. Zuk bidalitako fitxategia ez da irudia edo akatsa "
+"Igo baleko irudi bat. Zuk igotako fitxategia ez da irudi bat edo akatsen bat "
-"dauka."
+"du."
 #, python-format
 msgid "Select a valid choice. %(value)s is not one of the available choices."
-msgstr "Hautatu baliozko aukera bat. %(value)s ez dago erabilgarri."
+msgstr "Hautatu baleko aukera bat. %(value)s ez dago erabilgarri."
 msgid "Enter a list of values."
 msgstr "Idatzi balio-zerrenda bat."
 msgid "Enter a complete value."
-msgstr ""
+msgstr "Sartu balio osoa."
 msgid "Enter a valid UUID."
-msgstr ""
+msgstr "Idatzi baleko UUID bat."
 #. Translators: This is the default suffix added to form field labels
 msgid ":"
@ -670,19 +724,19 @@ msgid "(Hidden field %(name)s) %(error)s"
 msgstr "(%(name)s eremu ezkutua) %(error)s"
 msgid "ManagementForm data is missing or has been tampered with"
-msgstr ""
+msgstr "ManagementForm daturik ez dago edo ez da balekoa."
 #, python-format
 msgid "Please submit %d or fewer forms."
 msgid_plural "Please submit %d or fewer forms."
-msgstr[0] "Bidali inprimaki %d ala gutxiago, mesedez."
+msgstr[0] "Bidali formulario %d edo gutxiago, mesedez."
-msgstr[1] "Bidali %d inprimaki ala gutxiago, mesedez."
+msgstr[1] "Bidali %d formulario edo gutxiago, mesedez."
 #, python-format
 msgid "Please submit %d or more forms."
 msgid_plural "Please submit %d or more forms."
-msgstr[0] ""
+msgstr[0] "Gehitu formulario %d edo gehiago"
-msgstr[1] ""
+msgstr[1] "Bidali %d formulario edo gehiago, mesedez."
 msgid "Order"
 msgstr "Ordena"
@ -709,15 +763,15 @@ msgstr ""
 msgid "Please correct the duplicate values below."
 msgstr "Zuzendu hurrengo balio bikoiztuak."
-msgid "The inline foreign key did not match the parent instance primary key."
+msgid "The inline value did not match the parent instance."
-msgstr "Barneko gakoa eta gurasoaren gakoa ez datoz bat."
+msgstr "Barneko balioa eta gurasoaren instantzia ez datoz bat."
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr "Hautatu aukera zuzen bat. Hautatutakoa ez da zuzena."
 #, python-format
-msgid "\"%(pk)s\" is not a valid value for a primary key."
+msgid "\"%(pk)s\" is not a valid value."
-msgstr "\"%(pk)s\" ez da balio egokia lehen mailako gakoentzat."
+msgstr "\"%(pk)s\" ez da balio egokia."
 #, python-format
 msgid ""
@ -727,15 +781,15 @@ msgstr ""
 "%(datetime)s ezin da interpretatu %(current_timezone)s ordu-eremuan;\n"
 "baliteke ez existitzea edo anbiguoa izatea"
 msgid "Clear"
 msgstr "Garbitu"
 msgid "Currently"
 msgstr "Orain"
 msgid "Change"
 msgstr "Aldatu"
 msgid "Clear"
 msgstr "Garbitu"
 msgid "Unknown"
 msgstr "Ezezaguna"
@ -793,82 +847,82 @@ msgid "noon"
 msgstr "eguerdia"
 msgid "Monday"
-msgstr "Astelehena"
+msgstr "astelehena"
 msgid "Tuesday"
-msgstr "Asteartea"
+msgstr "asteartea"
 msgid "Wednesday"
-msgstr "Asteazkena"
+msgstr "asteazkena"
 msgid "Thursday"
-msgstr "Osteguna"
+msgstr "osteguna"
 msgid "Friday"
-msgstr "Ostirala"
+msgstr "ostirala"
 msgid "Saturday"
-msgstr "Larunbata"
+msgstr "larunbata"
 msgid "Sunday"
-msgstr "Igandea"
+msgstr "igandea"
 msgid "Mon"
-msgstr "Al"
+msgstr "al"
 msgid "Tue"
-msgstr "Ar"
+msgstr "ar"
 msgid "Wed"
-msgstr "Az"
+msgstr "az"
 msgid "Thu"
-msgstr "Og"
+msgstr "og"
 msgid "Fri"
-msgstr "Ol"
+msgstr "ol"
 msgid "Sat"
-msgstr "Lr"
+msgstr "lr"
 msgid "Sun"
-msgstr "Ig"
+msgstr "ig"
 msgid "January"
-msgstr "Urtarrila"
+msgstr "urtarrila"
 msgid "February"
-msgstr "Otsaila"
+msgstr "otsaila"
 msgid "March"
-msgstr "Martxoa"
+msgstr "martxoa"
 msgid "April"
-msgstr "Apirila"
+msgstr "apirila"
 msgid "May"
-msgstr "Maiatza"
+msgstr "maiatza"
 msgid "June"
-msgstr "Ekaina"
+msgstr "ekaina"
 msgid "July"
-msgstr "Uztaila"
+msgstr "uztaila"
 msgid "August"
-msgstr "Abuztua"
+msgstr "abuztua"
 msgid "September"
-msgstr "Iraila"
+msgstr "iraila"
 msgid "October"
-msgstr "Urria"
+msgstr "urria"
 msgid "November"
-msgstr "Azaroa"
+msgstr "azaroa"
 msgid "December"
-msgstr "Abendua"
+msgstr "abendua"
 msgid "jan"
 msgstr "urt"
@ -908,102 +962,102 @@ msgstr "abe"
 msgctxt "abbrev. month"
 msgid "Jan."
-msgstr "Urt."
+msgstr "urt."
 msgctxt "abbrev. month"
 msgid "Feb."
-msgstr "Ots."
+msgstr "ots."
 msgctxt "abbrev. month"
 msgid "March"
-msgstr "Mar."
+msgstr "mar."
 msgctxt "abbrev. month"
 msgid "April"
-msgstr "Api."
+msgstr "api."
 msgctxt "abbrev. month"
 msgid "May"
-msgstr "Mai."
+msgstr "mai."
 msgctxt "abbrev. month"
 msgid "June"
-msgstr "Eka."
+msgstr "eka."
 msgctxt "abbrev. month"
 msgid "July"
-msgstr "Uzt."
+msgstr "uzt."
 msgctxt "abbrev. month"
 msgid "Aug."
-msgstr "Abu."
+msgstr "abu."
 msgctxt "abbrev. month"
 msgid "Sept."
-msgstr "Ira."
+msgstr "ira."
 msgctxt "abbrev. month"
 msgid "Oct."
-msgstr "Urr."
+msgstr "urr."
 msgctxt "abbrev. month"
 msgid "Nov."
-msgstr "Aza."
+msgstr "aza."
 msgctxt "abbrev. month"
 msgid "Dec."
-msgstr "Abe."
+msgstr "abe."
 msgctxt "alt. month"
 msgid "January"
-msgstr "Urtarrila"
+msgstr "urtarrila"
 msgctxt "alt. month"
 msgid "February"
-msgstr "Otsaila"
+msgstr "otsaila"
 msgctxt "alt. month"
 msgid "March"
-msgstr "Martxoa"
+msgstr "martxoa"
 msgctxt "alt. month"
 msgid "April"
-msgstr "Apirila"
+msgstr "apirila"
 msgctxt "alt. month"
 msgid "May"
-msgstr "Maiatza"
+msgstr "maiatza"
 msgctxt "alt. month"
 msgid "June"
-msgstr "Ekaina"
+msgstr "ekaina"
 msgctxt "alt. month"
 msgid "July"
-msgstr "Uztaila"
+msgstr "uztaila"
 msgctxt "alt. month"
 msgid "August"
-msgstr "Abuztua"
+msgstr "abuztua"
 msgctxt "alt. month"
 msgid "September"
-msgstr "Iraila"
+msgstr "iraila"
 msgctxt "alt. month"
 msgid "October"
-msgstr "Urria"
+msgstr "urria"
 msgctxt "alt. month"
 msgid "November"
-msgstr "Azaroa"
+msgstr "azaroa"
 msgctxt "alt. month"
 msgid "December"
-msgstr "Abendua"
+msgstr "abendua"
 msgid "This is not a valid IPv6 address."
-msgstr ""
+msgstr "Hau ez da baleko IPv6 helbide bat."
 #, python-format
 msgctxt "String to return when truncating text"
@ -1057,7 +1111,7 @@ msgid "0 minutes"
 msgstr "0 minutu"
 msgid "Forbidden"
-msgstr ""
+msgstr "Debekatuta"
 msgid "CSRF verification failed. Request aborted."
 msgstr "CSRF egiaztapenak huts egin du. Eskaera abortatu da."
@ -1068,49 +1122,58 @@ msgid ""
 "required for security reasons, to ensure that your browser is not being "
 "hijacked by third parties."
 msgstr ""
 "Mezu hau ikusten ari zara HTTPS gune honek, zure nabigatzaileak 'Referer "
 "header' bat bidaltzea behar duelako, baina ez du batere bidali. Goiburuko "
 "hau zure nabigatzailea beste norbaitek ordeztu ez duela ziurtatzeko eskatzen "
 "da."
 msgid ""
 "If you have configured your browser to disable 'Referer' headers, please re-"
 "enable them, at least for this site, or for HTTPS connections, or for 'same-"
 "origin' requests."
 msgstr ""
 "Zure nabigatzailera 'Refere' goiburukoak desgaitzeko konfiguratu baldin "
 "baduzu, mesedez, gune honetarako, HTTPS konexio edo 'same-origin' "
 "eskaeretarako  gaitu berriro."
 msgid ""
 "If you are using the <meta name=\"referrer\" content=\"no-referrer\"> tag or "
 "including the 'Referrer-Policy: no-referrer' header, please remove them. The "
 "CSRF protection requires the 'Referer' header to do strict referer checking. "
 "If you're concerned about privacy, use alternatives like <a rel=\"noreferrer"
 "\" ...> for links to third-party sites."
 msgstr ""
 "<meta name=\"referrer\" content=\"no-referrer\"> etiketa erabiltzen ari "
 "bazara edo 'Referrer-Policy: no-referrer' goiburukoa, mesedez ezabatu "
 "itzazu. CSRF babesak 'Referer' goiburukoa behar du egiaztapen zorrotza "
 "egiteko. Pribatutasunaz kezkatuta bazaude, erabili <a rel=\"noreferrer\" ..."
 "> bezalako alternatibak hirugarrenen webgune loturentzat."
 msgid ""
 "You are seeing this message because this site requires a CSRF cookie when "
 "submitting forms. This cookie is required for security reasons, to ensure "
 "that your browser is not being hijacked by third parties."
 msgstr ""
 "Formularioa bidaltzean gune honek CSRF cookie bat behar duelako ikusten duzu "
 "mezu hau. Cookie hau beharrezkoa da segurtasun arrazoiengatik, zure "
 "nabigatzailea beste batek ordezkatzen ez duela ziurtatzeko."
 msgid ""
 "If you have configured your browser to disable cookies, please re-enable "
 "them, at least for this site, or for 'same-origin' requests."
 msgstr ""
 "Nabigatzailea cookiak desgaitzeko konfiguratu baldin baduzu, mesedez "
 "aktibatu behintzat gune honetarako, edo 'same-origin' eskaeretarako."
 msgid "More information is available with DEBUG=True."
 msgstr "Informazio gehiago erabilgarri dago DEBUG=True ezarrita."
 msgid "Welcome to Django"
 msgstr ""
 msgid "It worked!"
 msgstr ""
 msgid "Congratulations on your first Django-powered page."
 msgstr ""
 msgid ""
 "Of course, you haven't actually done any work yet. Next, start your first "
 "app by running <code>python manage.py startapp [app_label]</code>."
 msgstr ""
 msgid ""
 "You're seeing this message because you have <code>DEBUG = True</code> in "
 "your Django settings file and you haven't configured any URLs. Get to work!"
 msgstr ""
 msgid "No year specified"
 msgstr "Ez da urterik zehaztu"
 msgid "Date out of range"
 msgstr "Data baliozko tartetik kanpo"
 msgid "No month specified"
 msgstr "Ez da hilabeterik zehaztu"
@ -1129,8 +1192,8 @@ msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
 "allow_future is False."
 msgstr ""
-"Etorkizuneko %(verbose_name_plural)s ez dago aukeran \n"
+"Etorkizuneko %(verbose_name_plural)s ez dago aukeran %(class_name)s."
-"%(class_name)s.alloe_future False delako"
+"allow_future False delako"
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
@ -1161,3 +1224,48 @@ msgstr "\"%(path)s\" ez da existitzen"
 #, python-format
 msgid "Index of %(directory)s"
 msgstr "%(directory)s zerrenda"
 msgid "Django: the Web framework for perfectionists with deadlines."
 msgstr "Django: epeekin perfekzionistak direnentzat Web frameworka."
 #, python-format
 msgid ""
 "View <a href=\"https://docs.djangoproject.com/en/%(version)s/releases/\" "
 "target=\"_blank\" rel=\"noopener\">release notes</a> for Django %(version)s"
 msgstr ""
 "Ikusi Django %(version)s-ren <a href=\"https://docs.djangoproject.com/en/"
 "%(version)s/releases/\" target=\"_blank\" rel=\"noopener\">argitaratze "
 "oharrak</a>"
 msgid "The install worked successfully! Congratulations!"
 msgstr "Instalazioak arrakastaz funtzionatu du! Zorionak!"
 #, python-format
 msgid ""
 "You are seeing this page because <a href=\"https://docs.djangoproject.com/en/"
 "%(version)s/ref/settings/#debug\" target=\"_blank\" rel=\"noopener"
 "\">DEBUG=True</a> is in your settings file and you have not configured any "
 "URLs."
 msgstr ""
 "Zure settings fitxategian <a href=\"https://docs.djangoproject.com/en/"
 "%(version)s/ref/settings/#debug\" target=\"_blank\" rel=\"noopener"
 "\">DEBUG=True</a> jarrita eta URLrik konfiguratu gabe duzulako ari zara "
 "ikusten orrialde hau."
 msgid "Django Documentation"
 msgstr "Django dokumentazioa"
 msgid "Topics, references, &amp; how-to's"
 msgstr "Gaiak, erreferentziak, &amp; laguntzak"
 msgid "Tutorial: A Polling App"
 msgstr "Tutoriala: Galdetegi aplikazioa"
 msgid "Get started with Django"
 msgstr "Hasi Djangorekin"
 msgid "Django Community"
 msgstr "Django Komunitatea"
 msgid "Connect, get help, or contribute"
 msgstr "Konektatu, lortu laguntza edo lagundu"
--- a/django/conf/locale/eu/formats.py
+++ b/django/conf/locale/eu/formats.py
@ -1,24 +1,21 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
 from __future__ import unicode_literals
 # The *_FORMAT strings use the Django date format syntax,
-# see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
+# see https://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
-DATE_FORMAT = r'Yeko M\re\n d\a'
+DATE_FORMAT = r'Y\k\o N j\a'
 TIME_FORMAT = 'H:i'
-# DATETIME_FORMAT =
+DATETIME_FORMAT = r'Y\k\o N j\a, H:i'
-# YEAR_MONTH_FORMAT =
+YEAR_MONTH_FORMAT = r'Y\k\o F'
-# MONTH_DAY_FORMAT =
+MONTH_DAY_FORMAT = r'F\r\e\n j\a'
-SHORT_DATE_FORMAT = 'Y M j'
+SHORT_DATE_FORMAT = 'Y-m-d'
-# SHORT_DATETIME_FORMAT =
+SHORT_DATETIME_FORMAT = 'Y-m-d H:i'
-# FIRST_DAY_OF_WEEK =
+FIRST_DAY_OF_WEEK = 1  # Astelehena
 # The *_INPUT_FORMATS strings use the Python strftime format syntax,
-# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
+# see https://docs.python.org/library/datetime.html#strftime-strptime-behavior
 # DATE_INPUT_FORMATS =
 # TIME_INPUT_FORMATS =
 # DATETIME_INPUT_FORMATS =
 DECIMAL_SEPARATOR = ','
 THOUSAND_SEPARATOR = '.'
-# NUMBER_GROUPING =
+NUMBER_GROUPING = 3
--- a/django/conf/locale/fa/LC_MESSAGES/django.mo
+++ b/django/conf/locale/fa/LC_MESSAGES/django.mo
--- a/django/conf/locale/fa/LC_MESSAGES/django.po
+++ b/django/conf/locale/fa/LC_MESSAGES/django.po
@ -5,6 +5,7 @@
 # Arash Fazeli <a.fazeli@gmail.com>, 2012
 # Jannis Leidel <jannis@leidel.info>, 2011
 # Mazdak Badakhshan <geraneum@gmail.com>, 2014
 # MJafar Mashhadi <raindigital2007@gmail.com>, 2018
 # Mohammad Hossein Mojtahedi <Mhm5000@gmail.com>, 2013
 # Pouya Abbassi, 2016
 # Reza Mohammadi <reza@teeleh.ir>, 2013-2016
@ -14,16 +15,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-29 20:57+0200\n"
+"POT-Creation-Date: 2018-05-17 11:49+0200\n"
-"PO-Revision-Date: 2016-07-01 20:23+0000\n"
+"PO-Revision-Date: 2018-06-23 23:00+0000\n"
-"Last-Translator: Pouya Abbassi\n"
+"Last-Translator: MJafar Mashhadi <raindigital2007@gmail.com>\n"
 "Language-Team: Persian (http://www.transifex.com/django/django/language/"
 "fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fa\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 msgid "Afrikaans"
 msgstr "آفریکانس"
@ -166,6 +167,9 @@ msgstr "ژاپنی"
 msgid "Georgian"
 msgstr "گرجی"
 msgid "Kabyle"
 msgstr ""
 msgid "Kazakh"
 msgstr "قزاقستان"
@ -301,6 +305,15 @@ msgstr "پرونده‌های استاتیک"
 msgid "Syndication"
 msgstr "پیوند"
 msgid "That page number is not an integer"
 msgstr "شمارهٔ صفحه باید یک عدد باشد"
 msgid "That page number is less than 1"
 msgstr "شمارهٔ صفحه باید بزرگتر از ۱ باشد"
 msgid "That page contains no results"
 msgstr "این صفحه خالی از اطلاعات است"
 msgid "Enter a valid value."
 msgstr "یک مقدار معتبر وارد کنید."
@ -313,6 +326,7 @@ msgstr "یک عدد معتبر وارد کنید."
 msgid "Enter a valid email address."
 msgstr "یک ایمیل آدرس معتبر وارد کنید."
 #. Translators: "letters" means latin letters: a-z and A-Z.
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr "یک 'slug' معتبر شامل حروف، ارقام، خط زیر و یا خط تیره وارد کنید."
@ -356,6 +370,9 @@ msgid_plural ""
 msgstr[0] ""
 "طول این مقدار باید حداقل %(limit_value)d کاراکتر باشد (طولش %(show_value)d "
 "است)."
 msgstr[1] ""
 "طول این مقدار باید حداقل %(limit_value)d کاراکتر باشد (طولش %(show_value)d "
 "است)."
 #, python-format
 msgid ""
@ -367,16 +384,24 @@ msgid_plural ""
 msgstr[0] ""
 "طول این مقدار باید حداکثر %(limit_value)d کاراکتر باشد (طولش %(show_value)d "
 "است)."
 msgstr[1] ""
 "طول این مقدار باید حداکثر %(limit_value)d کاراکتر باشد (طولش %(show_value)d "
 "است)."
 msgid "Enter a number."
 msgstr "یک عدد وارد کنید."
 #, python-format
 msgid "Ensure that there are no more than %(max)s digit in total."
 msgid_plural "Ensure that there are no more than %(max)s digits in total."
 msgstr[0] "نباید در مجموع بیش از %(max)s رقم داشته باشد."
 msgstr[1] "نباید در مجموع بیش از %(max)s رقم داشته باشد."
 #, python-format
 msgid "Ensure that there are no more than %(max)s decimal place."
 msgid_plural "Ensure that there are no more than %(max)s decimal places."
 msgstr[0] "نباید بیش از %(max)s رقم اعشار داشته باشد."
 msgstr[1] "نباید بیش از %(max)s رقم اعشار داشته باشد."
 #, python-format
 msgid ""
@ -384,6 +409,18 @@ msgid ""
 msgid_plural ""
 "Ensure that there are no more than %(max)s digits before the decimal point."
 msgstr[0] "نباید بیش از %(max)s رقم قبل ممیز داشته باشد."
 msgstr[1] "نباید بیش از %(max)s رقم قبل ممیز داشته باشد."
 #, python-format
 msgid ""
 "File extension '%(extension)s' is not allowed. Allowed extensions are: "
 "'%(allowed_extensions)s'."
 msgstr ""
 "استفاده از پرونده با پسوند '%(extension)s' مجاز نیست. پسوند‌های مجاز عبارتند "
 "از: '%(allowed_extensions)s'"
 msgid "Null characters are not allowed."
 msgstr ""
 msgid "and"
 msgstr "و"
@ -432,6 +469,10 @@ msgstr "بزرگ (8 بایت) عدد صحیح"
 msgid "'%(value)s' value must be either True or False."
 msgstr "مقدار «%(value)s» باید یا True باشد و یا False."
 #, python-format
 msgid "'%(value)s' value must be either True, False, or None."
 msgstr "مقدار «%(value)s» باید یا None باشد یا True و یا False."
 msgid "Boolean (Either True or False)"
 msgstr "بولی (درست یا غلط)"
@ -608,9 +649,6 @@ msgstr "این فیلد لازم است."
 msgid "Enter a whole number."
 msgstr "به طور کامل یک عدد وارد کنید."
 msgid "Enter a number."
 msgstr "یک عدد وارد کنید."
 msgid "Enter a valid date."
 msgstr "یک تاریخ معتبر وارد کنید."
@ -623,6 +661,10 @@ msgstr "یک تاریخ/زمان معتبر وارد کنید."
 msgid "Enter a valid duration."
 msgstr "یک بازهٔ زمانی معتبر وارد کنید."
 #, python-brace-format
 msgid "The number of days must be between {min_days} and {max_days}."
 msgstr ""
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr "پرونده‌ای ارسال نشده است. نوع کدگذاری فرم را بررسی کنید."
@ -638,6 +680,8 @@ msgid_plural ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
 msgstr[0] ""
 "طول عنوان پرونده باید حداقل %(max)d کاراکتر باشد (طولش %(length)d است)."
 msgstr[1] ""
 "طول عنوان پرونده باید حداقل %(max)d کاراکتر باشد (طولش %(length)d است)."
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr "لطفا یا فایل ارسال کنید یا دکمه پاک کردن را علامت بزنید، نه هردو."
@ -677,11 +721,13 @@ msgstr "اطلاعات ManagementForm ناقص است و یا دستکاری ش
 msgid "Please submit %d or fewer forms."
 msgid_plural "Please submit %d or fewer forms."
 msgstr[0] "لطفاً %d یا کمتر فرم بفرستید."
 msgstr[1] "لطفاً %d یا کمتر فرم بفرستید."
 #, python-format
 msgid "Please submit %d or more forms."
 msgid_plural "Please submit %d or more forms."
 msgstr[0] "لطفاً %d یا بیشتر فرم بفرستید."
 msgstr[1] "لطفاً %d یا بیشتر فرم بفرستید."
 msgid "Order"
 msgstr "ترتیب:"
@ -708,15 +754,15 @@ msgstr ""
 msgid "Please correct the duplicate values below."
 msgstr "لطفا مقدار تکراری را اصلاح کنید."
-msgid "The inline foreign key did not match the parent instance primary key."
+msgid "The inline value did not match the parent instance."
-msgstr "کلید های درون خطی خارجی با هم مطابقت ندارند ."
+msgstr ""
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr "یک گزینهٔ معتبر انتخاب کنید. آن گزینه از گزینه‌های موجود نیست."
 #, python-format
-msgid "\"%(pk)s\" is not a valid value for a primary key."
+msgid "\"%(pk)s\" is not a valid value."
-msgstr "‏«‎%(pk)s» مقدار معتبری برای کلید اصلی نیست."
+msgstr ""
 #, python-format
 msgid ""
@ -726,15 +772,15 @@ msgstr ""
 "%(datetime)s نمیتواند در %(current_timezone)s معنی شود.شاید این زمان مبهم "
 "است و یا وجود ندارد."
 msgid "Clear"
 msgstr "پاک کردن"
 msgid "Currently"
 msgstr "در حال حاضر"
 msgid "Change"
 msgstr "تغییر"
 msgid "Clear"
 msgstr "پاک کردن"
 msgid "Unknown"
 msgstr "ناشناخته"
@ -751,6 +797,7 @@ msgstr "بله،خیر،شاید"
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] "%(size)d بایت"
 msgstr[1] "%(size)d بایت"
 #, python-format
 msgid "%s KB"
@ -1019,31 +1066,37 @@ msgstr "،"
 msgid "%d year"
 msgid_plural "%d years"
 msgstr[0] "%d سال"
 msgstr[1] "%d سال"
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
 msgstr[0] "%d ماه"
 msgstr[1] "%d ماه"
 #, python-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d هفته"
 msgstr[1] "%d هفته"
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d روز"
 msgstr[1] "%d روز"
 #, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d ساعت"
 msgstr[1] "%d ساعت"
 #, python-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d دقیقه"
 msgstr[1] "%d دقیقه"
 msgid "0 minutes"
 msgstr "0 دقیقه"
@ -1060,27 +1113,36 @@ msgid ""
 "required for security reasons, to ensure that your browser is not being "
 "hijacked by third parties."
 msgstr ""
-"شما این پیغام را میبینید چون این سایتِ HTTPS نیازمند یک «تیتر ارجاع» برای "
+"شما این پیام را می‌بینید چون این سایتِ HTTPS نیازمند یک «تیتر ارجاع (Referer "
-"ارسال به بروزر شماست، ولی هیچ چیزی ارسال نشده است. این تیتر به دلایل امنیتی "
+"header)» برای ارسال به مرورگر شماست اما هیچ چیزی ارسال نشده است. این تیتر "
-"مورد نیاز است، برای اینکه از هایجک نشدن بروزر اطمینان حاصل شود."
+"برای امنیت شما با حصول اطمینان از اینکه کنترل مرورگرتان به دست شخص ثالثی "
 "نیفتاده باشد ضروری است."
 msgid ""
 "If you have configured your browser to disable 'Referer' headers, please re-"
 "enable them, at least for this site, or for HTTPS connections, or for 'same-"
 "origin' requests."
 msgstr ""
-"اگر بزوزر خود را برای غیر فعال کردن تیترهای «ارجاع» تنظیم کرده‌اید، لطفا "
+"اگر تیترهای «ارجاع (Referer)» را در مرورگرتان غیرفعال کرده‌اید، لطفاً مجدداً "
-"مجددا این ویژگی را فعال کنید، حداقل برای این وبسایت، یا برای اتصالات HTTPS، "
+"این ویژگی را فعال کنید، حداقل برای این وبسایت، یا برای اتصالات HTTPS، یا "
-"یا برای درخواستهایی با «مبدا یکسان»."
+"برای درخواستهایی با «مبدا یکسان (same-origin)»."
 msgid ""
 "If you are using the <meta name=\"referrer\" content=\"no-referrer\"> tag or "
 "including the 'Referrer-Policy: no-referrer' header, please remove them. The "
 "CSRF protection requires the 'Referer' header to do strict referer checking. "
 "If you're concerned about privacy, use alternatives like <a rel=\"noreferrer"
 "\" ...> for links to third-party sites."
 msgstr ""
 msgid ""
 "You are seeing this message because this site requires a CSRF cookie when "
 "submitting forms. This cookie is required for security reasons, to ensure "
 "that your browser is not being hijacked by third parties."
 msgstr ""
-"شما این پیغام را میبینید چون این سایت نیازمند کوکی «جعل درخواست میان وبگاهی» "
+"شما این پیام را میبینید چون این سایت نیازمند کوکی «جعل درخواست میان وبگاهی "
-"در زمان ارائه ی فورم میباشد. این کوکی‌ها برای مسائل امنیتی ضروری هستند، برای "
+"(CSRF)» است. این کوکی برای امنیت شما ضروری است. با این کوکی می‌توانیم از "
-"اطمینان از اینکه بروزر شما توسط شخص ثالثی هایجک نشده باشد."
+"اینکه شخص ثالثی کنترل مرورگرتان را به دست نگرفته است اطمینان پیدا کنیم."
 msgid ""
 "If you have configured your browser to disable cookies, please re-enable "
@ -1092,32 +1154,12 @@ msgstr ""
 msgid "More information is available with DEBUG=True."
 msgstr "اطلاعات بیشتر با DEBUG=True ارائه خواهد شد."
 msgid "Welcome to Django"
 msgstr "به Django خوش آمدید"
 msgid "It worked!"
 msgstr "کار کرد!"
 msgid "Congratulations on your first Django-powered page."
 msgstr "تبریک فراوان بابت اولین صفحهٔ Djangoای‌تان."
 msgid ""
 "Of course, you haven't actually done any work yet. Next, start your first "
 "app by running <code>python manage.py startapp [app_label]</code>."
 msgstr ""
 "مطمئنا شما هنوز کاری انجام نداده اید. اولین اپلیکیشن خود را با اجرای دستور "
 "<code>python manage.py startapp [app_label]</code> شروع کنید."
 msgid ""
 "You're seeing this message because you have <code>DEBUG = True</code> in "
 "your Django settings file and you haven't configured any URLs. Get to work!"
 msgstr ""
 "شما این پیغام را میبینید چون <code>DEBUG = True</code> در فایل تنظیمات جنگو "
 "تنیظم شده و هیچ URLـی تنظیم نکرده اید. به کار خود ادامه دهید."
 msgid "No year specified"
 msgstr "هیچ سالی مشخص نشده است"
 msgid "Date out of range"
 msgstr "تاریخ غیرمجاز است"
 msgid "No month specified"
 msgstr "هیچ ماهی مشخص نشده است"
@ -1168,3 +1210,41 @@ msgstr "\"%(path)s\" وجود ندارد"
 #, python-format
 msgid "Index of %(directory)s"
 msgstr "فهرست %(directory)s"
 msgid "Django: the Web framework for perfectionists with deadlines."
 msgstr ""
 #, python-format
 msgid ""
 "View <a href=\"https://docs.djangoproject.com/en/%(version)s/releases/\" "
 "target=\"_blank\" rel=\"noopener\">release notes</a> for Django %(version)s"
 msgstr ""
 msgid "The install worked successfully! Congratulations!"
 msgstr ""
 #, python-format
 msgid ""
 "You are seeing this page because <a href=\"https://docs.djangoproject.com/en/"
 "%(version)s/ref/settings/#debug\" target=\"_blank\" rel=\"noopener"
 "\">DEBUG=True</a> is in your settings file and you have not configured any "
 "URLs."
 msgstr ""
 msgid "Django Documentation"
 msgstr "مستندات جنگو"
 msgid "Topics, references, &amp; how-to's"
 msgstr ""
 msgid "Tutorial: A Polling App"
 msgstr "آموزش گام به گام: برنامکی برای رأی‌گیری"
 msgid "Get started with Django"
 msgstr "شروع به کار با جنگو"
 msgid "Django Community"
 msgstr "جامعهٔ جنگو"
 msgid "Connect, get help, or contribute"
 msgstr ""
--- a/django/conf/locale/fa/formats.py
+++ b/django/conf/locale/fa/formats.py
@ -1,10 +1,7 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
 from __future__ import unicode_literals
 # The *_FORMAT strings use the Django date format syntax,
-# see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
+# see https://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
 DATE_FORMAT = 'j F Y'
 TIME_FORMAT = 'G:i'
 DATETIME_FORMAT = 'j F Y، ساعت G:i'
@ -15,7 +12,7 @@ SHORT_DATETIME_FORMAT = 'Y/n/j،‏ G:i'
 FIRST_DAY_OF_WEEK = 6
 # The *_INPUT_FORMATS strings use the Python strftime format syntax,
-# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
+# see https://docs.python.org/library/datetime.html#strftime-strptime-behavior
 # DATE_INPUT_FORMATS =
 # TIME_INPUT_FORMATS =
 # DATETIME_INPUT_FORMATS =
--- a/django/conf/locale/fi/LC_MESSAGES/django.mo
+++ b/django/conf/locale/fi/LC_MESSAGES/django.mo
--- a/django/conf/locale/fi/LC_MESSAGES/django.po
+++ b/django/conf/locale/fi/LC_MESSAGES/django.po
@ -1,7 +1,7 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
-# Aarni Koskela, 2015
+# Aarni Koskela, 2015,2017-2018
 # Antti Kaihola <antti.15+transifex@kaihola.fi>, 2011
 # Jannis Leidel <jannis@leidel.info>, 2011
 # Lasse Liehu <larso@gmx.com>, 2015
@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-29 20:57+0200\n"
+"POT-Creation-Date: 2018-05-17 11:49+0200\n"
-"PO-Revision-Date: 2016-06-30 08:31+0000\n"
+"PO-Revision-Date: 2018-05-18 00:21+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
 "Language-Team: Finnish (http://www.transifex.com/django/django/language/"
 "fi/)\n"
@ -64,7 +64,7 @@ msgid "German"
 msgstr "saksa"
 msgid "Lower Sorbian"
-msgstr ""
+msgstr "Alasorbi"
 msgid "Greek"
 msgstr "kreikka"
@ -136,7 +136,7 @@ msgid "Croatian"
 msgstr "kroatia"
 msgid "Upper Sorbian"
-msgstr ""
+msgstr "Yläsorbi"
 msgid "Hungarian"
 msgstr "unkari"
@ -162,6 +162,9 @@ msgstr "japani"
 msgid "Georgian"
 msgstr "georgia"
 msgid "Kabyle"
 msgstr "Kabyle"
 msgid "Kazakh"
 msgstr "kazakin kieli"
@ -199,7 +202,7 @@ msgid "Burmese"
 msgstr "burman kieli"
 msgid "Norwegian Bokmål"
-msgstr ""
+msgstr "norja (bokmål)"
 msgid "Nepali"
 msgstr "nepalin kieli"
@ -297,6 +300,15 @@ msgstr "Staattiset tiedostot"
 msgid "Syndication"
 msgstr "Syndikointi"
 msgid "That page number is not an integer"
 msgstr "Annettu sivunumero ei ole kokonaisluku"
 msgid "That page number is less than 1"
 msgstr "Annettu sivunumero on alle 1"
 msgid "That page contains no results"
 msgstr "Annetulla sivulla ei ole tuloksia"
 msgid "Enter a valid value."
 msgstr "Syötä oikea arvo."
@ -309,6 +321,7 @@ msgstr "Syötä kelvollinen kokonaisluku."
 msgid "Enter a valid email address."
 msgstr "Syötä kelvollinen sähköpostiosoite."
 #. Translators: "letters" means latin letters: a-z and A-Z.
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
@ -374,6 +387,9 @@ msgstr[1] ""
 "Varmista, että tämä arvo on enintään %(limit_value)d merkkiä pitkä (tällä "
 "hetkellä %(show_value)d)."
 msgid "Enter a number."
 msgstr "Syötä luku."
 #, python-format
 msgid "Ensure that there are no more than %(max)s digit in total."
 msgid_plural "Ensure that there are no more than %(max)s digits in total."
@ -396,6 +412,17 @@ msgstr[0] ""
 msgstr[1] ""
 "Tässä luvussa saa olla enintään %(max)s numeroa ennen desimaalipilkkua."
 #, python-format
 msgid ""
 "File extension '%(extension)s' is not allowed. Allowed extensions are: "
 "'%(allowed_extensions)s'."
 msgstr ""
 "Pääte \"%(extension)s\" ei ole sallittu. Sallittuja päätteitä ovat "
 "\"%(allowed_extensions)s\"."
 msgid "Null characters are not allowed."
 msgstr "Tyhjiä merkkejä (null) ei sallita."
 msgid "and"
 msgstr "ja"
@ -444,6 +471,10 @@ msgstr "Suuri (8-tavuinen) kokonaisluku"
 msgid "'%(value)s' value must be either True or False."
 msgstr "%(value)s-arvo pitää olla joko tosi tai epätosi."
 #, python-format
 msgid "'%(value)s' value must be either True, False, or None."
 msgstr ""
 msgid "Boolean (Either True or False)"
 msgstr "Totuusarvo: joko tosi (True) tai epätosi (False)"
@ -595,11 +626,11 @@ msgstr "Yksi-yhteen relaatio"
 #, python-format
 msgid "%(from)s-%(to)s relationship"
-msgstr ""
+msgstr "%(from)s-%(to)s -suhde"
 #, python-format
 msgid "%(from)s-%(to)s relationships"
-msgstr ""
+msgstr "%(from)s-%(to)s -suhteet"
 msgid "Many-to-many relationship"
 msgstr "Moni-moneen relaatio"
@ -616,9 +647,6 @@ msgstr "Tämä kenttä vaaditaan."
 msgid "Enter a whole number."
 msgstr "Syötä kokonaisluku."
 msgid "Enter a number."
 msgstr "Syötä luku."
 msgid "Enter a valid date."
 msgstr "Syötä oikea päivämäärä."
@ -631,6 +659,10 @@ msgstr "Syötä oikea pvm/kellonaika."
 msgid "Enter a valid duration."
 msgstr "Syötä oikea kesto."
 #, python-brace-format
 msgid "The number of days must be between {min_days} and {max_days}."
 msgstr ""
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr "Tiedostoa ei lähetetty. Tarkista lomakkeen koodaus (encoding)."
@ -721,15 +753,15 @@ msgstr ""
 msgid "Please correct the duplicate values below."
 msgstr "Korjaa allaolevat kaksoisarvot."
-msgid "The inline foreign key did not match the parent instance primary key."
+msgid "The inline value did not match the parent instance."
-msgstr "Liittyvä perusavain ei vastannut vanhemman perusavainta."
+msgstr ""
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr "Valitse oikea vaihtoehto. Valintasi ei löydy vaihtoehtojen joukosta."
 #, python-format
-msgid "\"%(pk)s\" is not a valid value for a primary key."
+msgid "\"%(pk)s\" is not a valid value."
-msgstr "\"%(pk)s\" ei ole kelvollinen pääavainarvo."
+msgstr "\"%(pk)s\" ei ole kelvollinen arvo."
 #, python-format
 msgid ""
@ -739,15 +771,15 @@ msgstr ""
 "%(datetime)s -arvoa ei pystytty lukemaan aikavyöhykkeellä "
 "%(current_timezone)s; se saattaa olla moniarvoinen tai määrittämätön."
 msgid "Clear"
 msgstr "Poista"
 msgid "Currently"
 msgstr "Tällä hetkellä"
 msgid "Change"
 msgstr "Muokkaa"
 msgid "Clear"
 msgstr "Poista"
 msgid "Unknown"
 msgstr "Tuntematon"
@ -1094,6 +1126,19 @@ msgstr ""
 "hyvä ja kytke otsake takaisin päälle ainakin tälle sivulle, HTTPS-"
 "yhteyksille tai saman lähteen (\"same-origin\") pyynnöille."
 msgid ""
 "If you are using the <meta name=\"referrer\" content=\"no-referrer\"> tag or "
 "including the 'Referrer-Policy: no-referrer' header, please remove them. The "
 "CSRF protection requires the 'Referer' header to do strict referer checking. "
 "If you're concerned about privacy, use alternatives like <a rel=\"noreferrer"
 "\" ...> for links to third-party sites."
 msgstr ""
 "Jos käytät <meta name=\"referrer\" content=\"no-referrer\">-tagia tai "
 "\"Referrer-Policy: no-referrer\" -otsaketta, ole hyvä ja poista ne. CSRF-"
 "suojaus vaatii Referer-otsakkeen tehdäkseen tarkan referer-tarkistuksen. Jos "
 "vaadit yksityisyyttä, käytä vaihtoehtoja kuten <a rel=\"noreferrer\" ..."
 ">linkittääksesi kolmannen osapuolen sivuille."
 msgid ""
 "You are seeing this message because this site requires a CSRF cookie when "
 "submitting forms. This cookie is required for security reasons, to ensure "
@ -1114,33 +1159,12 @@ msgstr ""
 msgid "More information is available with DEBUG=True."
 msgstr "Lisätietoja `DEBUG=True`-konfiguraatioasetuksella."
 msgid "Welcome to Django"
 msgstr "Tervetuloa Djangoon"
 msgid "It worked!"
 msgstr "Kappas, sehän toimi!"
 msgid "Congratulations on your first Django-powered page."
 msgstr "Onnittelut ensimmäisestä Django-sivustasi!"
 msgid ""
 "Of course, you haven't actually done any work yet. Next, start your first "
 "app by running <code>python manage.py startapp [app_label]</code>."
 msgstr ""
 "Et toki ole vielä tehnyt yhtään oikeaa työtä. Seuraavaksi voit aloittaa "
 "ensimmäisen sovelluksesi ajamalla <code>python manage.py startapp "
 "[sovelluksen_nimike]</code>."
 msgid ""
 "You're seeing this message because you have <code>DEBUG = True</code> in "
 "your Django settings file and you haven't configured any URLs. Get to work!"
 msgstr ""
 "Näet tämän viestin, koska asetuksissasi on <code>DEBUG = True</code> etkä "
 "ole konfiguroinut yhtään URL-osoitetta. Töihin siitä!"
 msgid "No year specified"
 msgstr "Vuosi puuttuu"
 msgid "Date out of range"
 msgstr "Päivämäärä ei alueella"
 msgid "No month specified"
 msgstr "Kuukausi puuttuu"
@ -1191,3 +1215,44 @@ msgstr "\"%(path)s\" ei ole olemassa"
 #, python-format
 msgid "Index of %(directory)s"
 msgstr "Hakemistolistaus: %(directory)s"
 msgid "Django: the Web framework for perfectionists with deadlines."
 msgstr ""
 #, python-format
 msgid ""
 "View <a href=\"https://docs.djangoproject.com/en/%(version)s/releases/\" "
 "target=\"_blank\" rel=\"noopener\">release notes</a> for Django %(version)s"
 msgstr ""
 msgid "The install worked successfully! Congratulations!"
 msgstr "Asennus toimi! Onneksi olkoon!"
 #, python-format
 msgid ""
 "You are seeing this page because <a href=\"https://docs.djangoproject.com/en/"
 "%(version)s/ref/settings/#debug\" target=\"_blank\" rel=\"noopener"
 "\">DEBUG=True</a> is in your settings file and you have not configured any "
 "URLs."
 msgstr ""
 "Näet tämän viestin, koska asetuksissasi on <a href=\"https://docs."
 "djangoproject.com/en/%(version)s/ref/settings/#debug\" target=\"_blank\" rel="
 "\"noopener\">DEBUG = True</a> etkä ole konfiguroinut yhtään URL-osoitetta."
 msgid "Django Documentation"
 msgstr "Django-dokumentaatio"
 msgid "Topics, references, &amp; how-to's"
 msgstr "Aiheet, viittaukset &amp; how-tot"
 msgid "Tutorial: A Polling App"
 msgstr "Tutoriaali: kyselyapplikaatio"
 msgid "Get started with Django"
 msgstr "Miten päästä alkuun Djangolla"
 msgid "Django Community"
 msgstr "Django-yhteisö"
 msgid "Connect, get help, or contribute"
 msgstr ""
--- a/django/conf/locale/fi/formats.py
+++ b/django/conf/locale/fi/formats.py
@ -1,10 +1,7 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
 from __future__ import unicode_literals
 # The *_FORMAT strings use the Django date format syntax,
-# see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
+# see https://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
 DATE_FORMAT = 'j. E Y'
 TIME_FORMAT = 'G.i'
 DATETIME_FORMAT = r'j. E Y \k\e\l\l\o G.i'
@ -15,7 +12,7 @@ SHORT_DATETIME_FORMAT = 'j.n.Y G.i'
 FIRST_DAY_OF_WEEK = 1  # Monday
 # The *_INPUT_FORMATS strings use the Python strftime format syntax,
-# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
+# see https://docs.python.org/library/datetime.html#strftime-strptime-behavior
 DATE_INPUT_FORMATS = [
    '%d.%m.%Y',  # '20.3.2014'
    '%d.%m.%y',  # '20.3.14'
--- a/django/conf/locale/fr/LC_MESSAGES/django.mo
+++ b/django/conf/locale/fr/LC_MESSAGES/django.mo
--- a/Show More
+++ b/Show More
`@ -1,4 +1,4 @@`
	`# http://editorconfig.org`	`# https://editorconfig.org/`

	`root = true`	`root = true`
`@ -1,3 +1,3 @@`
	`{{ unicode_literals }}from django.contrib import admin`	`from django.contrib import admin`

	`# Register your models here.`	`# Register your models here.`
`@ -1,4 +1,4 @@`
	`{{ unicode_literals }}from django.apps import AppConfig`	`from django.apps import AppConfig`


	`class {{ camel_case_app_name }}Config(AppConfig):`	`class {{ camel_case_app_name }}Config(AppConfig):`
`@ -1,3 +1,3 @@`
	`{{ unicode_literals }}from django.db import models`	`from django.db import models`

	`# Create your models here.`	`# Create your models here.`
`@ -1,3 +1,3 @@`
	`{{ unicode_literals }}from django.test import TestCase`	`from django.test import TestCase`

	`# Create your tests here.`	`# Create your tests here.`
`@ -1,3 +1,3 @@`
	`{{ unicode_literals }}from django.shortcuts import render`	`from django.shortcuts import render`

	`# Create your views here.`	`# Create your views here.`