Merge ~lvoytek/ubuntu/+source/python-django:merge-lp1946890-jammy into ubuntu/+source/python-django:ubuntu/devel

[Lena Voytek]

Merged up to Debian Unstable version 2:3.2.9-2, this should become a sync but this
MP will show the process of getting to this point.

PPA: ppa:lvoytek/python-django-sync-jammy

Basic test:

# python3
>>> import django
>>> print(django.get_version())
3.2.9

Package Test Results:

autopkgtest [17:12:27]: @@@@@@@@@@@@@@@@@@@@ summary
command1 PASS
command2 PASS

Additional autopkgtests were also run on reverse dependencies, all of which succeeded. These are associated with the above PPA.

This can become a sync as the only delta, containing the patch file test_subparser_regression.patch, was fixed in Debian version 2:3.2.8-1.

[Utkarsh Gupta (utkarsh)]

Hiya,

I see there are a bunch of conflicts here. Also, if this were to become a sync, the only thing remaining in this MP would be a d/ch entry and update-maintainers. Could you TAL and fix the same? TIA! \o/

review: Needs Fixing

[Christian Ehrhardt  (paelzer)]

@Utkarsh
The conflicts come from the merge target being ubuntu/devel, but since this is meant to show the (non-)delta to Debian it would need to be against debian/sid to show correctly.

@utkarsh
By accident you've consumed the canonical-server slot which is needed to be seen in our overviews, I can't add one back, but since I'll approve that is ok. Otherwise we'd need to add it back now.

--- review --

Vs the right branch it LGTM

$ git diff pkg/debian/sid | diffstat
 changelog | 14 ++++++++++++++
 control | 3 ++-
 2 files changed, 16 insertions(+), 1 deletion(-)

Sure, the question now is were all drops correct, but there is only one and plenty of tests 8as discussed in standup yesterday).

5030e5d8a * d/p/test_subparser_regression.patch: Fix test regression (LP: #1945993)
Is in 3.2.8 so it is ok to drop it.
No other delta left.

The tests indeed passed and I looked at $ lp-test-ppa ppa:lvoytek/python-django-sync-jammy --release jammy --showpass which showed me all the others that passed just fine.

On the Debian side a lot has changed since 2.2.24 (two years !)
Really time to get this updated.
The migration might have some hiccups due to that, but I see no show stoppers in there that would not work well for Ubuntu.

Therefore +1 to sync this.

review: Approve

[Christian Ehrhardt  (paelzer)]

Add Breaks: on python-django-pyscss << 2.0.2-10 (Closes: #983618)

That we have ready
 python-django-pyscss | 2.0.2-10 | jammy | source

Add Breaks: on lava-server << 2021.11 (Closes: #996931)
 lava-server | 2020.12-5 | jammy/universe | all

That would be unusable then, but ok as it is the same in Debian and we will pick it up once a compatible version exists.

[Christian Ehrhardt  (paelzer)]

$ syncpackage -r jammy-proposed -d unstable -v python-django --force --bug 1946890
Loading Gnome
Loading Google
Loading Windows (alt)
Loading file
Loading keyczar
Loading multi
Loading pyfs
Loading KWallet
Loading SecretService
Loading Windows
Loading chainer
Loading macOS
Source python-django -> jammy/Proposed: current version 2:2.2.24-1ubuntu1, new version 2:3.2.9-2
New changes:
python-django (2:3.2.9-2) unstable; urgency=medium

  * Team upload.
  * Fix __in lookup crash when combining with filtered aggregates.
    Fix for: https://code.djangoproject.com/ticket/32690
    This issue affects src:lava, where work is being done towards Django 3.2
    compatibility.
    Upstream patch from:
    https://github.com/django/django/commit/136ff592ad8aa8b7fa1e61435e5501cc98ce8573
  * Add Breaks: on lava-server << 2021.11 (Closes: #996931)
  * Add Breaks: on python-django-pyscss << 2.0.2-10 (Closes: #983618)

 -- Antonio Terceiro <email address hidden> Wed, 10 Nov 2021 11:22:48 -0300

python-django (2:3.2.9-1) unstable; urgency=medium

  * New upstream release.
    <https://docs.djangoproject.com/en/3.2/releases/3.2.9/>

 -- Chris Lamb <email address hidden> Mon, 01 Nov 2021 16:13:55 +0000

python-django (2:3.2.8-1) unstable; urgency=medium

  * New upstream bugfix release.
  * Drop a patch applied upstream.
  * Bump Standards-Version to 4.6.0.

 -- Chris Lamb <email address hidden> Tue, 05 Oct 2021 09:34:57 +0100

python-django (2:3.2.7-4) unstable; urgency=medium

  * Skip a test that is fixed upstream (with a number of overlapping patches).

 -- Chris Lamb <email address hidden> Mon, 13 Sep 2021 09:03:27 +0100

python-django (2:3.2.7-3) unstable; urgency=medium

  * Actually upload 3.2 branch to unstable...

 -- Chris Lamb <email address hidden> Thu, 09 Sep 2021 17:49:23 +0100

python-django (2:3.2.7-2) experimental; urgency=medium

  * Upload 3.2 branch to unstable.

 -- Chris Lamb <email address hidden> Thu, 09 Sep 2021 15:51:11 +0100

python-django (2:3.2.7-1) experimental; urgency=medium

  * New upstream bugfix release.

 -- Chris Lamb <email address hidden> Wed, 01 Sep 2021 10:46:07 +0100

python-django (2:3.2.6-1) experimental; urgency=medium

  * New upstream bugfix release.
    <https://docs.djangoproject.com/en/3.2/releases/3.2.6/>
  * Bump Standards-Version to 4.5.1.

 -- Chris Lamb <email address hidden> Mon, 02 Aug 2021 09:16:21 +0100

python-django (2:3.2.5-2) experimental; urgency=medium

  * Don't symlink /usr/bin/django-admin to "django-admin.py"; ship the script
    generated by the entry_points system instead, otherwise we introduce a
    confusing "django-admin.py" deprecation message when using "django-admin".
    (Closes: #991098)

 -- Chris Lamb <email address hidden> Thu, 15 Jul 2021 13:54:57 +0100

python-django (2:3.2.5-1) experimental; urgency=medium

  * New upstream security release:

    - CVE-2021-35042: Potential SQL injection via unsanitized
      QuerySet.order_by() input.

      Unsanitized user input passed to QuerySet.order_by() could bypass
      intended column reference validation in path marked for deprecation
      resulting in a potential SQL injection even if a deprecation warning is
      emitted. As a mitigation, the strict co...

[Christian Ehrhardt  (paelzer)]

https://launchpad.net/ubuntu/+source/python-django/2:3.2.9-2 builds fine it seems.
Please track migration of this and help to overcome any blockers.

diff --git a/AUTHORS b/AUTHORS
index b8c688c..f2a38ac 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -12,6 +12,7 @@ answer newbie questions, and generally made Django that much better:
     Abhijeet Viswa <[e-mail]>
     Abhinav Patil <https://github.com/ubadub/>
     Abhishek Gautam <[e-mail]>
+    Abhyudai <https://github.com/abhiabhi94>
     Adam Allred <[e-mail]>
     Adam Bogdał <[e-mail]>
     Adam Donaghy
@@ -34,13 +35,15 @@ answer newbie questions, and generally made Django that much better:
     Akshesh Doshi <[e-mail]>
     [e-mail]
     Alasdair Nicol <https://al.sdair.co.uk/>
-    Albert Wang <[e-mail]>
+    Albert Wang <https://github.com/albertyw/>
     Alcides Fonseca
+    Aldian Fazrihady <[e-mail]>
     Aleksandra Sendecka <[e-mail]>
     Aleksi Häkli <[e-mail]>
     Alexander Dutton <[e-mail]>
     Alexander Myodov <[e-mail]>
-    Alexandr Tatarinov <[e-mail]>
+    Alexandr Tatarinov <[e-mail]>
+    Alex Aktsipetrov <[e-mail]>
     Alex Becker <https://alexcbecker.net/>
     Alex Couper <http://alexcouper.com/>
     Alex Dedul
@@ -49,6 +52,8 @@ answer newbie questions, and generally made Django that much better:
     Alex Ogier <[e-mail]>
     Alex Robbins <[e-mail]>
     Alexey Boriskin <[e-mail]>
+    Alexey Tsivunin <[e-mail]>
+    Ali Vakilzade <[e-mail]>
     Aljosa Mohorovic <[e-mail]>
     Amit Chakradeo <https://amit.chakradeo.net/>
     Amit Ramon <[e-mail]>
@@ -70,6 +75,7 @@ answer newbie questions, and generally made Django that much better:
     Andrew Pinkham <http://AndrewsForge.com>
     Andrews Medina <[e-mail]>
     Andriy Sokolovskiy <[e-mail]>
+    Andy Chosak <[e-mail]>
     Andy Dustman <[e-mail]>
     Andy Gayton <[e-mail]>
     [e-mail]
@@ -89,6 +95,7 @@ answer newbie questions, and generally made Django that much better:
     Aron Podrigal <[e-mail]>
     Artem Gnilov <[e-mail]>
     Arthur <[e-mail]>
+    Arthur Jovart <[e-mail]>
     Arthur Koziel <http://arthurkoziel.com>
     Arthur Rio <[e-mail]>
     Arvis Bickovskis <[e-mail]>
@@ -105,11 +112,13 @@ answer newbie questions, and generally made Django that much better:
     Baptiste Mispelon <[e-mail]>
     Barry Pederson <[e-mail]>
     Bartolome Sanchez Salado <[e-mail]>
+    Barton Ip <[e-mail]>
     Bartosz Grabski <[e-mail]>
     Bashar Al-Abdulhadi
     Bastian Kleineidam <[e-mail]>
     Batiste Bieler <[e-mail]>
     Batman
+    Batuhan Taskaya <[e-mail]>
     Baurzhan Ismagulov <[e-mail]>
     Ben Dean Kawamura <[e-mail]>
     Ben Firshman <[e-mail]>
@@ -140,6 +149,7 @@ answer newbie questions, and generally made Django that much better:
     Brian Beck <http://blog.brianbeck.com/>
     Brian Fabian Crain <http://www.bfc.do/>
     Brian Harring <[e-mail]>
+    Brian Helba <[e-mail]>
     Brian Ray <http://brianray.chipy.org/>
     Brian Rosner <[e-mail]>
     Bruce Kroeze <https://coderseye.com/>
@@ -156,6 +166,7 @@ answer newbie questions, and generally made Django that much better:
     Cameron Curry
     Cameron Knight (ckknight)
     Can Burak Çilingir <[e-mail]>
+    Can Sarıgöl <[e-mail]>
     Carl Meyer <[e-mail]>
     Carles Pina i Estany <[e-mail]>
     Carlos Eduardo de Paula <[e-mail]>
@@ -166,6 +177,7 @@ answer newbie questions, and generally made Django that much better:
     ChaosKCW
     Charlie Leifer <[e-mail]>
     [e-mail]
+    Chason Chaffin <[e-mail]>
     Cheng Zhang
     Chris Adams
     Chris Beaven <[e-mail]>
@@ -180,6 +192,7 @@ answer newbie questions, and generally made Django that much better:
     Christian Metts
     Christian Oudard <[e-mail]>
     Christian Tanzer <[e-mail]>
+    Christoffer Sjöbergsson
     Christophe Pettus <[e-mail]>
     Christopher Adams <http://christopheradams.info>
     Christopher Babiak <[e-mail]>
@@ -194,6 +207,7 @@ answer newbie questions, and generally made Django that much better:
     Colin Wood <[e-mail]>
     Collin Anderson <[e-mail]>
     Collin Grady <[e-mail]>
+    Colton Hicks <[e-mail]>
     Craig Blaszczyk <[e-mail]>
     [e-mail]
     Curtis Maloney (FunkyBob) <[e-mail]>
@@ -211,6 +225,7 @@ answer newbie questions, and generally made Django that much better:
     Daniel Poelzleithner <https://poelzi.org/>
     Daniel Pyrathon <[e-mail]>
     Daniel Roseman <http://roseman.org.uk/>
+    Daniel Tao <https://philosopherdeveloper.com/>
     Daniel Wiesmann <[e-mail]>
     Danilo Bargen
     Dan Johnson <[e-mail]>
@@ -235,9 +250,12 @@ answer newbie questions, and generally made Django that much better:
     David Sanders <[e-mail]>
     David Schein
     David Tulig <[e-mail]>
+    David Wobrock <[e-mail]>
     Davide Ceretti <[e-mail]>
+    Deep L. Sukhwani <[e-mail]>
     Deepak Thukral <[e-mail]>
     Denis Kuzmichyov <[e-mail]>
+    Dennis Schwertel <[e-mail]>
     Derek Willis <http://blog.thescoop.org/>
     Deric Crago <[e-mail]>
     [e-mail]
@@ -248,6 +266,7 @@ answer newbie questions, and generally made Django that much better:
     Dmitri Fedortchenko <[e-mail]>
     Dmitry Jemerov <[e-mail]>
     [e-mail]
+    Dolan Antenucci <[e-mail]>
     Donald Harvey <[e-mail]>
     Donald Stufft <[e-mail]>
     Don Spaulding <[e-mail]>
@@ -255,7 +274,9 @@ answer newbie questions, and generally made Django that much better:
     Doug Napoleone <[e-mail]>
     dready <[e-mail]>
     [e-mail]
+    Dustyn Gibson <[e-mail]>
     Ed Morley <https://github.com/edmorley>
+    Egidijus Macijauskas <[e-mail]>
     [e-mail]
     elky <http://elky.me/>
     Emmanuelle Delescolle <https://github.com/nanuxbe>
@@ -272,22 +293,29 @@ answer newbie questions, and generally made Django that much better:
     Erik Karulf <[e-mail]>
     Erik Romijn <[e-mail]>
     [e-mail]
+    Erwin Junge <[e-mail]>
     Esdras Beleza <[e-mail]>
     Espen Grindhaug <http://grindhaug.org/>
+    Étienne Beaulé <[e-mail]>
     Eugene Lazutkin <http://lazutkin.com/blog/>
     Evan Grim <https://github.com/egrim>
     Fabrice Aneche <[e-mail]>
+    Farhaan Bukhsh <[e-mail]>
     [e-mail]
     fdr <[e-mail]>
     Federico Capoano <[e-mail]>
+    Felipe Lee <[e-mail]>
     Filip Noetzel <http://filip.noetzel.co.uk/>
     Filip Wasilewski <[e-mail]>
     Finn Gruwier Larsen <[e-mail]>
     Flávio Juvenal da Silva Junior <[e-mail]>
     [e-mail]
     Florian Apolloner <[e-mail]>
+    Florian Demmer <[e-mail]>
     Florian Moussous <[e-mail]>
+    Fran Hrženjak <[e-mail]>
     Francisco Albarran Cristobal <[e-mail]>
+    Francisco Couzo <[e-mail]>
     François Freitag <[e-mail]>
     Frank Tegtmeyer <[e-mail]>
     Frank Wierzbicki
@@ -304,6 +332,7 @@ answer newbie questions, and generally made Django that much better:
     Gasper Koren
     Gasper Zejn <[e-mail]>
     Gavin Wahl <[e-mail]>
+    Ge Hanbin <[e-mail]>
     [e-mail]
     Geert Vanderkelen
     George Karpenkov <[e-mail]>
@@ -331,8 +360,13 @@ answer newbie questions, and generally made Django that much better:
     Guillaume Pannatier <[e-mail]>
     Gustavo Picon
     hambaloney
+<<<<<<< AUTHORS
+=======
+    Hang Park <[e-mail]>
+>>>>>>> AUTHORS
     Hannes Ljungberg <[e-mail]>
     Hannes Struß <[e-mail]>
+    Harm Geerts <[e-mail]>
     Hasan Ramezani <[e-mail]>
     Hawkeye
     Helen Sherwood-Taylor <[e-mail]>
@@ -345,6 +379,7 @@ answer newbie questions, and generally made Django that much better:
     Honza Král <[e-mail]>
     Horst Gutmann <[e-mail]>
     Hugo Osvaldo Barrera <[e-mail]>
+    HyukJin Jang <[e-mail]>
     Hyun Mi Ae
     Iacopo Spalletti <[e-mail]>
     Ian A Wilson <http://ianawilson.com>
@@ -361,6 +396,7 @@ answer newbie questions, and generally made Django that much better:
     Ilya Semenov <[e-mail]>
     Ingo Klöcker <[e-mail]>
     I.S. van Oostveen <[e-mail]>
+    Iuri de Silvio <https://github.com/iurisilvio>
     [e-mail]
     Ivan Sagalaev (Maniac) <http://www.softwaremaniacs.org/>
     Jaap Roes <[e-mail]>
@@ -368,6 +404,7 @@ answer newbie questions, and generally made Django that much better:
     Jacob Burch <[e-mail]>
     Jacob Green
     Jacob Kaplan-Moss <[e-mail]>
+    Jacob Walls <http://www.jacobtylerwalls.com/>
     Jakub Paczkowski <[e-mail]>
     Jakub Wilk <[e-mail]>
     Jakub Wiśniowski <[e-mail]>
@@ -376,6 +413,8 @@ answer newbie questions, and generally made Django that much better:
     James Bennett <[e-mail]>
     James Murty
     James Tauber <[e-mail]>
+    James Timmins <[e-mail]>
+    James Turk <[e-mail]>
     James Wheare <[e-mail]>
     Jannis Leidel <[e-mail]>
     Janos Guljas
@@ -420,6 +459,7 @@ answer newbie questions, and generally made Django that much better:
     Joao Oliveira <[e-mail]>
     Joao Pedro Silva <[e-mail]>
     Joe Heck <http://www.rhonabwy.com/wp/>
+    Joe Jackson <[e-mail]>
     Joel Bohman <[e-mail]>
     Joel Heenan <[e-mail]>
     Joel Watts <[e-mail]>
@@ -475,6 +515,10 @@ answer newbie questions, and generally made Django that much better:
     Karen Tracey <[e-mail]>
     Karol Sikora <[e-mail]>
     Katherine “Kati” Michel <[e-mail]>
+<<<<<<< AUTHORS
+=======
+    Kathryn Killebrew <[e-mail]>
+>>>>>>> AUTHORS
     Katie Miller <[e-mail]>
     Keith Bussell <[e-mail]>
     Kenneth Love <[e-mail]>
@@ -484,10 +528,12 @@ answer newbie questions, and generally made Django that much better:
     Kevin McConnell <[e-mail]>
     Kieran Holland <http://www.kieranholland.com>
     kilian <[e-mail]>
+    Kim Joon Hwan 김준환 <[e-mail]>
     Klaas van Schelven <[e-mail]>
     knox <[e-mail]>
     [e-mail]
     Kowito Charoenratchatabhan <[e-mail]>
+    Krišjānis Vaiders <[e-mail]>
     [e-mail]
     Krzysztof Jurewicz <[e-mail]>
     Krzysztof Kulewski <[e-mail]>
@@ -510,6 +556,7 @@ answer newbie questions, and generally made Django that much better:
     Liang Feng <[e-mail]>
     limodou
     Lincoln Smith <[e-mail]>
+    Liu Yijie <[e-mail]>
     Loek van Gent <[e-mail]>
     Loïc Bistuer <[e-mail]>
     Lowe Thiderman <[e-mail]>
@@ -527,6 +574,7 @@ answer newbie questions, and generally made Django that much better:
     Mads Jensen <https://github.com/atombrella>
     Makoto Tsuyuki <[e-mail]>
     Malcolm Tredinnick
+    Manav Agarwal <[e-mail]>
     Manuel Saelices <[e-mail]>
     Manuzhai
     Marc Aymerich Gubern
@@ -559,6 +607,7 @@ answer newbie questions, and generally made Django that much better:
     Martin von Gagern <[e-mail]>
     Mart Sõmermaa <http://mrts.pri.ee/>
     Marty Alchin <[e-mail]>
+    Masashi Shibata <[e-mail]>
     [e-mail]
     Massimiliano Ravelli <[e-mail]>
     Massimo Scamarcia <[e-mail]>
@@ -591,7 +640,9 @@ answer newbie questions, and generally made Django that much better:
     Maximilian Merz <[e-mail]>
     Maximillian Dornseif <[e-mail]>
     [e-mail]
+    Meghana Bhange <[e-mail]>
     Meir Kriheli <http://mksoft.co.il/>
+    Michael S. Brown <[e-mail]>
     Michael Hall <[e-mail]>
     Michael Josephson <http://www.sdjournal.com/>
     Michael Manfre <[e-mail]>
@@ -628,11 +679,13 @@ answer newbie questions, and generally made Django that much better:
     msundstr
     Mushtaq Ali <[e-mail]>
     Mykola Zamkovoi <[e-mail]>
+    Nadège Michel <[e-mail]>
     Nagy Károly <[e-mail]>
     Nasimul Haque <[e-mail]>
     Nasir Hussain <[e-mail]>
     Natalia Bidart <[e-mail]>
     Nate Bragg <[e-mail]>
+    Nathan Gaberel <[e-mail]>
     Neal Norwitz <[e-mail]>
     Nebojša Dorđević
     Ned Batchelder <https://nedbatchelder.com/>
@@ -653,6 +706,7 @@ answer newbie questions, and generally made Django that much better:
     Nis Jørgensen <[e-mail]>
     Nowell Strite <https://nowell.strite.org/>
     Nuno Mariz <[e-mail]>
+    Octavio Peri <[e-mail]>
     oggie rob <[e-mail]>
     oggy <[e-mail]>
     Oliver Beattie <[e-mail]>
@@ -666,6 +720,7 @@ answer newbie questions, and generally made Django that much better:
     Owen Griffiths
     Pablo Martín <[e-mail]>
     Panos Laganakos <[e-mail]>
+    Paolo Melchiorre <[e-mail]>
     Pascal Hartig <[e-mail]>
     Pascal Varet
     Patrik Sletmo <[e-mail]>
@@ -691,6 +746,7 @@ answer newbie questions, and generally made Django that much better:
     Peter Zsoldos <http://zsoldosp.eu>
     Pete Shinners <[e-mail]>
     Petr Marhoun <[e-mail]>
+    Petter Strandmark
     [e-mail]
     phaedo <http://phaedo.cx/>
     [e-mail]
@@ -707,6 +763,7 @@ answer newbie questions, and generally made Django that much better:
     Priyansh Saxena <[e-mail]>
     Przemysław Buczkowski <[e-mail]>
     Przemysław Suliga <http://suligap.net>
+    Qi Zhao <[e-mail]>
     Rachel Tobin <[e-mail]>
     Rachel Willmer <http://www.willmer.com/kb/>
     Radek Švarz <https://www.svarz.cz/translate/>
@@ -740,7 +797,9 @@ answer newbie questions, and generally made Django that much better:
     Roberto Aguilar <[e-mail]>
     Robert Rock Howard <http://djangomojo.com/>
     Robert Wittams
+    Rob Golding-Day <[e-mail]>
     Rob Hudson <https://rob.cogit8.org/>
+    Rob Nguyen <[e-mail]>
     Robin Munn <http://www.geekforgod.com/>
     Rodrigo Pinheiro Marques de Araújo <[e-mail]>
     Romain Garrigues <[e-mail]>
@@ -757,8 +816,11 @@ answer newbie questions, and generally made Django that much better:
     ryankanno
     Ryan Kelly <[e-mail]>
     Ryan Niemeyer <https://profiles.google.com/ryan.niemeyer/about>
+    Ryan Petrello <[e-mail]>
     Ryan Rubin <[e-mail]>
     Ryno Mathee <[e-mail]>
+    Sachin Jat <[e-mail]>
+    Sage M. Abdullah <https://github.com/laymonage>
     Sam Newman <http://www.magpiebrain.com/>
     Sander Dijkhuis <[e-mail]>
     Sanket Saurav <[e-mail]>
@@ -767,6 +829,7 @@ answer newbie questions, and generally made Django that much better:
     [e-mail]
     Scot Hacker <[e-mail]>
     Scott Barr <[e-mail]>
+    Scott Cranfill <[e-mail]>
     Scott Fitsimones <[e-mail]>
     Scott Pashley <[e-mail]>
     [e-mail]
@@ -799,6 +862,7 @@ answer newbie questions, and generally made Django that much better:
     sloonz <[e-mail]>
     [e-mail]
     sopel
+    Sreehari K V <[e-mail]>
     Srinivas Reddy Thatiparthy <[e-mail]>
     Stanislas Guerra <[e-mail]>
     Stanislaus Madueke
@@ -841,6 +905,7 @@ answer newbie questions, and generally made Django that much better:
     Thomas Tanner <[e-mail]>
     [e-mail]
     Tim Allen <[e-mail]>
+    Tim Givois <[e-mail]>
     Tim Graham <[e-mail]>
     Tim Heap <[e-mail]>
     Tim Saylor <[e-mail]>
@@ -848,10 +913,12 @@ answer newbie questions, and generally made Django that much better:
     Tobias McNulty <https://www.caktusgroup.com/blog/>
     [e-mail]
     Todd O'Bryan <[e-mail]>
+    Tom Carrick <https://www.carrick.eu>
     Tom Christie <[e-mail]>
     Tom Forbes <[e-mail]>
     Tom Insam
     Tom Tobin
+    Tom Wojcik <[e-mail]>
     Tomáš Ehrlich <[e-mail]>
     Tomáš Kopeček <[e-mail]>
     Tome Cvitan <[e-mail]>
@@ -876,14 +943,18 @@ answer newbie questions, and generally made Django that much better:
     valtron
     Vasiliy Stavenko <[e-mail]>
     Vasil Vangelovski
+    Vibhu Agarwal <vibhu-agarwal.github.io>
     Victor Andrée
     [e-mail]
     Viktor Danyliuk <[e-mail]>
+    Viktor Grabov <[e-mail]>
     Ville Säävuori <https://www.unessa.net/>
     Vinay Karanam <https://github.com/vinayinvicible>
     Vinay Sajip <[e-mail]>
     Vincent Foley <[e-mail]>
+    Vinny Do <[e-mail]>
     Vitaly Babiy <[e-mail]>
+    Vitaliy Yelnik <[e-mail]>
     Vladimir Kuzma <[e-mail]>
     Vlado <[e-mail]>
     Vsevolod Solovyov
@@ -901,6 +972,7 @@ answer newbie questions, and generally made Django that much better:
     Wilson Miner <[e-mail]>
     Wim Glenn <[e-mail]>
     wojtek
+    Xavier Francisco <[e-mail]>
     Xia Kai <https://blog.xiaket.org/>
     Yann Fouillat <[e-mail]>
     Yann Malet
@@ -914,11 +986,14 @@ answer newbie questions, and generally made Django that much better:
     Zach Liu <[e-mail]>
     Zach Thompson <[e-mail]>
     Zain Memon
+    Zain Patel <[e-mail]>
     Zak Johnson <[e-mail]>
     Žan Anderle <[e-mail]>
     Zbigniew Siciarz <[e-mail]>
     zegor
+    Zeynel Özdemir <[e-mail]>
     Zlatko Mašek <[e-mail]>
+    zriv <https://github.com/zriv>
     <Please alphabetize new entries>
 
 A big THANK YOU goes to:
diff --git a/Django.egg-info/PKG-INFO b/Django.egg-info/PKG-INFO
index bfed6be..28bb264 100644
--- a/Django.egg-info/PKG-INFO
+++ b/Django.egg-info/PKG-INFO
@@ -1,16 +1,25 @@
 Metadata-Version: 2.1
 Name: Django
+<<<<<<< Django.egg-info/PKG-INFO
 Version: 2.2.24
+=======
+Version: 3.2.9
+>>>>>>> Django.egg-info/PKG-INFO
 Summary: A high-level Python Web framework that encourages rapid development and clean, pragmatic design.
 Home-page: https://www.djangoproject.com/
 Author: Django Software Foundation
 Author-email: [e-mail]
-License: BSD
+License: BSD-3-Clause
 Project-URL: Documentation, https://docs.djangoproject.com/
+Project-URL: Release notes, https://docs.djangoproject.com/en/stable/releases/
 Project-URL: Funding, https://www.djangoproject.com/fundraising/
 Project-URL: Source, https://github.com/django/django
 Project-URL: Tracker, https://code.djangoproject.com/
-Description: Django is a high-level Python Web framework that encourages rapid development
+Description: ======
+        Django
+        ======
+        
+        Django is a high-level Python Web framework that encourages rapid development
         and clean, pragmatic design. Thanks for checking it out.
         
         All documentation is in the "``docs``" directory and online at
@@ -38,8 +47,12 @@ Description: Django is a high-level Python Web framework that encourages rapid d
         To get more help:
         
         * Join the ``#django`` channel on ``irc.libera.chat``. Lots of helpful people
+<<<<<<< Django.egg-info/PKG-INFO
           out there. See https://en.wikipedia.org/wiki/Wikipedia:IRC/Tutorial if you're
           new to IRC.
+=======
+          hang out there. See https://web.libera.chat if you're new to IRC.
+>>>>>>> Django.egg-info/PKG-INFO
         
         * Join the django-users mailing list, or read the archives, at
           https://groups.google.com/group/django-users.
@@ -55,6 +68,13 @@ Description: Django is a high-level Python Web framework that encourages rapid d
           ``docs/internals/contributing/writing-code/unit-tests.txt``, published online at
           https://docs.djangoproject.com/en/dev/internals/contributing/writing-code/unit-tests/#running-the-unit-tests
         
+        Supporting the Development of Django
+        ====================================
+        
+        Django's development depends on your contributions. 
+        
+        If you depend on Django, remember to support the Django Software Foundation: https://www.djangoproject.com/fundraising/
+        
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Web Environment
@@ -64,17 +84,26 @@ Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.5
+Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: 3.6
 Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
+<<<<<<< Django.egg-info/PKG-INFO
 Classifier: Programming Language :: Python :: 3 :: Only
+=======
+Classifier: Programming Language :: Python :: 3.10
+>>>>>>> Django.egg-info/PKG-INFO
 Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
 Classifier: Topic :: Internet :: WWW/HTTP :: WSGI
 Classifier: Topic :: Software Development :: Libraries :: Application Frameworks
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
+<<<<<<< Django.egg-info/PKG-INFO
 Requires-Python: >=3.5
+=======
+Requires-Python: >=3.6
+Provides-Extra: argon2
+>>>>>>> Django.egg-info/PKG-INFO
 Provides-Extra: bcrypt
 Provides-Extra: argon2
diff --git a/Django.egg-info/SOURCES.txt b/Django.egg-info/SOURCES.txt
index 712c72f..b3ead93 100644
--- a/Django.egg-info/SOURCES.txt
+++ b/Django.egg-info/SOURCES.txt
@@ -39,6 +39,10 @@ django/conf/locale/ar/__init__.py
 django/conf/locale/ar/formats.py
 django/conf/locale/ar/LC_MESSAGES/django.mo
 django/conf/locale/ar/LC_MESSAGES/django.po
+django/conf/locale/ar_DZ/__init__.py
+django/conf/locale/ar_DZ/formats.py
+django/conf/locale/ar_DZ/LC_MESSAGES/django.mo
+django/conf/locale/ar_DZ/LC_MESSAGES/django.po
 django/conf/locale/ast/LC_MESSAGES/django.mo
 django/conf/locale/ast/LC_MESSAGES/django.po
 django/conf/locale/az/__init__.py
@@ -189,6 +193,10 @@ django/conf/locale/id/__init__.py
 django/conf/locale/id/formats.py
 django/conf/locale/id/LC_MESSAGES/django.mo
 django/conf/locale/id/LC_MESSAGES/django.po
+django/conf/locale/ig/__init__.py
+django/conf/locale/ig/formats.py
+django/conf/locale/ig/LC_MESSAGES/django.mo
+django/conf/locale/ig/LC_MESSAGES/django.po
 django/conf/locale/io/LC_MESSAGES/django.mo
 django/conf/locale/io/LC_MESSAGES/django.po
 django/conf/locale/is/__init__.py
@@ -223,6 +231,10 @@ django/conf/locale/ko/__init__.py
 django/conf/locale/ko/formats.py
 django/conf/locale/ko/LC_MESSAGES/django.mo
 django/conf/locale/ko/LC_MESSAGES/django.po
+django/conf/locale/ky/__init__.py
+django/conf/locale/ky/formats.py
+django/conf/locale/ky/LC_MESSAGES/django.mo
+django/conf/locale/ky/LC_MESSAGES/django.po
 django/conf/locale/lb/LC_MESSAGES/django.mo
 django/conf/locale/lb/LC_MESSAGES/django.po
 django/conf/locale/lt/__init__.py
@@ -321,10 +333,18 @@ django/conf/locale/te/__init__.py
 django/conf/locale/te/formats.py
 django/conf/locale/te/LC_MESSAGES/django.mo
 django/conf/locale/te/LC_MESSAGES/django.po
+django/conf/locale/tg/__init__.py
+django/conf/locale/tg/formats.py
+django/conf/locale/tg/LC_MESSAGES/django.mo
+django/conf/locale/tg/LC_MESSAGES/django.po
 django/conf/locale/th/__init__.py
 django/conf/locale/th/formats.py
 django/conf/locale/th/LC_MESSAGES/django.mo
 django/conf/locale/th/LC_MESSAGES/django.po
+django/conf/locale/tk/__init__.py
+django/conf/locale/tk/formats.py
+django/conf/locale/tk/LC_MESSAGES/django.mo
+django/conf/locale/tk/LC_MESSAGES/django.po
 django/conf/locale/tr/__init__.py
 django/conf/locale/tr/formats.py
 django/conf/locale/tr/LC_MESSAGES/django.mo
@@ -339,6 +359,10 @@ django/conf/locale/uk/LC_MESSAGES/django.mo
 django/conf/locale/uk/LC_MESSAGES/django.po
 django/conf/locale/ur/LC_MESSAGES/django.mo
 django/conf/locale/ur/LC_MESSAGES/django.po
+django/conf/locale/uz/__init__.py
+django/conf/locale/uz/formats.py
+django/conf/locale/uz/LC_MESSAGES/django.mo
+django/conf/locale/uz/LC_MESSAGES/django.po
 django/conf/locale/vi/__init__.py
 django/conf/locale/vi/formats.py
 django/conf/locale/vi/LC_MESSAGES/django.mo
@@ -353,6 +377,7 @@ django/conf/locale/zh_Hant/LC_MESSAGES/django.mo
 django/conf/locale/zh_Hant/LC_MESSAGES/django.po
 django/conf/project_template/manage.py-tpl
 django/conf/project_template/project_name/__init__.py-tpl
+django/conf/project_template/project_name/asgi.py-tpl
 django/conf/project_template/project_name/settings.py-tpl
 django/conf/project_template/project_name/urls.py-tpl
 django/conf/project_template/project_name/wsgi.py-tpl
@@ -385,6 +410,10 @@ django/contrib/admin/locale/ar/LC_MESSAGES/django.mo
 django/contrib/admin/locale/ar/LC_MESSAGES/django.po
 django/contrib/admin/locale/ar/LC_MESSAGES/djangojs.mo
 django/contrib/admin/locale/ar/LC_MESSAGES/djangojs.po
+django/contrib/admin/locale/ar_DZ/LC_MESSAGES/django.mo
+django/contrib/admin/locale/ar_DZ/LC_MESSAGES/django.po
+django/contrib/admin/locale/ar_DZ/LC_MESSAGES/djangojs.mo
+django/contrib/admin/locale/ar_DZ/LC_MESSAGES/djangojs.po
 django/contrib/admin/locale/ast/LC_MESSAGES/django.mo
 django/contrib/admin/locale/ast/LC_MESSAGES/django.po
 django/contrib/admin/locale/ast/LC_MESSAGES/djangojs.mo
@@ -585,6 +614,10 @@ django/contrib/admin/locale/ko/LC_MESSAGES/django.mo
 django/contrib/admin/locale/ko/LC_MESSAGES/django.po
 django/contrib/admin/locale/ko/LC_MESSAGES/djangojs.mo
 django/contrib/admin/locale/ko/LC_MESSAGES/djangojs.po
+django/contrib/admin/locale/ky/LC_MESSAGES/django.mo
+django/contrib/admin/locale/ky/LC_MESSAGES/django.po
+django/contrib/admin/locale/ky/LC_MESSAGES/djangojs.mo
+django/contrib/admin/locale/ky/LC_MESSAGES/djangojs.po
 django/contrib/admin/locale/lb/LC_MESSAGES/django.mo
 django/contrib/admin/locale/lb/LC_MESSAGES/django.po
 django/contrib/admin/locale/lb/LC_MESSAGES/djangojs.mo
@@ -697,6 +730,10 @@ django/contrib/admin/locale/te/LC_MESSAGES/django.mo
 django/contrib/admin/locale/te/LC_MESSAGES/django.po
 django/contrib/admin/locale/te/LC_MESSAGES/djangojs.mo
 django/contrib/admin/locale/te/LC_MESSAGES/djangojs.po
+django/contrib/admin/locale/tg/LC_MESSAGES/django.mo
+django/contrib/admin/locale/tg/LC_MESSAGES/django.po
+django/contrib/admin/locale/tg/LC_MESSAGES/djangojs.mo
+django/contrib/admin/locale/tg/LC_MESSAGES/djangojs.po
 django/contrib/admin/locale/th/LC_MESSAGES/django.mo
 django/contrib/admin/locale/th/LC_MESSAGES/django.po
 django/contrib/admin/locale/th/LC_MESSAGES/djangojs.mo
@@ -721,6 +758,10 @@ django/contrib/admin/locale/ur/LC_MESSAGES/django.mo
 django/contrib/admin/locale/ur/LC_MESSAGES/django.po
 django/contrib/admin/locale/ur/LC_MESSAGES/djangojs.mo
 django/contrib/admin/locale/ur/LC_MESSAGES/djangojs.po
+django/contrib/admin/locale/uz/LC_MESSAGES/django.mo
+django/contrib/admin/locale/uz/LC_MESSAGES/django.po
+django/contrib/admin/locale/uz/LC_MESSAGES/djangojs.mo
+django/contrib/admin/locale/uz/LC_MESSAGES/djangojs.po
 django/contrib/admin/locale/vi/LC_MESSAGES/django.mo
 django/contrib/admin/locale/vi/LC_MESSAGES/django.po
 django/contrib/admin/locale/vi/LC_MESSAGES/djangojs.mo
@@ -744,6 +785,7 @@ django/contrib/admin/static/admin/css/dashboard.css
 django/contrib/admin/static/admin/css/fonts.css
 django/contrib/admin/static/admin/css/forms.css
 django/contrib/admin/static/admin/css/login.css
+django/contrib/admin/static/admin/css/nav_sidebar.css
 django/contrib/admin/static/admin/css/responsive.css
 django/contrib/admin/static/admin/css/responsive_rtl.css
 django/contrib/admin/static/admin/css/rtl.css
@@ -781,22 +823,18 @@ django/contrib/admin/static/admin/img/gis/move_vertex_on.svg
 django/contrib/admin/static/admin/js/SelectBox.js
 django/contrib/admin/static/admin/js/SelectFilter2.js
 django/contrib/admin/static/admin/js/actions.js
-django/contrib/admin/static/admin/js/actions.min.js
 django/contrib/admin/static/admin/js/autocomplete.js
 django/contrib/admin/static/admin/js/calendar.js
 django/contrib/admin/static/admin/js/cancel.js
 django/contrib/admin/static/admin/js/change_form.js
 django/contrib/admin/static/admin/js/collapse.js
-django/contrib/admin/static/admin/js/collapse.min.js
 django/contrib/admin/static/admin/js/core.js
 django/contrib/admin/static/admin/js/inlines.js
-django/contrib/admin/static/admin/js/inlines.min.js
 django/contrib/admin/static/admin/js/jquery.init.js
+django/contrib/admin/static/admin/js/nav_sidebar.js
 django/contrib/admin/static/admin/js/popup_response.js
 django/contrib/admin/static/admin/js/prepopulate.js
-django/contrib/admin/static/admin/js/prepopulate.min.js
 django/contrib/admin/static/admin/js/prepopulate_init.js
-django/contrib/admin/static/admin/js/timeparse.js
 django/contrib/admin/static/admin/js/urlify.js
 django/contrib/admin/static/admin/js/admin/DateTimeShortcuts.js
 django/contrib/admin/static/admin/js/admin/RelatedObjectLookups.js
@@ -806,13 +844,17 @@ django/contrib/admin/static/admin/js/vendor/jquery/jquery.min.js
 django/contrib/admin/static/admin/js/vendor/select2/LICENSE.md
 django/contrib/admin/static/admin/js/vendor/select2/select2.full.js
 django/contrib/admin/static/admin/js/vendor/select2/select2.full.min.js
+django/contrib/admin/static/admin/js/vendor/select2/i18n/af.js
 django/contrib/admin/static/admin/js/vendor/select2/i18n/ar.js
 django/contrib/admin/static/admin/js/vendor/select2/i18n/az.js
 django/contrib/admin/static/admin/js/vendor/select2/i18n/bg.js
+django/contrib/admin/static/admin/js/vendor/select2/i18n/bn.js
+django/contrib/admin/static/admin/js/vendor/select2/i18n/bs.js
 django/contrib/admin/static/admin/js/vendor/select2/i18n/ca.js
 django/contrib/admin/static/admin/js/vendor/select2/i18n/cs.js
 django/contrib/admin/static/admin/js/vendor/select2/i18n/da.js
 django/contrib/admin/static/admin/js/vendor/select2/i18n/de.js
+django/contrib/admin/static/admin/js/vendor/select2/i18n/dsb.js
 django/contrib/admin/static/admin/js/vendor/select2/i18n/el.js
 django/contrib/admin/static/admin/js/vendor/select2/i18n/en.js
 django/contrib/admin/static/admin/js/vendor/select2/i18n/es.js
@@ -825,11 +867,14 @@ django/contrib/admin/static/admin/js/vendor/select2/i18n/gl.js
 django/contrib/admin/static/admin/js/vendor/select2/i18n/he.js
 django/contrib/admin/static/admin/js/vendor/select2/i18n/hi.js
 django/contrib/admin/static/admin/js/vendor/select2/i18n/hr.js
+django/contrib/admin/static/admin/js/vendor/select2/i18n/hsb.js
 django/contrib/admin/static/admin/js/vendor/select2/i18n/hu.js
+django/contrib/admin/static/admin/js/vendor/select2/i18n/hy.js
 django/contrib/admin/static/admin/js/vendor/select2/i18n/id.js
 django/contrib/admin/static/admin/js/vendor/select2/i18n/is.js
 django/contrib/admin/static/admin/js/vendor/select2/i18n/it.js
 django/contrib/admin/static/admin/js/vendor/select2/i18n/ja.js
+django/contrib/admin/static/admin/js/vendor/select2/i18n/ka.js
 django/contrib/admin/static/admin/js/vendor/select2/i18n/km.js
 django/contrib/admin/static/admin/js/vendor/select2/i18n/ko.js
 django/contrib/admin/static/admin/js/vendor/select2/i18n/lt.js
@@ -837,17 +882,22 @@ django/contrib/admin/static/admin/js/vendor/select2/i18n/lv.js
 django/contrib/admin/static/admin/js/vendor/select2/i18n/mk.js
 django/contrib/admin/static/admin/js/vendor/select2/i18n/ms.js
 django/contrib/admin/static/admin/js/vendor/select2/i18n/nb.js
+django/contrib/admin/static/admin/js/vendor/select2/i18n/ne.js
 django/contrib/admin/static/admin/js/vendor/select2/i18n/nl.js
 django/contrib/admin/static/admin/js/vendor/select2/i18n/pl.js
+django/contrib/admin/static/admin/js/vendor/select2/i18n/ps.js
 django/contrib/admin/static/admin/js/vendor/select2/i18n/pt-BR.js
 django/contrib/admin/static/admin/js/vendor/select2/i18n/pt.js
 django/contrib/admin/static/admin/js/vendor/select2/i18n/ro.js
 django/contrib/admin/static/admin/js/vendor/select2/i18n/ru.js
 django/contrib/admin/static/admin/js/vendor/select2/i18n/sk.js
+django/contrib/admin/static/admin/js/vendor/select2/i18n/sl.js
+django/contrib/admin/static/admin/js/vendor/select2/i18n/sq.js
 django/contrib/admin/static/admin/js/vendor/select2/i18n/sr-Cyrl.js
 django/contrib/admin/static/admin/js/vendor/select2/i18n/sr.js
 django/contrib/admin/static/admin/js/vendor/select2/i18n/sv.js
 django/contrib/admin/static/admin/js/vendor/select2/i18n/th.js
+django/contrib/admin/static/admin/js/vendor/select2/i18n/tk.js
 django/contrib/admin/static/admin/js/vendor/select2/i18n/tr.js
 django/contrib/admin/static/admin/js/vendor/select2/i18n/uk.js
 django/contrib/admin/static/admin/js/vendor/select2/i18n/vi.js
@@ -860,6 +910,7 @@ django/contrib/admin/templates/admin/404.html
 django/contrib/admin/templates/admin/500.html
 django/contrib/admin/templates/admin/actions.html
 django/contrib/admin/templates/admin/app_index.html
+django/contrib/admin/templates/admin/app_list.html
 django/contrib/admin/templates/admin/base.html
 django/contrib/admin/templates/admin/base_site.html
 django/contrib/admin/templates/admin/change_form.html
@@ -874,6 +925,7 @@ django/contrib/admin/templates/admin/filter.html
 django/contrib/admin/templates/admin/index.html
 django/contrib/admin/templates/admin/invalid_setup.html
 django/contrib/admin/templates/admin/login.html
+django/contrib/admin/templates/admin/nav_sidebar.html
 django/contrib/admin/templates/admin/object_history.html
 django/contrib/admin/templates/admin/pagination.html
 django/contrib/admin/templates/admin/popup_response.html
@@ -904,7 +956,6 @@ django/contrib/admin/templates/registration/password_reset_form.html
 django/contrib/admin/templatetags/__init__.py
 django/contrib/admin/templatetags/admin_list.py
 django/contrib/admin/templatetags/admin_modify.py
-django/contrib/admin/templatetags/admin_static.py
 django/contrib/admin/templatetags/admin_urls.py
 django/contrib/admin/templatetags/base.py
 django/contrib/admin/templatetags/log.py
@@ -922,6 +973,8 @@ django/contrib/admindocs/locale/af/LC_MESSAGES/django.mo
 django/contrib/admindocs/locale/af/LC_MESSAGES/django.po
 django/contrib/admindocs/locale/ar/LC_MESSAGES/django.mo
 django/contrib/admindocs/locale/ar/LC_MESSAGES/django.po
+django/contrib/admindocs/locale/ar_DZ/LC_MESSAGES/django.mo
+django/contrib/admindocs/locale/ar_DZ/LC_MESSAGES/django.po
 django/contrib/admindocs/locale/ast/LC_MESSAGES/django.mo
 django/contrib/admindocs/locale/ast/LC_MESSAGES/django.po
 django/contrib/admindocs/locale/az/LC_MESSAGES/django.mo
@@ -1020,6 +1073,8 @@ django/contrib/admindocs/locale/kn/LC_MESSAGES/django.mo
 django/contrib/admindocs/locale/kn/LC_MESSAGES/django.po
 django/contrib/admindocs/locale/ko/LC_MESSAGES/django.mo
 django/contrib/admindocs/locale/ko/LC_MESSAGES/django.po
+django/contrib/admindocs/locale/ky/LC_MESSAGES/django.mo
+django/contrib/admindocs/locale/ky/LC_MESSAGES/django.po
 django/contrib/admindocs/locale/lb/LC_MESSAGES/django.mo
 django/contrib/admindocs/locale/lb/LC_MESSAGES/django.po
 django/contrib/admindocs/locale/lt/LC_MESSAGES/django.mo
@@ -1076,6 +1131,8 @@ django/contrib/admindocs/locale/ta/LC_MESSAGES/django.mo
 django/contrib/admindocs/locale/ta/LC_MESSAGES/django.po
 django/contrib/admindocs/locale/te/LC_MESSAGES/django.mo
 django/contrib/admindocs/locale/te/LC_MESSAGES/django.po
+django/contrib/admindocs/locale/tg/LC_MESSAGES/django.mo
+django/contrib/admindocs/locale/tg/LC_MESSAGES/django.po
 django/contrib/admindocs/locale/th/LC_MESSAGES/django.mo
 django/contrib/admindocs/locale/th/LC_MESSAGES/django.po
 django/contrib/admindocs/locale/tr/LC_MESSAGES/django.mo
@@ -1130,6 +1187,8 @@ django/contrib/auth/locale/af/LC_MESSAGES/django.mo
 django/contrib/auth/locale/af/LC_MESSAGES/django.po
 django/contrib/auth/locale/ar/LC_MESSAGES/django.mo
 django/contrib/auth/locale/ar/LC_MESSAGES/django.po
+django/contrib/auth/locale/ar_DZ/LC_MESSAGES/django.mo
+django/contrib/auth/locale/ar_DZ/LC_MESSAGES/django.po
 django/contrib/auth/locale/ast/LC_MESSAGES/django.mo
 django/contrib/auth/locale/ast/LC_MESSAGES/django.po
 django/contrib/auth/locale/az/LC_MESSAGES/django.mo
@@ -1230,6 +1289,8 @@ django/contrib/auth/locale/kn/LC_MESSAGES/django.mo
 django/contrib/auth/locale/kn/LC_MESSAGES/django.po
 django/contrib/auth/locale/ko/LC_MESSAGES/django.mo
 django/contrib/auth/locale/ko/LC_MESSAGES/django.po
+django/contrib/auth/locale/ky/LC_MESSAGES/django.mo
+django/contrib/auth/locale/ky/LC_MESSAGES/django.po
 django/contrib/auth/locale/lb/LC_MESSAGES/django.mo
 django/contrib/auth/locale/lb/LC_MESSAGES/django.po
 django/contrib/auth/locale/lt/LC_MESSAGES/django.mo
@@ -1286,8 +1347,12 @@ django/contrib/auth/locale/ta/LC_MESSAGES/django.mo
 django/contrib/auth/locale/ta/LC_MESSAGES/django.po
 django/contrib/auth/locale/te/LC_MESSAGES/django.mo
 django/contrib/auth/locale/te/LC_MESSAGES/django.po
+django/contrib/auth/locale/tg/LC_MESSAGES/django.mo
+django/contrib/auth/locale/tg/LC_MESSAGES/django.po
 django/contrib/auth/locale/th/LC_MESSAGES/django.mo
 django/contrib/auth/locale/th/LC_MESSAGES/django.po
+django/contrib/auth/locale/tk/LC_MESSAGES/django.mo
+django/contrib/auth/locale/tk/LC_MESSAGES/django.po
 django/contrib/auth/locale/tr/LC_MESSAGES/django.mo
 django/contrib/auth/locale/tr/LC_MESSAGES/django.po
 django/contrib/auth/locale/tt/LC_MESSAGES/django.mo
@@ -1298,6 +1363,8 @@ django/contrib/auth/locale/uk/LC_MESSAGES/django.mo
 django/contrib/auth/locale/uk/LC_MESSAGES/django.po
 django/contrib/auth/locale/ur/LC_MESSAGES/django.mo
 django/contrib/auth/locale/ur/LC_MESSAGES/django.po
+django/contrib/auth/locale/uz/LC_MESSAGES/django.mo
+django/contrib/auth/locale/uz/LC_MESSAGES/django.po
 django/contrib/auth/locale/vi/LC_MESSAGES/django.mo
 django/contrib/auth/locale/vi/LC_MESSAGES/django.po
 django/contrib/auth/locale/zh_Hans/LC_MESSAGES/django.mo
@@ -1305,6 +1372,7 @@ django/contrib/auth/locale/zh_Hans/LC_MESSAGES/django.po
 django/contrib/auth/locale/zh_Hant/LC_MESSAGES/django.mo
 django/contrib/auth/locale/zh_Hant/LC_MESSAGES/django.po
 django/contrib/auth/management/__init__.py
+django/contrib/auth/management/commands/__init__.py
 django/contrib/auth/management/commands/changepassword.py
 django/contrib/auth/management/commands/createsuperuser.py
 django/contrib/auth/migrations/0001_initial.py
@@ -1318,6 +1386,7 @@ django/contrib/auth/migrations/0008_alter_user_username_max_length.py
 django/contrib/auth/migrations/0009_alter_user_last_name_max_length.py
 django/contrib/auth/migrations/0010_alter_group_name_max_length.py
 django/contrib/auth/migrations/0011_update_proxy_permissions.py
+django/contrib/auth/migrations/0012_alter_user_first_name_max_length.py
 django/contrib/auth/migrations/__init__.py
 django/contrib/auth/templates/auth/widgets/read_only_password_hash.html
 django/contrib/auth/templates/registration/password_reset_subject.txt
@@ -1333,6 +1402,8 @@ django/contrib/contenttypes/locale/af/LC_MESSAGES/django.mo
 django/contrib/contenttypes/locale/af/LC_MESSAGES/django.po
 django/contrib/contenttypes/locale/ar/LC_MESSAGES/django.mo
 django/contrib/contenttypes/locale/ar/LC_MESSAGES/django.po
+django/contrib/contenttypes/locale/ar_DZ/LC_MESSAGES/django.mo
+django/contrib/contenttypes/locale/ar_DZ/LC_MESSAGES/django.po
 django/contrib/contenttypes/locale/ast/LC_MESSAGES/django.mo
 django/contrib/contenttypes/locale/ast/LC_MESSAGES/django.po
 django/contrib/contenttypes/locale/az/LC_MESSAGES/django.mo
@@ -1431,6 +1502,8 @@ django/contrib/contenttypes/locale/kn/LC_MESSAGES/django.mo
 django/contrib/contenttypes/locale/kn/LC_MESSAGES/django.po
 django/contrib/contenttypes/locale/ko/LC_MESSAGES/django.mo
 django/contrib/contenttypes/locale/ko/LC_MESSAGES/django.po
+django/contrib/contenttypes/locale/ky/LC_MESSAGES/django.mo
+django/contrib/contenttypes/locale/ky/LC_MESSAGES/django.po
 django/contrib/contenttypes/locale/lb/LC_MESSAGES/django.mo
 django/contrib/contenttypes/locale/lb/LC_MESSAGES/django.po
 django/contrib/contenttypes/locale/lt/LC_MESSAGES/django.mo
@@ -1487,8 +1560,12 @@ django/contrib/contenttypes/locale/ta/LC_MESSAGES/django.mo
 django/contrib/contenttypes/locale/ta/LC_MESSAGES/django.po
 django/contrib/contenttypes/locale/te/LC_MESSAGES/django.mo
 django/contrib/contenttypes/locale/te/LC_MESSAGES/django.po
+django/contrib/contenttypes/locale/tg/LC_MESSAGES/django.mo
+django/contrib/contenttypes/locale/tg/LC_MESSAGES/django.po
 django/contrib/contenttypes/locale/th/LC_MESSAGES/django.mo
 django/contrib/contenttypes/locale/th/LC_MESSAGES/django.po
+django/contrib/contenttypes/locale/tk/LC_MESSAGES/django.mo
+django/contrib/contenttypes/locale/tk/LC_MESSAGES/django.po
 django/contrib/contenttypes/locale/tr/LC_MESSAGES/django.mo
 django/contrib/contenttypes/locale/tr/LC_MESSAGES/django.po
 django/contrib/contenttypes/locale/tt/LC_MESSAGES/django.mo
@@ -1506,6 +1583,7 @@ django/contrib/contenttypes/locale/zh_Hans/LC_MESSAGES/django.po
 django/contrib/contenttypes/locale/zh_Hant/LC_MESSAGES/django.mo
 django/contrib/contenttypes/locale/zh_Hant/LC_MESSAGES/django.po
 django/contrib/contenttypes/management/__init__.py
+django/contrib/contenttypes/management/commands/__init__.py
 django/contrib/contenttypes/management/commands/remove_stale_contenttypes.py
 django/contrib/contenttypes/migrations/0001_initial.py
 django/contrib/contenttypes/migrations/0002_remove_content_type_name.py
@@ -1523,6 +1601,8 @@ django/contrib/flatpages/locale/af/LC_MESSAGES/django.mo
 django/contrib/flatpages/locale/af/LC_MESSAGES/django.po
 django/contrib/flatpages/locale/ar/LC_MESSAGES/django.mo
 django/contrib/flatpages/locale/ar/LC_MESSAGES/django.po
+django/contrib/flatpages/locale/ar_DZ/LC_MESSAGES/django.mo
+django/contrib/flatpages/locale/ar_DZ/LC_MESSAGES/django.po
 django/contrib/flatpages/locale/ast/LC_MESSAGES/django.mo
 django/contrib/flatpages/locale/ast/LC_MESSAGES/django.po
 django/contrib/flatpages/locale/az/LC_MESSAGES/django.mo
@@ -1621,6 +1701,8 @@ django/contrib/flatpages/locale/kn/LC_MESSAGES/django.mo
 django/contrib/flatpages/locale/kn/LC_MESSAGES/django.po
 django/contrib/flatpages/locale/ko/LC_MESSAGES/django.mo
 django/contrib/flatpages/locale/ko/LC_MESSAGES/django.po
+django/contrib/flatpages/locale/ky/LC_MESSAGES/django.mo
+django/contrib/flatpages/locale/ky/LC_MESSAGES/django.po
 django/contrib/flatpages/locale/lb/LC_MESSAGES/django.mo
 django/contrib/flatpages/locale/lb/LC_MESSAGES/django.po
 django/contrib/flatpages/locale/lt/LC_MESSAGES/django.mo
@@ -1677,8 +1759,12 @@ django/contrib/flatpages/locale/ta/LC_MESSAGES/django.mo
 django/contrib/flatpages/locale/ta/LC_MESSAGES/django.po
 django/contrib/flatpages/locale/te/LC_MESSAGES/django.mo
 django/contrib/flatpages/locale/te/LC_MESSAGES/django.po
+django/contrib/flatpages/locale/tg/LC_MESSAGES/django.mo
+django/contrib/flatpages/locale/tg/LC_MESSAGES/django.po
 django/contrib/flatpages/locale/th/LC_MESSAGES/django.mo
 django/contrib/flatpages/locale/th/LC_MESSAGES/django.po
+django/contrib/flatpages/locale/tk/LC_MESSAGES/django.mo
+django/contrib/flatpages/locale/tk/LC_MESSAGES/django.po
 django/contrib/flatpages/locale/tr/LC_MESSAGES/django.mo
 django/contrib/flatpages/locale/tr/LC_MESSAGES/django.po
 django/contrib/flatpages/locale/tt/LC_MESSAGES/django.mo
@@ -1820,6 +1906,8 @@ django/contrib/gis/locale/af/LC_MESSAGES/django.mo
 django/contrib/gis/locale/af/LC_MESSAGES/django.po
 django/contrib/gis/locale/ar/LC_MESSAGES/django.mo
 django/contrib/gis/locale/ar/LC_MESSAGES/django.po
+django/contrib/gis/locale/ar_DZ/LC_MESSAGES/django.mo
+django/contrib/gis/locale/ar_DZ/LC_MESSAGES/django.po
 django/contrib/gis/locale/ast/LC_MESSAGES/django.mo
 django/contrib/gis/locale/ast/LC_MESSAGES/django.po
 django/contrib/gis/locale/az/LC_MESSAGES/django.mo
@@ -1918,6 +2006,8 @@ django/contrib/gis/locale/kn/LC_MESSAGES/django.mo
 django/contrib/gis/locale/kn/LC_MESSAGES/django.po
 django/contrib/gis/locale/ko/LC_MESSAGES/django.mo
 django/contrib/gis/locale/ko/LC_MESSAGES/django.po
+django/contrib/gis/locale/ky/LC_MESSAGES/django.mo
+django/contrib/gis/locale/ky/LC_MESSAGES/django.po
 django/contrib/gis/locale/lb/LC_MESSAGES/django.mo
 django/contrib/gis/locale/lb/LC_MESSAGES/django.po
 django/contrib/gis/locale/lt/LC_MESSAGES/django.mo
@@ -1974,6 +2064,8 @@ django/contrib/gis/locale/ta/LC_MESSAGES/django.mo
 django/contrib/gis/locale/ta/LC_MESSAGES/django.po
 django/contrib/gis/locale/te/LC_MESSAGES/django.mo
 django/contrib/gis/locale/te/LC_MESSAGES/django.po
+django/contrib/gis/locale/tg/LC_MESSAGES/django.mo
+django/contrib/gis/locale/tg/LC_MESSAGES/django.po
 django/contrib/gis/locale/th/LC_MESSAGES/django.mo
 django/contrib/gis/locale/th/LC_MESSAGES/django.po
 django/contrib/gis/locale/tr/LC_MESSAGES/django.mo
@@ -1992,6 +2084,8 @@ django/contrib/gis/locale/zh_Hans/LC_MESSAGES/django.mo
 django/contrib/gis/locale/zh_Hans/LC_MESSAGES/django.po
 django/contrib/gis/locale/zh_Hant/LC_MESSAGES/django.mo
 django/contrib/gis/locale/zh_Hant/LC_MESSAGES/django.po
+django/contrib/gis/management/__init__.py
+django/contrib/gis/management/commands/__init__.py
 django/contrib/gis/management/commands/inspectdb.py
 django/contrib/gis/management/commands/ogrinspect.py
 django/contrib/gis/serializers/__init__.py
@@ -2026,6 +2120,8 @@ django/contrib/humanize/locale/af/LC_MESSAGES/django.mo
 django/contrib/humanize/locale/af/LC_MESSAGES/django.po
 django/contrib/humanize/locale/ar/LC_MESSAGES/django.mo
 django/contrib/humanize/locale/ar/LC_MESSAGES/django.po
+django/contrib/humanize/locale/ar_DZ/LC_MESSAGES/django.mo
+django/contrib/humanize/locale/ar_DZ/LC_MESSAGES/django.po
 django/contrib/humanize/locale/ast/LC_MESSAGES/django.mo
 django/contrib/humanize/locale/ast/LC_MESSAGES/django.po
 django/contrib/humanize/locale/az/LC_MESSAGES/django.mo
@@ -2124,6 +2220,8 @@ django/contrib/humanize/locale/kn/LC_MESSAGES/django.mo
 django/contrib/humanize/locale/kn/LC_MESSAGES/django.po
 django/contrib/humanize/locale/ko/LC_MESSAGES/django.mo
 django/contrib/humanize/locale/ko/LC_MESSAGES/django.po
+django/contrib/humanize/locale/ky/LC_MESSAGES/django.mo
+django/contrib/humanize/locale/ky/LC_MESSAGES/django.po
 django/contrib/humanize/locale/lb/LC_MESSAGES/django.mo
 django/contrib/humanize/locale/lb/LC_MESSAGES/django.po
 django/contrib/humanize/locale/lt/LC_MESSAGES/django.mo
@@ -2182,6 +2280,8 @@ django/contrib/humanize/locale/ta/LC_MESSAGES/django.mo
 django/contrib/humanize/locale/ta/LC_MESSAGES/django.po
 django/contrib/humanize/locale/te/LC_MESSAGES/django.mo
 django/contrib/humanize/locale/te/LC_MESSAGES/django.po
+django/contrib/humanize/locale/tg/LC_MESSAGES/django.mo
+django/contrib/humanize/locale/tg/LC_MESSAGES/django.po
 django/contrib/humanize/locale/th/LC_MESSAGES/django.mo
 django/contrib/humanize/locale/th/LC_MESSAGES/django.po
 django/contrib/humanize/locale/tr/LC_MESSAGES/django.mo
@@ -2194,6 +2294,8 @@ django/contrib/humanize/locale/uk/LC_MESSAGES/django.mo
 django/contrib/humanize/locale/uk/LC_MESSAGES/django.po
 django/contrib/humanize/locale/ur/LC_MESSAGES/django.mo
 django/contrib/humanize/locale/ur/LC_MESSAGES/django.po
+django/contrib/humanize/locale/uz/LC_MESSAGES/django.mo
+django/contrib/humanize/locale/uz/LC_MESSAGES/django.po
 django/contrib/humanize/locale/vi/LC_MESSAGES/django.mo
 django/contrib/humanize/locale/vi/LC_MESSAGES/django.po
 django/contrib/humanize/locale/zh_Hans/LC_MESSAGES/django.mo
@@ -2217,6 +2319,7 @@ django/contrib/messages/storage/fallback.py
 django/contrib/messages/storage/session.py
 django/contrib/postgres/__init__.py
 django/contrib/postgres/apps.py
+django/contrib/postgres/constraints.py
 django/contrib/postgres/functions.py
 django/contrib/postgres/indexes.py
 django/contrib/postgres/lookups.py
@@ -2235,7 +2338,6 @@ django/contrib/postgres/fields/array.py
 django/contrib/postgres/fields/citext.py
 django/contrib/postgres/fields/hstore.py
 django/contrib/postgres/fields/jsonb.py
-django/contrib/postgres/fields/mixins.py
 django/contrib/postgres/fields/ranges.py
 django/contrib/postgres/fields/utils.py
 django/contrib/postgres/forms/__init__.py
@@ -2248,6 +2350,8 @@ django/contrib/postgres/locale/af/LC_MESSAGES/django.mo
 django/contrib/postgres/locale/af/LC_MESSAGES/django.po
 django/contrib/postgres/locale/ar/LC_MESSAGES/django.mo
 django/contrib/postgres/locale/ar/LC_MESSAGES/django.po
+django/contrib/postgres/locale/ar_DZ/LC_MESSAGES/django.mo
+django/contrib/postgres/locale/ar_DZ/LC_MESSAGES/django.po
 django/contrib/postgres/locale/az/LC_MESSAGES/django.mo
 django/contrib/postgres/locale/az/LC_MESSAGES/django.po
 django/contrib/postgres/locale/be/LC_MESSAGES/django.mo
@@ -2318,12 +2422,16 @@ django/contrib/postgres/locale/kk/LC_MESSAGES/django.mo
 django/contrib/postgres/locale/kk/LC_MESSAGES/django.po
 django/contrib/postgres/locale/ko/LC_MESSAGES/django.mo
 django/contrib/postgres/locale/ko/LC_MESSAGES/django.po
+django/contrib/postgres/locale/ky/LC_MESSAGES/django.mo
+django/contrib/postgres/locale/ky/LC_MESSAGES/django.po
 django/contrib/postgres/locale/lt/LC_MESSAGES/django.mo
 django/contrib/postgres/locale/lt/LC_MESSAGES/django.po
 django/contrib/postgres/locale/lv/LC_MESSAGES/django.mo
 django/contrib/postgres/locale/lv/LC_MESSAGES/django.po
 django/contrib/postgres/locale/mk/LC_MESSAGES/django.mo
 django/contrib/postgres/locale/mk/LC_MESSAGES/django.po
+django/contrib/postgres/locale/ml/LC_MESSAGES/django.mo
+django/contrib/postgres/locale/ml/LC_MESSAGES/django.po
 django/contrib/postgres/locale/mn/LC_MESSAGES/django.mo
 django/contrib/postgres/locale/mn/LC_MESSAGES/django.po
 django/contrib/postgres/locale/nb/LC_MESSAGES/django.mo
@@ -2354,10 +2462,16 @@ django/contrib/postgres/locale/sr_Latn/LC_MESSAGES/django.mo
 django/contrib/postgres/locale/sr_Latn/LC_MESSAGES/django.po
 django/contrib/postgres/locale/sv/LC_MESSAGES/django.mo
 django/contrib/postgres/locale/sv/LC_MESSAGES/django.po
+django/contrib/postgres/locale/tg/LC_MESSAGES/django.mo
+django/contrib/postgres/locale/tg/LC_MESSAGES/django.po
+django/contrib/postgres/locale/tk/LC_MESSAGES/django.mo
+django/contrib/postgres/locale/tk/LC_MESSAGES/django.po
 django/contrib/postgres/locale/tr/LC_MESSAGES/django.mo
 django/contrib/postgres/locale/tr/LC_MESSAGES/django.po
 django/contrib/postgres/locale/uk/LC_MESSAGES/django.mo
 django/contrib/postgres/locale/uk/LC_MESSAGES/django.po
+django/contrib/postgres/locale/uz/LC_MESSAGES/django.mo
+django/contrib/postgres/locale/uz/LC_MESSAGES/django.po
 django/contrib/postgres/locale/zh_Hans/LC_MESSAGES/django.mo
 django/contrib/postgres/locale/zh_Hans/LC_MESSAGES/django.po
 django/contrib/postgres/locale/zh_Hant/LC_MESSAGES/django.mo
@@ -2372,6 +2486,8 @@ django/contrib/redirects/locale/af/LC_MESSAGES/django.mo
 django/contrib/redirects/locale/af/LC_MESSAGES/django.po
 django/contrib/redirects/locale/ar/LC_MESSAGES/django.mo
 django/contrib/redirects/locale/ar/LC_MESSAGES/django.po
+django/contrib/redirects/locale/ar_DZ/LC_MESSAGES/django.mo
+django/contrib/redirects/locale/ar_DZ/LC_MESSAGES/django.po
 django/contrib/redirects/locale/ast/LC_MESSAGES/django.mo
 django/contrib/redirects/locale/ast/LC_MESSAGES/django.po
 django/contrib/redirects/locale/az/LC_MESSAGES/django.mo
@@ -2472,6 +2588,8 @@ django/contrib/redirects/locale/kn/LC_MESSAGES/django.mo
 django/contrib/redirects/locale/kn/LC_MESSAGES/django.po
 django/contrib/redirects/locale/ko/LC_MESSAGES/django.mo
 django/contrib/redirects/locale/ko/LC_MESSAGES/django.po
+django/contrib/redirects/locale/ky/LC_MESSAGES/django.mo
+django/contrib/redirects/locale/ky/LC_MESSAGES/django.po
 django/contrib/redirects/locale/lb/LC_MESSAGES/django.mo
 django/contrib/redirects/locale/lb/LC_MESSAGES/django.po
 django/contrib/redirects/locale/lt/LC_MESSAGES/django.mo
@@ -2528,8 +2646,12 @@ django/contrib/redirects/locale/ta/LC_MESSAGES/django.mo
 django/contrib/redirects/locale/ta/LC_MESSAGES/django.po
 django/contrib/redirects/locale/te/LC_MESSAGES/django.mo
 django/contrib/redirects/locale/te/LC_MESSAGES/django.po
+django/contrib/redirects/locale/tg/LC_MESSAGES/django.mo
+django/contrib/redirects/locale/tg/LC_MESSAGES/django.po
 django/contrib/redirects/locale/th/LC_MESSAGES/django.mo
 django/contrib/redirects/locale/th/LC_MESSAGES/django.po
+django/contrib/redirects/locale/tk/LC_MESSAGES/django.mo
+django/contrib/redirects/locale/tk/LC_MESSAGES/django.po
 django/contrib/redirects/locale/tr/LC_MESSAGES/django.mo
 django/contrib/redirects/locale/tr/LC_MESSAGES/django.po
 django/contrib/redirects/locale/tt/LC_MESSAGES/django.mo
@@ -2549,6 +2671,7 @@ django/contrib/redirects/locale/zh_Hans/LC_MESSAGES/django.po
 django/contrib/redirects/locale/zh_Hant/LC_MESSAGES/django.mo
 django/contrib/redirects/locale/zh_Hant/LC_MESSAGES/django.po
 django/contrib/redirects/migrations/0001_initial.py
+django/contrib/redirects/migrations/0002_alter_redirect_new_path_help_text.py
 django/contrib/redirects/migrations/__init__.py
 django/contrib/sessions/__init__.py
 django/contrib/sessions/apps.py
@@ -2568,6 +2691,8 @@ django/contrib/sessions/locale/af/LC_MESSAGES/django.mo
 django/contrib/sessions/locale/af/LC_MESSAGES/django.po
 django/contrib/sessions/locale/ar/LC_MESSAGES/django.mo
 django/contrib/sessions/locale/ar/LC_MESSAGES/django.po
+django/contrib/sessions/locale/ar_DZ/LC_MESSAGES/django.mo
+django/contrib/sessions/locale/ar_DZ/LC_MESSAGES/django.po
 django/contrib/sessions/locale/ast/LC_MESSAGES/django.mo
 django/contrib/sessions/locale/ast/LC_MESSAGES/django.po
 django/contrib/sessions/locale/az/LC_MESSAGES/django.mo
@@ -2668,6 +2793,8 @@ django/contrib/sessions/locale/kn/LC_MESSAGES/django.mo
 django/contrib/sessions/locale/kn/LC_MESSAGES/django.po
 django/contrib/sessions/locale/ko/LC_MESSAGES/django.mo
 django/contrib/sessions/locale/ko/LC_MESSAGES/django.po
+django/contrib/sessions/locale/ky/LC_MESSAGES/django.mo
+django/contrib/sessions/locale/ky/LC_MESSAGES/django.po
 django/contrib/sessions/locale/lb/LC_MESSAGES/django.mo
 django/contrib/sessions/locale/lb/LC_MESSAGES/django.po
 django/contrib/sessions/locale/lt/LC_MESSAGES/django.mo
@@ -2724,8 +2851,12 @@ django/contrib/sessions/locale/ta/LC_MESSAGES/django.mo
 django/contrib/sessions/locale/ta/LC_MESSAGES/django.po
 django/contrib/sessions/locale/te/LC_MESSAGES/django.mo
 django/contrib/sessions/locale/te/LC_MESSAGES/django.po
+django/contrib/sessions/locale/tg/LC_MESSAGES/django.mo
+django/contrib/sessions/locale/tg/LC_MESSAGES/django.po
 django/contrib/sessions/locale/th/LC_MESSAGES/django.mo
 django/contrib/sessions/locale/th/LC_MESSAGES/django.po
+django/contrib/sessions/locale/tk/LC_MESSAGES/django.mo
+django/contrib/sessions/locale/tk/LC_MESSAGES/django.po
 django/contrib/sessions/locale/tr/LC_MESSAGES/django.mo
 django/contrib/sessions/locale/tr/LC_MESSAGES/django.po
 django/contrib/sessions/locale/tt/LC_MESSAGES/django.mo
@@ -2744,18 +2875,23 @@ django/contrib/sessions/locale/zh_Hans/LC_MESSAGES/django.mo
 django/contrib/sessions/locale/zh_Hans/LC_MESSAGES/django.po
 django/contrib/sessions/locale/zh_Hant/LC_MESSAGES/django.mo
 django/contrib/sessions/locale/zh_Hant/LC_MESSAGES/django.po
+django/contrib/sessions/management/__init__.py
+django/contrib/sessions/management/commands/__init__.py
 django/contrib/sessions/management/commands/clearsessions.py
 django/contrib/sessions/migrations/0001_initial.py
 django/contrib/sessions/migrations/__init__.py
 django/contrib/sitemaps/__init__.py
 django/contrib/sitemaps/apps.py
 django/contrib/sitemaps/views.py
+django/contrib/sitemaps/management/__init__.py
+django/contrib/sitemaps/management/commands/__init__.py
 django/contrib/sitemaps/management/commands/ping_google.py
 django/contrib/sitemaps/templates/sitemap.xml
 django/contrib/sitemaps/templates/sitemap_index.xml
 django/contrib/sites/__init__.py
 django/contrib/sites/admin.py
 django/contrib/sites/apps.py
+django/contrib/sites/checks.py
 django/contrib/sites/management.py
 django/contrib/sites/managers.py
 django/contrib/sites/middleware.py
@@ -2766,6 +2902,8 @@ django/contrib/sites/locale/af/LC_MESSAGES/django.mo
 django/contrib/sites/locale/af/LC_MESSAGES/django.po
 django/contrib/sites/locale/ar/LC_MESSAGES/django.mo
 django/contrib/sites/locale/ar/LC_MESSAGES/django.po
+django/contrib/sites/locale/ar_DZ/LC_MESSAGES/django.mo
+django/contrib/sites/locale/ar_DZ/LC_MESSAGES/django.po
 django/contrib/sites/locale/ast/LC_MESSAGES/django.mo
 django/contrib/sites/locale/ast/LC_MESSAGES/django.po
 django/contrib/sites/locale/az/LC_MESSAGES/django.mo
@@ -2866,6 +3004,8 @@ django/contrib/sites/locale/kn/LC_MESSAGES/django.mo
 django/contrib/sites/locale/kn/LC_MESSAGES/django.po
 django/contrib/sites/locale/ko/LC_MESSAGES/django.mo
 django/contrib/sites/locale/ko/LC_MESSAGES/django.po
+django/contrib/sites/locale/ky/LC_MESSAGES/django.mo
+django/contrib/sites/locale/ky/LC_MESSAGES/django.po
 django/contrib/sites/locale/lb/LC_MESSAGES/django.mo
 django/contrib/sites/locale/lb/LC_MESSAGES/django.po
 django/contrib/sites/locale/lt/LC_MESSAGES/django.mo
@@ -2922,8 +3062,12 @@ django/contrib/sites/locale/ta/LC_MESSAGES/django.mo
 django/contrib/sites/locale/ta/LC_MESSAGES/django.po
 django/contrib/sites/locale/te/LC_MESSAGES/django.mo
 django/contrib/sites/locale/te/LC_MESSAGES/django.po
+django/contrib/sites/locale/tg/LC_MESSAGES/django.mo
+django/contrib/sites/locale/tg/LC_MESSAGES/django.po
 django/contrib/sites/locale/th/LC_MESSAGES/django.mo
 django/contrib/sites/locale/th/LC_MESSAGES/django.po
+django/contrib/sites/locale/tk/LC_MESSAGES/django.mo
+django/contrib/sites/locale/tk/LC_MESSAGES/django.po
 django/contrib/sites/locale/tr/LC_MESSAGES/django.mo
 django/contrib/sites/locale/tr/LC_MESSAGES/django.po
 django/contrib/sites/locale/tt/LC_MESSAGES/django.mo
@@ -2955,15 +3099,16 @@ django/contrib/staticfiles/testing.py
 django/contrib/staticfiles/urls.py
 django/contrib/staticfiles/utils.py
 django/contrib/staticfiles/views.py
+django/contrib/staticfiles/management/__init__.py
+django/contrib/staticfiles/management/commands/__init__.py
 django/contrib/staticfiles/management/commands/collectstatic.py
 django/contrib/staticfiles/management/commands/findstatic.py
 django/contrib/staticfiles/management/commands/runserver.py
-django/contrib/staticfiles/templatetags/__init__.py
-django/contrib/staticfiles/templatetags/staticfiles.py
 django/contrib/syndication/__init__.py
 django/contrib/syndication/apps.py
 django/contrib/syndication/views.py
 django/core/__init__.py
+django/core/asgi.py
 django/core/exceptions.py
 django/core/paginator.py
 django/core/signals.py
@@ -2980,6 +3125,7 @@ django/core/cache/backends/filebased.py
 django/core/cache/backends/locmem.py
 django/core/cache/backends/memcached.py
 django/core/checks/__init__.py
+django/core/checks/async_checks.py
 django/core/checks/caches.py
 django/core/checks/database.py
 django/core/checks/messages.py
@@ -3004,6 +3150,7 @@ django/core/files/uploadedfile.py
 django/core/files/uploadhandler.py
 django/core/files/utils.py
 django/core/handlers/__init__.py
+django/core/handlers/asgi.py
 django/core/handlers/base.py
 django/core/handlers/exception.py
 django/core/handlers/wsgi.py
@@ -3023,6 +3170,7 @@ django/core/management/color.py
 django/core/management/sql.py
 django/core/management/templates.py
 django/core/management/utils.py
+django/core/management/commands/__init__.py
 django/core/management/commands/check.py
 django/core/management/commands/compilemessages.py
 django/core/management/commands/createcachetable.py
@@ -3050,6 +3198,7 @@ django/core/management/commands/testserver.py
 django/core/serializers/__init__.py
 django/core/serializers/base.py
 django/core/serializers/json.py
+django/core/serializers/jsonl.py
 django/core/serializers/python.py
 django/core/serializers/pyyaml.py
 django/core/serializers/xml_serializer.py
@@ -3087,7 +3236,6 @@ django/db/backends/mysql/validation.py
 django/db/backends/oracle/__init__.py
 django/db/backends/oracle/base.py
 django/db/backends/oracle/client.py
-django/db/backends/oracle/compiler.py
 django/db/backends/oracle/creation.py
 django/db/backends/oracle/features.py
 django/db/backends/oracle/functions.py
@@ -3104,16 +3252,6 @@ django/db/backends/postgresql/features.py
 django/db/backends/postgresql/introspection.py
 django/db/backends/postgresql/operations.py
 django/db/backends/postgresql/schema.py
-django/db/backends/postgresql/utils.py
-django/db/backends/postgresql_psycopg2/__init__.py
-django/db/backends/postgresql_psycopg2/base.py
-django/db/backends/postgresql_psycopg2/client.py
-django/db/backends/postgresql_psycopg2/creation.py
-django/db/backends/postgresql_psycopg2/features.py
-django/db/backends/postgresql_psycopg2/introspection.py
-django/db/backends/postgresql_psycopg2/operations.py
-django/db/backends/postgresql_psycopg2/schema.py
-django/db/backends/postgresql_psycopg2/utils.py
 django/db/backends/sqlite3/__init__.py
 django/db/backends/sqlite3/base.py
 django/db/backends/sqlite3/client.py
@@ -3148,6 +3286,7 @@ django/db/models/base.py
 django/db/models/constants.py
 django/db/models/constraints.py
 django/db/models/deletion.py
+django/db/models/enums.py
 django/db/models/expressions.py
 django/db/models/indexes.py
 django/db/models/lookups.py
@@ -3159,6 +3298,7 @@ django/db/models/signals.py
 django/db/models/utils.py
 django/db/models/fields/__init__.py
 django/db/models/fields/files.py
+django/db/models/fields/json.py
 django/db/models/fields/mixins.py
 django/db/models/fields/proxy.py
 django/db/models/fields/related.py
@@ -3262,6 +3402,7 @@ django/middleware/http.py
 django/middleware/locale.py
 django/middleware/security.py
 django/template/__init__.py
+django/template/autoreload.py
 django/template/base.py
 django/template/context.py
 django/template/context_processors.py
@@ -3311,9 +3452,11 @@ django/urls/utils.py
 django/utils/__init__.py
 django/utils/_os.py
 django/utils/archive.py
+django/utils/asyncio.py
 django/utils/autoreload.py
 django/utils/baseconv.py
 django/utils/cache.py
+django/utils/connection.py
 django/utils/crypto.py
 django/utils/datastructures.py
 django/utils/dateformat.py
@@ -3337,12 +3480,10 @@ django/utils/itercompat.py
 django/utils/jslex.py
 django/utils/log.py
 django/utils/lorem_ipsum.py
-django/utils/lru_cache.py
 django/utils/module_loading.py
 django/utils/numberformat.py
 django/utils/regex_helper.py
 django/utils/safestring.py
-django/utils/six.py
 django/utils/termcolors.py
 django/utils/text.py
 django/utils/timesince.py
@@ -3365,6 +3506,7 @@ django/views/static.py
 django/views/decorators/__init__.py
 django/views/decorators/cache.py
 django/views/decorators/clickjacking.py
+django/views/decorators/common.py
 django/views/decorators/csrf.py
 django/views/decorators/debug.py
 django/views/decorators/gzip.py
@@ -3381,7 +3523,7 @@ django/views/templates/technical_404.html
 django/views/templates/technical_500.html
 django/views/templates/technical_500.txt
 docs/Makefile
-docs/README
+docs/README.rst
 docs/conf.py
 docs/contents.txt
 docs/glossary.txt
@@ -3432,11 +3574,11 @@ docs/howto/custom-file-storage.txt
 docs/howto/custom-lookups.txt
 docs/howto/custom-management-commands.txt
 docs/howto/custom-model-fields.txt
+docs/howto/custom-template-backend.txt
 docs/howto/custom-template-tags.txt
 docs/howto/error-reporting.txt
 docs/howto/index.txt
 docs/howto/initial-data.txt
-docs/howto/jython.txt
 docs/howto/legacy-databases.txt
 docs/howto/outputting-csv.txt
 docs/howto/outputting-pdf.txt
@@ -3444,8 +3586,14 @@ docs/howto/overriding-templates.txt
 docs/howto/upgrade-version.txt
 docs/howto/windows.txt
 docs/howto/writing-migrations.txt
+docs/howto/_images/postmortem.png
+docs/howto/_images/template-lines.png
 docs/howto/deployment/checklist.txt
 docs/howto/deployment/index.txt
+docs/howto/deployment/asgi/daphne.txt
+docs/howto/deployment/asgi/hypercorn.txt
+docs/howto/deployment/asgi/index.txt
+docs/howto/deployment/asgi/uvicorn.txt
 docs/howto/deployment/wsgi/apache-auth.txt
 docs/howto/deployment/wsgi/gunicorn.txt
 docs/howto/deployment/wsgi/index.txt
@@ -3519,6 +3667,7 @@ docs/ref/exceptions.txt
 docs/ref/index.txt
 docs/ref/middleware.txt
 docs/ref/migration-operations.txt
+docs/ref/paginator.txt
 docs/ref/request-response.txt
 docs/ref/schema-editor.txt
 docs/ref/settings.txt
@@ -3589,6 +3738,7 @@ docs/ref/contrib/gis/install/index.txt
 docs/ref/contrib/gis/install/postgis.txt
 docs/ref/contrib/gis/install/spatialite.txt
 docs/ref/contrib/postgres/aggregates.txt
+docs/ref/contrib/postgres/constraints.txt
 docs/ref/contrib/postgres/fields.txt
 docs/ref/contrib/postgres/forms.txt
 docs/ref/contrib/postgres/functions.txt
@@ -3842,8 +3992,48 @@ docs/releases/2.2.7.txt
 docs/releases/2.2.8.txt
 docs/releases/2.2.9.txt
 docs/releases/2.2.txt
+docs/releases/3.0.1.txt
+docs/releases/3.0.10.txt
+docs/releases/3.0.11.txt
+docs/releases/3.0.12.txt
+docs/releases/3.0.13.txt
+docs/releases/3.0.14.txt
+docs/releases/3.0.2.txt
+docs/releases/3.0.3.txt
+docs/releases/3.0.4.txt
+docs/releases/3.0.5.txt
+docs/releases/3.0.6.txt
+docs/releases/3.0.7.txt
+docs/releases/3.0.8.txt
+docs/releases/3.0.9.txt
+docs/releases/3.0.txt
+docs/releases/3.1.1.txt
+docs/releases/3.1.10.txt
+docs/releases/3.1.11.txt
+docs/releases/3.1.12.txt
+docs/releases/3.1.13.txt
+docs/releases/3.1.2.txt
+docs/releases/3.1.3.txt
+docs/releases/3.1.4.txt
+docs/releases/3.1.5.txt
+docs/releases/3.1.6.txt
+docs/releases/3.1.7.txt
+docs/releases/3.1.8.txt
+docs/releases/3.1.9.txt
+docs/releases/3.1.txt
+docs/releases/3.2.1.txt
+docs/releases/3.2.2.txt
+docs/releases/3.2.3.txt
+docs/releases/3.2.4.txt
+docs/releases/3.2.5.txt
+docs/releases/3.2.6.txt
+docs/releases/3.2.7.txt
+docs/releases/3.2.8.txt
+docs/releases/3.2.9.txt
+docs/releases/3.2.txt
 docs/releases/index.txt
 docs/releases/security.txt
+docs/topics/async.txt
 docs/topics/cache.txt
 docs/topics/checks.txt
 docs/topics/conditional-view-processing.txt
@@ -3862,8 +4052,6 @@ docs/topics/settings.txt
 docs/topics/signals.txt
 docs/topics/signing.txt
 docs/topics/templates.txt
-docs/topics/_images/postmortem.png
-docs/topics/_images/template-lines.png
 docs/topics/auth/customizing.txt
 docs/topics/auth/default.txt
 docs/topics/auth/index.txt
@@ -3919,7 +4107,6 @@ extras/README.TXT
 extras/django_bash_completion
 js_tests/tests.html
 js_tests/admin/DateTimeShortcuts.test.js
-js_tests/admin/RelatedObjectLookups.test.js
 js_tests/admin/SelectBox.test.js
 js_tests/admin/SelectFilter2.test.js
 js_tests/admin/URLify.test.js
@@ -3927,10 +4114,7 @@ js_tests/admin/actions.test.js
 js_tests/admin/core.test.js
 js_tests/admin/inlines.test.js
 js_tests/admin/jsi18n-mocks.test.js
-js_tests/admin/timeparse.test.js
 js_tests/gis/mapwidget.test.js
-js_tests/qunit/qunit.css
-js_tests/qunit/qunit.js
 scripts/manage_translations.py
 scripts/rpm-install.sh
 tests/.coveragerc
@@ -3987,7 +4171,9 @@ tests/admin_registration/__init__.py
 tests/admin_registration/models.py
 tests/admin_registration/tests.py
 tests/admin_scripts/__init__.py
+tests/admin_scripts/configured_dynamic_settings_manage.py
 tests/admin_scripts/configured_settings_manage.py
+tests/admin_scripts/test_django_admin_py.py
 tests/admin_scripts/tests.py
 tests/admin_scripts/urls.py
 tests/admin_scripts/another_app_waiting_migration/__init__.py
@@ -4009,6 +4195,8 @@ tests/admin_scripts/broken_app/models.py
 tests/admin_scripts/complex_app/__init__.py
 tests/admin_scripts/complex_app/admin/__init__.py
 tests/admin_scripts/complex_app/admin/foo.py
+tests/admin_scripts/complex_app/management/__init__.py
+tests/admin_scripts/complex_app/management/commands/__init__.py
 tests/admin_scripts/complex_app/management/commands/duplicate.py
 tests/admin_scripts/complex_app/models/__init__.py
 tests/admin_scripts/complex_app/models/bar.py
@@ -4026,6 +4214,8 @@ tests/admin_scripts/custom_templates/project_template/additional_dir/localized.p
 tests/admin_scripts/custom_templates/project_template/additional_dir/requirements.txt
 tests/admin_scripts/custom_templates/project_template/project_name/__init__.py
 tests/admin_scripts/custom_templates/project_template/project_name/settings.py
+tests/admin_scripts/management/__init__.py
+tests/admin_scripts/management/commands/__init__.py
 tests/admin_scripts/management/commands/app_command.py
 tests/admin_scripts/management/commands/base_command.py
 tests/admin_scripts/management/commands/custom_startproject.py
@@ -4033,6 +4223,8 @@ tests/admin_scripts/management/commands/label_command.py
 tests/admin_scripts/management/commands/noargs_command.py
 tests/admin_scripts/simple_app/__init__.py
 tests/admin_scripts/simple_app/models.py
+tests/admin_scripts/simple_app/management/__init__.py
+tests/admin_scripts/simple_app/management/commands/__init__.py
 tests/admin_scripts/simple_app/management/commands/duplicate.py
 tests/admin_utils/__init__.py
 tests/admin_utils/admin.py
@@ -4050,8 +4242,9 @@ tests/admin_views/test_actions.py
 tests/admin_views/test_adminsite.py
 tests/admin_views/test_autocomplete_view.py
 tests/admin_views/test_forms.py
+tests/admin_views/test_history_view.py
 tests/admin_views/test_multidb.py
-tests/admin_views/test_static_deprecation.py
+tests/admin_views/test_nav_sidebar.py
 tests/admin_views/test_templatetags.py
 tests/admin_views/tests.py
 tests/admin_views/urls.py
@@ -4095,10 +4288,32 @@ tests/apps/__init__.py
 tests/apps/apps.py
 tests/apps/models.py
 tests/apps/tests.py
-tests/apps/default_config_app/__init__.py
-tests/apps/default_config_app/apps.py
+tests/apps/explicit_default_config_app/__init__.py
+tests/apps/explicit_default_config_app/apps.py
+tests/apps/explicit_default_config_empty_apps/__init__.py
+tests/apps/explicit_default_config_empty_apps/apps.py
+tests/apps/explicit_default_config_mismatch_app/__init__.py
+tests/apps/explicit_default_config_mismatch_app/apps.py
+tests/apps/explicit_default_config_mismatch_app/not_apps.py
+tests/apps/explicit_default_config_without_apps/__init__.py
 tests/apps/namespace_package_base/nsapp/apps.py
 tests/apps/namespace_package_other_base/nsapp/.keep
+tests/apps/no_config_app/__init__.py
+tests/apps/one_config_app/__init__.py
+tests/apps/one_config_app/apps.py
+tests/apps/two_configs_app/__init__.py
+tests/apps/two_configs_app/apps.py
+tests/apps/two_configs_one_default_app/__init__.py
+tests/apps/two_configs_one_default_app/apps.py
+tests/apps/two_default_configs_app/__init__.py
+tests/apps/two_default_configs_app/apps.py
+tests/asgi/__init__.py
+tests/asgi/tests.py
+tests/asgi/urls.py
+tests/asgi/project/static/file.txt
+tests/async/__init__.py
+tests/async/models.py
+tests/async/tests.py
 tests/auth_tests/__init__.py
 tests/auth_tests/backend_alias.py
 tests/auth_tests/client.py
@@ -4118,8 +4333,8 @@ tests/auth_tests/test_middleware.py
 tests/auth_tests/test_migrations.py
 tests/auth_tests/test_mixins.py
 tests/auth_tests/test_models.py
+tests/auth_tests/test_password_reset_timeout_days.py
 tests/auth_tests/test_remote_user.py
-tests/auth_tests/test_remote_user_deprecation.py
 tests/auth_tests/test_signals.py
 tests/auth_tests/test_templates.py
 tests/auth_tests/test_tokens.py
@@ -4143,6 +4358,7 @@ tests/auth_tests/models/with_custom_email_field.py
 tests/auth_tests/models/with_foreign_key.py
 tests/auth_tests/models/with_integer_username.py
 tests/auth_tests/models/with_last_login_attr.py
+tests/auth_tests/models/with_many_to_many.py
 tests/auth_tests/templates/context_processors/auth_attrs_access.html
 tests/auth_tests/templates/context_processors/auth_attrs_messages.html
 tests/auth_tests/templates/context_processors/auth_attrs_no_access.html
@@ -4167,13 +4383,21 @@ tests/backends/test_utils.py
 tests/backends/tests.py
 tests/backends/base/__init__.py
 tests/backends/base/test_base.py
+tests/backends/base/test_client.py
 tests/backends/base/test_creation.py
 tests/backends/base/test_features.py
+tests/backends/base/test_introspection.py
 tests/backends/base/test_operations.py
 tests/backends/base/test_schema.py
+tests/backends/base/app_unmigrated/__init__.py
+tests/backends/base/app_unmigrated/models.py
+tests/backends/base/app_unmigrated/migrations/0001_initial.py
+tests/backends/base/app_unmigrated/migrations/__init__.py
 tests/backends/mysql/__init__.py
 tests/backends/mysql/test_creation.py
 tests/backends/mysql/test_features.py
+tests/backends/mysql/test_introspection.py
+tests/backends/mysql/test_operations.py
 tests/backends/mysql/test_schema.py
 tests/backends/mysql/tests.py
 tests/backends/oracle/__init__.py
@@ -4184,21 +4408,29 @@ tests/backends/oracle/tests.py
 tests/backends/postgresql/__init__.py
 tests/backends/postgresql/test_creation.py
 tests/backends/postgresql/test_introspection.py
+tests/backends/postgresql/test_operations.py
 tests/backends/postgresql/test_server_side_cursors.py
 tests/backends/postgresql/tests.py
 tests/backends/sqlite/__init__.py
+tests/backends/sqlite/test_creation.py
+tests/backends/sqlite/test_features.py
 tests/backends/sqlite/test_introspection.py
+tests/backends/sqlite/test_operations.py
 tests/backends/sqlite/tests.py
 tests/base/__init__.py
 tests/base/models.py
 tests/bash_completion/__init__.py
 tests/bash_completion/tests.py
+tests/bash_completion/management/__init__.py
+tests/bash_completion/management/commands/__init__.py
 tests/bash_completion/management/commands/test_command.py
 tests/basic/__init__.py
 tests/basic/models.py
 tests/basic/tests.py
 tests/builtin_server/__init__.py
 tests/builtin_server/tests.py
+tests/builtin_server/urls.py
+tests/builtin_server/views.py
 tests/bulk_create/__init__.py
 tests/bulk_create/models.py
 tests/bulk_create/tests.py
@@ -4208,7 +4440,9 @@ tests/cache/liberal_backend.py
 tests/cache/models.py
 tests/cache/tests.py
 tests/check_framework/__init__.py
+tests/check_framework/apps.py
 tests/check_framework/models.py
+tests/check_framework/test_async_checks.py
 tests/check_framework/test_caches.py
 tests/check_framework/test_database.py
 tests/check_framework/test_model_checks.py
@@ -4237,9 +4471,6 @@ tests/check_framework/urls/path_compatibility/__init__.py
 tests/check_framework/urls/path_compatibility/beginning_with_caret.py
 tests/check_framework/urls/path_compatibility/contains_re_named_group.py
 tests/check_framework/urls/path_compatibility/ending_with_dollar.py
-tests/choices/__init__.py
-tests/choices/models.py
-tests/choices/tests.py
 tests/conditional_processing/__init__.py
 tests/conditional_processing/tests.py
 tests/conditional_processing/urls.py
@@ -4306,7 +4537,9 @@ tests/db_functions/tests.py
 tests/db_functions/comparison/__init__.py
 tests/db_functions/comparison/test_cast.py
 tests/db_functions/comparison/test_coalesce.py
+tests/db_functions/comparison/test_collate.py
 tests/db_functions/comparison/test_greatest.py
+tests/db_functions/comparison/test_json_object.py
 tests/db_functions/comparison/test_least.py
 tests/db_functions/comparison/test_nullif.py
 tests/db_functions/datetime/__init__.py
@@ -4330,22 +4563,33 @@ tests/db_functions/math/test_mod.py
 tests/db_functions/math/test_pi.py
 tests/db_functions/math/test_power.py
 tests/db_functions/math/test_radians.py
+tests/db_functions/math/test_random.py
 tests/db_functions/math/test_round.py
+tests/db_functions/math/test_sign.py
 tests/db_functions/math/test_sin.py
 tests/db_functions/math/test_sqrt.py
 tests/db_functions/math/test_tan.py
+tests/db_functions/migrations/0001_setup_extensions.py
+tests/db_functions/migrations/0002_create_test_models.py
+tests/db_functions/migrations/__init__.py
 tests/db_functions/text/__init__.py
 tests/db_functions/text/test_chr.py
 tests/db_functions/text/test_concat.py
 tests/db_functions/text/test_left.py
 tests/db_functions/text/test_length.py
 tests/db_functions/text/test_lower.py
+tests/db_functions/text/test_md5.py
 tests/db_functions/text/test_ord.py
 tests/db_functions/text/test_pad.py
 tests/db_functions/text/test_repeat.py
 tests/db_functions/text/test_replace.py
 tests/db_functions/text/test_reverse.py
 tests/db_functions/text/test_right.py
+tests/db_functions/text/test_sha1.py
+tests/db_functions/text/test_sha224.py
+tests/db_functions/text/test_sha256.py
+tests/db_functions/text/test_sha384.py
+tests/db_functions/text/test_sha512.py
 tests/db_functions/text/test_strindex.py
 tests/db_functions/text/test_substr.py
 tests/db_functions/text/test_trim.py
@@ -4357,9 +4601,12 @@ tests/db_typecasts/tests.py
 tests/db_utils/__init__.py
 tests/db_utils/tests.py
 tests/dbshell/__init__.py
+tests/dbshell/fake_client.py
 tests/dbshell/test_mysql.py
 tests/dbshell/test_oracle.py
 tests/dbshell/test_postgresql.py
+tests/dbshell/test_sqlite.py
+tests/dbshell/tests.py
 tests/decorators/__init__.py
 tests/decorators/tests.py
 tests/defer/__init__.py
@@ -4375,6 +4622,8 @@ tests/delete_regress/__init__.py
 tests/delete_regress/models.py
 tests/delete_regress/tests.py
 tests/deprecation/__init__.py
+tests/deprecation/test_default_hashing_algorithm.py
+tests/deprecation/test_middleware_mixin.py
 tests/deprecation/tests.py
 tests/dispatch/__init__.py
 tests/dispatch/tests.py
@@ -4385,8 +4634,12 @@ tests/empty/__init__.py
 tests/empty/models.py
 tests/empty/tests.py
 tests/empty/no_models/__init__.py
+tests/empty_models/__init__.py
+tests/empty_models/models.py
+tests/empty_models/test_commands.py
 tests/expressions/__init__.py
 tests/expressions/models.py
+tests/expressions/test_deprecation.py
 tests/expressions/test_queryset_values.py
 tests/expressions/tests.py
 tests/expressions_case/__init__.py
@@ -4430,6 +4683,8 @@ tests/filtered_relation/tests.py
 tests/fixtures/__init__.py
 tests/fixtures/models.py
 tests/fixtures/tests.py
+tests/fixtures/fixtures/circular_reference.json
+tests/fixtures/fixtures/circular_reference_natural_key.json
 tests/fixtures/fixtures/db_fixture_1.default.json
 tests/fixtures/fixtures/db_fixture_2.default.json.gz
 tests/fixtures/fixtures/db_fixture_3.nosuchdb.json
@@ -4438,7 +4693,10 @@ tests/fixtures/fixtures/fixture2.json
 tests/fixtures/fixtures/fixture2.xml
 tests/fixtures/fixtures/fixture3.xml
 tests/fixtures/fixtures/fixture4.json.zip
+tests/fixtures/fixtures/fixture5.json.bz2
 tests/fixtures/fixtures/fixture5.json.gz
+tests/fixtures/fixtures/fixture5.json.lzma
+tests/fixtures/fixtures/fixture5.json.xz
 tests/fixtures/fixtures/fixture5.json.zip
 tests/fixtures/fixtures/fixture6.json
 tests/fixtures/fixtures/fixture7.xml
@@ -4446,14 +4704,15 @@ tests/fixtures/fixtures/fixture8.json
 tests/fixtures/fixtures/fixture9.xml
 tests/fixtures/fixtures/fixture_with[special]chars.json
 tests/fixtures/fixtures/forward_reference_fk.json
+tests/fixtures/fixtures/forward_reference_fk_natural_key.json
 tests/fixtures/fixtures/forward_reference_m2m.json
+tests/fixtures/fixtures/forward_reference_m2m_natural_key.json
 tests/fixtures/fixtures/invalid.json
 tests/fixtures/fixtures/null_character_in_field_value.json
 tests/fixtures_model_package/__init__.py
 tests/fixtures_model_package/tests.py
-tests/fixtures_model_package/fixtures/fixture1.json
-tests/fixtures_model_package/fixtures/fixture2.json
-tests/fixtures_model_package/fixtures/fixture2.xml
+tests/fixtures_model_package/fixtures/model_package_fixture1.json
+tests/fixtures_model_package/fixtures/model_package_fixture2.json
 tests/fixtures_model_package/models/__init__.py
 tests/fixtures_regress/__init__.py
 tests/fixtures_regress/models.py
@@ -4485,6 +4744,8 @@ tests/fixtures_regress/fixtures_1/forward_ref_1.json
 tests/fixtures_regress/fixtures_1/inner/absolute.json
 tests/fixtures_regress/fixtures_2/forward_ref_2.json
 tests/flatpages_tests/__init__.py
+tests/flatpages_tests/absolute_urls.py
+tests/flatpages_tests/no_slash_urls.py
 tests/flatpages_tests/settings.py
 tests/flatpages_tests/test_csrf.py
 tests/flatpages_tests/test_forms.py
@@ -4530,6 +4791,7 @@ tests/forms_tests/field_tests/test_floatfield.py
 tests/forms_tests/field_tests/test_genericipaddressfield.py
 tests/forms_tests/field_tests/test_imagefield.py
 tests/forms_tests/field_tests/test_integerfield.py
+tests/forms_tests/field_tests/test_jsonfield.py
 tests/forms_tests/field_tests/test_multiplechoicefield.py
 tests/forms_tests/field_tests/test_multivaluefield.py
 tests/forms_tests/field_tests/test_nullbooleanfield.py
@@ -4601,7 +4863,6 @@ tests/forms_tests/widget_tests/test_timeinput.py
 tests/forms_tests/widget_tests/test_widget.py
 tests/from_db_value/__init__.py
 tests/from_db_value/models.py
-tests/from_db_value/test_deprecated.py
 tests/from_db_value/tests.py
 tests/generic_inline_admin/__init__.py
 tests/generic_inline_admin/admin.py
@@ -4691,6 +4952,7 @@ tests/gis_tests/data/gas_lines/gas_leitung.dbf
 tests/gis_tests/data/gas_lines/gas_leitung.prj
 tests/gis_tests/data/gas_lines/gas_leitung.shp
 tests/gis_tests/data/gas_lines/gas_leitung.shx
+tests/gis_tests/data/has_nulls/has_nulls.geojson
 tests/gis_tests/data/interstates/interstates.dbf
 tests/gis_tests/data/interstates/interstates.prj
 tests/gis_tests/data/interstates/interstates.shp
@@ -4723,6 +4985,7 @@ tests/gis_tests/gdal_tests/test_envelope.py
 tests/gis_tests/gdal_tests/test_geom.py
 tests/gis_tests/gdal_tests/test_raster.py
 tests/gis_tests/gdal_tests/test_srs.py
+tests/gis_tests/gdal_tests/tests.py
 tests/gis_tests/geo3d/__init__.py
 tests/gis_tests/geo3d/models.py
 tests/gis_tests/geo3d/tests.py
@@ -4739,6 +5002,7 @@ tests/gis_tests/geoapp/sitemaps.py
 tests/gis_tests/geoapp/test_expressions.py
 tests/gis_tests/geoapp/test_feeds.py
 tests/gis_tests/geoapp/test_functions.py
+tests/gis_tests/geoapp/test_indexes.py
 tests/gis_tests/geoapp/test_regress.py
 tests/gis_tests/geoapp/test_serializers.py
 tests/gis_tests/geoapp/test_sitemaps.py
@@ -4758,7 +5022,8 @@ tests/gis_tests/geos_tests/test_mutable_list.py
 tests/gis_tests/gis_migrations/__init__.py
 tests/gis_tests/gis_migrations/test_commands.py
 tests/gis_tests/gis_migrations/test_operations.py
-tests/gis_tests/gis_migrations/migrations/0001_initial.py
+tests/gis_tests/gis_migrations/migrations/0001_setup_extensions.py
+tests/gis_tests/gis_migrations/migrations/0002_create_models.py
 tests/gis_tests/gis_migrations/migrations/__init__.py
 tests/gis_tests/inspectapp/__init__.py
 tests/gis_tests/inspectapp/models.py
@@ -4766,10 +5031,12 @@ tests/gis_tests/inspectapp/tests.py
 tests/gis_tests/layermap/__init__.py
 tests/gis_tests/layermap/models.py
 tests/gis_tests/layermap/tests.py
-tests/gis_tests/maps/__init__.py
 tests/gis_tests/rasterapp/__init__.py
 tests/gis_tests/rasterapp/models.py
 tests/gis_tests/rasterapp/test_rasterfield.py
+tests/gis_tests/rasterapp/migrations/0001_setup_extensions.py
+tests/gis_tests/rasterapp/migrations/0002_rastermodels.py
+tests/gis_tests/rasterapp/migrations/__init__.py
 tests/gis_tests/relatedapp/__init__.py
 tests/gis_tests/relatedapp/models.py
 tests/gis_tests/relatedapp/tests.py
@@ -4999,6 +5266,7 @@ tests/messages_tests/test_fallback.py
 tests/messages_tests/test_middleware.py
 tests/messages_tests/test_mixins.py
 tests/messages_tests/test_session.py
+tests/messages_tests/tests.py
 tests/messages_tests/urls.py
 tests/middleware/__init__.py
 tests/middleware/cond_get_urls.py
@@ -5117,6 +5385,10 @@ tests/migrations/test_add_many_to_many_field_initial/0002_initial.py
 tests/migrations/test_add_many_to_many_field_initial/__init__.py
 tests/migrations/test_auto_now_add/0001_initial.py
 tests/migrations/test_auto_now_add/__init__.py
+tests/migrations/test_fake_initial_case_insensitive/fake_initial/0001_initial.py
+tests/migrations/test_fake_initial_case_insensitive/fake_initial/__init__.py
+tests/migrations/test_fake_initial_case_insensitive/initial/0001_initial.py
+tests/migrations/test_fake_initial_case_insensitive/initial/__init__.py
 tests/migrations/test_migrations/0001_initial.py
 tests/migrations/test_migrations/0002_second.py
 tests/migrations/test_migrations/__init__.py
@@ -5133,6 +5405,10 @@ tests/migrations/test_migrations_conflict/0001_initial.py
 tests/migrations/test_migrations_conflict/0002_conflicting_second.py
 tests/migrations/test_migrations_conflict/0002_second.py
 tests/migrations/test_migrations_conflict/__init__.py
+tests/migrations/test_migrations_conflict_long_name/0001_initial.py
+tests/migrations/test_migrations_conflict_long_name/0002_conflicting_second_migration_with_long_name.py
+tests/migrations/test_migrations_conflict_long_name/0002_second.py
+tests/migrations/test_migrations_conflict_long_name/__init__.py
 tests/migrations/test_migrations_custom_user/0001_initial.py
 tests/migrations/test_migrations_custom_user/__init__.py
 tests/migrations/test_migrations_empty/__init__.py
@@ -5144,6 +5420,7 @@ tests/migrations/test_migrations_first/second.py
 tests/migrations/test_migrations_first/thefirst.py
 tests/migrations/test_migrations_initial_false/0001_not_initial.py
 tests/migrations/test_migrations_initial_false/__init__.py
+tests/migrations/test_migrations_namespace_package/0001_initial.py
 tests/migrations/test_migrations_no_ancestor/0001_initial.py
 tests/migrations/test_migrations_no_ancestor/0002_conflicting_second.py
 tests/migrations/test_migrations_no_ancestor/0002_second.py
@@ -5155,6 +5432,8 @@ tests/migrations/test_migrations_no_changes/__init__.py
 tests/migrations/test_migrations_no_default/0001_initial.py
 tests/migrations/test_migrations_no_default/__init__.py
 tests/migrations/test_migrations_no_init/.gitkeep
+tests/migrations/test_migrations_no_operations/0001_initial.py
+tests/migrations/test_migrations_no_operations/__init__.py
 tests/migrations/test_migrations_non_atomic/0001_initial.py
 tests/migrations/test_migrations_non_atomic/__init__.py
 tests/migrations/test_migrations_order/0001.py
@@ -5231,10 +5510,13 @@ tests/migrations2/test_migrations_2_first/0002_second.py
 tests/migrations2/test_migrations_2_first/__init__.py
 tests/migrations2/test_migrations_2_no_deps/0001_initial.py
 tests/migrations2/test_migrations_2_no_deps/__init__.py
+tests/model_enums/__init__.py
+tests/model_enums/tests.py
 tests/model_fields/4x8.png
 tests/model_fields/8x4.png
 tests/model_fields/__init__.py
 tests/model_fields/models.py
+tests/model_fields/test_autofield.py
 tests/model_fields/test_binaryfield.py
 tests/model_fields/test_booleanfield.py
 tests/model_fields/test_charfield.py
@@ -5243,11 +5525,13 @@ tests/model_fields/test_decimalfield.py
 tests/model_fields/test_durationfield.py
 tests/model_fields/test_field_flags.py
 tests/model_fields/test_filefield.py
+tests/model_fields/test_filepathfield.py
 tests/model_fields/test_floatfield.py
 tests/model_fields/test_foreignkey.py
 tests/model_fields/test_genericipaddressfield.py
 tests/model_fields/test_imagefield.py
 tests/model_fields/test_integerfield.py
+tests/model_fields/test_jsonfield.py
 tests/model_fields/test_manytomanyfield.py
 tests/model_fields/test_promises.py
 tests/model_fields/test_slugfield.py
@@ -5281,9 +5565,10 @@ tests/model_inheritance_regress/tests.py
 tests/model_meta/__init__.py
 tests/model_meta/models.py
 tests/model_meta/results.py
-tests/model_meta/test_manager_inheritance_from_future.py
 tests/model_meta/tests.py
 tests/model_options/__init__.py
+tests/model_options/apps.py
+tests/model_options/test_default_pk.py
 tests/model_options/test_default_related_name.py
 tests/model_options/test_tablespaces.py
 tests/model_options/models/__init__.py
@@ -5299,11 +5584,12 @@ tests/model_regress/models.py
 tests/model_regress/test_pickle.py
 tests/model_regress/test_state.py
 tests/model_regress/tests.py
+tests/model_utils/__init__.py
+tests/model_utils/tests.py
 tests/modeladmin/__init__.py
 tests/modeladmin/models.py
 tests/modeladmin/test_actions.py
 tests/modeladmin/test_checks.py
-tests/modeladmin/test_has_add_permission_obj_deprecation.py
 tests/modeladmin/tests.py
 tests/multiple_database/__init__.py
 tests/multiple_database/models.py
@@ -5362,7 +5648,8 @@ tests/postgres_tests/test_hstore.py
 tests/postgres_tests/test_indexes.py
 tests/postgres_tests/test_integration.py
 tests/postgres_tests/test_introspection.py
-tests/postgres_tests/test_json.py
+tests/postgres_tests/test_json_deprecation.py
+tests/postgres_tests/test_operations.py
 tests/postgres_tests/test_ranges.py
 tests/postgres_tests/test_search.py
 tests/postgres_tests/test_signals.py
@@ -5404,6 +5691,8 @@ tests/proxy_models/fixtures/mypeople.json
 tests/queries/__init__.py
 tests/queries/models.py
 tests/queries/test_bulk_update.py
+tests/queries/test_db_returning.py
+tests/queries/test_deprecation.py
 tests/queries/test_explain.py
 tests/queries/test_iterator.py
 tests/queries/test_q.py
@@ -5420,7 +5709,9 @@ tests/redirects_tests/__init__.py
 tests/redirects_tests/tests.py
 tests/redirects_tests/urls.py
 tests/requests/__init__.py
+tests/requests/test_accept_header.py
 tests/requests/test_data_upload_settings.py
+tests/requests/test_is_ajax_deprecations.py
 tests/requests/tests.py
 tests/requirements/mysql.txt
 tests/requirements/oracle.txt
@@ -5464,6 +5755,7 @@ tests/serializers/__init__.py
 tests/serializers/test_data.py
 tests/serializers/test_deserializedobject.py
 tests/serializers/test_json.py
+tests/serializers/test_jsonl.py
 tests/serializers/test_natural.py
 tests/serializers/test_xml.py
 tests/serializers/test_yaml.py
@@ -5487,14 +5779,13 @@ tests/servers/media/example_media_file.txt
 tests/servers/static/example_static_file.txt
 tests/sessions_tests/__init__.py
 tests/sessions_tests/models.py
+tests/sessions_tests/no_clear_expired.py
 tests/sessions_tests/tests.py
 tests/settings_tests/__init__.py
-tests/settings_tests/test_file_charset.py
 tests/settings_tests/tests.py
 tests/shell/__init__.py
 tests/shell/tests.py
 tests/shortcuts/__init__.py
-tests/shortcuts/test_render_to_response.py
 tests/shortcuts/tests.py
 tests/shortcuts/urls.py
 tests/shortcuts/views.py
@@ -5503,6 +5794,7 @@ tests/shortcuts/templates/shortcuts/render_test.html
 tests/shortcuts/templates/shortcuts/using.html
 tests/signals/__init__.py
 tests/signals/models.py
+tests/signals/test_deprecation.py
 tests/signals/tests.py
 tests/signed_cookies_tests/__init__.py
 tests/signed_cookies_tests/tests.py
@@ -5537,10 +5829,10 @@ tests/staticfiles_tests/storage.py
 tests/staticfiles_tests/test_checks.py
 tests/staticfiles_tests/test_finders.py
 tests/staticfiles_tests/test_forms.py
+tests/staticfiles_tests/test_handlers.py
 tests/staticfiles_tests/test_liveserver.py
 tests/staticfiles_tests/test_management.py
 tests/staticfiles_tests/test_storage.py
-tests/staticfiles_tests/test_templatetag_deprecation.py
 tests/staticfiles_tests/test_templatetags.py
 tests/staticfiles_tests/test_utils.py
 tests/staticfiles_tests/test_views.py
@@ -5586,6 +5878,7 @@ tests/staticfiles_tests/project/documents/test/file.txt
 tests/staticfiles_tests/project/faulty/faulty.css
 tests/staticfiles_tests/project/loop/bar.css
 tests/staticfiles_tests/project/loop/foo.css
+tests/staticfiles_tests/project/pathlib/pathlib.txt
 tests/staticfiles_tests/project/prefixed/test.txt
 tests/staticfiles_tests/project/site_media/media/media-file.txt
 tests/staticfiles_tests/project/site_media/static/testfile.txt
@@ -5632,6 +5925,7 @@ tests/template_backends/jinja2/template_backends/django_escaping.html
 tests/template_backends/jinja2/template_backends/hello.html
 tests/template_backends/jinja2/template_backends/syntax_error.html
 tests/template_backends/jinja2/template_backends/syntax_error2.html
+tests/template_backends/jinja2/template_backends/syntax_error_include.html
 tests/template_backends/template_strings/template_backends/csrf.html
 tests/template_backends/template_strings/template_backends/hello.html
 tests/template_backends/templates/template_backends/csrf.html
@@ -5648,6 +5942,7 @@ tests/template_tests/__init__.py
 tests/template_tests/alternate_urls.py
 tests/template_tests/annotated_tag_function.py
 tests/template_tests/broken_tag.py
+tests/template_tests/test_autoreloader.py
 tests/template_tests/test_base.py
 tests/template_tests/test_callables.py
 tests/template_tests/test_context.py
@@ -5754,6 +6049,7 @@ tests/template_tests/relative_templates/dir1/three.html
 tests/template_tests/relative_templates/dir1/two.html
 tests/template_tests/relative_templates/dir1/dir2/inc1.html
 tests/template_tests/relative_templates/dir1/dir2/inc2.html
+tests/template_tests/relative_templates/dir1/dir2/inc3.html
 tests/template_tests/relative_templates/dir1/dir2/include_content.html
 tests/template_tests/relative_templates/dir1/dir2/one.html
 tests/template_tests/syntax_tests/__init__.py
@@ -5794,7 +6090,7 @@ tests/template_tests/syntax_tests/test_width_ratio.py
 tests/template_tests/syntax_tests/test_with.py
 tests/template_tests/syntax_tests/i18n/__init__.py
 tests/template_tests/syntax_tests/i18n/base.py
-tests/template_tests/syntax_tests/i18n/test_blocktrans.py
+tests/template_tests/syntax_tests/i18n/test_blocktranslate.py
 tests/template_tests/syntax_tests/i18n/test_filters.py
 tests/template_tests/syntax_tests/i18n/test_get_available_languages.py
 tests/template_tests/syntax_tests/i18n/test_get_current_language.py
@@ -5802,7 +6098,7 @@ tests/template_tests/syntax_tests/i18n/test_get_current_language_bidi.py
 tests/template_tests/syntax_tests/i18n/test_get_language_info.py
 tests/template_tests/syntax_tests/i18n/test_get_language_info_list.py
 tests/template_tests/syntax_tests/i18n/test_language.py
-tests/template_tests/syntax_tests/i18n/test_trans.py
+tests/template_tests/syntax_tests/i18n/test_translate.py
 tests/template_tests/syntax_tests/i18n/test_underscore_syntax.py
 tests/template_tests/templates/27584_child.html
 tests/template_tests/templates/27584_parent.html
@@ -5868,6 +6164,7 @@ tests/templates/views/urlarticle_form.html
 tests/test_client/__init__.py
 tests/test_client/auth_backends.py
 tests/test_client/test_conditional_content_removal.py
+tests/test_client/test_fakepayload.py
 tests/test_client/tests.py
 tests/test_client/urls.py
 tests/test_client/views.py
@@ -5892,6 +6189,7 @@ tests/test_runner/test_discover_runner.py
 tests/test_runner/test_parallel.py
 tests/test_runner/tests.py
 tests/test_runner_apps/__init__.py
+tests/test_runner_apps/buffer/tests_buffer.py
 tests/test_runner_apps/databases/__init__.py
 tests/test_runner_apps/databases/tests.py
 tests/test_runner_apps/sample/__init__.py
@@ -5908,7 +6206,7 @@ tests/test_runner_apps/tagged/tests.py
 tests/test_runner_apps/tagged/tests_inheritance.py
 tests/test_utils/__init__.py
 tests/test_utils/models.py
-tests/test_utils/test_deprecated_features.py
+tests/test_utils/test_simpletestcase.py
 tests/test_utils/test_testcase.py
 tests/test_utils/test_transactiontestcase.py
 tests/test_utils/tests.py
@@ -5947,6 +6245,7 @@ tests/urlpatterns/included_urls.py
 tests/urlpatterns/more_urls.py
 tests/urlpatterns/path_base64_urls.py
 tests/urlpatterns/path_dynamic_urls.py
+tests/urlpatterns/path_same_name_urls.py
 tests/urlpatterns/path_urls.py
 tests/urlpatterns/test_resolvers.py
 tests/urlpatterns/tests.py
@@ -5994,20 +6293,31 @@ tests/user_commands/models.py
 tests/user_commands/tests.py
 tests/user_commands/urls.py
 tests/user_commands/eggs/basic.egg
+tests/user_commands/management/__init__.py
+tests/user_commands/management/commands/__init__.py
 tests/user_commands/management/commands/common_args.py
 tests/user_commands/management/commands/dance.py
 tests/user_commands/management/commands/hal.py
+tests/user_commands/management/commands/mutually_exclusive_required.py
+tests/user_commands/management/commands/no_system_checks.py
 tests/user_commands/management/commands/no_translations.py
+tests/user_commands/management/commands/outputwrapper.py
+tests/user_commands/management/commands/required_constant_option.py
+tests/user_commands/management/commands/required_list_option.py
 tests/user_commands/management/commands/required_option.py
 tests/user_commands/management/commands/reverse_url.py
 tests/user_commands/management/commands/set_option.py
+tests/user_commands/management/commands/specific_system_checks.py
 tests/user_commands/management/commands/subparser.py
+tests/user_commands/management/commands/subparser_dest.py
+tests/user_commands/management/commands/subparser_required.py
 tests/user_commands/management/commands/transaction.py
 tests/utils_tests/__init__.py
 tests/utils_tests/models.py
 tests/utils_tests/test_archive.py
 tests/utils_tests/test_autoreload.py
 tests/utils_tests/test_baseconv.py
+tests/utils_tests/test_connection.py
 tests/utils_tests/test_crypto.py
 tests/utils_tests/test_datastructures.py
 tests/utils_tests/test_dateformat.py
@@ -6016,6 +6326,7 @@ tests/utils_tests/test_datetime_safe.py
 tests/utils_tests/test_decorators.py
 tests/utils_tests/test_duration.py
 tests/utils_tests/test_encoding.py
+tests/utils_tests/test_encoding_deprecations.py
 tests/utils_tests/test_feedgenerator.py
 tests/utils_tests/test_functional.py
 tests/utils_tests/test_hashable.py
@@ -6039,18 +6350,24 @@ tests/utils_tests/test_timesince.py
 tests/utils_tests/test_timezone.py
 tests/utils_tests/test_topological_sort.py
 tests/utils_tests/test_tree.py
+tests/utils_tests/utils.py
 tests/utils_tests/archives/foobar.tar
 tests/utils_tests/archives/foobar.tar.bz2
 tests/utils_tests/archives/foobar.tar.gz
+tests/utils_tests/archives/foobar.tar.lzma
+tests/utils_tests/archives/foobar.tar.xz
 tests/utils_tests/archives/foobar.zip
 tests/utils_tests/archives/leadpath_foobar.tar
 tests/utils_tests/archives/leadpath_foobar.tar.bz2
 tests/utils_tests/archives/leadpath_foobar.tar.gz
+tests/utils_tests/archives/leadpath_foobar.tar.lzma
+tests/utils_tests/archives/leadpath_foobar.tar.xz
 tests/utils_tests/archives/leadpath_foobar.zip
 tests/utils_tests/eggs/test_egg.egg
 tests/utils_tests/files/strip_tags1.html
 tests/utils_tests/files/strip_tags2.txt
 tests/utils_tests/test_module/__init__.py
+tests/utils_tests/test_module/__main__.py
 tests/utils_tests/test_module/another_bad_module.py
 tests/utils_tests/test_module/another_good_module.py
 tests/utils_tests/test_module/bad_module.py
@@ -6123,6 +6440,8 @@ tests/view_tests/media/subdir/.hidden
 tests/view_tests/media/subdir/visible
 tests/view_tests/templates/jsi18n-multi-catalogs.html
 tests/view_tests/templates/jsi18n.html
+tests/view_tests/templates/my_technical_500.html
+tests/view_tests/templates/my_technical_500.txt
 tests/view_tests/templates/debug/template_error.html
 tests/view_tests/templates/debug/template_exception.html
 tests/view_tests/templatetags/__init__.py
@@ -6130,7 +6449,6 @@ tests/view_tests/templatetags/debugtags.py
 tests/view_tests/tests/__init__.py
 tests/view_tests/tests/test_csrf.py
 tests/view_tests/tests/test_debug.py
-tests/view_tests/tests/test_default_content_type.py
 tests/view_tests/tests/test_defaults.py
 tests/view_tests/tests/test_i18n.py
 tests/view_tests/tests/test_json.py
diff --git a/Django.egg-info/requires.txt b/Django.egg-info/requires.txt
index a1ec2c7..23c0c79 100644
--- a/Django.egg-info/requires.txt
+++ b/Django.egg-info/requires.txt
@@ -1,8 +1,9 @@
+asgiref<4,>=3.3.2
 pytz
 sqlparse>=0.2.2
 
 [argon2]
-argon2-cffi>=16.1.0
+argon2-cffi>=19.1.0
 
 [bcrypt]
 bcrypt
diff --git a/Gruntfile.js b/Gruntfile.js
index 2bf8a10..2d99041 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,4 +1,6 @@
-var globalThreshold = 50;  // Global code coverage threshold (as a percentage)
+'use strict';
+
+const globalThreshold = 50; // Global code coverage threshold (as a percentage)
 
 module.exports = function(grunt) {
     grunt.initConfig({
diff --git a/INSTALL b/INSTALL
index 25ff0ec..7c10946 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,6 +1,6 @@
 Thanks for downloading Django.
 
-To install it, make sure you have Python 3.5 or greater installed. Then run
+To install it, make sure you have Python 3.6 or greater installed. Then run
 this command from the command prompt:
 
     python -m pip install .
diff --git a/LICENSE.python b/LICENSE.python
index d517733..8e1c618 100644
--- a/LICENSE.python
+++ b/LICENSE.python
@@ -24,12 +24,11 @@ software.
 
 In May 2000, Guido and the Python core development team moved to
 BeOpen.com to form the BeOpen PythonLabs team.  In October of the same
-year, the PythonLabs team moved to Digital Creations (now Zope
-Corporation, see http://www.zope.com).  In 2001, the Python Software
-Foundation (PSF, see http://www.python.org/psf/) was formed, a
-non-profit organization created specifically to own Python-related
-Intellectual Property.  Zope Corporation is a sponsoring member of
-the PSF.
+year, the PythonLabs team moved to Digital Creations, which became
+Zope Corporation.  In 2001, the Python Software Foundation (PSF, see
+https://www.python.org/psf/) was formed, a non-profit organization
+created specifically to own Python-related Intellectual Property.
+Zope Corporation was a sponsoring member of the PSF.
 
 All Python releases are Open Source (see http://www.opensource.org for
 the Open Source Definition).  Historically, most, but not all, Python
@@ -85,8 +84,8 @@ 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, 2017, 2018 Python Software Foundation; All
-Rights Reserved" are retained in Python alone or in any derivative version
+2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Python Software Foundation;
+All Rights Reserved" are retained in Python alone or in any derivative version
 prepared by Licensee.
 
 3. In the event Licensee prepares a derivative work that is based on
diff --git a/MANIFEST.in b/MANIFEST.in
index 0e131eb..fecbae3 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -7,7 +7,6 @@ include MANIFEST.in
 include package.json
 include *.rst
 graft django
-prune django/contrib/admin/bin
 graft docs
 graft extras
 graft js_tests
diff --git a/PKG-INFO b/PKG-INFO
index bfed6be..0af8692 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,16 +1,25 @@
 Metadata-Version: 2.1
 Name: Django
+<<<<<<< PKG-INFO
 Version: 2.2.24
+=======
+Version: 3.2.9
+>>>>>>> PKG-INFO
 Summary: A high-level Python Web framework that encourages rapid development and clean, pragmatic design.
 Home-page: https://www.djangoproject.com/
 Author: Django Software Foundation
 Author-email: [e-mail]
-License: BSD
+License: BSD-3-Clause
 Project-URL: Documentation, https://docs.djangoproject.com/
+Project-URL: Release notes, https://docs.djangoproject.com/en/stable/releases/
 Project-URL: Funding, https://www.djangoproject.com/fundraising/
 Project-URL: Source, https://github.com/django/django
 Project-URL: Tracker, https://code.djangoproject.com/
-Description: Django is a high-level Python Web framework that encourages rapid development
+Description: ======
+        Django
+        ======
+        
+        Django is a high-level Python Web framework that encourages rapid development
         and clean, pragmatic design. Thanks for checking it out.
         
         All documentation is in the "``docs``" directory and online at
@@ -38,8 +47,12 @@ Description: Django is a high-level Python Web framework that encourages rapid d
         To get more help:
         
         * Join the ``#django`` channel on ``irc.libera.chat``. Lots of helpful people
+<<<<<<< PKG-INFO
           out there. See https://en.wikipedia.org/wiki/Wikipedia:IRC/Tutorial if you're
           new to IRC.
+=======
+          hang out there. See https://web.libera.chat if you're new to IRC.
+>>>>>>> PKG-INFO
         
         * Join the django-users mailing list, or read the archives, at
           https://groups.google.com/group/django-users.
@@ -55,6 +68,13 @@ Description: Django is a high-level Python Web framework that encourages rapid d
           ``docs/internals/contributing/writing-code/unit-tests.txt``, published online at
           https://docs.djangoproject.com/en/dev/internals/contributing/writing-code/unit-tests/#running-the-unit-tests
         
+        Supporting the Development of Django
+        ====================================
+        
+        Django's development depends on your contributions. 
+        
+        If you depend on Django, remember to support the Django Software Foundation: https://www.djangoproject.com/fundraising/
+        
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Web Environment
@@ -64,17 +84,26 @@ Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.5
+Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: 3.6
 Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
+<<<<<<< PKG-INFO
 Classifier: Programming Language :: Python :: 3 :: Only
+=======
+Classifier: Programming Language :: Python :: 3.10
+>>>>>>> PKG-INFO
 Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
 Classifier: Topic :: Internet :: WWW/HTTP :: WSGI
 Classifier: Topic :: Software Development :: Libraries :: Application Frameworks
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
+<<<<<<< PKG-INFO
 Requires-Python: >=3.5
+=======
+Requires-Python: >=3.6
+Provides-Extra: argon2
+>>>>>>> PKG-INFO
 Provides-Extra: bcrypt
 Provides-Extra: argon2
diff --git a/README.rst b/README.rst
index 6776b7c..c808a45 100644
--- a/README.rst
+++ b/README.rst
@@ -1,3 +1,7 @@
+======
+Django
+======
+
 Django is a high-level Python Web framework that encourages rapid development
 and clean, pragmatic design. Thanks for checking it out.
 
@@ -26,8 +30,12 @@ ticket here: https://code.djangoproject.com/newticket
 To get more help:
 
 * Join the ``#django`` channel on ``irc.libera.chat``. Lots of helpful people
+<<<<<<< README.rst
   out there. See https://en.wikipedia.org/wiki/Wikipedia:IRC/Tutorial if you're
   new to IRC.
+=======
+  hang out there. See https://web.libera.chat if you're new to IRC.
+>>>>>>> README.rst
 
 * Join the django-users mailing list, or read the archives, at
   https://groups.google.com/group/django-users.
@@ -42,3 +50,10 @@ To run Django's test suite:
 * Follow the instructions in the "Unit tests" section of
   ``docs/internals/contributing/writing-code/unit-tests.txt``, published online at
   https://docs.djangoproject.com/en/dev/internals/contributing/writing-code/unit-tests/#running-the-unit-tests
+
+Supporting the Development of Django
+====================================
+
+Django's development depends on your contributions. 
+
+If you depend on Django, remember to support the Django Software Foundation: https://www.djangoproject.com/fundraising/
diff --git a/debian/changelog b/debian/changelog
index 01b2283..879ccc0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,376 @@
+<<<<<<< debian/changelog
+=======
+python-django (2:3.2.9-2ubuntu1) jammy; urgency=medium
+
+  * Merge with Debian unstable (LP: #1946890). Dropped changes:
+    - d/p/test_subparser_regression.patch: Fix test regression (LP: #1945993)
+      [Fixed in 2:3.2.8-1]
+
+ -- Lena Voytek <[e-mail]>  Thu, 18 Nov 2021 10:28:01 -0700
+
+python-django (2:3.2.9-2) unstable; urgency=medium
+
+  * Team upload.
+  * Fix __in lookup crash when combining with filtered aggregates.
+    Fix for: https://code.djangoproject.com/ticket/32690
+    This issue affects src:lava, where work is being done towards Django 3.2
+    compatibility.
+    Upstream patch from:
+    https://github.com/django/django/commit/136ff592ad8aa8b7fa1e61435e5501cc98ce8573
+  * Add Breaks: on lava-server << 2021.11 (Closes: #996931)
+  * Add Breaks: on python-django-pyscss << 2.0.2-10 (Closes: #983618)
+
+ -- Antonio Terceiro <[e-mail]>  Wed, 10 Nov 2021 11:22:48 -0300
+
+python-django (2:3.2.9-1) unstable; urgency=medium
+
+  * New upstream release.
+    <https://docs.djangoproject.com/en/3.2/releases/3.2.9/>
+
+ -- Chris Lamb <[e-mail]>  Mon, 01 Nov 2021 16:13:55 +0000
+
+python-django (2:3.2.8-1) unstable; urgency=medium
+
+  * New upstream bugfix release.
+  * Drop a patch applied upstream.
+  * Bump Standards-Version to 4.6.0.
+
+ -- Chris Lamb <[e-mail]>  Tue, 05 Oct 2021 09:34:57 +0100
+
+python-django (2:3.2.7-4) unstable; urgency=medium
+
+  * Skip a test that is fixed upstream (with a number of overlapping patches).
+
+ -- Chris Lamb <[e-mail]>  Mon, 13 Sep 2021 09:03:27 +0100
+
+python-django (2:3.2.7-3) unstable; urgency=medium
+
+  * Actually upload 3.2 branch to unstable...
+
+ -- Chris Lamb <[e-mail]>  Thu, 09 Sep 2021 17:49:23 +0100
+
+python-django (2:3.2.7-2) experimental; urgency=medium
+
+  * Upload 3.2 branch to unstable.
+
+ -- Chris Lamb <[e-mail]>  Thu, 09 Sep 2021 15:51:11 +0100
+
+python-django (2:3.2.7-1) experimental; urgency=medium
+
+  * New upstream bugfix release.
+
+ -- Chris Lamb <[e-mail]>  Wed, 01 Sep 2021 10:46:07 +0100
+
+python-django (2:3.2.6-1) experimental; urgency=medium
+
+  * New upstream bugfix release.
+    <https://docs.djangoproject.com/en/3.2/releases/3.2.6/>
+  * Bump Standards-Version to 4.5.1.
+
+ -- Chris Lamb <[e-mail]>  Mon, 02 Aug 2021 09:16:21 +0100
+
+python-django (2:3.2.5-2) experimental; urgency=medium
+
+  * Don't symlink /usr/bin/django-admin to "django-admin.py"; ship the script
+    generated by the entry_points system instead, otherwise we introduce a
+    confusing "django-admin.py" deprecation message when using "django-admin".
+    (Closes: #991098)
+
+ -- Chris Lamb <[e-mail]>  Thu, 15 Jul 2021 13:54:57 +0100
+
+python-django (2:3.2.5-1) experimental; urgency=medium
+
+  * New upstream security release:
+
+    - CVE-2021-35042: Potential SQL injection via unsanitized
+      QuerySet.order_by() input.
+
+      Unsanitized user input passed to QuerySet.order_by() could bypass
+      intended column reference validation in path marked for deprecation
+      resulting in a potential SQL injection even if a deprecation warning is
+      emitted. As a mitigation, the strict column reference validation was
+      restored for the duration of the deprecation period. This regression
+      appeared in Django version 3.1 as a side effect of fixing another bug
+      (#31426).
+
+    For more information, please see:
+    <https://www.djangoproject.com/weblog/2021/jul/01/security-releases/>
+
+ -- Chris Lamb <[e-mail]>  Thu, 01 Jul 2021 10:56:07 +0100
+
+python-django (2:3.2.4-1) experimental; urgency=medium
+
+  * New upstream security release. (Closes: #989394)
+
+    - CVE-2021-33203: Potential directory traversal via admindocs
+
+      Staff members could use the admindocs TemplateDetailView view to
+      check the existence of arbitrary files. Additionally, if (and only
+      if) the default admindocs templates have been customized by the
+      developers to also expose the file contents, then not only the
+      existence but also the file contents would have been exposed.
+
+      As a mitigation, path sanitation is now applied and only files
+      within the template root directories can be loaded.
+
+      This issue has low severity, according to the Django security
+      policy.
+
+      Thanks to Rasmus Lerchedahl Petersen and Rasmus Wriedt Larsen from
+      the CodeQL Python team for the report.
+
+    - CVE-2021-33571: Possible indeterminate SSRF, RFI, and LFI attacks
+      since validators accepted leading zeros in IPv4 addresses
+
+      URLValidator, validate_ipv4_address(), and
+      validate_ipv46_address() didn't prohibit leading zeros in octal
+      literals. If you used such values you could suffer from
+      indeterminate SSRF, RFI, and LFI attacks.
+
+      validate_ipv4_address() and validate_ipv46_address() validators
+      were not affected on Python 3.9.5+.
+
+      This issue has medium severity, according to the Django security
+      policy.
+
+  * Bump Standards-Version to 4.5.1.
+
+ -- Chris Lamb <[e-mail]>  Wed, 02 Jun 2021 16:08:13 +0100
+
+python-django (2:3.2.3-1) experimental; urgency=medium
+
+  * New upstream release.
+    <https://docs.djangoproject.com/en/3.2/releases/3.2.3/>
+
+ -- Chris Lamb <[e-mail]>  Thu, 13 May 2021 10:25:49 +0100
+
+python-django (2:3.2.2-1) experimental; urgency=medium
+
+  * New upstream security release:
+    - CVE-2021-32052: Header injection possibility since URLValidator accepted
+      newlines in input on Python 3.9.5+. (Closes: #988136)
+    - Full release notes:
+      <https://www.djangoproject.com/weblog/2021/may/06/security-releases/>
+
+ -- Chris Lamb <[e-mail]>  Thu, 06 May 2021 13:04:03 +0100
+
+python-django (2:3.2.1-1) experimental; urgency=medium
+
+  * New upstream security release:
+    - CVE-2021-31542: Potential directory-traversal via uploaded files.
+      (Closes: #988053)
+    - Full release notes:
+      <https://www.djangoproject.com/weblog/2021/may/04/security-releases/>
+  * Refresh patches.
+
+ -- Chris Lamb <[e-mail]>  Tue, 04 May 2021 12:59:07 +0100
+
+python-django (2:3.2-1) experimental; urgency=medium
+
+  * New upstream major release:
+
+    - Full release notes: <https://docs.djangoproject.com/en/3.2/releases/3.2/>
+    - CVE-2021-28658: The MultiPartParser class allowed directory-traversal
+      via uploaded files via maliciously crafted filenames. (Closes: #986447)
+
+ -- Chris Lamb <[e-mail]>  Tue, 06 Apr 2021 11:38:48 +0100
+
+python-django (2:3.2~rc1-1) experimental; urgency=medium
+
+  * New upstream release candidate.
+    <https://www.djangoproject.com/weblog/2021/mar/18/django-32-rc1/#s-id5>
+  * Refresh patches.
+
+ -- Chris Lamb <[e-mail]>  Fri, 19 Mar 2021 09:56:40 +0000
+
+python-django (2:3.2~beta1-1) experimental; urgency=medium
+
+  * New upstream beta release.
+    <https://www.djangoproject.com/weblog/2021/feb/19/django-32-beta-1-released/>
+  * Apply wrap-and-sort -sa.
+
+ -- Chris Lamb <[e-mail]>  Fri, 19 Feb 2021 16:13:21 +0000
+
+python-django (2:3.2~alpha1-2) experimental; urgency=medium
+
+  * Apply security fix from upstream:
+
+    - CVE-2021-23336: Prevent a web cache poisoning attack via "parameter
+      cloaking". Django contains a copy of urllib.parse.parse_qsl() which was
+      added to backport some security fixes. A further security fix has been
+      issued recently such that parse_qsl() no longer allows using ";" as a
+      query parameter separator by default. (Closes: #983090)
+
+    <https://www.djangoproject.com/weblog/2021/feb/19/security-releases/>
+
+ -- Chris Lamb <[e-mail]>  Fri, 19 Feb 2021 09:28:42 +0000
+
+python-django (2:3.2~alpha1-1) experimental; urgency=medium
+
+  * New upstream alpha release.
+    <https://www.djangoproject.com/weblog/2021/jan/19/django-32-alpha-1-released/>
+  * Refresh patches.
+  * Drop no-upstream-changelog overrides; removed from Lintian.
+
+ -- Chris Lamb <[e-mail]>  Wed, 20 Jan 2021 09:27:49 +0000
+
+python-django (2:3.1.5-1) experimental; urgency=medium
+
+  * New upstream bugfix release.
+    <https://docs.djangoproject.com/en/3.1/releases/3.1.5/>
+
+ -- Chris Lamb <[e-mail]>  Mon, 04 Jan 2021 12:45:20 +0000
+
+python-django (2:3.1.4-1) experimental; urgency=medium
+
+  * New upstream bugfix release.
+    <https://docs.djangoproject.com/en/3.1/releases/3.1.4/>
+  * Bump Standards-Version to 4.5.1.
+
+ -- Chris Lamb <[e-mail]>  Tue, 01 Dec 2020 11:25:32 +0000
+
+python-django (2:3.1.3-1) experimental; urgency=medium
+
+  * New upstream bugfix release.
+    <https://docs.djangoproject.com/en/stable/releases/3.1.3/>
+
+ -- Chris Lamb <[e-mail]>  Tue, 03 Nov 2020 11:59:29 +0000
+
+python-django (2:3.1.2-1) experimental; urgency=medium
+
+  * New upstream bugfix release.
+    <https://www.djangoproject.com/weblog/2020/oct/01/django-bugfix-release-312/>
+  * Update Maintainer field with new Debian Python Team contact address.
+  * Update Vcs-* fields with new Debian Python Team Salsa layout.
+
+ -- Chris Lamb <[e-mail]>  Thu, 01 Oct 2020 10:06:16 +0100
+
+python-django (2:3.1.1-1) experimental; urgency=medium
+
+  * New upstream security release to address CVE-2020-24583, CVE-2020-24584.
+    (Closes: #969367)
+    <https://www.djangoproject.com/weblog/2020/sep/01/security-releases/>
+
+ -- Chris Lamb <[e-mail]>  Tue, 01 Sep 2020 12:32:23 +0100
+
+python-django (2:3.1-2) experimental; urgency=medium
+
+  * Set the PYTHONPATH in the autopkgtests in the same way that we do in
+    debian/rules. (Closes: #968577)
+
+ -- Chris Lamb <[e-mail]>  Mon, 17 Aug 2020 23:11:30 +0100
+
+python-django (2:3.1-1) experimental; urgency=medium
+
+  * New upstream release.
+    <https://docs.djangoproject.com/en/3.1/releases/3.1/>
+
+ -- Chris Lamb <[e-mail]>  Tue, 04 Aug 2020 10:11:43 +0100
+
+python-django (2:3.1~rc1-1) experimental; urgency=medium
+
+  * New upstream release candidate release.
+    <https://www.djangoproject.com/weblog/2020/jul/20/django-31-release-candidate-1-released/>
+
+ -- Chris Lamb <[e-mail]>  Mon, 20 Jul 2020 11:43:40 +0100
+
+python-django (2:3.1~beta1-1) experimental; urgency=medium
+
+  * New upstream beta release.
+    <https://www.djangoproject.com/weblog/2020/jun/15/django-31-beta-1-released/>
+  * Refresh patches.
+
+ -- Chris Lamb <[e-mail]>  Mon, 15 Jun 2020 11:30:39 +0100
+
+python-django (2:3.0.7-2) experimental; urgency=medium
+
+  * Fix a regression in the handling of CVE-2020-13596.
+  * Refresh patches.
+
+ -- Chris Lamb <[e-mail]>  Sat, 13 Jun 2020 15:15:34 +0100
+
+python-django (2:3.0.7-1) experimental; urgency=medium
+
+  * New upstream security release.
+    <https://www.djangoproject.com/weblog/2020/jun/03/security-releases/>
+
+ -- Chris Lamb <[e-mail]>  Wed, 03 Jun 2020 21:16:00 +0100
+
+python-django (2:3.0.6-1) experimental; urgency=medium
+
+  * New upstream bugfix release.
+    <https://docs.djangoproject.com/en/3.0/releases/3.0.6/>
+
+ -- Chris Lamb <[e-mail]>  Mon, 04 May 2020 19:33:25 +0100
+
+python-django (2:3.0.5-1) experimental; urgency=medium
+
+  * New upstream release.
+    <https://docs.djangoproject.com/en/3.0/releases/3.0.5/>
+  * Refresh all patches.
+
+ -- Chris Lamb <[e-mail]>  Wed, 01 Apr 2020 10:35:42 +0100
+
+python-django (2:3.0.4-1) experimental; urgency=medium
+
+  * New upstream security release. (Closes: #953102)
+    <https://www.djangoproject.com/weblog/2020/mar/04/security-releases/>
+  * Bump Standards-Version to 4.5.0.
+  * Refresh debian/patches/0004-Use-locally-installed-documentation-sources.patch.
+
+ -- Chris Lamb <[e-mail]>  Wed, 04 Mar 2020 08:22:30 -0800
+
+python-django (2:3.0.2-1) experimental; urgency=medium
+
+  * New upstream bugfix release.
+    <https://www.djangoproject.com/weblog/2020/jan/02/django-bugfix-release-302/>
+  * Add python3-selenium to test-dependencies and to a runtime "Suggests".
+    (Closes: #947549)
+
+ -- Chris Lamb <[e-mail]>  Thu, 02 Jan 2020 10:52:39 +0000
+
+python-django (2:3.0.1-1) experimental; urgency=medium
+
+  * New upstream security release.
+    <https://www.djangoproject.com/weblog/2019/dec/18/security-releases/>
+    (Closes: #946937)
+
+ -- Chris Lamb <[e-mail]>  Mon, 30 Dec 2019 10:44:01 +0000
+
+python-django (2:3.0-1) experimental; urgency=medium
+
+  * New upstream release.
+    <https://www.djangoproject.com/weblog/2019/dec/02/django-3-released/>
+
+ -- Chris Lamb <[e-mail]>  Mon, 02 Dec 2019 12:24:50 +0000
+
+python-django (2:3.0~rc1-1) experimental; urgency=medium
+
+  * New upstream release candidate release.
+    <https://www.djangoproject.com/weblog/2019/nov/18/django-30-release-candidate-1-released/>
+
+ -- Chris Lamb <[e-mail]>  Mon, 18 Nov 2019 11:25:38 -0500
+
+python-django (2:3.0~beta1-1) experimental; urgency=medium
+
+  * New upstream beta release.
+    <https://www.djangoproject.com/weblog/2019/oct/14/django-30-beta-1-released/>
+  * Bump Standards-Version to 4.4.1.
+  * wrap-and-sort -sa.
+
+ -- Chris Lamb <[e-mail]>  Mon, 14 Oct 2019 11:11:10 -0700
+
+python-django (2:3.0~alpha1-1) experimental; urgency=medium
+
+  * New upstream alpha release.
+    <https://www.djangoproject.com/weblog/2019/sep/10/django-30-alpha-1-released/>
+  * Refresh all patches.
+  * Add asgiref to build and runtime dependencies.
+  * Update debian/copyright.
+
+ -- Chris Lamb <[e-mail]>  Tue, 10 Sep 2019 11:22:45 +0100
+
+>>>>>>> debian/changelog
 python-django (2:2.2.24-1ubuntu1) impish; urgency=medium
 
   * d/p/test_subparser_regression.patch: Fix test regression (LP: #1945993)
diff --git a/debian/control b/debian/control
index 4d6f99d..c1930ed 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,11 @@ Uploaders:
  Raphaël Hertzog <[e-mail]>,
  Brian May <[e-mail]>,
  Chris Lamb <[e-mail]>,
+<<<<<<< debian/control
 Standards-Version: 4.5.1
+=======
+Standards-Version: 4.6.0
+>>>>>>> debian/control
 Build-Depends:
  debhelper-compat (= 13),
  dh-python,
@@ -18,6 +22,7 @@ Build-Depends:
  python-django-formtools-doc <!nodoc>,
  python-psycopg2-doc <!nodoc>,
  python3-all,
+ python3-asgiref <!nocheck>,
  python3-bcrypt <!nocheck>,
  python3-doc <!nodoc>,
  python3-docutils <!nodoc>,
@@ -50,7 +55,10 @@ Breaks:
  python-django-common,
  python3-django-filters (<< 2.1.0),
  python3-mysqldb (<< 1.3.13),
+ lava-server (<< 2021.11),
+ python3-django-pyscss (<< 2.0.2-10~),
 Depends:
+ python3-asgiref,
  ${misc:Depends},
  ${python3:Depends},
 Recommends:
diff --git a/debian/copyright b/debian/copyright
index a310c48..e6b2edf 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -51,14 +51,6 @@ Files: django/utils/ipv6.py
 Copyright: 2007 Google Inc.
 License: Apache-2.0
 
-Files: django/utils/lru_cache.py
-Copyright: 2012 Raymond Hettinger
-License: Expat
-
-Files: django/utils/six.py
-Copyright: 2010-2015 Benjamin Peterson
-License: Expat
-
 Files: django/utils/autoreload.py
 Copyright: 2004 CherryPy Team <[e-mail]>, 2008 Ian Bicking
 Comment: "NAME" is the CherryPy Team. Also, quoting the source code:
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 114ce39..3dfdaa2 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,5 +1,5 @@
 [DEFAULT]
-upstream-branch=upstream/2.0.x
+upstream-branch=upstream/3.x
 debian-branch=debian/sid
 pristine-tar=True
 
diff --git a/debian/patches/0001-disable-sources-in-sphinxdoc.diff b/debian/patches/0001-disable-sources-in-sphinxdoc.diff
index a7eb740..596cc77 100644
--- a/debian/patches/0001-disable-sources-in-sphinxdoc.diff
+++ b/debian/patches/0001-disable-sources-in-sphinxdoc.diff
@@ -15,10 +15,17 @@ Patch-Name: 02_disable-sources-in-sphinxdoc.diff
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/docs/conf.py b/docs/conf.py
+<<<<<<< debian/patches/0001-disable-sources-in-sphinxdoc.diff
 index 9526cc411bab..9cbac4ad2804 100644
 --- a/docs/conf.py
 +++ b/docs/conf.py
 @@ -210,7 +210,10 @@ html_additional_pages = {}
+=======
+index f7a690953ff5..1ef211981cb3 100644
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -217,7 +217,10 @@ html_additional_pages = {}
+>>>>>>> debian/patches/0001-disable-sources-in-sphinxdoc.diff
  # html_split_index = False
  
  # If true, links to the reST sources are added to the pages.
diff --git a/debian/patches/0002-use_debian_geoip_database_as_default.diff b/debian/patches/0002-use_debian_geoip_database_as_default.diff
index e910849..e20522c 100644
--- a/debian/patches/0002-use_debian_geoip_database_as_default.diff
+++ b/debian/patches/0002-use_debian_geoip_database_as_default.diff
@@ -15,7 +15,7 @@ Patch-Name: 06_use_debian_geoip_database_as_default.diff
  1 file changed, 6 insertions(+), 3 deletions(-)
 
 diff --git a/django/contrib/gis/geoip2/base.py b/django/contrib/gis/geoip2/base.py
-index b098632d39b3..7cdf81aad598 100644
+index 6b35a8acdc42..ff6141bdcc5b 100644
 --- a/django/contrib/gis/geoip2/base.py
 +++ b/django/contrib/gis/geoip2/base.py
 @@ -53,6 +53,7 @@ class GeoIP2:
@@ -46,8 +46,8 @@ index b098632d39b3..7cdf81aad598 100644
 +        path = path or GEOIP_SETTINGS.get('GEOIP_PATH', '/usr/share/GeoIP')
          if not path:
              raise GeoIP2Exception('GeoIP path must be provided via parameter or the GEOIP_PATH setting.')
-         if not isinstance(path, str):
-@@ -84,12 +87,12 @@ class GeoIP2:
+ 
+@@ -82,12 +85,12 @@ class GeoIP2:
              # Constructing the GeoIP database filenames using the settings
              # dictionary. If the database files for the GeoLite country
              # and/or city datasets exist, then try to open them.
diff --git a/debian/patches/0004-Set-the-default-shebang-to-new-projects-to-use-Pytho.patch b/debian/patches/0004-Set-the-default-shebang-to-new-projects-to-use-Pytho.patch
index 71e54c3..25d142b 100644
--- a/debian/patches/0004-Set-the-default-shebang-to-new-projects-to-use-Pytho.patch
+++ b/debian/patches/0004-Set-the-default-shebang-to-new-projects-to-use-Pytho.patch
@@ -7,7 +7,7 @@ Subject: Set the default shebang to new projects to use Python 3.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/django/conf/project_template/manage.py-tpl b/django/conf/project_template/manage.py-tpl
-index 9525fd7ac703..d5d5607bad93 100755
+index a628884dc80b..50920a0df19b 100755
 --- a/django/conf/project_template/manage.py-tpl
 +++ b/django/conf/project_template/manage.py-tpl
 @@ -1,4 +1,4 @@
diff --git a/debian/patches/0004-Use-locally-installed-documentation-sources.patch b/debian/patches/0004-Use-locally-installed-documentation-sources.patch
index 44d7977..17115a8 100644
--- a/debian/patches/0004-Use-locally-installed-documentation-sources.patch
+++ b/debian/patches/0004-Use-locally-installed-documentation-sources.patch
@@ -7,16 +7,23 @@ Subject: Use locally installed documentation sources
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/docs/conf.py b/docs/conf.py
+<<<<<<< debian/patches/0004-Use-locally-installed-documentation-sources.patch
 index 9cbac4ad2804..803f00078109 100644
 --- a/docs/conf.py
 +++ b/docs/conf.py
 @@ -140,9 +140,9 @@ pygments_style = 'trac'
+=======
+index 1ef211981cb3..da1eea251f91 100644
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -147,9 +147,9 @@ pygments_style = 'trac'
+>>>>>>> debian/patches/0004-Use-locally-installed-documentation-sources.patch
  # Links to Python's docs should reference the most recent version of the 3.x
  # branch, which is located at this URL.
  intersphinx_mapping = {
 -    'python': ('https://docs.python.org/3/', None),
--    'sphinx': ('http://www.sphinx-doc.org/en/master/', None),
--    'psycopg2': ('http://initd.org/psycopg/docs/', None),
+-    'sphinx': ('https://www.sphinx-doc.org/en/master/', None),
+-    'psycopg2': ('https://www.psycopg.org/docs/', None),
 +    'python': ('/usr/share/doc/python3-doc/html/', None),
 +    'sphinx': ('/usr/share/doc/sphinx-doc/html/', None),
 +    'psycopg2': ('/usr/share/doc/python-psycopg2-doc/html/', None),
diff --git a/debian/patches/0005-Use-usr-bin-env-python3-shebang-for-django-admin.py.patch b/debian/patches/0005-Use-usr-bin-env-python3-shebang-for-django-admin.py.patch
index c30be2c..f115e3d 100644
--- a/debian/patches/0005-Use-usr-bin-env-python3-shebang-for-django-admin.py.patch
+++ b/debian/patches/0005-Use-usr-bin-env-python3-shebang-for-django-admin.py.patch
@@ -7,12 +7,12 @@ Subject: Use #!/usr/bin/env python3 shebang for django-admin.py.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/django/bin/django-admin.py b/django/bin/django-admin.py
-index f518cdc463eb..53c32d657371 100755
+index 594b0f11db53..898788e66b77 100755
 --- a/django/bin/django-admin.py
 +++ b/django/bin/django-admin.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
- from django.core import management
+ # When the django-admin.py deprecation ends, remove this script.
+ import warnings
  
- if __name__ == "__main__":
diff --git a/debian/patches/0006-Fixed-32690-Fixed-__in-lookup-crash-when-combining-w.patch b/debian/patches/0006-Fixed-32690-Fixed-__in-lookup-crash-when-combining-w.patch
 new file mode 100644
index 0000000..137b7be
--- /dev/null
+++ b/debian/patches/0006-Fixed-32690-Fixed-__in-lookup-crash-when-combining-w.patch
@@ -0,0 +1,57 @@
+From: Simon Charette <[e-mail]>
+Date: Tue, 4 May 2021 23:42:52 -0400
+Subject: Fixed #32690 -- Fixed __in lookup crash when combining with filtered
+ aggregates.
+
+Having lookups group by subquery right-hand-sides is likely unnecessary
+in the first place but relatively large amount of work would be needed
+to achieve that such as making Lookup instances proper resolvable
+expressions.
+
+Regression in 35431298226165986ad07e91f9d3aca721ff38ec.
+
+Thanks James A. Munsch for the report.
+---
+ django/db/models/lookups.py        | 9 +++++++++
+ tests/aggregation_regress/tests.py | 8 ++++++++
+ 2 files changed, 17 insertions(+)
+
+diff --git a/django/db/models/lookups.py b/django/db/models/lookups.py
+index 43f40c24ec1f..82f149750ea6 100644
+--- a/django/db/models/lookups.py
++++ b/django/db/models/lookups.py
+@@ -402,6 +402,15 @@ class In(FieldGetDbPrepValueIterableMixin, BuiltinLookup):
+                 self.rhs.add_fields(['pk'])
+             return super().process_rhs(compiler, connection)
+ 
++    def get_group_by_cols(self, alias=None):
++        cols = self.lhs.get_group_by_cols()
++        if hasattr(self.rhs, 'get_group_by_cols'):
++            if not getattr(self.rhs, 'has_select_fields', True):
++                self.rhs.clear_select_clause()
++                self.rhs.add_fields(['pk'])
++            cols.extend(self.rhs.get_group_by_cols())
++        return cols
++
+     def get_rhs_op(self, connection, rhs):
+         return 'IN %s' % rhs
+ 
+diff --git a/tests/aggregation_regress/tests.py b/tests/aggregation_regress/tests.py
+index 877e7b49a7c8..5d841b166a35 100644
+--- a/tests/aggregation_regress/tests.py
++++ b/tests/aggregation_regress/tests.py
+@@ -1525,6 +1525,14 @@ class AggregationTests(TestCase):
+             allow_distinct = True
+         DistinctAggregate('foo', distinct=True)
+ 
++    @skipUnlessDBFeature('supports_subqueries_in_group_by')
++    def test_having_subquery_select(self):
++        authors = Author.objects.filter(pk=self.a1.pk)
++        books = Book.objects.annotate(Count('authors')).filter(
++            Q(authors__in=authors) | Q(authors__count__gt=2)
++        )
++        self.assertEqual(set(books), {self.b1, self.b4})
++
+ 
+ class JoinPromotionTests(TestCase):
+     def test_ticket_21150(self):
diff --git a/debian/patches/series b/debian/patches/series
index 08cb34f..d369411 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,8 @@
 0004-Use-locally-installed-documentation-sources.patch
 0004-Set-the-default-shebang-to-new-projects-to-use-Pytho.patch
 0005-Use-usr-bin-env-python3-shebang-for-django-admin.py.patch
+<<<<<<< debian/patches/series
 0006-test-subparser-regression.patch
+=======
+0006-Fixed-32690-Fixed-__in-lookup-crash-when-combining-w.patch
+>>>>>>> debian/patches/series
diff --git a/debian/python-django-doc.lintian-overrides b/debian/python-django-doc.lintian-overrides
 deleted file mode 100644
index ee7fa27..0000000
--- a/debian/python-django-doc.lintian-overrides
+++ /dev/null
@@ -1,4 +0,0 @@
-# We ship upstream's comprehensive, referenced and hyperlinked upstream
-# changelog under /usr/share/docwhich we would be doing a disservice to our
-# users by duplicating elsewhere.
-python-django-doc: no-upstream-changelog
diff --git a/debian/python-django.lintian-overrides b/debian/python-django.lintian-overrides
 deleted file mode 100644
index 243f97b..0000000
--- a/debian/python-django.lintian-overrides
+++ /dev/null
@@ -1,4 +0,0 @@
-# We ship upstream's comprehensive, referenced and hyperlinked upstream
-# changelog in python-django-doc which we would be doing a disservice to our
-# users by duplicating here.
-python-django: no-upstream-changelog
diff --git a/debian/python3-django.links b/debian/python3-django.links
 deleted file mode 100644
index ef4f565..0000000
--- a/debian/python3-django.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/python3/dist-packages/django/bin/django-admin.py usr/bin/django-admin
diff --git a/debian/python3-django.lintian-overrides b/debian/python3-django.lintian-overrides
 deleted file mode 100644
index e03289e..0000000
--- a/debian/python3-django.lintian-overrides
+++ /dev/null
@@ -1,4 +0,0 @@
-# We ship upstream's comprehensive, referenced and hyperlinked upstream
-# changelog in python-django-doc which we would be doing a disservice to our
-# users by duplicating here.
-python3-django: no-upstream-changelog
diff --git a/debian/watch b/debian/watch
index a367f77..ee5eb0b 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,7 @@
 version=4
 opts=filenamemangle=s/.*\/download\/(.*)\/tarball\//Django-$1.tar.gz/,uversionmangle=s/a(?=\d$)/alpha/;s/b(?=\d$)/beta/;s/(alpha|beta|rc)/~$1/ \
+<<<<<<< debian/watch
     https://www.djangoproject.com/download/ .*/(2[^/]+)/tarball/
+=======
+    https://www.djangoproject.com/download/ .*/(3[^/]+)/tarball/
+>>>>>>> debian/watch
diff --git a/django/__init__.py b/django/__init__.py
index 7963a36..dae16e0 100644
--- a/django/__init__.py
+++ b/django/__init__.py
@@ -1,6 +1,10 @@
 from django.utils.version import get_version
 
+<<<<<<< django/__init__.py
 VERSION = (2, 2, 24, 'final', 0)
+=======
+VERSION = (3, 2, 9, 'final', 0)
+>>>>>>> django/__init__.py
 
 __version__ = get_version(VERSION)
 
diff --git a/django/apps/config.py b/django/apps/config.py
index f5c971f..bced53d 100644
--- a/django/apps/config.py
+++ b/django/apps/config.py
@@ -1,9 +1,14 @@
+import inspect
 import os
+import warnings
 from importlib import import_module
 
 from django.core.exceptions import ImproperlyConfigured
-from django.utils.module_loading import module_has_submodule
+from django.utils.deprecation import RemovedInDjango41Warning
+from django.utils.functional import cached_property
+from django.utils.module_loading import import_string, module_has_submodule
 
+APPS_MODULE_NAME = 'apps'
 MODELS_MODULE_NAME = 'models'
 
 
@@ -29,6 +34,10 @@ class AppConfig:
         # This value must be unique across a Django project.
         if not hasattr(self, 'label'):
             self.label = app_name.rpartition(".")[2]
+        if not self.label.isidentifier():
+            raise ImproperlyConfigured(
+                "The app label '%s' is not a valid Python identifier." % self.label
+            )
 
         # Human-readable name for the application e.g. "Admin".
         if not hasattr(self, 'verbose_name'):
@@ -51,6 +60,15 @@ class AppConfig:
     def __repr__(self):
         return '<%s: %s>' % (self.__class__.__name__, self.label)
 
+    @cached_property
+    def default_auto_field(self):
+        from django.conf import settings
+        return settings.DEFAULT_AUTO_FIELD
+
+    @property
+    def _is_default_auto_field_overridden(self):
+        return self.__class__.default_auto_field is not AppConfig.default_auto_field
+
     def _path_from_module(self, module):
         """Attempt to determine app's filesystem path from its module."""
         # See #21874 for extended discussion of the behavior of this method in
@@ -75,7 +93,7 @@ class AppConfig:
             raise ImproperlyConfigured(
                 "The app module %r has no filesystem location, "
                 "you must configure this app with an AppConfig subclass "
-                "with a 'path' class attribute." % (module,))
+                "with a 'path' class attribute." % module)
         return paths[0]
 
     @classmethod
@@ -83,73 +101,143 @@ class AppConfig:
         """
         Factory that creates an app config from an entry in INSTALLED_APPS.
         """
-        try:
-            # If import_module succeeds, entry is a path to an app module,
-            # which may specify an app config class with default_app_config.
-            # Otherwise, entry is a path to an app config class or an error.
-            module = import_module(entry)
-
-        except ImportError:
-            # Track that importing as an app module failed. If importing as an
-            # app config class fails too, we'll trigger the ImportError again.
-            module = None
-
-            mod_path, _, cls_name = entry.rpartition('.')
-
-            # Raise the original exception when entry cannot be a path to an
-            # app config class.
-            if not mod_path:
-                raise
+        # create() eventually returns app_config_class(app_name, app_module).
+        app_config_class = None
+        app_config_name = None
+        app_name = None
+        app_module = None
 
+        # If import_module succeeds, entry points to the app module.
+        try:
+            app_module = import_module(entry)
+        except Exception:
+            pass
         else:
+            # If app_module has an apps submodule that defines a single
+            # AppConfig subclass, use it automatically.
+            # To prevent this, an AppConfig subclass can declare a class
+            # variable default = False.
+            # If the apps module defines more than one AppConfig subclass,
+            # the default one can declare default = True.
+            if module_has_submodule(app_module, APPS_MODULE_NAME):
+                mod_path = '%s.%s' % (entry, APPS_MODULE_NAME)
+                mod = import_module(mod_path)
+                # Check if there's exactly one AppConfig candidate,
+                # excluding those that explicitly define default = False.
+                app_configs = [
+                    (name, candidate)
+                    for name, candidate in inspect.getmembers(mod, inspect.isclass)
+                    if (
+                        issubclass(candidate, cls) and
+                        candidate is not cls and
+                        getattr(candidate, 'default', True)
+                    )
+                ]
+                if len(app_configs) == 1:
+                    app_config_class = app_configs[0][1]
+                    app_config_name = '%s.%s' % (mod_path, app_configs[0][0])
+                else:
+                    # Check if there's exactly one AppConfig subclass,
+                    # among those that explicitly define default = True.
+                    app_configs = [
+                        (name, candidate)
+                        for name, candidate in app_configs
+                        if getattr(candidate, 'default', False)
+                    ]
+                    if len(app_configs) > 1:
+                        candidates = [repr(name) for name, _ in app_configs]
+                        raise RuntimeError(
+                            '%r declares more than one default AppConfig: '
+                            '%s.' % (mod_path, ', '.join(candidates))
+                        )
+                    elif len(app_configs) == 1:
+                        app_config_class = app_configs[0][1]
+                        app_config_name = '%s.%s' % (mod_path, app_configs[0][0])
+
+            # If app_module specifies a default_app_config, follow the link.
+            # default_app_config is deprecated, but still takes over the
+            # automatic detection for backwards compatibility during the
+            # deprecation period.
             try:
-                # If this works, the app module specifies an app config class.
-                entry = module.default_app_config
+                new_entry = app_module.default_app_config
             except AttributeError:
-                # Otherwise, it simply uses the default app config class.
-                return cls(entry, module)
+                # Use the default app config class if we didn't find anything.
+                if app_config_class is None:
+                    app_config_class = cls
+                    app_name = entry
             else:
-                mod_path, _, cls_name = entry.rpartition('.')
-
-        # If we're reaching this point, we must attempt to load the app config
-        # class located at <mod_path>.<cls_name>
-        mod = import_module(mod_path)
-        try:
-            cls = getattr(mod, cls_name)
-        except AttributeError:
-            if module is None:
-                # If importing as an app module failed, check if the module
-                # contains any valid AppConfigs and show them as choices.
-                # Otherwise, that error probably contains the most informative
-                # traceback, so trigger it again.
-                candidates = sorted(
-                    repr(name) for name, candidate in mod.__dict__.items()
-                    if isinstance(candidate, type) and
-                    issubclass(candidate, AppConfig) and
-                    candidate is not AppConfig
+                message = (
+                    '%r defines default_app_config = %r. ' % (entry, new_entry)
                 )
-                if candidates:
-                    raise ImproperlyConfigured(
-                        "'%s' does not contain a class '%s'. Choices are: %s."
-                        % (mod_path, cls_name, ', '.join(candidates))
+                if new_entry == app_config_name:
+                    message += (
+                        'Django now detects this configuration automatically. '
+                        'You can remove default_app_config.'
                     )
-                import_module(entry)
+                else:
+                    message += (
+                        "However, Django's automatic detection %s. You should "
+                        "move the default config class to the apps submodule "
+                        "of your application and, if this module defines "
+                        "several config classes, mark the default one with "
+                        "default = True." % (
+                            "picked another configuration, %r" % app_config_name
+                            if app_config_name
+                            else "did not find this configuration"
+                        )
+                    )
+                warnings.warn(message, RemovedInDjango41Warning, stacklevel=2)
+                entry = new_entry
+                app_config_class = None
+
+        # If import_string succeeds, entry is an app config class.
+        if app_config_class is None:
+            try:
+                app_config_class = import_string(entry)
+            except Exception:
+                pass
+        # If both import_module and import_string failed, it means that entry
+        # doesn't have a valid value.
+        if app_module is None and app_config_class is None:
+            # If the last component of entry starts with an uppercase letter,
+            # then it was likely intended to be an app config class; if not,
+            # an app module. Provide a nice error message in both cases.
+            mod_path, _, cls_name = entry.rpartition('.')
+            if mod_path and cls_name[0].isupper():
+                # We could simply re-trigger the string import exception, but
+                # we're going the extra mile and providing a better error
+                # message for typos in INSTALLED_APPS.
+                # This may raise ImportError, which is the best exception
+                # possible if the module at mod_path cannot be imported.
+                mod = import_module(mod_path)
+                candidates = [
+                    repr(name)
+                    for name, candidate in inspect.getmembers(mod, inspect.isclass)
+                    if issubclass(candidate, cls) and candidate is not cls
+                ]
+                msg = "Module '%s' does not contain a '%s' class." % (mod_path, cls_name)
+                if candidates:
+                    msg += ' Choices are: %s.' % ', '.join(candidates)
+                raise ImportError(msg)
             else:
-                raise
+                # Re-trigger the module import exception.
+                import_module(entry)
 
         # Check for obvious errors. (This check prevents duck typing, but
         # it could be removed if it became a problem in practice.)
-        if not issubclass(cls, AppConfig):
+        if not issubclass(app_config_class, AppConfig):
             raise ImproperlyConfigured(
                 "'%s' isn't a subclass of AppConfig." % entry)
 
         # Obtain app name here rather than in AppClass.__init__ to keep
         # all error checking for entries in INSTALLED_APPS in one place.
-        try:
-            app_name = cls.name
-        except AttributeError:
-            raise ImproperlyConfigured(
-                "'%s' must supply a name attribute." % entry)
+        if app_name is None:
+            try:
+                app_name = app_config_class.name
+            except AttributeError:
+                raise ImproperlyConfigured(
+                    "'%s' must supply a name attribute." % entry
+                )
 
         # Ensure app_name points to a valid module.
         try:
@@ -157,12 +245,14 @@ class AppConfig:
         except ImportError:
             raise ImproperlyConfigured(
                 "Cannot import '%s'. Check that '%s.%s.name' is correct." % (
-                    app_name, mod_path, cls_name,
+                    app_name,
+                    app_config_class.__module__,
+                    app_config_class.__qualname__,
                 )
             )
 
         # Entry is a path to an app config class.
-        return cls(app_name, app_module)
+        return app_config_class(app_name, app_module)
 
     def get_model(self, model_name, require_ready=True):
         """
diff --git a/django/apps/registry.py b/django/apps/registry.py
index 234a830..62650ca 100644
--- a/django/apps/registry.py
+++ b/django/apps/registry.py
@@ -2,7 +2,7 @@ import functools
 import sys
 import threading
 import warnings
-from collections import Counter, OrderedDict, defaultdict
+from collections import Counter, defaultdict
 from functools import partial
 
 from django.core.exceptions import AppRegistryNotReady, ImproperlyConfigured
@@ -31,10 +31,10 @@ class Apps:
         # and whether the registry has been populated. Since it isn't possible
         # to reimport a module safely (it could reexecute initialization code)
         # all_models is never overridden or reset.
-        self.all_models = defaultdict(OrderedDict)
+        self.all_models = defaultdict(dict)
 
         # Mapping of labels to AppConfig instances for installed apps.
-        self.app_configs = OrderedDict()
+        self.app_configs = {}
 
         # Stack of app_configs. Used to store the current state in
         # set_available_apps and set_installed_apps.
@@ -128,6 +128,7 @@ class Apps:
         """Raise 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.
@@ -316,10 +317,11 @@ class Apps:
             )
 
         self.stored_app_configs.append(self.app_configs)
-        self.app_configs = OrderedDict(
-            (label, app_config)
+        self.app_configs = {
+            label: app_config
             for label, app_config in self.app_configs.items()
-            if app_config.name in available)
+            if app_config.name in available
+        }
         self.clear_cache()
 
     def unset_available_apps(self):
@@ -347,7 +349,7 @@ class Apps:
         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.app_configs = {}
         self.apps_ready = self.models_ready = self.loading = self.ready = False
         self.clear_cache()
         self.populate(installed)
diff --git a/django/bin/django-admin.py b/django/bin/django-admin.py
index f518cdc..594b0f1 100755
--- a/django/bin/django-admin.py
+++ b/django/bin/django-admin.py
@@ -1,5 +1,21 @@
 #!/usr/bin/env python
+# When the django-admin.py deprecation ends, remove this script.
+import warnings
+
 from django.core import management
 
+try:
+    from django.utils.deprecation import RemovedInDjango40Warning
+except ImportError:
+    raise ImportError(
+        'django-admin.py was deprecated in Django 3.1 and removed in Django '
+        '4.0. Please manually remove this script from your virtual environment '
+        'and use django-admin instead.'
+    )
+
 if __name__ == "__main__":
+    warnings.warn(
+        'django-admin.py is deprecated in favor of django-admin.',
+        RemovedInDjango40Warning,
+    )
     management.execute_from_command_line()
diff --git a/django/conf/__init__.py b/django/conf/__init__.py
index cf91ce8..2830244 100644
--- a/django/conf/__init__.py
+++ b/django/conf/__init__.py
@@ -16,17 +16,20 @@ from pathlib import Path
 import django
 from django.conf import global_settings
 from django.core.exceptions import ImproperlyConfigured
-from django.utils.deprecation import (
-    RemovedInDjango30Warning, RemovedInDjango31Warning,
-)
+from django.utils.deprecation import RemovedInDjango40Warning
 from django.utils.functional import LazyObject, empty
 
 ENVIRONMENT_VARIABLE = "DJANGO_SETTINGS_MODULE"
 
-DEFAULT_CONTENT_TYPE_DEPRECATED_MSG = 'The DEFAULT_CONTENT_TYPE setting is deprecated.'
-FILE_CHARSET_DEPRECATED_MSG = (
-    'The FILE_CHARSET setting is deprecated. Starting with Django 3.1, all '
-    'files read from disk must be UTF-8 encoded.'
+PASSWORD_RESET_TIMEOUT_DAYS_DEPRECATED_MSG = (
+    'The PASSWORD_RESET_TIMEOUT_DAYS setting is deprecated. Use '
+    'PASSWORD_RESET_TIMEOUT instead.'
+)
+
+DEFAULT_HASHING_ALGORITHM_DEPRECATED_MSG = (
+    'The DEFAULT_HASHING_ALGORITHM transitional setting is deprecated. '
+    'Support for it and tokens, cookies, sessions, and signatures that use '
+    'SHA-1 hashing algorithm will be removed in Django 4.0.'
 )
 
 
@@ -78,6 +81,14 @@ class LazySettings(LazyObject):
         if self._wrapped is empty:
             self._setup(name)
         val = getattr(self._wrapped, name)
+
+        # Special case some settings which require further modification.
+        # This is done here for performance reasons so the modified value is cached.
+        if name in {'MEDIA_URL', 'STATIC_URL'} and val is not None:
+            val = self._add_script_prefix(val)
+        elif name == 'SECRET_KEY' and not val:
+            raise ImproperlyConfigured("The SECRET_KEY setting must not be empty.")
+
         self.__dict__[name] = val
         return val
 
@@ -107,41 +118,43 @@ class LazySettings(LazyObject):
             raise RuntimeError('Settings already configured.')
         holder = UserSettingsHolder(default_settings)
         for name, value in options.items():
+            if not name.isupper():
+                raise TypeError('Setting %r must be uppercase.' % name)
             setattr(holder, name, value)
         self._wrapped = holder
 
+    @staticmethod
+    def _add_script_prefix(value):
+        """
+        Add SCRIPT_NAME prefix to relative paths.
+
+        Useful when the app is being served at a subpath and manually prefixing
+        subpath to STATIC_URL and MEDIA_URL in settings is inconvenient.
+        """
+        # Don't apply prefix to absolute paths and URLs.
+        if value.startswith(('http://', 'https://', '/')):
+            return value
+        from django.urls import get_script_prefix
+        return '%s%s' % (get_script_prefix(), value)
+
     @property
     def configured(self):
         """Return True if the settings have already been configured."""
         return self._wrapped is not empty
 
     @property
-    def DEFAULT_CONTENT_TYPE(self):
+    def PASSWORD_RESET_TIMEOUT_DAYS(self):
         stack = traceback.extract_stack()
         # Show a warning if the setting is used outside of Django.
         # Stack index: -1 this line, -2 the caller.
-        filename, _line_number, _function_name, _text = stack[-2]
+        filename, _, _, _ = stack[-2]
         if not filename.startswith(os.path.dirname(django.__file__)):
             warnings.warn(
-                DEFAULT_CONTENT_TYPE_DEPRECATED_MSG,
-                RemovedInDjango30Warning,
+                PASSWORD_RESET_TIMEOUT_DAYS_DEPRECATED_MSG,
+                RemovedInDjango40Warning,
                 stacklevel=2,
             )
-        return self.__getattr__('DEFAULT_CONTENT_TYPE')
-
-    @property
-    def FILE_CHARSET(self):
-        stack = traceback.extract_stack()
-        # Show a warning if the setting is used outside of Django.
-        # Stack index: -1 this line, -2 the caller.
-        filename, _line_number, _function_name, _text = stack[-2]
-        if not filename.startswith(os.path.dirname(django.__file__)):
-            warnings.warn(
-                FILE_CHARSET_DEPRECATED_MSG,
-                RemovedInDjango31Warning,
-                stacklevel=2,
-            )
-        return self.__getattr__('FILE_CHARSET')
+        return self.__getattr__('PASSWORD_RESET_TIMEOUT_DAYS')
 
 
 class Settings:
@@ -172,13 +185,17 @@ class Settings:
                 setattr(self, setting, setting_value)
                 self._explicit_settings.add(setting)
 
-        if not self.SECRET_KEY:
-            raise ImproperlyConfigured("The SECRET_KEY setting must not be empty.")
+        if self.is_overridden('PASSWORD_RESET_TIMEOUT_DAYS'):
+            if self.is_overridden('PASSWORD_RESET_TIMEOUT'):
+                raise ImproperlyConfigured(
+                    'PASSWORD_RESET_TIMEOUT_DAYS/PASSWORD_RESET_TIMEOUT are '
+                    'mutually exclusive.'
+                )
+            setattr(self, 'PASSWORD_RESET_TIMEOUT', self.PASSWORD_RESET_TIMEOUT_DAYS * 60 * 60 * 24)
+            warnings.warn(PASSWORD_RESET_TIMEOUT_DAYS_DEPRECATED_MSG, RemovedInDjango40Warning)
 
-        if self.is_overridden('DEFAULT_CONTENT_TYPE'):
-            warnings.warn(DEFAULT_CONTENT_TYPE_DEPRECATED_MSG, RemovedInDjango30Warning)
-        if self.is_overridden('FILE_CHARSET'):
-            warnings.warn(FILE_CHARSET_DEPRECATED_MSG, RemovedInDjango31Warning)
+        if self.is_overridden('DEFAULT_HASHING_ALGORITHM'):
+            warnings.warn(DEFAULT_HASHING_ALGORITHM_DEPRECATED_MSG, RemovedInDjango40Warning)
 
         if hasattr(time, 'tzset') and self.TIME_ZONE:
             # When we can, attempt to validate the timezone. If we can't find
@@ -217,16 +234,17 @@ class UserSettingsHolder:
         self.default_settings = default_settings
 
     def __getattr__(self, name):
-        if name in self._deleted:
+        if not name.isupper() or name in self._deleted:
             raise AttributeError
         return getattr(self.default_settings, name)
 
     def __setattr__(self, name, value):
         self._deleted.discard(name)
-        if name == 'DEFAULT_CONTENT_TYPE':
-            warnings.warn(DEFAULT_CONTENT_TYPE_DEPRECATED_MSG, RemovedInDjango30Warning)
-        elif name == 'FILE_CHARSET':
-            warnings.warn(FILE_CHARSET_DEPRECATED_MSG, RemovedInDjango31Warning)
+        if name == 'PASSWORD_RESET_TIMEOUT_DAYS':
+            setattr(self, 'PASSWORD_RESET_TIMEOUT', value * 60 * 60 * 24)
+            warnings.warn(PASSWORD_RESET_TIMEOUT_DAYS_DEPRECATED_MSG, RemovedInDjango40Warning)
+        if name == 'DEFAULT_HASHING_ALGORITHM':
+            warnings.warn(DEFAULT_HASHING_ALGORITHM_DEPRECATED_MSG, RemovedInDjango40Warning)
         super().__setattr__(name, value)
 
     def __delattr__(self, name):
diff --git a/django/conf/app_template/apps.py-tpl b/django/conf/app_template/apps.py-tpl
index 9b2ce52..b705352 100644
--- a/django/conf/app_template/apps.py-tpl
+++ b/django/conf/app_template/apps.py-tpl
@@ -2,4 +2,5 @@ from django.apps import AppConfig
 
 
 class {{ camel_case_app_name }}Config(AppConfig):
+    default_auto_field = 'django.db.models.BigAutoField'
     name = '{{ app_name }}'
diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py
index f3abfad..cf9fae4 100644
--- a/django/conf/global_settings.py
+++ b/django/conf/global_settings.py
@@ -51,6 +51,7 @@ LANGUAGE_CODE = 'en-us'
 LANGUAGES = [
     ('af', gettext_noop('Afrikaans')),
     ('ar', gettext_noop('Arabic')),
+    ('ar-dz', gettext_noop('Algerian Arabic')),
     ('ast', gettext_noop('Asturian')),
     ('az', gettext_noop('Azerbaijani')),
     ('bg', gettext_noop('Bulgarian')),
@@ -92,6 +93,7 @@ LANGUAGES = [
     ('hy', gettext_noop('Armenian')),
     ('ia', gettext_noop('Interlingua')),
     ('id', gettext_noop('Indonesian')),
+    ('ig', gettext_noop('Igbo')),
     ('io', gettext_noop('Ido')),
     ('is', gettext_noop('Icelandic')),
     ('it', gettext_noop('Italian')),
@@ -102,6 +104,7 @@ LANGUAGES = [
     ('km', gettext_noop('Khmer')),
     ('kn', gettext_noop('Kannada')),
     ('ko', gettext_noop('Korean')),
+    ('ky', gettext_noop('Kyrgyz')),
     ('lb', gettext_noop('Luxembourgish')),
     ('lt', gettext_noop('Lithuanian')),
     ('lv', gettext_noop('Latvian')),
@@ -130,19 +133,22 @@ LANGUAGES = [
     ('sw', gettext_noop('Swahili')),
     ('ta', gettext_noop('Tamil')),
     ('te', gettext_noop('Telugu')),
+    ('tg', gettext_noop('Tajik')),
     ('th', gettext_noop('Thai')),
+    ('tk', gettext_noop('Turkmen')),
     ('tr', gettext_noop('Turkish')),
     ('tt', gettext_noop('Tatar')),
     ('udm', gettext_noop('Udmurt')),
     ('uk', gettext_noop('Ukrainian')),
     ('ur', gettext_noop('Urdu')),
+    ('uz', gettext_noop('Uzbek')),
     ('vi', gettext_noop('Vietnamese')),
     ('zh-hans', gettext_noop('Simplified Chinese')),
     ('zh-hant', gettext_noop('Traditional Chinese')),
 ]
 
 # Languages using BiDi (right-to-left) layout
-LANGUAGES_BIDI = ["he", "ar", "fa", "ur"]
+LANGUAGES_BIDI = ["he", "ar", "ar-dz", "fa", "ur"]
 
 # If you set this to False, Django will make some optimizations so as not
 # to load the internationalization machinery.
@@ -154,6 +160,9 @@ LANGUAGE_COOKIE_NAME = 'django_language'
 LANGUAGE_COOKIE_AGE = None
 LANGUAGE_COOKIE_DOMAIN = None
 LANGUAGE_COOKIE_PATH = '/'
+LANGUAGE_COOKIE_SECURE = False
+LANGUAGE_COOKIE_HTTPONLY = False
+LANGUAGE_COOKIE_SAMESITE = None
 
 
 # If you set this to True, Django will format dates, numbers and calendars
@@ -164,15 +173,10 @@ USE_L10N = False
 # notifications and other various emails.
 MANAGERS = ADMINS
 
-# Default content type and charset to use for all HttpResponse objects, if a
-# MIME type isn't manually specified. These are used to construct the
-# Content-Type header.
-DEFAULT_CONTENT_TYPE = 'text/html'
+# Default charset to use for all HttpResponse objects, if a MIME type isn't
+# manually specified. It's used to construct the Content-Type header.
 DEFAULT_CHARSET = 'utf-8'
 
-# Encoding of files read from disk (template and initial SQL files).
-FILE_CHARSET = 'utf-8'
-
 # Email address that error messages come from.
 SERVER_EMAIL = 'root@localhost'
 
@@ -306,7 +310,7 @@ 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/library/os.html#files-and-directories.
-FILE_UPLOAD_PERMISSIONS = None
+FILE_UPLOAD_PERMISSIONS = 0o644
 
 # 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;
@@ -381,15 +385,12 @@ DATETIME_INPUT_FORMATS = [
     '%Y-%m-%d %H:%M:%S',     # '2006-10-25 14:30:59'
     '%Y-%m-%d %H:%M:%S.%f',  # '2006-10-25 14:30:59.000200'
     '%Y-%m-%d %H:%M',        # '2006-10-25 14:30'
-    '%Y-%m-%d',              # '2006-10-25'
     '%m/%d/%Y %H:%M:%S',     # '10/25/2006 14:30:59'
     '%m/%d/%Y %H:%M:%S.%f',  # '10/25/2006 14:30:59.000200'
     '%m/%d/%Y %H:%M',        # '10/25/2006 14:30'
-    '%m/%d/%Y',              # '10/25/2006'
     '%m/%d/%y %H:%M:%S',     # '10/25/06 14:30:59'
     '%m/%d/%y %H:%M:%S.%f',  # '10/25/06 14:30:59.000200'
     '%m/%d/%y %H:%M',        # '10/25/06 14:30'
-    '%m/%d/%y',              # '10/25/06'
 ]
 
 # First day of week, to be used on calendars
@@ -413,8 +414,11 @@ THOUSAND_SEPARATOR = ','
 DEFAULT_TABLESPACE = ''
 DEFAULT_INDEX_TABLESPACE = ''
 
+# Default primary key field type.
+DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
+
 # Default X-Frame-Options header value
-X_FRAME_OPTIONS = 'SAMEORIGIN'
+X_FRAME_OPTIONS = 'DENY'
 
 USE_X_FORWARDED_HOST = False
 USE_X_FORWARDED_PORT = False
@@ -435,6 +439,12 @@ WSGI_APPLICATION = None
 # you may be opening yourself up to a security risk.
 SECURE_PROXY_SSL_HEADER = None
 
+# Default hashing algorithm to use for encoding cookies, password reset tokens
+# in the admin site, user sessions, and signatures. It's a transitional setting
+# helpful in migrating multiple instance of the same project to Django 3.1+.
+# Algorithm must be 'sha1' or 'sha256'.
+DEFAULT_HASHING_ALGORITHM = 'sha256'
+
 ##############
 # MIDDLEWARE #
 ##############
@@ -463,7 +473,7 @@ SESSION_COOKIE_PATH = '/'
 # Whether to use the HttpOnly flag.
 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.
+# This can be 'Lax', 'Strict', 'None', or False to disable the flag.
 SESSION_COOKIE_SAMESITE = 'Lax'
 # Whether to save the session data on every request.
 SESSION_SAVE_EVERY_REQUEST = False
@@ -508,6 +518,9 @@ LOGOUT_REDIRECT_URL = None
 # The number of days a password reset link is valid for
 PASSWORD_RESET_TIMEOUT_DAYS = 3
 
+# The number of seconds a password reset link is valid for (default: 3 days).
+PASSWORD_RESET_TIMEOUT = 60 * 60 * 24 * 3
+
 # the first hasher in this list is the preferred algorithm.  any
 # password using different algorithms will be converted automatically
 # upon login
@@ -566,6 +579,10 @@ LOGGING_CONFIG = 'logging.config.dictConfig'
 # Custom logging configuration.
 LOGGING = {}
 
+# Default exception reporter class used in case none has been
+# specifically assigned to the HttpRequest instance.
+DEFAULT_EXCEPTION_REPORTER = 'django.views.debug.ExceptionReporter'
+
 # Default exception reporter filter class used in case none has been
 # specifically assigned to the HttpRequest instance.
 DEFAULT_EXCEPTION_REPORTER_FILTER = 'django.views.debug.SafeExceptionReporterFilter'
@@ -627,10 +644,11 @@ SILENCED_SYSTEM_CHECKS = []
 # SECURITY MIDDLEWARE #
 #######################
 SECURE_BROWSER_XSS_FILTER = False
-SECURE_CONTENT_TYPE_NOSNIFF = False
+SECURE_CONTENT_TYPE_NOSNIFF = True
 SECURE_HSTS_INCLUDE_SUBDOMAINS = False
 SECURE_HSTS_PRELOAD = False
 SECURE_HSTS_SECONDS = 0
 SECURE_REDIRECT_EXEMPT = []
+SECURE_REFERRER_POLICY = 'same-origin'
 SECURE_SSL_HOST = None
 SECURE_SSL_REDIRECT = False
diff --git a/django/conf/locale/__init__.py b/django/conf/locale/__init__.py
index 720045d..6285f20 100644
--- a/django/conf/locale/__init__.py
+++ b/django/conf/locale/__init__.py
@@ -20,6 +20,12 @@ LANG_INFO = {
         'name': 'Arabic',
         'name_local': 'العربيّة',
     },
+    'ar-dz': {
+        'bidi': True,
+        'code': 'ar-dz',
+        'name': 'Algerian Arabic',
+        'name_local': 'العربية الجزائرية',
+    },
     'ast': {
         'bidi': False,
         'code': 'ast',
@@ -228,7 +234,7 @@ LANG_INFO = {
         'bidi': False,
         'code': 'hi',
         'name': 'Hindi',
-        'name_local': 'Hindi',
+        'name_local': 'हिंदी',
     },
     'hr': {
         'bidi': False,
@@ -272,6 +278,12 @@ LANG_INFO = {
         'name': 'Indonesian',
         'name_local': 'Bahasa Indonesia',
     },
+    'ig': {
+        'bidi': False,
+        'code': 'ig',
+        'name': 'Igbo',
+        'name_local': 'Asụsụ Ìgbò',
+    },
     'is': {
         'bidi': False,
         'code': 'is',
@@ -326,6 +338,12 @@ LANG_INFO = {
         'name': 'Korean',
         'name_local': '한국어',
     },
+    'ky': {
+        'bidi': False,
+        'code': 'ky',
+        'name': 'Kyrgyz',
+        'name_local': 'Кыргызча',
+    },
     'lb': {
         'bidi': False,
         'code': 'lb',
@@ -354,7 +372,7 @@ LANG_INFO = {
         'bidi': False,
         'code': 'ml',
         'name': 'Malayalam',
-        'name_local': 'Malayalam',
+        'name_local': 'മലയാളം',
     },
     'mn': {
         'bidi': False,
@@ -500,12 +518,24 @@ LANG_INFO = {
         'name': 'Telugu',
         'name_local': 'తెలుగు',
     },
+    'tg': {
+        'bidi': False,
+        'code': 'tg',
+        'name': 'Tajik',
+        'name_local': 'тоҷикӣ',
+    },
     'th': {
         'bidi': False,
         'code': 'th',
         'name': 'Thai',
         'name_local': 'ภาษาไทย',
     },
+    'tk': {
+        'bidi': False,
+        'code': 'tk',
+        'name': 'Turkmen',
+        'name_local': 'Türkmençe',
+    },
     'tr': {
         'bidi': False,
         'code': 'tr',
@@ -536,6 +566,12 @@ LANG_INFO = {
         'name': 'Urdu',
         'name_local': 'اردو',
     },
+    'uz': {
+        'bidi': False,
+        'code': 'uz',
+        'name': 'Uzbek',
+        'name_local': 'oʻzbek tili',
+    },
     'vi': {
         'bidi': False,
         'code': 'vi',
diff --git a/django/conf/locale/af/LC_MESSAGES/django.mo b/django/conf/locale/af/LC_MESSAGES/django.mo
index ea048a7..5da1748 100644
 Binary files a/django/conf/locale/af/LC_MESSAGES/django.mo and b/django/conf/locale/af/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/af/LC_MESSAGES/django.po b/django/conf/locale/af/LC_MESSAGES/django.po
index f85a36d..f7084ad 100644
--- a/django/conf/locale/af/LC_MESSAGES/django.po
+++ b/django/conf/locale/af/LC_MESSAGES/django.po
@@ -1,16 +1,16 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
-# F Wolff <[e-mail]>, 2019
+# F Wolff <[e-mail]>, 2019-2020
 # Stephen Cox <[e-mail]>, 2011-2012
 # unklphil <[e-mail]>, 2014,2019
 msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-16 20:42+0100\n"
-"PO-Revision-Date: 2019-02-18 22:37+0000\n"
-"Last-Translator: unklphil <[e-mail]>\n"
+"POT-Creation-Date: 2020-05-19 20:23+0200\n"
+"PO-Revision-Date: 2020-07-20 19:37+0000\n"
+"Last-Translator: F Wolff <[e-mail]>\n"
 "Language-Team: Afrikaans (http://www.transifex.com/django/django/language/"
 "af/)\n"
 "MIME-Version: 1.0\n"
@@ -25,6 +25,9 @@ msgstr "Afrikaans"
 msgid "Arabic"
 msgstr "Arabies"
 
+msgid "Algerian Arabic"
+msgstr ""
+
 msgid "Asturian"
 msgstr "Asturies"
 
@@ -148,6 +151,9 @@ msgstr "Interlingua"
 msgid "Indonesian"
 msgstr "Indonesies"
 
+msgid "Igbo"
+msgstr ""
+
 msgid "Ido"
 msgstr "Ido"
 
@@ -178,6 +184,9 @@ msgstr "Kannada"
 msgid "Korean"
 msgstr "Koreaans"
 
+msgid "Kyrgyz"
+msgstr ""
+
 msgid "Luxembourgish"
 msgstr "Luxemburgs"
 
@@ -262,9 +271,15 @@ msgstr "Tamil"
 msgid "Telugu"
 msgstr "Teloegoe"
 
+msgid "Tajik"
+msgstr ""
+
 msgid "Thai"
 msgstr "Thai"
 
+msgid "Turkmen"
+msgstr ""
+
 msgid "Turkish"
 msgstr "Turks"
 
@@ -280,6 +295,9 @@ msgstr "Oekraïens"
 msgid "Urdu"
 msgstr "Oerdoe"
 
+msgid "Uzbek"
+msgstr "Oesbekies "
+
 msgid "Vietnamese"
 msgstr "Viëtnamees"
 
@@ -324,17 +342,13 @@ msgstr "Gee ’n geldige e-posadres."
 
 #. Translators: "letters" means latin letters: a-z and A-Z.
 msgid ""
-"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
+"Enter a valid “slug” consisting of letters, numbers, underscores or hyphens."
 msgstr ""
-"Gee ’n geldige \"slak\" in wat bestaan ​​uit letters, syfers, onderstreep of "
-"koppelteken."
 
 msgid ""
-"Enter a valid 'slug' consisting of Unicode letters, numbers, underscores, or "
+"Enter a valid “slug” consisting of Unicode letters, numbers, underscores, or "
 "hyphens."
 msgstr ""
-"Gee ’n geldige “slak” in wat bestaan ​​uit Unicode-letters, syfers, "
-"onderstreep of koppelteken."
 
 msgid "Enter a valid IPv4 address."
 msgstr "Gee ’n geldige IPv4-adres."
@@ -416,11 +430,9 @@ msgstr[1] ""
 
 #, python-format
 msgid ""
-"File extension '%(extension)s' is not allowed. Allowed extensions are: "
-"'%(allowed_extensions)s'."
+"File extension “%(extension)s” is not allowed. Allowed extensions are: "
+"%(allowed_extensions)s."
 msgstr ""
-"Lêeruitbreiding “%(extension)s” word nie toegelaat nie. Toegelate "
-"uitbreidings is: “%(allowed_extensions)s”."
 
 msgid "Null characters are not allowed."
 msgstr "Nul-karakters word nie toegelaat nie."
@@ -458,23 +470,13 @@ msgstr ""
 msgid "Field of type: %(field_type)s"
 msgstr "Veld van tipe: %(field_type)s "
 
-msgid "Integer"
-msgstr "Heelgetal"
-
-#, python-format
-msgid "'%(value)s' value must be an integer."
-msgstr "Die waarde “%(value)s” moet ’n heelgetal wees."
-
-msgid "Big (8 byte) integer"
-msgstr "Groot (8 greep) heelgetal"
-
 #, python-format
-msgid "'%(value)s' value must be either True or False."
-msgstr "Die waarde “%(value)s” moet óf True (waar) óf False (vals) wees."
+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 "Die waarde “%(value)s” moet True, False of None wees."
+msgid "“%(value)s” value must be either True, False, or None."
+msgstr ""
 
 msgid "Boolean (Either True or False)"
 msgstr "Boole (True of False)"
@@ -488,56 +490,46 @@ msgstr "Heelgetalle geskei met kommas"
 
 #, python-format
 msgid ""
-"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
+"“%(value)s” value has an invalid date format. It must be in YYYY-MM-DD "
 "format."
 msgstr ""
-"Die waarde “%(value)s” het ’n ongeldige datumformaat. Dit moet in die "
-"formaat JJJJ-MM-DD wees."
 
 #, python-format
 msgid ""
-"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
+"“%(value)s” value has the correct format (YYYY-MM-DD) but it is an invalid "
 "date."
 msgstr ""
-"Die waarde “%(value)s” het die korrekte formaat (JJJJ-MM-DD), maar dit is ’n "
-"ongeldige datum."
 
 msgid "Date (without time)"
 msgstr "Datum (sonder die tyd)"
 
 #, python-format
 msgid ""
-"'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"“%(value)s” value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
 "uuuuuu]][TZ] format."
 msgstr ""
-"Die waarde “%(value)s” se formaat is ongeldig. Dit moet in die formaat JJJJ-"
-"MM-DD HH:MM[:ss[.uuuuuu]][TZ] wees."
 
 #, python-format
 msgid ""
-"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
+"“%(value)s” value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
 "[TZ]) but it is an invalid date/time."
 msgstr ""
-"Die waarde “%(value)s” het die korrekte formaat (JJJJ-MM-DD HH:MM[:ss[."
-"uuuuuu]][TZ]) maar dit is ’n ongeldige datum/tyd."
 
 msgid "Date (with time)"
 msgstr "Datum (met die tyd)"
 
 #, python-format
-msgid "'%(value)s' value must be a decimal number."
-msgstr "Die waarde “%(value)s” moet ’n desimale getal wees."
+msgid "“%(value)s” value must be a decimal number."
+msgstr "“%(value)s”-waarde moet ’n desimale getal wees."
 
 msgid "Decimal number"
 msgstr "Desimale getal"
 
 #, python-format
 msgid ""
-"'%(value)s' value has an invalid format. It must be in [DD] [HH:[MM:]]ss[."
+"“%(value)s” value has an invalid format. It must be in [DD] [[HH:]MM:]ss[."
 "uuuuuu] format."
 msgstr ""
-"Die waarde “%(value)s” het ’n ongeldige formaat. Dit moet in die formaat "
-"[DD] [HH:[MM:]]ss[.uuuuuu] wees."
 
 msgid "Duration"
 msgstr "Duur"
@@ -549,12 +541,22 @@ msgid "File path"
 msgstr "Lêerpad"
 
 #, python-format
-msgid "'%(value)s' value must be a float."
-msgstr "Die waarde “%(value)s” moete ’n dryfpuntgetal wees."
+msgid "“%(value)s” value must be a float."
+msgstr ""
 
 msgid "Floating point number"
 msgstr "Dryfpuntgetal"
 
+#, python-format
+msgid "“%(value)s” value must be an integer."
+msgstr "“%(value)s”-waarde moet ’n heelgetal wees."
+
+msgid "Integer"
+msgstr "Heelgetal"
+
+msgid "Big (8 byte) integer"
+msgstr "Groot (8 greep) heelgetal"
+
 msgid "IPv4 address"
 msgstr "IPv4-adres"
 
@@ -562,12 +564,15 @@ msgid "IP address"
 msgstr "IP-adres"
 
 #, python-format
-msgid "'%(value)s' value must be either None, True or False."
-msgstr "Die waarde “%(value)s” moet None, True of False wees."
+msgid "“%(value)s” value must be either None, True or False."
+msgstr "“%(value)s”-waarde moet een wees uit None, True of False."
 
 msgid "Boolean (Either True, False or None)"
 msgstr "Boole (True, False, of None)"
 
+msgid "Positive big integer"
+msgstr "Positiewe groot heelgetal"
+
 msgid "Positive integer"
 msgstr "Positiewe heelgetal"
 
@@ -586,19 +591,17 @@ msgstr "Teks"
 
 #, python-format
 msgid ""
-"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
+"“%(value)s” value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
 "format."
 msgstr ""
-"Die waarde “%(value)s” se formaat is ongeldig. Dit moet in die formaat HH:"
-"MM[:ss[.uuuuuu]] wees."
+"“%(value)s”-waarde het ’n ongeldige formaat. Dit moet geformateer word as HH:"
+"MM[:ss[.uuuuuu]]."
 
 #, python-format
 msgid ""
-"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
+"“%(value)s” value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
 "invalid time."
 msgstr ""
-"Die waarde “%(value)s” het die regte formaat (HH:MM[:ss[.uuuuuu]]) maar is "
-"nie ’n geldige tyd nie."
 
 msgid "Time"
 msgstr "Tyd"
@@ -610,7 +613,7 @@ msgid "Raw binary data"
 msgstr "Rou binêre data"
 
 #, python-format
-msgid "'%(value)s' is not a valid UUID."
+msgid "“%(value)s” is not a valid UUID."
 msgstr "“%(value)s” is nie ’n geldige UUID nie."
 
 msgid "Universally unique identifier"
@@ -622,6 +625,12 @@ msgstr "Lêer"
 msgid "Image"
 msgstr "Prent"
 
+msgid "A JSON object"
+msgstr "’n JSON-objek"
+
+msgid "Value must be valid JSON."
+msgstr "Waarde moet geldige JSON wees."
+
 #, python-format
 msgid "%(model)s instance with %(field)s %(value)r does not exist."
 msgstr "%(model)s-objek met %(field)s %(value)r bestaan nie."
@@ -716,6 +725,9 @@ msgstr "Tik ’n volledige waarde in."
 msgid "Enter a valid UUID."
 msgstr "Tik ’n geldig UUID in."
 
+msgid "Enter a valid JSON."
+msgstr "Gee geldige JSON."
+
 #. Translators: This is the default suffix added to form field labels
 msgid ":"
 msgstr ":"
@@ -773,16 +785,14 @@ msgstr ""
 "nie."
 
 #, python-format
-msgid "\"%(pk)s\" is not a valid value."
-msgstr "“%(pk)s” is nie 'n geldige waarde nie."
+msgid "“%(pk)s” is not a valid value."
+msgstr "“%(pk)s” is nie ’n geldige waarde nie."
 
 #, python-format
 msgid ""
-"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"%(datetime)s couldn’t be interpreted in time zone %(current_timezone)s; it "
 "may be ambiguous or it may not exist."
 msgstr ""
-"%(datetime)s kon nie in die tydsone %(current_timezone)s vertolk word nie; "
-"dit is dalk dubbelsinnig, of bestaan nie."
 
 msgid "Clear"
 msgstr "Maak skoon"
@@ -802,6 +812,7 @@ msgstr "Ja"
 msgid "No"
 msgstr "Nee"
 
+#. Translators: Please do not add spaces around commas.
 msgid "yes,no,maybe"
 msgstr "ja,nee,miskien"
 
@@ -1110,9 +1121,6 @@ msgid_plural "%d minutes"
 msgstr[0] "%d minuut"
 msgstr[1] "%d minute"
 
-msgid "0 minutes"
-msgstr "0 minute"
-
 msgid "Forbidden"
 msgstr "Verbode"
 
@@ -1120,38 +1128,25 @@ msgid "CSRF verification failed. Request aborted."
 msgstr "CSRF-verifikasie het misluk. Versoek is laat val."
 
 msgid ""
-"You are seeing this message because this HTTPS site requires a 'Referer "
-"header' to be sent by your Web browser, but none was sent. This header is "
+"You are seeing this message because this HTTPS site requires a “Referer "
+"header” to be sent by your Web browser, but none was sent. This header is "
 "required for security reasons, to ensure that your browser is not being "
 "hijacked by third parties."
 msgstr ""
-"U sien hierdie boodskap  omdat dié HTTPS-werf vereis dat u blaaier ’n "
-"“Referer header” moet stuur, maar dit is nie gestuur nie. Hierdie header is "
-"vir sekuriteitsredes nodig om te verseker dat u blaaier nie deur derde "
-"partye gekaap is nie."
 
 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."
+"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 ""
-"As “Referer headers” in u blaaier gedeaktiveer is, heraktiveer hulle asb. "
-"ten minste vir dié werf, of vir HTTPS-verbindings, of vir “same-origin”-"
-"versoeke."
 
 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."
+"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 ""
-"Indien u die <meta name=\"referrer\" content=\"no-referrer\">-etiket gebruik "
-"of die “Referrer-Policy: no-referrer header” gebruik, verwyder hulle asb. "
-"Die CSRF-beskerming vereis die “Referer header” om streng kontrole van die "
-"verwysende bladsy te doen. Indien u besorg is oor privaatheid, gebruik "
-"alternatiewe soos <a rel=\"noreferrer\" ...> vir skakels na "
-"derdepartywebwerwe."
 
 msgid ""
 "You are seeing this message because this site requires a CSRF cookie when "
@@ -1164,10 +1159,8 @@ msgstr ""
 
 msgid ""
 "If you have configured your browser to disable cookies, please re-enable "
-"them, at least for this site, or for 'same-origin' requests."
+"them, at least for this site, or for “same-origin” requests."
 msgstr ""
-"Indien koekies in u blaaier gedeaktiveer is, heraktiveer hulle asb ten "
-"minste vir dié werf, of vir “same-origin”-versoeke."
 
 msgid "More information is available with DEBUG=True."
 msgstr "Meer inligting is beskikbaar met DEBUG=True."
@@ -1200,31 +1193,30 @@ msgstr ""
 "%(class_name)s.allow_future vals is."
 
 #, python-format
-msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
-msgstr "Ongeldige datumstring “%(datestr)s” vir formaat “%(format)s”"
+msgid "Invalid date string “%(datestr)s” given format “%(format)s”"
+msgstr "Ongeldige datumstring “%(datestr)s” gegewe die formaat “%(format)s”"
 
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
 msgstr "Geen %(verbose_name)s gevind vir die soektog"
 
-msgid "Page is not 'last', nor can it be converted to an int."
+msgid "Page is not “last”, nor can it be converted to an int."
 msgstr ""
-"Bladsy is nie “last” nie, en dit kan nie omgeskakel word na ’n heelgetal nie."
 
 #, python-format
 msgid "Invalid page (%(page_number)s): %(message)s"
 msgstr "Ongeldige bladsy (%(page_number)s): %(message)s"
 
 #, python-format
-msgid "Empty list and '%(class_name)s.allow_empty' is False."
-msgstr "Leë lys en “%(class_name)s.allow_empty” is vals."
+msgid "Empty list and “%(class_name)s.allow_empty” is False."
+msgstr ""
 
 msgid "Directory indexes are not allowed here."
 msgstr "Gidsindekse word nie hier toegelaat nie."
 
 #, python-format
-msgid "\"%(path)s\" does not exist"
-msgstr "“%(path)s” bestaan nie"
+msgid "“%(path)s” does not exist"
+msgstr "“%(path)s” bestaan nie."
 
 #, python-format
 msgid "Index of %(directory)s"
@@ -1259,7 +1251,7 @@ msgstr ""
 msgid "Django Documentation"
 msgstr "Django-dokumentasie"
 
-msgid "Topics, references, &amp; how-to's"
+msgid "Topics, references, &amp; how-to’s"
 msgstr ""
 
 msgid "Tutorial: A Polling App"
diff --git a/django/conf/locale/ar/LC_MESSAGES/django.mo b/django/conf/locale/ar/LC_MESSAGES/django.mo
index 6330ab5..d65a93a 100644
 Binary files a/django/conf/locale/ar/LC_MESSAGES/django.mo and b/django/conf/locale/ar/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/ar/LC_MESSAGES/django.po b/django/conf/locale/ar/LC_MESSAGES/django.po
index d0c82d8..ccda018 100644
--- a/django/conf/locale/ar/LC_MESSAGES/django.po
+++ b/django/conf/locale/ar/LC_MESSAGES/django.po
@@ -1,18 +1,22 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
-# Bashar Al-Abdulhadi, 2015-2016
+# Bashar Al-Abdulhadi, 2015-2016,2020
 # Bashar Al-Abdulhadi, 2014
 # Eyad Toma <[e-mail]>, 2013-2014
 # Jannis Leidel <[e-mail]>, 2011
+# Muaaz Alsaied, 2020
+# Omar Al-Ithawi <[e-mail]>, 2020
 # Ossama Khayat <[e-mail]>, 2011
+# Tony xD <[e-mail]>, 2020
+# صفا الفليج <[e-mail]>, 2020
 msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-15 16:15+0100\n"
-"PO-Revision-Date: 2017-11-16 01:13+0000\n"
-"Last-Translator: Jannis Leidel <[e-mail]>\n"
+"POT-Creation-Date: 2020-05-19 20:23+0200\n"
+"PO-Revision-Date: 2020-07-15 00:40+0000\n"
+"Last-Translator: Bashar Al-Abdulhadi\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"
@@ -27,6 +31,9 @@ msgstr "الإفريقية"
 msgid "Arabic"
 msgstr "العربيّة"
 
+msgid "Algerian Arabic"
+msgstr "عربي جزائري"
+
 msgid "Asturian"
 msgstr "الأسترية"
 
@@ -141,12 +148,18 @@ msgstr "الصربية العليا"
 msgid "Hungarian"
 msgstr "الهنغاريّة"
 
+msgid "Armenian"
+msgstr "الأرمنية"
+
 msgid "Interlingua"
 msgstr "اللغة الوسيطة"
 
 msgid "Indonesian"
 msgstr "الإندونيسيّة"
 
+msgid "Igbo"
+msgstr "الإيبو"
+
 msgid "Ido"
 msgstr "ايدو"
 
@@ -162,6 +175,9 @@ msgstr "اليابانيّة"
 msgid "Georgian"
 msgstr "الجورجيّة"
 
+msgid "Kabyle"
+msgstr "القبائل"
+
 msgid "Kazakh"
 msgstr "الكازاخستانية"
 
@@ -174,6 +190,9 @@ msgstr "الهنديّة (كنّادا)"
 msgid "Korean"
 msgstr "الكوريّة"
 
+msgid "Kyrgyz"
+msgstr "قيرغيز"
+
 msgid "Luxembourgish"
 msgstr "اللوكسمبرجية"
 
@@ -258,9 +277,15 @@ msgstr "التاميل"
 msgid "Telugu"
 msgstr "التيلوغو"
 
+msgid "Tajik"
+msgstr "طاجيك"
+
 msgid "Thai"
 msgstr "التايلنديّة"
 
+msgid "Turkmen"
+msgstr "تركمان"
+
 msgid "Turkish"
 msgstr "التركيّة"
 
@@ -276,6 +301,9 @@ msgstr "الأكرانيّة"
 msgid "Urdu"
 msgstr "الأوردو"
 
+msgid "Uzbek"
+msgstr "الأوزبكي"
+
 msgid "Vietnamese"
 msgstr "الفيتناميّة"
 
@@ -298,47 +326,49 @@ msgid "Syndication"
 msgstr "توظيف النشر"
 
 msgid "That page number is not an integer"
-msgstr ""
+msgstr "رقم الصفحة هذا ليس عدداً طبيعياً"
 
 msgid "That page number is less than 1"
-msgstr ""
+msgstr "رقم الصفحة أقل من 1"
 
 msgid "That page contains no results"
-msgstr ""
+msgstr "هذه الصفحة لا تحتوي على نتائج"
 
 msgid "Enter a valid value."
-msgstr "أدخل قيمة صحيحة."
+msgstr "أدخِل قيمة صحيحة."
 
 msgid "Enter a valid URL."
-msgstr "أدخل رابطاً صحيحاً."
+msgstr "أدخِل رابطًا صحيحًا."
 
 msgid "Enter a valid integer."
-msgstr "أدخل رقم صالح."
+msgstr "أدخِل عدداً طبيعياً."
 
 msgid "Enter a valid email address."
-msgstr "أدخل عنوان بريد إلكتروني صحيح."
+msgstr "أدخِل عنوان بريد إلكتروني صحيح."
 
 #. Translators: "letters" means latin letters: a-z and A-Z.
 msgid ""
-"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
+"Enter a valid “slug” consisting of letters, numbers, underscores or hyphens."
 msgstr "أدخل اختصار 'slug' صحيح يتكوّن من أحرف، أرقام، شرطات سفلية وعاديّة."
 
 msgid ""
-"Enter a valid 'slug' consisting of Unicode letters, numbers, underscores, or "
+"Enter a valid “slug” consisting of Unicode letters, numbers, underscores, or "
 "hyphens."
-msgstr "أدخل اختصار 'slug' صحيح يتكوّن من أحرف، أرقام، شرطات سفلية وعاديّة."
+msgstr ""
+"أدخل اختصار 'slug' صحيح يتكون من أحرف Unicode أو أرقام أو شرطات سفلية أو "
+"واصلات."
 
 msgid "Enter a valid IPv4 address."
-msgstr "أدخل عنوان IPv4 صحيح."
+msgstr "أدخِل عنوان IPv4 صحيح."
 
 msgid "Enter a valid IPv6 address."
-msgstr "أدخل عنوان IPv6 صحيح."
+msgstr "أدخِل عنوان IPv6 صحيح."
 
 msgid "Enter a valid IPv4 or IPv6 address."
-msgstr "أدخل عنوان IPv4 أو عنوان IPv6 صحيح."
+msgstr "أدخِل عنوان IPv4 أو عنوان IPv6 صحيح."
 
 msgid "Enter only digits separated by commas."
-msgstr "أدخل أرقاما فقط مفصول بينها بفواصل."
+msgstr "أدخِل فقط أرقامًا تفصلها الفواصل."
 
 #, python-format
 msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
@@ -404,6 +434,9 @@ msgstr[5] ""
 "تأكد أن هذه القيمة تحتوي على %(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."
@@ -438,12 +471,14 @@ msgstr[5] "تحقق من أن تدخل %(max)s أرقام قبل الفاصل ا
 
 #, python-format
 msgid ""
-"File extension '%(extension)s' is not allowed. Allowed extensions are: "
-"'%(allowed_extensions)s'."
+"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 ""
+msgstr "الأحرف الخالية غير مسموح بها."
 
 msgid "and"
 msgstr "و"
@@ -478,19 +513,13 @@ msgstr ""
 msgid "Field of type: %(field_type)s"
 msgstr "حقل نوع: %(field_type)s"
 
-msgid "Integer"
-msgstr "عدد صحيح"
-
 #, python-format
-msgid "'%(value)s' value must be an integer."
-msgstr "قيمة '%(value)s' يجب ان تكون عدد صحيح."
-
-msgid "Big (8 byte) integer"
-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 or False."
-msgstr "قيمة '%(value)s' يجب أن تكون True أو False."
+msgid "“%(value)s” value must be either True, False, or None."
+msgstr "قيمة “%(value)s” يجب أن تكون True , False أو None."
 
 msgid "Boolean (Either True or False)"
 msgstr "ثنائي (إما True أو False)"
@@ -504,7 +533,7 @@ msgstr "أرقام صحيحة مفصولة بفواصل"
 
 #, python-format
 msgid ""
-"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
+"“%(value)s” value has an invalid date format. It must be in YYYY-MM-DD "
 "format."
 msgstr ""
 "قيمة '%(value)s' ليست من بُنية تاريخ صحيحة. القيمة يجب ان تكون من البُنية YYYY-"
@@ -512,7 +541,7 @@ msgstr ""
 
 #, python-format
 msgid ""
-"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
+"“%(value)s” value has the correct format (YYYY-MM-DD) but it is an invalid "
 "date."
 msgstr "قيمة '%(value)s' من بُنية صحيحة (YYYY-MM-DD) لكنها تحوي تاريخ غير صحيح."
 
@@ -521,7 +550,7 @@ msgstr "التاريخ (دون الوقت)"
 
 #, python-format
 msgid ""
-"'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"“%(value)s” value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
 "uuuuuu]][TZ] format."
 msgstr ""
 "قيمة '%(value)s' ليست من بُنية صحيحة. القيمة يجب ان تكون من البُنية YYYY-MM-DD "
@@ -529,7 +558,7 @@ msgstr ""
 
 #, python-format
 msgid ""
-"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
+"“%(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' من بُنية صحيحة (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) لكنها "
@@ -539,7 +568,7 @@ msgid "Date (with time)"
 msgstr "التاريخ (مع الوقت)"
 
 #, python-format
-msgid "'%(value)s' value must be a decimal number."
+msgid "“%(value)s” value must be a decimal number."
 msgstr "قيمة '%(value)s' يجب ان تكون عدد عشري."
 
 msgid "Decimal number"
@@ -547,11 +576,11 @@ msgstr "رقم عشري"
 
 #, python-format
 msgid ""
-"'%(value)s' value has an invalid format. It must be in [DD] [HH:[MM:]]ss[."
+"“%(value)s” value has an invalid format. It must be in [DD] [[HH:]MM:]ss[."
 "uuuuuu] format."
 msgstr ""
-"قيمة '%(value)s' ليست بنسق صحيح. القيمة يجب ان تكون من التنسيق [DD] [HH:"
-"[MM:]]ss[.uuuuuu]."
+"قيمة '%(value)s' ليست بنسق صحيح. القيمة يجب ان تكون من التنسيق ([DD] "
+"[[HH:]MM:]ss[.uuuuuu])"
 
 msgid "Duration"
 msgstr "المدّة"
@@ -563,12 +592,22 @@ msgid "File path"
 msgstr "مسار الملف"
 
 #, python-format
-msgid "'%(value)s' value must be a float."
-msgstr "قيمة '%(value)s' يجب ان تكون عدد فاصل عائم."
+msgid "“%(value)s” value must be a float."
+msgstr "قيمة '%(value)s' يجب ان تكون عدد تعويم."
 
 msgid "Floating point number"
 msgstr "رقم فاصلة عائمة"
 
+#, python-format
+msgid "“%(value)s” value must be an integer."
+msgstr "قيمة '%(value)s' يجب ان تكون عدد طبيعي."
+
+msgid "Integer"
+msgstr "عدد صحيح"
+
+msgid "Big (8 byte) integer"
+msgstr "عدد صحيح كبير (8 بايت)"
+
 msgid "IPv4 address"
 msgstr "عنوان IPv4"
 
@@ -576,12 +615,15 @@ msgid "IP address"
 msgstr "عنوان IP"
 
 #, python-format
-msgid "'%(value)s' value must be either None, True or False."
+msgid "“%(value)s” value must be either None, True or False."
 msgstr "قيمة '%(value)s' يجب ان تكون None أو True أو False."
 
 msgid "Boolean (Either True, False or None)"
 msgstr "ثنائي (إما True أو False أو None)"
 
+msgid "Positive big integer"
+msgstr "عدد صحيح موجب كبير"
+
 msgid "Positive integer"
 msgstr "عدد صحيح موجب"
 
@@ -600,15 +642,15 @@ msgstr "نص"
 
 #, python-format
 msgid ""
-"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
+"“%(value)s” value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
 "format."
 msgstr ""
-"قيمة '%(value)s' ليست من بُنية صحيحة. القيمة يجب ان تكون من البُنية HH:MM[:ss[."
-"uuuuuu]]."
+"قيمة '%(value)s' ليست بنسق صحيح. القيمة يجب ان تكون من التنسيق\n"
+"HH:MM[:ss[.uuuuuu]]"
 
 #, python-format
 msgid ""
-"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
+"“%(value)s” value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
 "invalid time."
 msgstr ""
 "قيمة '%(value)s' من بُنية صحيحة (HH:MM[:ss[.uuuuuu]]) لكنها تحوي وقت غير صحيح."
@@ -623,8 +665,11 @@ msgid "Raw binary data"
 msgstr "البيانات الثنائية الخام"
 
 #, python-format
-msgid "'%(value)s' is not a valid UUID."
-msgstr "'%(value)s' ليست قيمة UUID صحيحة."
+msgid "“%(value)s” is not a valid UUID."
+msgstr "القيمة \"%(value)s\" ليست UUID صالح."
+
+msgid "Universally unique identifier"
+msgstr "معرّف فريد عالمياً"
 
 msgid "File"
 msgstr "ملف"
@@ -632,6 +677,12 @@ msgstr "ملف"
 msgid "Image"
 msgstr "صورة"
 
+msgid "A JSON object"
+msgstr "كائن JSON"
+
+msgid "Value must be valid JSON."
+msgstr "يجب أن تكون قيمة JSON صالحة."
+
 #, python-format
 msgid "%(model)s instance with %(field)s %(value)r does not exist."
 msgstr "النموذج %(model)s ذو الحقل و القيمة %(field)s %(value)r غير موجود."
@@ -665,9 +716,6 @@ msgstr "هذا الحقل مطلوب."
 msgid "Enter a whole number."
 msgstr "أدخل رقما صحيحا."
 
-msgid "Enter a number."
-msgstr "أدخل رقماً."
-
 msgid "Enter a valid date."
 msgstr "أدخل تاريخاً صحيحاً."
 
@@ -680,6 +728,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 "لم يتم ارسال ملف، الرجاء التأكد من نوع ترميز الاستمارة."
 
@@ -735,6 +787,9 @@ msgstr "إدخال قيمة كاملة."
 msgid "Enter a valid UUID."
 msgstr "أدخل قيمة UUID صحيحة."
 
+msgid "Enter a valid JSON."
+msgstr "أدخل مدخل JSON صالح."
+
 #. Translators: This is the default suffix added to form field labels
 msgid ":"
 msgstr ":"
@@ -792,18 +847,18 @@ msgid "Please correct the duplicate values below."
 msgstr "رجاءً صحّح القيم المُكرّرة أدناه."
 
 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."
-msgstr ""
+msgid "“%(pk)s” is not a valid value."
+msgstr "\"%(pk)s\" ليست قيمة صالحة."
 
 #, python-format
 msgid ""
-"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"%(datetime)s couldn’t be interpreted in time zone %(current_timezone)s; it "
 "may be ambiguous or it may not exist."
 msgstr ""
 "%(datetime)s لا يمكن تفسيرها في المنطقة الزمنية %(current_timezone)s; قد "
@@ -827,6 +882,7 @@ msgstr "نعم"
 msgid "No"
 msgstr "لا"
 
+#. Translators: Please do not add spaces around commas.
 msgid "yes,no,maybe"
 msgstr "نعم,لا,ربما"
 
@@ -1093,7 +1149,7 @@ msgstr "هذا ليس عنوان IPv6 صحيح."
 
 #, python-format
 msgctxt "String to return when truncating text"
-msgid "%(truncated_text)s..."
+msgid "%(truncated_text)s…"
 msgstr "%(truncated_text)s..."
 
 msgid "or"
@@ -1163,9 +1219,6 @@ msgstr[3] "%d دقائق"
 msgstr[4] "%d دقيقة"
 msgstr[5] "%d دقيقة"
 
-msgid "0 minutes"
-msgstr "0 دقيقة"
-
 msgid "Forbidden"
 msgstr "ممنوع"
 
@@ -1173,31 +1226,34 @@ msgid "CSRF verification failed. Request aborted."
 msgstr "تم الفشل للتحقق من CSRF. تم إنهاء الطلب."
 
 msgid ""
-"You are seeing this message because this HTTPS site requires a 'Referer "
-"header' to be sent by your Web browser, but none was sent. This header is "
+"You are seeing this message because this HTTPS site requires a “Referer "
+"header” to be sent by your Web browser, but none was sent. This header is "
 "required for security reasons, to ensure that your browser is not being "
 "hijacked by third parties."
 msgstr ""
-"أنت ترى هذه الرسالة لأن هذا الموقع HTTPS يتطلب إرسال 'Referer header'  من "
-"قبل المتصفح، ولكن لم تم إرسال أي شيء. هذا الـheader مطلوب لأسباب أمنية، "
-"لضمان أن متصفحك لم يتم اختطافه من قبل أطراف أخرى."
+"تظهر لك هذه الرسالة لأن موقع HTTPS يتطلب \"رأس مرجعي\" ليتم إرساله بواسطة "
+"مستعرض الويب الخاص بك ، ولكن لم يتم إرسال أي منها. هذا العنوان مطلوب لأسباب "
+"أمنية ، للتأكد من أن متصفحك لا يتم اختراقه من قبل أطراف ثالثة."
 
 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."
+"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 headers'، يرجى إعادة تفعيلها، على الأقل "
-"بالنسبة لهذا الموقع، أو لاتصالات HTTPS، أو للطلبات من نفس المنشأ 'same-"
-"origin'."
+"إذا قمت بتكوين المستعرض لتعطيل رؤوس “Referer” ، فيرجى إعادة تمكينها ، على "
+"الأقل لهذا الموقع ، أو لاتصالات 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."
+"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 "
@@ -1210,10 +1266,10 @@ msgstr ""
 
 msgid ""
 "If you have configured your browser to disable cookies, please re-enable "
-"them, at least for this site, or for 'same-origin' requests."
+"them, at least for this site, or for “same-origin” requests."
 msgstr ""
 "إذا قمت بضبط المتصفح لتعطيل الكوكيز الرجاء إعادة تغعيلها، على الأقل بالنسبة "
-"لهذا الموقع، أو للطلبات من نفس المنشأ 'same-origin'."
+"لهذا الموقع، أو للطلبات من “same-origin”."
 
 msgid "More information is available with DEBUG=True."
 msgstr "يتوفر مزيد من المعلومات عند ضبط الخيار DEBUG=True."
@@ -1222,7 +1278,7 @@ msgid "No year specified"
 msgstr "لم تحدد السنة"
 
 msgid "Date out of range"
-msgstr ""
+msgstr "التاريخ خارج النطاق"
 
 msgid "No month specified"
 msgstr "لم تحدد الشهر"
@@ -1246,46 +1302,51 @@ msgstr ""
 "allow_future هي False."
 
 #, python-format
-msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
-msgstr "نسق تاريخ غير صحيح '%(datestr)s' محدد بالشكل '%(format)s'"
+msgid "Invalid date string “%(datestr)s” given format “%(format)s”"
+msgstr "نسق تاريخ غير صحيح \"%(datestr)s\" محدد بالشكل ''%(format)s\""
 
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
 msgstr "لم يعثر على أي %(verbose_name)s مطابقة لهذا الإستعلام"
 
-msgid "Page is not 'last', nor can it be converted to an int."
-msgstr "الصفحة ليست 'الأخيرة'، ولا يمكن تحويل القيمة إلى رقم صحيح."
+msgid "Page is not “last”, nor can it be converted to an int."
+msgstr "الصفحة ليست \"الأخيرة\"، كما لا يمكن تحويل القيمة إلى رقم طبيعي."
 
 #, python-format
 msgid "Invalid page (%(page_number)s): %(message)s"
 msgstr "صفحة خاطئة (%(page_number)s): %(message)s"
 
 #, python-format
-msgid "Empty list and '%(class_name)s.allow_empty' is False."
-msgstr "قائمة فارغة و '%(class_name)s.allow_empty' قيمته False."
+msgid "Empty list and “%(class_name)s.allow_empty” is False."
+msgstr ""
+"قائمة فارغة و\n"
+"\"%(class_name)s.allow_empty\"\n"
+"قيمته False."
 
 msgid "Directory indexes are not allowed here."
 msgstr "لا يسمح لفهارس الدليل هنا."
 
 #, python-format
-msgid "\"%(path)s\" does not exist"
-msgstr "المسار \"%(path)s\" غير موجود."
+msgid "“%(path)s” does not exist"
+msgstr "”%(path)s“ غير موجود"
 
 #, python-format
 msgid "Index of %(directory)s"
 msgstr "فهرس لـ %(directory)s"
 
 msgid "Django: the Web framework for perfectionists with deadlines."
-msgstr ""
+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 ""
+"استعراض <a href=\"https://docs.djangoproject.com/en/%(version)s/releases/\" "
+"target=\"_blank\" rel=\"noopener\">ملاحظات الإصدار</a> لجانغو %(version)s"
 
 msgid "The install worked successfully! Congratulations!"
-msgstr ""
+msgstr "تمت عملية التنصيب بنجاح! تهانينا!"
 
 #, python-format
 msgid ""
@@ -1294,21 +1355,24 @@ msgid ""
 "\">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 خاصتك كما أنك لم تقم بإعداد الروابط URLs."
 
 msgid "Django Documentation"
-msgstr ""
+msgstr "وثائق تعليمات جانغو"
 
-msgid "Topics, references, &amp; how-to's"
-msgstr ""
+msgid "Topics, references, &amp; how-to’s"
+msgstr "المواضيع و المراجع و التعليمات"
 
 msgid "Tutorial: A Polling App"
-msgstr ""
+msgstr "برنامج تعليمي: تطبيق تصويت"
 
 msgid "Get started with Django"
-msgstr ""
+msgstr "إبدأ مع جانغو"
 
 msgid "Django Community"
-msgstr ""
+msgstr "مجتمع جانغو"
 
 msgid "Connect, get help, or contribute"
-msgstr ""
+msgstr "اتصل بنا أو احصل على مساعدة أو ساهم"
diff --git a/django/conf/locale/ar_DZ/LC_MESSAGES/django.mo b/django/conf/locale/ar_DZ/LC_MESSAGES/django.mo
 new file mode 100644
index 0000000..1fce7bc
 Binary files /dev/null and b/django/conf/locale/ar_DZ/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/ar_DZ/LC_MESSAGES/django.po b/django/conf/locale/ar_DZ/LC_MESSAGES/django.po
 new file mode 100644
index 0000000..373dea1
--- /dev/null
+++ b/django/conf/locale/ar_DZ/LC_MESSAGES/django.po
@@ -0,0 +1,1379 @@
+# This file is distributed under the same license as the Django package.
+#
+# Translators:
+# Riterix <[e-mail]>, 2019-2020
+# Riterix <[e-mail]>, 2019
+msgid ""
+msgstr ""
+"Project-Id-Version: django\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-05-19 20:23+0200\n"
+"PO-Revision-Date: 2020-07-14 21:42+0000\n"
+"Last-Translator: Transifex Bot <>\n"
+"Language-Team: Arabic (Algeria) (http://www.transifex.com/django/django/"
+"language/ar_DZ/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar_DZ\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
+"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+
+msgid "Afrikaans"
+msgstr "الإفريقية"
+
+msgid "Arabic"
+msgstr "العربية"
+
+msgid "Algerian Arabic"
+msgstr "العربية الجزائرية"
+
+msgid "Asturian"
+msgstr "الأسترية"
+
+msgid "Azerbaijani"
+msgstr "الأذربيجانية"
+
+msgid "Bulgarian"
+msgstr "البلغارية"
+
+msgid "Belarusian"
+msgstr "البيلاروسية"
+
+msgid "Bengali"
+msgstr "البنغالية"
+
+msgid "Breton"
+msgstr "البريتونية"
+
+msgid "Bosnian"
+msgstr "البوسنية"
+
+msgid "Catalan"
+msgstr "الكتلانية"
+
+msgid "Czech"
+msgstr "التشيكية"
+
+msgid "Welsh"
+msgstr "الويلز"
+
+msgid "Danish"
+msgstr "الدنماركية"
+
+msgid "German"
+msgstr "الألمانية"
+
+msgid "Lower Sorbian"
+msgstr "الصربية السفلى"
+
+msgid "Greek"
+msgstr "اليونانية"
+
+msgid "English"
+msgstr "الإنجليزية"
+
+msgid "Australian English"
+msgstr "الإنجليزية الإسترالية"
+
+msgid "British English"
+msgstr "الإنجليزية البريطانية"
+