[1.8.x] Added CVE-2018-7536,7 to the security release archive.

Backport of 5bbbdd26d1ea4f3bb164ad64b0d0d458d8bfdd02 from master
[1.8.x] Added CVE-2018-6188 to the security release archive.
2018-03-06 13:10:07 -05:00 · 2018-03-06 13:09:57 -05:00 · 2018-03-06 09:37:53 -05:00 · 2018-03-06 09:17:43 -05:00 · 2018-03-01 11:58:41 -05:00 · 2018-03-01 11:58:41 -05:00
4525 changed files with 116249 additions and 204401 deletions
--- a/.editorconfig
+++ b/.editorconfig
@ -1,41 +0,0 @@
 # http://editorconfig.org
 root = true
 [*]
 indent_style = space
 indent_size = 4
 insert_final_newline = true
 trim_trailing_whitespace = true
 end_of_line = lf
 charset = utf-8
 # Docstrings and comments use max_line_length = 79
 [*.py]
 max_line_length = 119
 # Use 2 spaces for the HTML files
 [*.html]
 indent_size = 2
 # The JSON files contain newlines inconsistently
 [*.json]
 indent_size = 2
 insert_final_newline = ignore
 [**/admin/js/vendor/**]
 indent_style = ignore
 indent_size = ignore
 # Minified JavaScript files shouldn't be changed
 [**.min.js]
 indent_style = ignore
 insert_final_newline = ignore
 # Makefiles always use tabs for indentation
 [Makefile]
 indent_style = tab
 # Batch files use tabs for indentation
 [*.bat]
 indent_style = tab
--- a/.eslintignore
+++ b/.eslintignore
@ -1,4 +0,0 @@
 **/*.min.js
 **/vendor/**/*.js
 django/contrib/gis/templates/**/*.js
 node_modules/**.js
--- a/.eslintrc
+++ b/.eslintrc
@ -1,33 +0,0 @@
 {
    "rules": {
        "camelcase": [0, {"properties": "always"}],
        "comma-spacing": [2, {"before": false, "after": true}],
        "dot-notation": [2, {"allowKeywords": true}],
        "curly": [2, "all"],
        "indent": [2, 4],
        "key-spacing": [2, {"beforeColon": false, "afterColon": true}],
        "new-cap": [0, {"newIsCap": true, "capIsNew": true}],
        "no-alert": [0],
        "no-eval": [2],
        "no-extend-native": [2, {"exceptions": ["Date", "String"]}],
        "no-multi-spaces": [2],
        "no-octal-escape": [2],
        "no-underscore-dangle": [2],
        "no-unused-vars": [2, {"vars": "local", "args": "none"}],
        "no-script-url": [2],
        "no-shadow": [2, {"hoist": "functions"}],
        "quotes": [0, "single"],
        "linebreak-style": [2, "unix"],
        "semi": [2, "always"],
        "space-before-blocks": [2, "always"],
        "space-before-function-paren": [2, {"anonymous": "never", "named": "never"}],
        "space-infix-ops": [2, {"int32Hint": false}],
        "strict": [1, "function"]
    },
    "env": {
        "browser": true
    },
    "globals": {
        "django": false
    }
 }
--- a/.gitattributes
+++ b/.gitattributes
@ -1,7 +1,5 @@
 # Normalize line endings to avoid spurious failures in the core test suite on Windows.
 *html text eol=lf
 *css text eol=lf
 *js text eol=lf
 tests/staticfiles_tests/apps/test/static/test/*txt text eol=lf
 tests/staticfiles_tests/project/documents/test/*txt text eol=lf
 docs/releases/*.txt merge=union
--- a/.gitignore
+++ b/.gitignore
@ -1,11 +1,6 @@
 # If you need to exclude files such as those generated by an IDE, use
 # $GIT_DIR/info/exclude or the core.excludesFile configuration variable as
 # described in https://git-scm.com/docs/gitignore
 *.egg-info
 *.pot
 *.py[co]
 .tox/
 __pycache__
 MANIFEST
 dist/
--- a/.tx/config
+++ b/.tx/config
@ -47,6 +47,11 @@ file_filter = django/contrib/humanize/locale/<lang>/LC_MESSAGES/django.po
 source_file = django/contrib/humanize/locale/en/LC_MESSAGES/django.po
 source_lang = en
 [django.contrib-messages]
 file_filter = django/contrib/messages/locale/<lang>/LC_MESSAGES/django.po
 source_file = django/contrib/messages/locale/en/LC_MESSAGES/django.po
 source_lang = en
 [django.contrib-postgres]
 file_filter = django/contrib/postgres/locale/<lang>/LC_MESSAGES/django.po
 source_file = django/contrib/postgres/locale/en/LC_MESSAGES/django.po
--- a/116
+++ b/116
@ -8,11 +8,7 @@ answer newbie questions, and generally made Django that much better:
    Aaron Cannon <cannona@fireantproductions.com>
    Aaron Swartz <http://www.aaronsw.com/>
    Aaron T. Myers <atmyers@gmail.com>
    Adam Donaghy
    Adam Johnson <https://github.com/adamchainz>
    Adam Malinowski <http://adammalinowski.co.uk>
    Adam Vandenberg
    Adiyat Mubarak <adiyatmubarak@gmail.com>
    Adrian Holovaty <adrian@holovaty.com>
    Adrien Lemaire <lemaire.adrien@gmail.com>
    Afonso Fernández Nogueira <fonzzo.django@gmail.com>
@ -22,32 +18,26 @@ answer newbie questions, and generally made Django that much better:
    ajs <adi@sieker.info>
    Akis Kesoglou <akiskesoglou@gmail.com>
    Aksel Ethem <aksel.ethem@gmail.com>
    Akshesh Doshi <aksheshdoshi+django@gmail.com>
    alang@bright-green.com
    Alasdair Nicol <http://al.sdair.co.uk/>
    Albert Wang <aywang31@gmail.com>
    Alcides Fonseca
    Aleksandra Sendecka <asendecka@hauru.eu>
    Aleksi Häkli <aleksi.hakli@iki.fi>
    Alexander Dutton <dev@alexdutton.co.uk>
    Alexander Myodov <alex@myodov.com>
    Alex Couper <http://alexcouper.com/>
    Alex Dedul
    Alex Gaynor <alex.gaynor@gmail.com>
    Alex Hill <alex@hill.net.au>
    Alex Ogier <alex.ogier@gmail.com>
    Alex Robbins <alexander.j.robbins@gmail.com>
    Alexey Boriskin <alex@boriskin.me>
    Aljosa Mohorovic <aljosa.mohorovic@gmail.com>
    Amit Chakradeo <http://amit.chakradeo.net/>
    Amit Ramon <amit.ramon@gmail.com>
    Amit Upadhyay <http://www.amitu.com/blog/>
    A. Murat Eren <meren@pardus.org.tr>
    Ana Belen Sarabia <belensarabia@gmail.com>
    Ana Krivokapic <https://github.com/infraredgirl>
    Andi Albrecht <albrecht.andi@gmail.com>
    André Ericson <de.ericson@gmail.com>
    Andrei Kulakov <andrei.avk@gmail.com>
    Andreas
    Andreas Mock <andreas.mock@web.de>
    Andreas Pelme <andreas@pelme.se>
@ -58,14 +48,13 @@ answer newbie questions, and generally made Django that much better:
    Andrew Godwin <andrew@aeracode.org>
    Andrew Pinkham <http://AndrewsForge.com>
    Andrews Medina <andrewsmedina@gmail.com>
-    Andriy Sokolovskiy <me@asokolovskiy.com>
+    Andriy Sokolovskiy <sokandpal@yandex.ru>
    Andy Dustman <farcepest@gmail.com>
    Andy Gayton <andy-django@thecablelounge.com>
    andy@jadedplanet.net
    Anssi Kääriäinen <akaariai@gmail.com>
    ant9000@netwise.it
    Anthony Briggs <anthony.briggs@gmail.com>
    Anton Samarchyan <desecho@gmail.com>
    Antoni Aloy
    Antonio Cavedoni <http://cavedoni.com/>
    Antonis Christofides <anthony@itia.ntua.gr>
@ -75,14 +64,12 @@ answer newbie questions, and generally made Django that much better:
    Aram Dulyan
    arien <regexbot@gmail.com>
    Armin Ronacher
    Aron Podrigal <aronp@guaranteedplus.com>
    Artem Gnilov <boobsd@gmail.com>
    Arthur <avandorp@gmail.com>
    Arthur Koziel <http://arthurkoziel.com>
    Arvis Bickovskis <viestards.lists@gmail.com>
    Aryeh Leib Taurog <http://www.aryehleib.com/>
    A S Alam <aalam@users.sf.net>
    Asif Saif Uddin <auvipy@gmail.com>
    atlithorn <atlithorn@gmail.com>
    Audrey Roy <http://audreymroy.com/>
    av0000@mail.ru
@ -111,14 +98,10 @@ answer newbie questions, and generally made Django that much better:
    berto
    Bill Fenner <fenner@gmail.com>
    Bjørn Stabell <bjorn@exoweb.net>
    Bo Marchman <bo.marchman@gmail.com>
    Bojan Mihelac <bmihelac@mihelac.org>
    Bouke Haarsma <bouke@haarsma.eu>
    Božidar Benko <bbenko@gmail.com>
    Brad Melin <melinbrad@gmail.com>
    Brandon Chinn <http://brandonchinn178.github.io>
    Brant Harris
    Brendan Hayward <brendanhayward85@gmail.com>
    Brenton Simpson <http://theillustratedlife.com>
    Brett Cannon <brett@python.org>
    Brett Hoerner <bretthoerner@bretthoerner.com>
@ -152,9 +135,7 @@ answer newbie questions, and generally made Django that much better:
    Chris Bennett <chrisrbennett@yahoo.com>
    Chris Cahoon <chris.cahoon@gmail.com>
    Chris Chamberlin <dja@cdc.msbx.net>
-    Chris Jerdonek
+    Chris Lamb <lamby@debian.org>
    Chris Jones <chris@brack3t.com>
    Chris Lamb <chris@chris-lamb.co.uk>
    Chris Streeter <chris@chrisstreeter.com>
    Christian Metts
    Christian Oudard <christian.oudard@gmail.com>
@ -185,7 +166,6 @@ answer newbie questions, and generally made Django that much better:
    Daniele Procida <daniele@vurt.org>
    Daniel Greenfeld
    dAniel hAhler
    Daniel Jilg <daniel@breakthesystem.org>
    Daniel Lindsley <daniel@toastdriven.com>
    Daniel Poelzleithner <http://poelzi.org/>
    Daniel Pyrathon <pirosb3@gmail.com>
@ -194,7 +174,6 @@ answer newbie questions, and generally made Django that much better:
    Danilo Bargen
    Dan Johnson <danj.py@gmail.com>
    Dan Poirier <poirier@pobox.com>
    Dan Stephenson <http://dan.io/>
    Dan Watson <http://danwatson.net/>
    dave@thebarproject.com
    David Ascher <http://ascher.ca/>
@ -209,7 +188,6 @@ answer newbie questions, and generally made Django that much better:
    David Krauth
    David Larlet <http://david.larlet.fr>
    David Reynolds <david@reynoldsfamily.org.uk>
    David Sanders <dsanders11@ucsbalum.com>
    David Schein
    David Tulig <david.tulig@gmail.com>
    Davide Ceretti <dav.ceretti@gmail.com>
@ -225,16 +203,13 @@ answer newbie questions, and generally made Django that much better:
    Dmitri Fedortchenko <zeraien@gmail.com>
    Dmitry Jemerov <intelliyole@gmail.com>
    dne@mayonnaise.net
    Donald Harvey <donald@donaldharvey.co.uk>
    Donald Stufft <donald@stufft.io>
    Don Spaulding <donspauldingii@gmail.com>
    Doug Beck <doug@douglasbeck.com>
    Doug Napoleone <doug@dougma.com>
    dready <wil@mojipage.com>
    dusk@woofle.net
    Ed Morley <https://github.com/edmorley>
    eibaan@gmail.com
    Emmanuelle Delescolle <https://github.com/nanuxbe>
    Emil Stenström <em@kth.se>
    enlight
    Enrico <rico.bl@gmail.com>
@ -253,22 +228,18 @@ answer newbie questions, and generally made Django that much better:
    Fabrice Aneche <akh@nobugware.com>
    favo@exoweb.net
    fdr <drfarina@gmail.com>
    Federico Capoano <nemesis@ninux.org>
    Filip Noetzel <http://filip.noetzel.co.uk/>
    Filip Wasilewski <filip.wasilewski@gmail.com>
    Finn Gruwier Larsen <finn@gruwier.dk>
    flavio.curella@gmail.com
    Florian Apolloner <florian@apolloner.eu>
    Francisco Albarran Cristobal <pahko.xd@gmail.com>
    Frank Tegtmeyer <fte@fte.to>
    Frank Wierzbicki
-    Frank Wiles <frank@revsys.com>
+    Frantisek Malina <vizualbod@vizualbod.com>
    František Malina <fmalina@gmail.com>
    Fraser Nevett <mail@nevett.org>
    Gabriel Grant <g@briel.ca>
    Gabriel Hurley <gabriel@strikeawe.com>
    gandalf@owca.info
    Garry Lawrence
    Garry Polley <garrympolley@gmail.com>
    Garth Kidd <http://www.deadlybloodyserious.com/>
    Gary Wilson <gary.wilson@gmail.com>
@ -284,7 +255,6 @@ answer newbie questions, and generally made Django that much better:
    Georgi Stanojevski <glisha@gmail.com>
    Gerardo Orozco <gerardo.orozco.mosqueda@gmail.com>
    Gil Gonçalves <lursty@gmail.com>
    Girish Kumar <girishkumarkh@gmail.com>
    Gisle Aas <gisle@aas.no>
    Glenn Maynard <glenn@zewt.org>
    glin@seznam.cz
@ -295,23 +265,18 @@ answer newbie questions, and generally made Django that much better:
    Greg Chapple <gregchapple1@gmail.com>
    Gregor Müllegger <gregor@muellegger.de>
    Grigory Fateyev <greg@dial.com.ru>
    Grzegorz Ślusarek <grzegorz.slusarek@gmail.com>
    Guilherme Mesquita Gondim <semente@taurinus.org>
    Guillaume Pannatier <guillaume.pannatier@gmail.com>
    Gustavo Picon
    hambaloney
    Hannes Struß <x@hannesstruss.de>
    Hawkeye
    Helen Sherwood-Taylor <helen@rrdlabs.co.uk>
    Henrique Romano <onaiort@gmail.com>
    Henry Dang <henrydangprg@gmail.com>
    hipertracker@gmail.com
    Hiroki Kiyohara <hirokiky@gmail.com>
    Honza Král <honza.kral@gmail.com>
    Horst Gutmann <zerok@zerokspot.com>
    Hugo Osvaldo Barrera <hugo@barrera.io>
    Hyun Mi Ae
    Iacopo Spalletti <i.spalletti@nephila.it>
    Ian A Wilson <http://ianawilson.com>
    Ian Clelland <clelland@gmail.com>
    Ian G. Kelly <ian.g.kelly@gmail.com>
@ -319,19 +284,15 @@ answer newbie questions, and generally made Django that much better:
    Ian Lee <IanLee1521@gmail.com>
    Ibon <ibonso@gmail.com>
    Idan Gazit <idan@gazit.me>
    Ifedapo Olarewaju <ifedapoolarewaju@gmail.com>
    Igor Kolar <ike@email.si>
    Illia Volochii <illia.volochii@gmail.com>
    Ilya Semenov <semenov@inetss.com>
    I.S. van Oostveen <v.oostveen@idca.nl>
    ivan.chelubeev@gmail.com
    Ivan Sagalaev (Maniac) <http://www.softwaremaniacs.org/>
    Jaap Roes <jaap.roes@gmail.com>
    Jack Moffitt <https://metajack.im/>
    Jacob Burch <jacobburch@gmail.com>
    Jacob Kaplan-Moss <jacob@jacobian.org>
-    Jakub Paczkowski <jakub@paczkowski.eu>
+    Jakub Wilk <ubanus@users.sf.net>
    Jakub Wilk <jwilk@jwilk.net>
    Jakub Wiśniowski <restless.being@gmail.com>
    james_027@yahoo.com
    James Aylett
@ -341,9 +302,7 @@ answer newbie questions, and generally made Django that much better:
    James Wheare <django@sparemint.com>
    Jannis Leidel <jannis@leidel.info>
    Janos Guljas
    Jan Pazdziora
    Jan Rademaker
    Jarek Głowacki <jarekwg@gmail.com>
    Jarek Zgoda <jarek.zgoda@gmail.com>
    Jason Davies (Esaj) <http://www.jasondavies.com/>
    Jason Huggins <http://www.jrandolph.com/blog/>
@ -361,21 +320,16 @@ answer newbie questions, and generally made Django that much better:
    Jeff Hui <jeffkhui@gmail.com>
    Jeffrey Gelens <jeffrey@gelens.org>
    Jeff Triplett <jeff.triplett@gmail.com>
    Jens Diemer <django@htfx.de>
    Jens Page
    Jensen Cochran <jensen.cochran@gmail.com>
    Jeong-Min Lee <falsetru@gmail.com>
    Jérémie Blaser <blaserje@gmail.com>
    Jeremy Bowman <https://github.com/jmbowman>
    Jeremy Carbaugh <jcarbaugh@gmail.com>
    Jeremy Dunck <jdunck@gmail.com>
    Jeremy Lainé <jeremy.laine@m4x.org>
    Jesse Young <adunar@gmail.com>
    jhenry <jhenry@theonion.com>
    Jim Dalton <jim.dalton@gmail.com>
    Jimmy Song <jaejoon@gmail.com>
    Jiri Barton
    Joachim Jablon <ewjoachim@gmail.com>
    Joao Oliveira <joaoxsouls@gmail.com>
    Joe Heck <http://www.rhonabwy.com/wp/>
    Joel Bohman <mail@jbohman.com>
@ -391,19 +345,13 @@ answer newbie questions, and generally made Django that much better:
    John Paulett <john@paulett.org>
    John Shaffer <jshaffer2112@gmail.com>
    Jökull Sólberg Auðunsson <jokullsolberg@gmail.com>
    Jon Dufresne <jon.dufresne@gmail.com>
    Jonas Haag <jonas@lophus.org>
    Jonatas C. D. <jonatas.cd@gmail.com>
    Jonathan Buchanan <jonathan.buchanan@gmail.com>
    Jonathan Daugherty (cygnus) <http://www.cprogrammer.org/>
    Jonathan Feignberg <jdf@pobox.com>
    Jonathan Slenders
    Jordan Dimov <s3x3y1@gmail.com>
    Jordi J. Tablada <jordi.joan@gmail.com>
    Jorge Bastida <me@jorgebastida.com>
    Jorge Gajon <gajon@gajon.org>
    José Tomás Tocino García <josetomas.tocino@gmail.com>
    Josef Rousek <josef.rousek@gmail.com>
    Joseph Kocherhans <joseph@jkocherhans.com>
    Josh Smeaton <josh.smeaton@gmail.com>
    Joshua Ginsberg <jag@flowtheory.net>
@ -420,7 +368,7 @@ answer newbie questions, and generally made Django that much better:
    junzhang.jn@gmail.com
    Jure Cuhalev <gandalf@owca.info>
    Justin Bronn <jbronn@gmail.com>
-    Justine Tunney <jtunney@gmail.com>
+    Justine Tunney <jtunney@lobstertech.com>
    Justin Lilly <justinlilly@gmail.com>
    Justin Michalicek <jmichalicek@gmail.com>
    Justin Myles Holmes <justin@slashrootcafe.com>
@ -431,7 +379,6 @@ answer newbie questions, and generally made Django that much better:
    Karol Sikora <elektrrrus@gmail.com>
    Katie Miller <katie@sub50.com>
    Keith Bussell <kbussell@gmail.com>
    Kenneth Love <kennethlove@gmail.com>
    Kent Hauser <kent@khauser.net>
    Kevin Kubasik <kevin@kubasik.net>
    Kevin McConnell <kevin.mcconnell@gmail.com>
@ -459,11 +406,8 @@ answer newbie questions, and generally made Django that much better:
    Leo Shklovskii
    Leo Soto <leo.soto@gmail.com>
    lerouxb@gmail.com
    Lex Berezhny <lex@damoti.com>
    Liang Feng <hutuworm@gmail.com>
    limodou
    Lincoln Smith <lincoln.smith@anu.edu.au>
    Loek van Gent <loek@barakken.nl>
    Loïc Bistuer <loic.bistuer@sixmedia.com>
    Lowe Thiderman <lowe.thiderman@gmail.com>
    Luan Pablo <luanpab@gmail.com>
@ -475,7 +419,6 @@ answer newbie questions, and generally made Django that much better:
    Luke Plant <L.Plant.98@cantab.net>
    Maciej Fijalkowski
    Maciej Wiśniowski <pigletto@gmail.com>
    Mads Jensen <https://github.com/atombrella>
    Makoto Tsuyuki <mtsuyuki@gmail.com>
    Malcolm Tredinnick
    Manuel Saelices <msaelices@yaco.es>
@ -488,7 +431,6 @@ answer newbie questions, and generally made Django that much better:
    Marcin Wróbel
    Marc Remolt <m.remolt@webmasters.de>
    Marc Tamlyn <marc.tamlyn@gmail.com>
    Marc-Aurèle Brothier <ma.brothier@gmail.com>
    Marian Andre <django@andre.sk>
    Marijn Vriens <marijn@metronomo.cl>
    Mario Gonzalez <gonzalemario@gmail.com>
@ -497,7 +439,6 @@ answer newbie questions, and generally made Django that much better:
    mark@junklight.com
    Mark Lavin <markdlavin@gmail.com>
    Mark Sandstrom <mark@deliciouslynerdy.com>
    Markus Amalthea Magnuson <markus.magnuson@gmail.com>
    Markus Holtermann <https://markusholtermann.eu>
    Marten Kenbeek <marten.knbk+django@gmail.com>
    martin.glueck@gmail.com
@ -517,22 +458,17 @@ answer newbie questions, and generally made Django that much better:
    Matt Deacalion Stevens <matt@dirtymonkey.co.uk>
    Matt Dennenbaum
    Matthew Flanagan <http://wadofstuff.blogspot.com>
-    Matthew Schinckel <matt@schinckel.net>
+    Matthew Somerville <matthew-github@dracos.co.uk>
    Matthew Somerville <matthew-django@dracos.co.uk>
    Matthew Tretter <m@tthewwithanm.com>
    Matthew Wilkes <matt@matthewwilkes.name>
    Matthias Kestenholz <mk@406.ch>
    Matthias Pronk <django@masida.nl>
    Matt Hoskins <skaffenuk@googlemail.com>
    Matt McClanahan <http://mmcc.cx/>
    Matt Riggott
    Matt Robenolt <m@robenolt.com>
    Mattia Larentis <mattia@laretis.eu>
    Mattias Loverot <mattias@stubin.se>
    mattycakes@gmail.com
    Max Burstein <http://maxburstein.com>
    Max Derkachev <mderk@yandex.ru>
    Maxime Lorant <maxime.lorant@gmail.com>
    Maxime Turcotte <maxocub@riseup.net>
    Maximillian Dornseif <md@hudora.de>
    mccutchen@gmail.com
@ -543,8 +479,6 @@ answer newbie questions, and generally made Django that much better:
    michael.mcewan@gmail.com
    Michael Placentra II <someone@michaelplacentra2.net>
    Michael Radziej <mir@noris.de>
    Michael Sanders <m.r.sanders@gmail.com>
    Michael Schwarz <michi.schwarz@gmail.com>
    Michael Thornhill <michael.thornhill@gmail.com>
    Michal Chruszcz <troll@pld-linux.org>
    michal@plovarna.cz
@ -564,7 +498,6 @@ answer newbie questions, and generally made Django that much better:
    mitakummaa@gmail.com
    mmarshall
    Moayad Mardini <moayad.m@gmail.com>
    Morgan Aubert <morgan.aubert@zoho.com>
    Moritz Sichert <moritz.sichert@googlemail.com>
    Morten Bagai <m@bagai.com>
    msaelices <msaelices@gmail.com>
@ -581,7 +514,6 @@ answer newbie questions, and generally made Django that much better:
    Niall Kelly <duke.sam.vimes@gmail.com>
    Nick Efford <nick@efford.org>
    Nick Lane <nick.lane.au@gmail.com>
    Nick Pope <nick@nickpope.me.uk>
    Nick Presta <nick@nickpresta.ca>
    Nick Sandford <nick.sandford@gmail.com>
    Niclas Olofsson <n@niclasolofsson.se>
@ -609,11 +541,9 @@ answer newbie questions, and generally made Django that much better:
    Paul Bissex <http://e-scribe.com/>
    Paul Collier <paul@paul-collier.com>
    Paul Collins <paul.collins.iii@gmail.com>
    Paul Donohue <django@PaulSD.com>
    Paul Lanier <planier@google.com>
    Paul McLanahan <paul@mclanahan.net>
    Paul McMillan <Paul@McMillan.ws>
    Paulo Poiati <paulogpoiati@gmail.com>
    Paulo Scardine <paulo@scardine.com.br>
    Paul Smith <blinkylights23@gmail.com>
    pavithran s <pavithran.s@gmail.com>
@ -632,24 +562,19 @@ answer newbie questions, and generally made Django that much better:
    Philip Lindborg <philip.lindborg@gmail.com>
    Philippe Raoult <philippe.raoult@n2nsoft.com>
    phil@produxion.net
    Piotr Jakimiak <piotr.jakimiak@gmail.com>
    Piotr Lewandowski <piotr.lewandowski@gmail.com>
    plisk
    polpak@yahoo.com
    pradeep.gowda@gmail.com
    Preston Holmes <preston@ptone.com>
    Preston Timmons <prestontimmons@gmail.com>
    Rachel Tobin <rmtobin@me.com>
    Rachel Willmer <http://www.willmer.com/kb/>
    Radek Švarz <http://www.svarz.cz/translate/>
    Rajesh Dhawan <rajesh.dhawan@gmail.com>
    Ramez Ashraf <ramezashraf@gmail.com>
    Ramin Farajpour Cami <ramin.blackhat@gmail.com>
    Ramiro Morales <ramiro@rmorales.net>
    Ram Rachum <ram@rachum.com>
    Randy Barlow <randy@electronsweatshop.com>
    Raphaël Barrois <raphael.barrois@m4x.org>
    Raphael Michel <mail@raphaelmichel.de>
    Raúl Cumplido <raulcumplido@gmail.com>
    Remco Wendt <remco.wendt@gmail.com>
    Renaud Parent <renaud.parent@gmail.com>
@ -659,11 +584,9 @@ answer newbie questions, and generally made Django that much better:
    Ricardo Javier Cárdenes Medina <ricardo.cardenes@gmail.com>
    ricardojbarrios@gmail.com
    Riccardo Di Virgilio
    Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com>
    Richard Davies <richard.davies@elastichosts.com>
    Richard House <Richard.House@i-logue.com>
    Rick Wagner <rwagner@physics.ucsd.edu>
    Rigel Di Scala <rigel.discala@propylon.com>
    Robert Coup
    Robert Myers <myer0052@gmail.com>
    Roberto Aguilar <roberto@baremetal.io>
@ -671,7 +594,6 @@ answer newbie questions, and generally made Django that much better:
    Robert Wittams
    Rob Hudson <http://rob.cogit8.org/>
    Robin Munn <http://www.geekforgod.com/>
    Romain Garrigues <romain.garrigues.cs@gmail.com>
    Ronny Haryanto <http://ronny.haryan.to/>
    Ross Poulton <ross@rossp.org>
    Rozza <ross.lawley@gmail.com>
@ -681,14 +603,11 @@ answer newbie questions, and generally made Django that much better:
    Russell Cloran <russell@rucus.net>
    Russell Keith-Magee <russell@keith-magee.com>
    Russ Webber
    Ryan Hall <ryanhall989@gmail.com>
    ryankanno
    Ryan Kelly <ryan@rfk.id.au>
    Ryan Niemeyer <https://profiles.google.com/ryan.niemeyer/about>
    Ryno Mathee <rmathee@gmail.com>
    Sam Newman <http://www.magpiebrain.com/>
    Sander Dijkhuis <sander.dijkhuis@gmail.com>
    Sarthak Mehrish <sarthakmeh03@gmail.com>
    schwank@gmail.com
    Scot Hacker <shacker@birdhouse.org>
    Scott Barr <scott@divisionbyzero.com.au>
@ -696,14 +615,10 @@ answer newbie questions, and generally made Django that much better:
    scott@staplefish.com
    Sean Brant
    Sebastian Hillig <sebastian.hillig@gmail.com>
    Sebastian Spiegel <http://www.tivix.com/>
    Selwin Ong <selwin@ui.co.id>
    Sengtha Chay <sengtha@e-khmer.com>
    Senko Rašić <senko.rasic@dobarkod.hr>
    serbaut@gmail.com
    Sergei Maertens <sergeimaertens@gmail.com>
    Sergey Fedoseev <fedoseev.sergey@gmail.com>
    Sergey Kolosov <m17.admin@gmail.com>
    Seth Hill <sethrh@gmail.com>
    Shai Berger <shai@platonix.com>
    Shannon -jj Behrens <http://jjinux.blogspot.com/>
@ -725,21 +640,17 @@ answer newbie questions, and generally made Django that much better:
    Stanislaus Madueke
    starrynight <cmorgh@gmail.com>
    Stefane Fermgier <sf@fermigier.com>
    Stefano Rivera <stefano@rivera.za.net>
    Stéphane Raimbault <stephane.raimbault@gmail.com>
    Stephan Jaekel <steph@rdev.info>
    Stephen Burrows <stephen.r.burrows@gmail.com>
    Steven L. Smith (fvox13) <steven@stevenlsmith.com>
    Stuart Langridge <http://www.kryogenix.org/>
    Sujay S Kumar <sujay.skumar141295@gmail.com>
    Sune Kirkeby <http://ibofobi.dk/>
    Sung-Jin Hong <serialx.net@gmail.com>
    SuperJared
    Susan Tan <susan.tan.fleckerl@gmail.com>
    Sutrisno Efendi <kangfend@gmail.com>
    Swaroop C H <http://www.swaroopch.info>
    Szilveszter Farkas <szilveszter.farkas@gmail.com>
    Taavi Teska <taaviteska@gmail.com>
    Tai Lee <real.human@mrmachine.net>
    Takashi Matsuo <matsuo.takashi@gmail.com>
    Tareque Hossain <http://www.codexn.com>
@ -759,7 +670,6 @@ answer newbie questions, and generally made Django that much better:
    Tim Graham <timograham@gmail.com>
    Tim Heap <tim@timheap.me>
    Tim Saylor <tim.saylor@gmail.com>
    Tobias Kunze <rixx@cutebit.de>
    Tobias McNulty <http://www.caktusgroup.com/blog>
    tobias@neuyork.de
    Todd O'Bryan <toddobryan@mac.com>
@ -769,10 +679,7 @@ answer newbie questions, and generally made Django that much better:
    Tome Cvitan <tome@cvitan.com>
    Tomek Paczkowski <tomek@hauru.eu>
    Tom Insam
    Tomer Chachamu
    Tommy Beadle <tbeadle@gmail.com>
    Tom Tobin
    Tore Lundqvist <tore.lundqvist@gmail.com>
    torne-django@wolfpuppy.org.uk
    Travis Cline <travis.cline@gmail.com>
    Travis Pinney
@ -783,10 +690,8 @@ answer newbie questions, and generally made Django that much better:
    tstromberg@google.com
    tt@gurgle.no
    Tyler Tarabula <tyler.tarabula@gmail.com>
    Tyson Clugg <tyson@clugg.net>
    Tyson Tate <tyson@fallingbullets.com>
    Unai Zalakain <unai@gisa-elkartea.org>
    Valentina Mukhamedzhanova <umirra@gmail.com>
    valtron
    Vasiliy Stavenko <stavenko@gmail.com>
    Vasil Vangelovski
@ -799,18 +704,16 @@ answer newbie questions, and generally made Django that much better:
    Vladimir Kuzma <vladimirkuzma.ch@gmail.com>
    Vlado <vlado@labath.org>
    Vsevolod Solovyov
    Vytis Banaitis <vytis.banaitis@gmail.com>
    wam-djangobug@wamber.net
    Wang Chun <wangchun@exoweb.net>
    Warren Smith <warren@wandrsmith.net>
    Waylan Limberg <waylan@gmail.com>
    Wiktor Kołodziej
    Wiktor Kołodziej <wiktor@pykonik.org>
    Wiley Kestner <wiley.kestner@gmail.com>
    Wiliam Alves de Souza <wiliamsouza83@gmail.com>
    William Schwartz <wkschwartz@gmail.com>
    Will Hardy <django@willhardy.com.au>
    Wilson Miner <wminer@gmail.com>
    Wim Glenn <hey@wimglenn.com>
    wojtek
    Xia Kai <http://blog.xiaket.org/>
    Yann Fouillat <gagaro42@gmail.com>
@ -819,9 +722,7 @@ answer newbie questions, and generally made Django that much better:
    ye7cakf02@sneakemail.com
    ymasuda@ethercube.com
    Yoong Kang Lim <yoongkang.lim@gmail.com>
    Yusuke Miyazaki <miyazaki.dev@gmail.com>
    Zachary Voase <zacharyvoase@gmail.com>
    Zach Liu <zachliu@gmail.com>
    Zach Thompson <zthompson47@gmail.com>
    Zain Memon
    Zak Johnson <zakj@nox.cx>
@ -840,6 +741,7 @@ A big THANK YOU goes to:
    Ian Bicking for convincing Adrian to ditch code generation.
-    Mark Pilgrim for "Dive Into Python" (http://www.diveintopython3.net).
+    Mark Pilgrim for "Dive Into Python" (http://www.diveintopython.net,
    http://www.diveintopython3.net).
    Guido van Rossum for creating Python.
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@ -24,9 +24,3 @@ Django uses Trac to keep track of bugs, feature requests, and associated
 patches because GitHub doesn't provide adequate tooling for its community.
 Patches can be submitted as pull requests, but if you don't file a ticket,
 it's unlikely that we'll notice your contribution.
 Code of Conduct
 ===============
 As a contributor, you can help us keep the Django community open and inclusive.
 Please read and follow our `Code of Conduct <https://www.djangoproject.com/conduct/>`_.
--- a/Gruntfile.js
+++ b/Gruntfile.js
@ -1,13 +0,0 @@
 var globalThreshold = 50;  // Global code coverage threshold (as a percentage)
 module.exports = function(grunt) {
    grunt.initConfig({
        qunit: {
            all: ['js_tests/tests.html']
        }
    });
    grunt.loadNpmTasks('grunt-contrib-qunit');
    grunt.registerTask('test', ['qunit']);
    grunt.registerTask('default', ['test']);
 };
--- a/MANIFEST.in
+++ b/MANIFEST.in
@ -1,17 +1,26 @@
 include README.rst
 include AUTHORS
 include Gruntfile.js
 include INSTALL
 include LICENSE
 include LICENSE.python
 include MANIFEST.in
-include package.json
+include django/contrib/gis/gdal/LICENSE
-include *.rst
+include django/contrib/gis/geos/LICENSE
-graft django
+include django/dispatch/license.txt
-prune django/contrib/admin/bin
+include django/dispatch/license.python.txt
-graft docs
+recursive-include docs *
-graft extras
+recursive-include scripts *
-graft js_tests
+recursive-include extras *
-graft scripts
+recursive-include tests *
-graft tests
+recursive-include django/conf/app_template *
-global-exclude __pycache__
+recursive-include django/conf/locale *
-global-exclude *.py[co]
+recursive-include django/conf/project_template *
 recursive-include django/contrib/*/locale *
 recursive-include django/contrib/admin/templates *
 recursive-include django/contrib/admin/static *
 recursive-include django/contrib/admindocs/templates *
 recursive-include django/contrib/auth/templates *
 recursive-include django/contrib/gis/static *
 recursive-include django/contrib/gis/templates *
 recursive-include django/contrib/sitemaps/templates *
 recursive-exclude * __pycache__
 recursive-exclude * *.py[co]
--- a/README.rst
+++ b/README.rst
@ -1,23 +1,23 @@
 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
+All documentation is in the "docs" directory and online at
 https://docs.djangoproject.com/en/stable/. If you're just getting started,
 here's how we recommend you read the docs:
-* First, read ``docs/intro/install.txt`` for instructions on installing Django.
+* First, read docs/intro/install.txt for instructions on installing Django.
-* Next, work through the tutorials in order (``docs/intro/tutorial01.txt``,
+* Next, work through the tutorials in order (docs/intro/tutorial01.txt,
-  ``docs/intro/tutorial02.txt``, etc.).
+  docs/intro/tutorial02.txt, etc.).
 * If you want to set up an actual deployment server, read
-  ``docs/howto/deployment/index.txt`` for instructions.
+  docs/howto/deployment/index.txt for instructions.
-* You'll probably want to read through the topical guides (in ``docs/topics``)
+* You'll probably want to read through the topical guides (in docs/topics)
-  next; from there you can jump to the HOWTOs (in ``docs/howto``) for specific
+  next; from there you can jump to the HOWTOs (in docs/howto) for specific
-  problems, and check out the reference (``docs/ref``) for gory details.
+  problems, and check out the reference (docs/ref) for gory details.
-* See ``docs/README`` for instructions on building an HTML version of the docs.
+* See docs/README for instructions on building an HTML version of the docs.
 Docs are updated rigorously. If you find any problems in the docs, or think
 they should be clarified in any way, please take 30 seconds to fill out a
@ -25,8 +25,8 @@ ticket here: https://code.djangoproject.com/newticket
 To get more help:
-* Join the ``#django`` channel on irc.freenode.net. Lots of helpful people hang out
+* Join the #django channel on irc.freenode.net. Lots of helpful people hang out
-  there. Read the archives at https://botbot.me/freenode/django/.
+  there. Read the archives at http://django-irc-logs.com/.
 * Join the django-users mailing list, or read the archives, at
  https://groups.google.com/group/django-users.
@ -39,5 +39,5 @@ To contribute to Django:
 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
+  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
--- a/django/init.py
+++ b/django/init.py
@ -1,27 +1,18 @@
 from __future__ import unicode_literals
 from django.utils.version import get_version
-VERSION = (1, 11, 30, 'alpha', 0)
+VERSION = (1, 8, 20, 'alpha', 0)
 __version__ = get_version(VERSION)
-def setup(set_prefix=True):
+def setup():
    """
    Configure the settings (this happens as a side effect of accessing the
    first setting), configure logging and populate the app registry.
    Set the thread-local urlresolvers script prefix if `set_prefix` is True.
    """
    from django.apps import apps
    from django.conf import settings
    from django.urls import set_script_prefix
    from django.utils.encoding import force_text
    from django.utils.log import configure_logging
    configure_logging(settings.LOGGING_CONFIG, settings.LOGGING)
    if set_prefix:
        set_script_prefix(
            '/' if settings.FORCE_SCRIPT_NAME is None else force_text(settings.FORCE_SCRIPT_NAME)
        )
    apps.populate(settings.INSTALLED_APPS)
--- a/django/main.py
+++ b/django/main.py
@ -1,9 +0,0 @@
 """
 Invokes django-admin when the django module is run as a script.
 Example: python -m django check
 """
 from django.core import management
 if __name__ == "__main__":
    management.execute_from_command_line()
--- a/django/apps/init.py
+++ b/django/apps/init.py
@ -1,4 +1,2 @@
-from .config import AppConfig
+from .config import AppConfig   # NOQA
-from .registry import apps
+from .registry import apps      # NOQA
 __all__ = ['AppConfig', 'apps']
--- a/django/apps/config.py
+++ b/django/apps/config.py
@ -1,7 +1,7 @@
 import os
 from importlib import import_module
-from django.core.exceptions import ImproperlyConfigured
+from django.core.exceptions import AppRegistryNotReady, ImproperlyConfigured
 from django.utils._os import upath
 from django.utils.module_loading import module_has_submodule
@ -21,10 +21,6 @@ class AppConfig(object):
        # from 'django/contrib/admin/__init__.pyc'>.
        self.module = app_module
        # Reference to the Apps registry that holds this AppConfig. Set by the
        # registry when it registers the AppConfig instance.
        self.apps = None
        # The following attributes could be defined at the class level in a
        # subclass, hence the test-and-set pattern.
@ -59,17 +55,13 @@ class AppConfig(object):
        """Attempt to determine app's filesystem path from its module."""
        # See #21874 for extended discussion of the behavior of this method in
        # various cases.
-        # Convert paths to list because Python 3's _NamespacePath does not
+        # Convert paths to list because Python 3.3 _NamespacePath does not
        # support indexing.
        paths = list(getattr(module, '__path__', []))
        if len(paths) != 1:
            filename = getattr(module, '__file__', None)
            if filename is not None:
                paths = [os.path.dirname(filename)]
            else:
                # For unknown reasons, sometimes the list returned by __path__
                # contains duplicates that must be removed (#25246).
                paths = list(set(paths))
        if len(paths) > 1:
            raise ImproperlyConfigured(
                "The app module %r has multiple filesystem locations (%r); "
@ -143,35 +135,34 @@ class AppConfig(object):
                "'%s' must supply a name attribute." % entry)
        # Ensure app_name points to a valid module.
        try:
        app_module = import_module(app_name)
        except ImportError:
            raise ImproperlyConfigured(
                "Cannot import '%s'. Check that '%s.%s.name' is correct." % (
                    app_name, mod_path, cls_name,
                )
            )
        # Entry is a path to an app config class.
        return cls(app_name, app_module)
-    def get_model(self, model_name, require_ready=True):
+    def check_models_ready(self):
        """
        Raises an exception if models haven't been imported yet.
        """
        if self.models is None:
            raise AppRegistryNotReady(
                "Models for app '%s' haven't been imported yet." % self.label)
    def get_model(self, model_name):
        """
        Returns the model with the given case-insensitive model_name.
        Raises LookupError if no model exists with this name.
        """
-        if require_ready:
+        self.check_models_ready()
            self.apps.check_models_ready()
        else:
            self.apps.check_apps_ready()
        try:
            return self.models[model_name.lower()]
        except KeyError:
            raise LookupError(
                "App '%s' doesn't have a '%s' model." % (self.label, model_name))
-    def get_models(self, include_auto_created=False, include_swapped=False):
+    def get_models(self, include_auto_created=False,
                   include_deferred=False, include_swapped=False):
        """
        Returns an iterable of models.
@ -179,23 +170,28 @@ class AppConfig(object):
        - auto-created models for many-to-many relations without
          an explicit intermediate table,
        - models created to satisfy deferred attribute queries,
        - models that have been swapped out.
        Set the corresponding keyword argument to True to include such models.
        Keyword arguments aren't documented; they're a private API.
        """
-        self.apps.check_models_ready()
+        self.check_models_ready()
        for model in self.models.values():
            if model._deferred and not include_deferred:
                continue
            if model._meta.auto_created and not include_auto_created:
                continue
            if model._meta.swapped and not include_swapped:
                continue
            yield model
-    def import_models(self):
+    def import_models(self, all_models):
        # Dictionary of models for this app, primarily maintained in the
        # 'all_models' attribute of the Apps this AppConfig is attached to.
-        self.models = self.apps.all_models[self.label]
+        # Injected as a parameter because it gets populated when models are
        # imported, which might happen before populate() imports models.
        self.models = all_models
        if module_has_submodule(self.module, MODELS_MODULE_NAME):
            models_module_name = '%s.%s' % (self.name, MODELS_MODULE_NAME)
--- a/django/apps/registry.py
+++ b/django/apps/registry.py
@ -1,11 +1,13 @@
 import os
 import sys
 import threading
 import warnings
 from collections import Counter, OrderedDict, defaultdict
 from functools import partial
 from django.core.exceptions import AppRegistryNotReady, ImproperlyConfigured
 from django.utils import lru_cache
 from django.utils._os import upath
 from django.utils.deprecation import RemovedInDjango19Warning
 from .config import AppConfig
@ -46,10 +48,8 @@ class Apps(object):
        # Lock for thread-safe population.
        self._lock = threading.Lock()
-        # Maps ("app_label", "modelname") tuples to lists of functions to be
+        # Pending lookups for lazy relations.
-        # called when the corresponding model is ready. Used by this class's
+        self._pending_lookups = {}
        # `lazy_model_operation()` and `do_pending_operations()` methods.
        self._pending_operations = defaultdict(list)
        # Populate apps and models, unless it's the master registry.
        if installed_apps is not None:
@ -77,7 +77,7 @@ class Apps(object):
            if self.app_configs:
                raise RuntimeError("populate() isn't reentrant")
-            # Phase 1: initialize app configs and import app modules.
+            # Load app configs and app modules.
            for entry in installed_apps:
                if isinstance(entry, AppConfig):
                    app_config = entry
@ -89,7 +89,6 @@ class Apps(object):
                        "duplicates: %s" % app_config.label)
                self.app_configs[app_config.label] = app_config
                app_config.apps = self
            # Check for duplicate app names.
            counts = Counter(
@ -103,15 +102,15 @@ class Apps(object):
            self.apps_ready = True
-            # Phase 2: import models modules.
+            # Load models.
            for app_config in self.app_configs.values():
-                app_config.import_models()
+                all_models = self.all_models[app_config.label]
                app_config.import_models(all_models)
            self.clear_cache()
            self.models_ready = True
            # Phase 3: run ready() methods of app configs.
            for app_config in self.get_app_configs():
                app_config.ready()
@ -148,16 +147,12 @@ class Apps(object):
        try:
            return self.app_configs[app_label]
        except KeyError:
-            message = "No installed app with label '%s'." % app_label
+            raise LookupError("No installed app with label '%s'." % app_label)
            for app_config in self.get_app_configs():
                if app_config.name == app_label:
                    message += " Did you mean '%s'?" % app_config.label
                    break
            raise LookupError(message)
    # This method is performance-critical at least for Django's test suite.
    @lru_cache.lru_cache(maxsize=None)
-    def get_models(self, include_auto_created=False, include_swapped=False):
+    def get_models(self, app_mod=None, include_auto_created=False,
                   include_deferred=False, include_swapped=False):
        """
        Returns a list of all installed models.
@ -165,18 +160,30 @@ class Apps(object):
        - auto-created models for many-to-many relations without
          an explicit intermediate table,
        - models created to satisfy deferred attribute queries,
        - models that have been swapped out.
        Set the corresponding keyword argument to True to include such models.
        """
        self.check_models_ready()
        if app_mod:
            warnings.warn(
                "The app_mod argument of get_models is deprecated.",
                RemovedInDjango19Warning, stacklevel=2)
            app_label = app_mod.__name__.split('.')[-2]
            try:
                return list(self.get_app_config(app_label).get_models(
                    include_auto_created, include_deferred, include_swapped))
            except LookupError:
                return []
        result = []
        for app_config in self.app_configs.values():
-            result.extend(list(app_config.get_models(include_auto_created, include_swapped)))
+            result.extend(list(app_config.get_models(
                include_auto_created, include_deferred, include_swapped)))
        return result
-    def get_model(self, app_label, model_name=None, require_ready=True):
+    def get_model(self, app_label, model_name=None):
        """
        Returns the model matching the given app_label and model_name.
@ -189,20 +196,10 @@ class Apps(object):
        model exists with this name in the application. Raises ValueError if
        called with a single argument that doesn't contain exactly one dot.
        """
        if require_ready:
        self.check_models_ready()
        else:
            self.check_apps_ready()
        if model_name is None:
            app_label, model_name = app_label.split('.')
-
+        return self.get_app_config(app_label).get_model(model_name.lower())
        app_config = self.get_app_config(app_label)
        if not require_ready and app_config.models is None:
            app_config.import_models()
        return app_config.get_model(model_name, require_ready=require_ready)
    def register_model(self, app_label, model):
        # Since this method is called when models are imported, it cannot
@ -223,7 +220,6 @@ class Apps(object):
                    "Conflicting '%s' models in application '%s': %s and %s." %
                    (model_name, app_label, app_models[model_name], model))
        app_models[model_name] = model
        self.do_pending_operations(model)
        self.clear_cache()
    def is_installed(self, app_name):
@ -244,7 +240,9 @@ class Apps(object):
        Returns the app config for the inner application in case of nesting.
        Returns None if the object isn't in any registered app config.
        """
-        self.check_apps_ready()
+        # In Django 1.7 and 1.8, it's allowed to call this method at import
        # time, even while the registry is being populated. In Django 1.9 and
        # later, that should be forbidden with `self.check_apps_ready()`.
        candidates = []
        for app_config in self.app_configs.values():
            if object_name.startswith(app_config.name):
@ -268,28 +266,6 @@ class Apps(object):
                "Model '%s.%s' not registered." % (app_label, model_name))
        return model
    @lru_cache.lru_cache(maxsize=None)
    def get_swappable_settings_name(self, to_string):
        """
        For a given model string (e.g. "auth.User"), return the name of the
        corresponding settings name if it refers to a swappable model. If the
        referred model is not swappable, return None.
        This method is decorated with lru_cache because it's performance
        critical when it comes to migrations. Since the swappable settings don't
        change after Django has loaded the settings, there is no reason to get
        the respective settings attribute over and over again.
        """
        for model in self.get_models(include_swapped=True):
            swapped = model._meta.swapped
            # Is this model swapped out for the model given by to_string?
            if swapped and swapped == to_string:
                return model._meta.swappable
            # Is this model swappable and the one given by to_string?
            if model._meta.swappable and model._meta.label == to_string:
                return model._meta.swappable
        return None
    def set_available_apps(self, available):
        """
        Restricts the set of installed apps used by get_app_config[s].
@ -305,10 +281,8 @@ class Apps(object):
        available = set(available)
        installed = set(app_config.name for app_config in self.get_app_configs())
        if not available.issubset(installed):
-            raise ValueError(
+            raise ValueError("Available apps isn't a subset of installed "
-                "Available apps isn't a subset of installed apps, extra apps: %s"
+                "apps, extra apps: %s" % ", ".join(available - installed))
                % ", ".join(available - installed)
            )
        self.stored_app_configs.append(self.app_configs)
        self.app_configs = OrderedDict(
@ -367,59 +341,106 @@ class Apps(object):
        # the relation tree and the fields cache.
        self.get_models.cache_clear()
        if self.ready:
-            # Circumvent self.get_models() to prevent that the cache is refilled.
+            for model in self.get_models(include_auto_created=True):
            # This particularly prevents that an empty value is cached while cloning.
            for app_config in self.app_configs.values():
                for model in app_config.get_models(include_auto_created=True):
                model._meta._expire_cache()
-    def lazy_model_operation(self, function, *model_keys):
+    # ### DEPRECATED METHODS GO BELOW THIS LINE ###
    def load_app(self, app_name):
        """
-        Take a function and a number of ("app_label", "modelname") tuples, and
+        Loads the app with the provided fully qualified name, and returns the
-        when all the corresponding models have been imported and registered,
+        model module.
        call the function with the model classes as its arguments.
        The function passed to this method must accept exactly n models as
        arguments, where n=len(model_keys).
        """
-        # Base case: no arguments, just execute the function.
+        warnings.warn(
-        if not model_keys:
+            "load_app(app_name) is deprecated.",
-            function()
+            RemovedInDjango19Warning, stacklevel=2)
-        # Recursive case: take the head of model_keys, wait for the
+        app_config = AppConfig.create(app_name)
-        # corresponding model class to be imported and registered, then apply
+        app_config.import_models(self.all_models[app_config.label])
-        # that argument to the supplied function. Pass the resulting partial
+        self.app_configs[app_config.label] = app_config
-        # to lazy_model_operation() along with the remaining model args and
+        self.clear_cache()
-        # repeat until all models are loaded and all arguments are applied.
+        return app_config.models_module
        else:
            next_model, more_models = model_keys[0], model_keys[1:]
-            # This will be executed after the class corresponding to next_model
+    def app_cache_ready(self):
-            # has been imported and registered. The `func` attribute provides
+        warnings.warn(
-            # duck-type compatibility with partials.
+            "app_cache_ready() is deprecated in favor of the ready property.",
-            def apply_next_model(model):
+            RemovedInDjango19Warning, stacklevel=2)
-                next_function = partial(apply_next_model.func, model)
+        return self.ready
                self.lazy_model_operation(next_function, *more_models)
            apply_next_model.func = function
-            # If the model has already been imported and registered, partially
+    def get_app(self, app_label):
-            # apply it to the function now. If not, add it to the list of
+        """
-            # pending operations for the model, where it will be executed with
+        Returns the module containing the models for the given app_label.
-            # the model class as its sole argument once the model is ready.
+        """
        warnings.warn(
            "get_app_config(app_label).models_module supersedes get_app(app_label).",
            RemovedInDjango19Warning, stacklevel=2)
        try:
-                model_class = self.get_registered_model(*next_model)
+            models_module = self.get_app_config(app_label).models_module
-            except LookupError:
+        except LookupError as exc:
-                self._pending_operations[next_model].append(apply_next_model)
+            # Change the exception type for backwards compatibility.
-            else:
+            raise ImproperlyConfigured(*exc.args)
-                apply_next_model(model_class)
+        if models_module is None:
            raise ImproperlyConfigured(
                "App '%s' doesn't have a models module." % app_label)
        return models_module
-    def do_pending_operations(self, model):
+    def get_apps(self):
        """
-        Take a newly-prepared model and pass it to each function waiting for
+        Returns a list of all installed modules that contain models.
        it. This is called at the very end of `Apps.register_model()`.
        """
-        key = model._meta.app_label, model._meta.model_name
+        warnings.warn(
-        for function in self._pending_operations.pop(key, []):
+            "[a.models_module for a in get_app_configs()] supersedes get_apps().",
-            function(model)
+            RemovedInDjango19Warning, stacklevel=2)
        app_configs = self.get_app_configs()
        return [app_config.models_module for app_config in app_configs
                if app_config.models_module is not None]
    def _get_app_package(self, app):
        return '.'.join(app.__name__.split('.')[:-1])
    def get_app_package(self, app_label):
        warnings.warn(
            "get_app_config(label).name supersedes get_app_package(label).",
            RemovedInDjango19Warning, stacklevel=2)
        return self._get_app_package(self.get_app(app_label))
    def _get_app_path(self, app):
        if hasattr(app, '__path__'):        # models/__init__.py package
            app_path = app.__path__[0]
        else:                               # models.py module
            app_path = app.__file__
        return os.path.dirname(upath(app_path))
    def get_app_path(self, app_label):
        warnings.warn(
            "get_app_config(label).path supersedes get_app_path(label).",
            RemovedInDjango19Warning, stacklevel=2)
        return self._get_app_path(self.get_app(app_label))
    def get_app_paths(self):
        """
        Returns a list of paths to all installed apps.
        Useful for discovering files at conventional locations inside apps
        (static files, templates, etc.)
        """
        warnings.warn(
            "[a.path for a in get_app_configs()] supersedes get_app_paths().",
            RemovedInDjango19Warning, stacklevel=2)
        self.check_apps_ready()
        app_paths = []
        for app in self.get_apps():
            app_paths.append(self._get_app_path(app))
        return app_paths
    def register_models(self, app_label, *models):
        """
        Register a set of models as belonging to an app.
        """
        warnings.warn(
            "register_models(app_label, *models) is deprecated.",
            RemovedInDjango19Warning, stacklevel=2)
        for model in models:
            self.register_model(app_label, model)
 apps = Apps(installed_apps=None)
--- a/django/conf/init.py
+++ b/django/conf/init.py
@ -8,11 +8,14 @@ a list of all possible variables.
 import importlib
 import os
-import time
+import time     # Needed for Windows
 import warnings
 from django.conf import global_settings
 from django.core.exceptions import ImproperlyConfigured
 from django.utils.deprecation import RemovedInDjango110Warning
 from django.utils.functional import LazyObject, empty
 from django.utils import six
 ENVIRONMENT_VARIABLE = "DJANGO_SETTINGS_MODULE"
@ -40,41 +43,10 @@ class LazySettings(LazyObject):
        self._wrapped = Settings(settings_module)
    def __repr__(self):
        # Hardcode the class name as otherwise it yields 'Settings'.
        if self._wrapped is empty:
            return '<LazySettings [Unevaluated]>'
        return '<LazySettings "%(settings_module)s">' % {
            'settings_module': self._wrapped.SETTINGS_MODULE,
        }
    def __getattr__(self, name):
        """
        Return the value of a setting and cache it in self.__dict__.
        """
        if self._wrapped is empty:
            self._setup(name)
-        val = getattr(self._wrapped, name)
+        return getattr(self._wrapped, name)
        self.__dict__[name] = val
        return val
    def __setattr__(self, name, value):
        """
        Set the value of setting. Clear all cached values if _wrapped changes
        (@override_settings does this) or clear single values when set.
        """
        if name == '_wrapped':
            self.__dict__.clear()
        else:
            self.__dict__.pop(name, None)
        super(LazySettings, self).__setattr__(name, value)
    def __delattr__(self, name):
        """
        Delete a setting and clear it from cache if needed.
        """
        super(LazySettings, self).__delattr__(name)
        self.__dict__.pop(name, None)
    def configure(self, default_settings=global_settings, **options):
        """
@ -97,7 +69,17 @@ class LazySettings(LazyObject):
        return self._wrapped is not empty
-class Settings(object):
+class BaseSettings(object):
    """
    Common logic for settings whether set by a module or by the user.
    """
    def __setattr__(self, name, value):
        if name in ("MEDIA_URL", "STATIC_URL") and value and not value.endswith('/'):
            raise ImproperlyConfigured("If set, %s must end with a slash" % name)
        object.__setattr__(self, name, value)
 class Settings(BaseSettings):
    def __init__(self, settings_module):
        # update this dict from global settings (but only for ALL_CAPS settings)
        for setting in dir(global_settings):
@ -110,6 +92,7 @@ class Settings(object):
        mod = importlib.import_module(self.SETTINGS_MODULE)
        tuple_settings = (
            "ALLOWED_INCLUDE_ROOTS",
            "INSTALLED_APPS",
            "TEMPLATE_DIRS",
            "LOCALE_PATHS",
@ -120,14 +103,25 @@ class Settings(object):
                setting_value = getattr(mod, setting)
                if (setting in tuple_settings and
-                        not isinstance(setting_value, (list, tuple))):
+                        isinstance(setting_value, six.string_types)):
-                    raise ImproperlyConfigured("The %s setting must be a list or a tuple. " % setting)
+                    raise ImproperlyConfigured("The %s setting must be a tuple. "
                            "Please fix your settings." % setting)
                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 ('django.contrib.auth.middleware.AuthenticationMiddleware' in self.MIDDLEWARE_CLASSES and
                'django.contrib.auth.middleware.SessionAuthenticationMiddleware' not in self.MIDDLEWARE_CLASSES):
            warnings.warn(
                "Session verification will become mandatory in Django 1.10. "
                "Please add 'django.contrib.auth.middleware.SessionAuthenticationMiddleware' "
                "to your MIDDLEWARE_CLASSES setting when you are ready to opt-in after "
                "reading the upgrade considerations in the 1.8 release notes.",
                RemovedInDjango110Warning
            )
        if hasattr(time, 'tzset') and self.TIME_ZONE:
            # When we can, attempt to validate the timezone. If we can't find
            # this file, no check happens and it's harmless.
@ -143,14 +137,8 @@ class Settings(object):
    def is_overridden(self, setting):
        return setting in self._explicit_settings
    def __repr__(self):
        return '<%(cls)s "%(settings_module)s">' % {
            'cls': self.__class__.__name__,
            'settings_module': self.SETTINGS_MODULE,
        }
-
+class UserSettingsHolder(BaseSettings):
 class UserSettingsHolder(object):
    """
    Holder for user configured settings.
    """
@ -181,10 +169,7 @@ class UserSettingsHolder(object):
            super(UserSettingsHolder, self).__delattr__(name)
    def __dir__(self):
-        return sorted(
+        return list(self.__dict__) + dir(self.default_settings)
            s for s in list(self.__dict__) + dir(self.default_settings)
            if s not in self._deleted
        )
    def is_overridden(self, setting):
        deleted = (setting in self._deleted)
@ -192,10 +177,4 @@ class UserSettingsHolder(object):
        set_on_default = getattr(self.default_settings, 'is_overridden', lambda s: False)(setting)
        return (deleted or set_locally or set_on_default)
    def __repr__(self):
        return '<%(cls)s>' % {
            'cls': self.__class__.__name__,
        }
 settings = LazySettings()
--- a/django/conf/app_template/init.py
+++ b/django/conf/app_template/init.py
--- a/django/conf/app_template/init.py-tpl
+++ b/django/conf/app_template/init.py-tpl
--- a/django/conf/app_template/admin.py
+++ b/django/conf/app_template/admin.py
@ -0,0 +1,3 @@
 from django.contrib import admin
 # Register your models here.
--- a/django/conf/app_template/admin.py-tpl
+++ b/django/conf/app_template/admin.py-tpl
@ -1,3 +0,0 @@
 {{ unicode_literals }}from django.contrib import admin
 # Register your models here.
--- a/django/conf/app_template/apps.py-tpl
+++ b/django/conf/app_template/apps.py-tpl
@ -1,5 +0,0 @@
 {{ unicode_literals }}from django.apps import AppConfig
 class {{ camel_case_app_name }}Config(AppConfig):
    name = '{{ app_name }}'
--- a/django/conf/app_template/migrations/init.py
+++ b/django/conf/app_template/migrations/init.py
--- a/django/conf/app_template/migrations/init.py-tpl
+++ b/django/conf/app_template/migrations/init.py-tpl
--- a/django/conf/app_template/models.py
+++ b/django/conf/app_template/models.py
@ -0,0 +1,3 @@
 from django.db import models
 # Create your models here.
--- a/django/conf/app_template/models.py-tpl
+++ b/django/conf/app_template/models.py-tpl
@ -1,3 +0,0 @@
 {{ unicode_literals }}from django.db import models
 # Create your models here.
--- a/django/conf/app_template/tests.py
+++ b/django/conf/app_template/tests.py
@ -0,0 +1,3 @@
 from django.test import TestCase
 # Create your tests here.
--- a/django/conf/app_template/tests.py-tpl
+++ b/django/conf/app_template/tests.py-tpl
@ -1,3 +0,0 @@
 {{ unicode_literals }}from django.test import TestCase
 # Create your tests here.
--- a/django/conf/app_template/views.py
+++ b/django/conf/app_template/views.py
@ -0,0 +1,3 @@
 from django.shortcuts import render
 # Create your views here.
--- a/django/conf/app_template/views.py-tpl
+++ b/django/conf/app_template/views.py-tpl
@ -1,3 +0,0 @@
 {{ unicode_literals }}from django.shortcuts import render
 # Create your views here.
--- a/django/conf/global_settings.py
+++ b/django/conf/global_settings.py
@ -1,41 +1,33 @@
-# -*- coding: utf-8 -*-
+# Default Django settings. Override these with settings in the module
-"""
+# pointed-to by the DJANGO_SETTINGS_MODULE environment variable.
 Default Django settings. Override these with settings in the module pointed to
 by the DJANGO_SETTINGS_MODULE environment variable.
 """
 from __future__ import unicode_literals
 # This is defined here as a do-nothing function because we can't import
 # django.utils.translation -- that module depends on the settings.
-def gettext_noop(s):
+gettext_noop = lambda s: s
    return s
 ####################
 # CORE             #
 ####################
 DEBUG = False
 TEMPLATE_DEBUG = False
 # Whether the framework should propagate raw exceptions rather than catching
 # them. This is useful under some testing situations and should never be used
 # on a live site.
 DEBUG_PROPAGATE_EXCEPTIONS = False
-# Whether to use the "ETag" header. This saves bandwidth but slows down performance.
+# Whether to use the "Etag" header. This saves bandwidth but slows down performance.
 # Deprecated (RemovedInDjango21Warning) in favor of ConditionalGetMiddleware
 # which sets the ETag regardless of this setting.
 USE_ETAGS = False
 # People who get code error notifications.
-# In the format [('Full Name', 'email@example.com'), ('Full Name', 'anotheremail@example.com')]
+# In the format (('Full Name', 'email@example.com'), ('Full Name', 'anotheremail@example.com'))
-ADMINS = []
+ADMINS = ()
-# List of IP addresses, as strings, that:
+# Tuple of IP addresses, as strings, that:
 #   * See debug comments, when DEBUG is true
 #   * Receive x-headers
-INTERNAL_IPS = []
+INTERNAL_IPS = ()
 # Hosts/domain names that are valid for this site.
 # "*" matches anything, ".example.com" matches example.com and all subdomains
@ -55,7 +47,7 @@ USE_TZ = False
 LANGUAGE_CODE = 'en-us'
 # Languages we provide translations for, out of the box.
-LANGUAGES = [
+LANGUAGES = (
    ('af', gettext_noop('Afrikaans')),
    ('ar', gettext_noop('Arabic')),
    ('ast', gettext_noop('Asturian')),
@ -70,7 +62,6 @@ LANGUAGES = [
    ('cy', gettext_noop('Welsh')),
    ('da', gettext_noop('Danish')),
    ('de', gettext_noop('German')),
    ('dsb', gettext_noop('Lower Sorbian')),
    ('el', gettext_noop('Greek')),
    ('en', gettext_noop('English')),
    ('en-au', gettext_noop('Australian English')),
@ -78,7 +69,6 @@ LANGUAGES = [
    ('eo', gettext_noop('Esperanto')),
    ('es', gettext_noop('Spanish')),
    ('es-ar', gettext_noop('Argentinian Spanish')),
    ('es-co', gettext_noop('Colombian Spanish')),
    ('es-mx', gettext_noop('Mexican Spanish')),
    ('es-ni', gettext_noop('Nicaraguan Spanish')),
    ('es-ve', gettext_noop('Venezuelan Spanish')),
@ -89,12 +79,10 @@ LANGUAGES = [
    ('fr', gettext_noop('French')),
    ('fy', gettext_noop('Frisian')),
    ('ga', gettext_noop('Irish')),
    ('gd', gettext_noop('Scottish Gaelic')),
    ('gl', gettext_noop('Galician')),
    ('he', gettext_noop('Hebrew')),
    ('hi', gettext_noop('Hindi')),
    ('hr', gettext_noop('Croatian')),
    ('hsb', gettext_noop('Upper Sorbian')),
    ('hu', gettext_noop('Hungarian')),
    ('ia', gettext_noop('Interlingua')),
    ('id', gettext_noop('Indonesian')),
@ -115,7 +103,7 @@ LANGUAGES = [
    ('mn', gettext_noop('Mongolian')),
    ('mr', gettext_noop('Marathi')),
    ('my', gettext_noop('Burmese')),
-    ('nb', gettext_noop('Norwegian Bokmål')),
+    ('nb', gettext_noop('Norwegian Bokmal')),
    ('ne', gettext_noop('Nepali')),
    ('nl', gettext_noop('Dutch')),
    ('nn', gettext_noop('Norwegian Nynorsk')),
@ -142,17 +130,19 @@ LANGUAGES = [
    ('uk', gettext_noop('Ukrainian')),
    ('ur', gettext_noop('Urdu')),
    ('vi', gettext_noop('Vietnamese')),
    ('zh-cn', gettext_noop('Simplified Chinese')),
    ('zh-hans', gettext_noop('Simplified Chinese')),
    ('zh-hant', gettext_noop('Traditional Chinese')),
-]
+    ('zh-tw', gettext_noop('Traditional Chinese')),
 )
 # Languages using BiDi (right-to-left) layout
-LANGUAGES_BIDI = ["he", "ar", "fa", "ur"]
+LANGUAGES_BIDI = ("he", "ar", "fa", "ur")
 # If you set this to False, Django will make some optimizations so as not
 # to load the internationalization machinery.
 USE_I18N = True
-LOCALE_PATHS = []
+LOCALE_PATHS = ()
 # Settings for language cookie
 LANGUAGE_COOKIE_NAME = 'django_language'
@ -199,9 +189,6 @@ EMAIL_HOST = 'localhost'
 # Port for sending email.
 EMAIL_PORT = 25
 # Whether to send SMTP 'Date' header in the local time zone or in UTC.
 EMAIL_USE_LOCALTIME = False
 # Optional SMTP authentication information for EMAIL_HOST.
 EMAIL_HOST_USER = ''
 EMAIL_HOST_PASSWORD = ''
@ -212,13 +199,39 @@ EMAIL_SSL_KEYFILE = None
 EMAIL_TIMEOUT = None
 # List of strings representing installed apps.
-INSTALLED_APPS = []
+INSTALLED_APPS = ()
 # List of locations of the template source files, in search order.
 TEMPLATE_DIRS = ()
 # List of callables that know how to import templates from various sources.
 # See the comments in django/core/template/loader.py for interface
 # documentation.
 TEMPLATE_LOADERS = (
    'django.template.loaders.filesystem.Loader',
    'django.template.loaders.app_directories.Loader',
    # 'django.template.loaders.eggs.Loader',
 )
 # List of processors used by RequestContext to populate the context.
 # Each one should be a callable that takes the request object as its
 # only parameter and returns a dictionary to add to the context.
 TEMPLATE_CONTEXT_PROCESSORS = (
    'django.contrib.auth.context_processors.auth',
    'django.template.context_processors.debug',
    'django.template.context_processors.i18n',
    'django.template.context_processors.media',
    'django.template.context_processors.static',
    'django.template.context_processors.tz',
    # 'django.template.context_processors.request',
    'django.contrib.messages.context_processors.messages',
 )
 # Output to use in template system for invalid (e.g. misspelled) variables.
 TEMPLATE_STRING_IF_INVALID = ''
 TEMPLATES = []
 # Default form rendering class.
 FORM_RENDERER = 'django.forms.renderers.DjangoTemplates'
 # Default email address to use for various automated correspondence from
 # the site managers.
 DEFAULT_FROM_EMAIL = 'webmaster@localhost'
@ -240,27 +253,31 @@ FORCE_SCRIPT_NAME = None
 # that are not allowed to visit any page, systemwide. Use this for bad
 # robots/crawlers. Here are a few examples:
 #     import re
-#     DISALLOWED_USER_AGENTS = [
+#     DISALLOWED_USER_AGENTS = (
 #         re.compile(r'^NaverBot.*'),
 #         re.compile(r'^EmailSiphon.*'),
 #         re.compile(r'^SiteSucker.*'),
-#         re.compile(r'^sohu-search'),
+#         re.compile(r'^sohu-search')
-#     ]
+#     )
-DISALLOWED_USER_AGENTS = []
+DISALLOWED_USER_AGENTS = ()
 ABSOLUTE_URL_OVERRIDES = {}
 # Tuple of strings representing allowed prefixes for the {% ssi %} tag.
 # Example: ('/home/html', '/var/www')
 ALLOWED_INCLUDE_ROOTS = ()
 # List of compiled regular expression objects representing URLs that need not
 # be reported by BrokenLinkEmailsMiddleware. Here are a few examples:
 #    import re
-#    IGNORABLE_404_URLS = [
+#    IGNORABLE_404_URLS = (
 #        re.compile(r'^/apple-touch-icon.*\.png$'),
-#        re.compile(r'^/favicon.ico$'),
+#        re.compile(r'^/favicon.ico$),
-#        re.compile(r'^/robots.txt$'),
+#        re.compile(r'^/robots.txt$),
-#        re.compile(r'^/phpmyadmin/'),
+#        re.compile(r'^/phpmyadmin/),
 #        re.compile(r'\.(cgi|php|pl)$'),
-#    ]
+#    )
-IGNORABLE_404_URLS = []
+IGNORABLE_404_URLS = ()
 # A secret key for this particular Django installation. Used in secret-key
 # hashing algorithms. Set this in your settings, or Django will complain
@ -287,39 +304,27 @@ STATIC_ROOT = None
 STATIC_URL = None
 # List of upload handler classes to be applied in order.
-FILE_UPLOAD_HANDLERS = [
+FILE_UPLOAD_HANDLERS = (
    'django.core.files.uploadhandler.MemoryFileUploadHandler',
    'django.core.files.uploadhandler.TemporaryFileUploadHandler',
-]
+)
 # Maximum size, in bytes, of a request before it will be streamed to the
 # file system instead of into memory.
 FILE_UPLOAD_MAX_MEMORY_SIZE = 2621440  # i.e. 2.5 MB
 # Maximum size in bytes of request data (excluding file uploads) that will be
 # read before a SuspiciousOperation (RequestDataTooBig) is raised.
 DATA_UPLOAD_MAX_MEMORY_SIZE = 2621440  # i.e. 2.5 MB
 # Maximum number of GET/POST parameters that will be read before a
 # SuspiciousOperation (TooManyFieldsSent) is raised.
 DATA_UPLOAD_MAX_NUMBER_FIELDS = 1000
 # Maximum number of files encoded in a multipart upload that will be read
 # before a SuspiciousOperation (TooManyFilesSent) is raised.
 DATA_UPLOAD_MAX_NUMBER_FILES = 100
 # Directory in which upload streamed files will be temporarily saved. A value of
 # `None` will make Django use the operating system's default temporary directory
 # (i.e. "/tmp" on *nix systems).
 FILE_UPLOAD_TEMP_DIR = None
 # The numeric mode to set newly-uploaded files to. The value should be a mode
-# you'd pass directly to os.chmod; see https://docs.python.org/3/library/os.html#files-and-directories.
+# you'd pass directly to os.chmod; see http://docs.python.org/lib/os-file-dir.html.
 FILE_UPLOAD_PERMISSIONS = None
 # The numeric mode to assign to newly-created directories, when uploading files.
 # The value should be a mode as you'd pass to os.chmod;
-# see https://docs.python.org/3/library/os.html#files-and-directories.
+# see http://docs.python.org/lib/os-file-dir.html.
 FILE_UPLOAD_DIRECTORY_PERMISSIONS = None
 # Python module path where user will place custom format definition.
@ -363,30 +368,30 @@ SHORT_DATETIME_FORMAT = 'm/d/Y P'
 # See all available format string here:
 # http://docs.python.org/library/datetime.html#strftime-behavior
 # * Note that these format strings are different from the ones to display dates
-DATE_INPUT_FORMATS = [
+DATE_INPUT_FORMATS = (
    '%Y-%m-%d', '%m/%d/%Y', '%m/%d/%y',  # '2006-10-25', '10/25/2006', '10/25/06'
    '%b %d %Y', '%b %d, %Y',             # 'Oct 25 2006', 'Oct 25, 2006'
    '%d %b %Y', '%d %b, %Y',             # '25 Oct 2006', '25 Oct, 2006'
    '%B %d %Y', '%B %d, %Y',             # 'October 25 2006', 'October 25, 2006'
    '%d %B %Y', '%d %B, %Y',             # '25 October 2006', '25 October, 2006'
-]
+)
 # Default formats to be used when parsing times from input boxes, in order
 # See all available format string here:
 # http://docs.python.org/library/datetime.html#strftime-behavior
 # * Note that these format strings are different from the ones to display dates
-TIME_INPUT_FORMATS = [
+TIME_INPUT_FORMATS = (
    '%H:%M:%S',     # '14:30:59'
    '%H:%M:%S.%f',  # '14:30:59.000200'
    '%H:%M',        # '14:30'
-]
+)
 # Default formats to be used when parsing dates and times from input boxes,
 # in order
 # See all available format string here:
 # http://docs.python.org/library/datetime.html#strftime-behavior
 # * Note that these format strings are different from the ones to display dates
-DATETIME_INPUT_FORMATS = [
+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'
@ -399,7 +404,7 @@ DATETIME_INPUT_FORMATS = [
    '%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
 # 0 means Sunday, 1 means Monday...
@ -426,10 +431,9 @@ DEFAULT_INDEX_TABLESPACE = ''
 X_FRAME_OPTIONS = 'SAMEORIGIN'
 USE_X_FORWARDED_HOST = False
 USE_X_FORWARDED_PORT = False
-# The Python dotted path to the WSGI application that Django's internal server
+# The Python dotted path to the WSGI application that Django's internal servers
-# (runserver) will use. If `None`, the return value of
+# (runserver, runfcgi) will use. If `None`, the return value of
 # 'django.core.wsgi.get_wsgi_application' is used, thus preserving the same
 # behavior as previous versions of Django. Otherwise this should point to an
 # actual WSGI application object.
@ -448,15 +452,13 @@ SECURE_PROXY_SSL_HEADER = None
 # MIDDLEWARE #
 ##############
-# List of middleware to use. Order is important; in the request phase, these
+# List of middleware classes to use.  Order is important; in the request phase,
-# middleware will be applied in the order given, and in the response
+# this middleware classes will be applied in the order given, and in the
-# phase the middleware will be applied in reverse order.
+# response phase the middleware will be applied in reverse order.
-MIDDLEWARE_CLASSES = [
+MIDDLEWARE_CLASSES = (
    'django.middleware.common.CommonMiddleware',
    'django.middleware.csrf.CsrfViewMiddleware',
-]
+)
 MIDDLEWARE = None
 ############
 # SESSIONS #
@ -508,13 +510,13 @@ CACHE_MIDDLEWARE_ALIAS = 'default'
 AUTH_USER_MODEL = 'auth.User'
-AUTHENTICATION_BACKENDS = ['django.contrib.auth.backends.ModelBackend']
+AUTHENTICATION_BACKENDS = ('django.contrib.auth.backends.ModelBackend',)
 LOGIN_URL = '/accounts/login/'
-LOGIN_REDIRECT_URL = '/accounts/profile/'
+LOGOUT_URL = '/accounts/logout/'
-LOGOUT_REDIRECT_URL = None
+LOGIN_REDIRECT_URL = '/accounts/profile/'
 # The number of days a password reset link is valid for
 PASSWORD_RESET_TIMEOUT_DAYS = 3
@ -522,15 +524,17 @@ PASSWORD_RESET_TIMEOUT_DAYS = 3
 # the first hasher in this list is the preferred algorithm.  any
 # password using different algorithms will be converted automatically
 # upon login
-PASSWORD_HASHERS = [
+PASSWORD_HASHERS = (
    'django.contrib.auth.hashers.PBKDF2PasswordHasher',
    'django.contrib.auth.hashers.PBKDF2SHA1PasswordHasher',
    'django.contrib.auth.hashers.Argon2PasswordHasher',
    'django.contrib.auth.hashers.BCryptSHA256PasswordHasher',
    'django.contrib.auth.hashers.BCryptPasswordHasher',
-]
+    'django.contrib.auth.hashers.SHA1PasswordHasher',
-
+    'django.contrib.auth.hashers.MD5PasswordHasher',
-AUTH_PASSWORD_VALIDATORS = []
+    'django.contrib.auth.hashers.UnsaltedSHA1PasswordHasher',
    'django.contrib.auth.hashers.UnsaltedMD5PasswordHasher',
    'django.contrib.auth.hashers.CryptPasswordHasher',
 )
 ###########
 # SIGNING #
@ -553,9 +557,6 @@ CSRF_COOKIE_DOMAIN = None
 CSRF_COOKIE_PATH = '/'
 CSRF_COOKIE_SECURE = False
 CSRF_COOKIE_HTTPONLY = False
 CSRF_HEADER_NAME = 'HTTP_X_CSRFTOKEN'
 CSRF_TRUSTED_ORIGINS = []
 CSRF_USE_SESSIONS = False
 ############
 # MESSAGES #
@ -597,25 +598,25 @@ TEST_NON_SERIALIZED_APPS = []
 ############
 # The list of directories to search for fixtures
-FIXTURE_DIRS = []
+FIXTURE_DIRS = ()
 ###############
 # STATICFILES #
 ###############
 # A list of locations of additional static files
-STATICFILES_DIRS = []
+STATICFILES_DIRS = ()
 # The default file storage backend used during the build process
 STATICFILES_STORAGE = 'django.contrib.staticfiles.storage.StaticFilesStorage'
 # List of finder classes that know how to find static files in
 # various locations.
-STATICFILES_FINDERS = [
+STATICFILES_FINDERS = (
    'django.contrib.staticfiles.finders.FileSystemFinder',
    'django.contrib.staticfiles.finders.AppDirectoriesFinder',
    # 'django.contrib.staticfiles.finders.DefaultStorageFinder',
-]
+)
 ##############
 # MIGRATIONS #
@ -640,7 +641,6 @@ SILENCED_SYSTEM_CHECKS = []
 SECURE_BROWSER_XSS_FILTER = False
 SECURE_CONTENT_TYPE_NOSNIFF = False
 SECURE_HSTS_INCLUDE_SUBDOMAINS = False
 SECURE_HSTS_PRELOAD = False
 SECURE_HSTS_SECONDS = 0
 SECURE_REDIRECT_EXEMPT = []
 SECURE_SSL_HOST = None
--- a/django/conf/locale/init.py
+++ b/django/conf/locale/init.py
@ -95,12 +95,6 @@ LANG_INFO = {
        'name': 'German',
        'name_local': 'Deutsch',
    },
    'dsb': {
        'bidi': False,
        'code': 'dsb',
        'name': 'Lower Sorbian',
        'name_local': 'dolnoserbski',
    },
    'el': {
        'bidi': False,
        'code': 'el',
@ -143,12 +137,6 @@ LANG_INFO = {
        'name': 'Argentinian Spanish',
        'name_local': 'español de Argentina',
    },
    'es-co': {
        'bidi': False,
        'code': 'es-co',
        'name': 'Colombian Spanish',
        'name_local': 'español de Colombia',
    },
    'es-mx': {
        'bidi': False,
        'code': 'es-mx',
@ -209,12 +197,6 @@ LANG_INFO = {
        'name': 'Irish',
        'name_local': 'Gaeilge',
    },
    'gd': {
        'bidi': False,
        'code': 'gd',
        'name': 'Scottish Gaelic',
        'name_local': 'Gàidhlig',
    },
    'gl': {
        'bidi': False,
        'code': 'gl',
@ -239,12 +221,6 @@ LANG_INFO = {
        'name': 'Croatian',
        'name_local': 'Hrvatski',
    },
    'hsb': {
        'bidi': False,
        'code': 'hsb',
        'name': 'Upper Sorbian',
        'name_local': 'hornjoserbsce',
    },
    'hu': {
        'bidi': False,
        'code': 'hu',
@ -441,7 +417,7 @@ LANG_INFO = {
        'bidi': False,
        'code': 'sk',
        'name': 'Slovak',
-        'name_local': 'Slovensky',
+        'name_local': 'slovenský',
    },
    'sl': {
        'bidi': False,
@ -535,6 +511,10 @@ LANG_INFO = {
    },
    'zh-cn': {
        'fallback': ['zh-hans'],
        'bidi': False,
        'code': 'zh-cn',
        'name': 'Simplified Chinese',
        'name_local': '简体中文',
    },
    'zh-hans': {
        'bidi': False,
@ -562,5 +542,9 @@ LANG_INFO = {
    },
    'zh-tw': {
        'fallback': ['zh-hant'],
        'bidi': False,
        'code': 'zh-tw',
        'name': 'Traditional Chinese',
        'name_local': '繁體中文',
    },
 }
--- a/django/conf/locale/af/LC_MESSAGES/django.mo
+++ b/django/conf/locale/af/LC_MESSAGES/django.mo
--- a/django/conf/locale/af/LC_MESSAGES/django.po
+++ b/django/conf/locale/af/LC_MESSAGES/django.po
@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-29 20:57+0200\n"
+"POT-Creation-Date: 2015-03-18 09:16+0100\n"
-"PO-Revision-Date: 2016-06-30 08:31+0000\n"
+"PO-Revision-Date: 2015-03-18 08:44+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Afrikaans (http://www.transifex.com/django/django/language/"
+"Language-Team: Afrikaans (http://www.transifex.com/projects/p/django/"
-"af/)\n"
+"language/af/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@ -60,9 +60,6 @@ msgstr "Deens"
 msgid "German"
 msgstr "Duits"
 msgid "Lower Sorbian"
 msgstr ""
 msgid "Greek"
 msgstr "Grieks"
@ -84,9 +81,6 @@ msgstr "Spaans"
 msgid "Argentinian Spanish"
 msgstr "Argentynse Spaans"
 msgid "Colombian Spanish"
 msgstr ""
 msgid "Mexican Spanish"
 msgstr "Meksikaanse Spaans"
@ -117,9 +111,6 @@ msgstr "Fries"
 msgid "Irish"
 msgstr "Iers"
 msgid "Scottish Gaelic"
 msgstr ""
 msgid "Galician"
 msgstr "Galicies"
@ -132,9 +123,6 @@ msgstr "Hindoe"
 msgid "Croatian"
 msgstr "Kroaties"
 msgid "Upper Sorbian"
 msgstr ""
 msgid "Hungarian"
 msgstr "Hongaars"
@ -195,8 +183,8 @@ msgstr ""
 msgid "Burmese"
 msgstr "Birmaans"
-msgid "Norwegian Bokmål"
+msgid "Norwegian Bokmal"
-msgstr ""
+msgstr "Noors Bokmal"
 msgid "Nepali"
 msgstr "Nepalees"
@ -294,6 +282,9 @@ msgstr ""
 msgid "Syndication"
 msgstr "Sindikasie"
 msgid "Web Design"
 msgstr "Webontwerp"
 msgid "Enter a valid value."
 msgstr "Sleutel 'n geldige waarde in."
@ -312,11 +303,6 @@ msgstr ""
 "Sleutel 'n geldige \"slak\" wat bestaan uit letters, syfers, beklemtoon of "
 "koppel."
 msgid ""
 "Enter a valid 'slug' consisting of Unicode letters, numbers, underscores, or "
 "hyphens."
 msgstr ""
 msgid "Enter a valid IPv4 address."
 msgstr "Sleutel 'n geldige IPv4-adres in."
@ -372,28 +358,6 @@ msgstr[1] ""
 "Maak seker hierdie waarde het op die meeste %(limit_value)d karakters (dit "
 "het %(show_value)d)."
 #, python-format
 msgid "Ensure that there are no more than %(max)s digit in total."
 msgid_plural "Ensure that there are no more than %(max)s digits in total."
 msgstr[0] "Maak seker dat daar nie meer as %(max)s syfer in totaal is nie."
 msgstr[1] "Maak seker dat daar nie meer as %(max)s syfers in totaal is nie."
 #, python-format
 msgid "Ensure that there are no more than %(max)s decimal place."
 msgid_plural "Ensure that there are no more than %(max)s decimal places."
 msgstr[0] "Maak seker dat daar nie meer as %(max)s desimale plek is nie."
 msgstr[1] "Maak seker dat daar nie meer as %(max)s desimale plekke is nie."
 #, python-format
 msgid ""
 "Ensure that there are no more than %(max)s digit before the decimal point."
 msgid_plural ""
 "Ensure that there are no more than %(max)s digits before the decimal point."
 msgstr[0] ""
 "Maak seker dat daar nie meer as %(max)s syfer voor die desimale punt is nie."
 msgstr[1] ""
 "Maak seker dat daar nie meer as %(max)s syfers voor die desimale punt is nie."
 msgid "and"
 msgstr "en"
@ -434,9 +398,6 @@ msgstr "Heelgetal"
 msgid "'%(value)s' value must be an integer."
 msgstr "'%(value)s' waarde 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 "'%(value)s' waarde moet óf True of False wees."
@ -518,6 +479,9 @@ msgstr "'%(value)s' waarde meote 'n dryfpunt getal wees."
 msgid "Floating point number"
 msgstr "Dryfpunt getal"
 msgid "Big (8 byte) integer"
 msgstr "Groot (8 greep) heelgetal"
 msgid "IPv4 address"
 msgstr "IPv4 adres"
@ -592,23 +556,9 @@ msgstr "Vreemde sleutel (tipe bepaal deur verwante veld)"
 msgid "One-to-one relationship"
 msgstr "Een-tot-een-verhouding"
 #, python-format
 msgid "%(from)s-%(to)s relationship"
 msgstr ""
 #, python-format
 msgid "%(from)s-%(to)s relationships"
 msgstr ""
 msgid "Many-to-many relationship"
 msgstr "Baie-tot-baie-verwantskap"
 #. Translators: If found as last label character, these punctuation
 #. characters will prevent the default label_suffix to be appended to the
 #. label
 msgid ":?.!"
 msgstr ":?.!"
 msgid "This field is required."
 msgstr "Die veld is verpligtend."
@ -618,6 +568,28 @@ msgstr "Sleutel 'n hele getal in."
 msgid "Enter a number."
 msgstr "Sleutel 'n nommer in."
 #, python-format
 msgid "Ensure that there are no more than %(max)s digit in total."
 msgid_plural "Ensure that there are no more than %(max)s digits in total."
 msgstr[0] "Maak seker dat daar nie meer as %(max)s syfer in totaal is nie."
 msgstr[1] "Maak seker dat daar nie meer as %(max)s syfers in totaal is nie."
 #, python-format
 msgid "Ensure that there are no more than %(max)s decimal place."
 msgid_plural "Ensure that there are no more than %(max)s decimal places."
 msgstr[0] "Maak seker dat daar nie meer as %(max)s desimale plek is nie."
 msgstr[1] "Maak seker dat daar nie meer as %(max)s desimale plekke is nie."
 #, python-format
 msgid ""
 "Ensure that there are no more than %(max)s digit before the decimal point."
 msgid_plural ""
 "Ensure that there are no more than %(max)s digits before the decimal point."
 msgstr[0] ""
 "Maak seker dat daar nie meer as %(max)s syfer voor die desimale punt is nie."
 msgstr[1] ""
 "Maak seker dat daar nie meer as %(max)s syfers voor die desimale punt is nie."
 msgid "Enter a valid date."
 msgstr "Sleutel 'n geldige datum in."
@ -683,6 +655,12 @@ msgstr ":"
 msgid "(Hidden field %(name)s) %(error)s"
 msgstr "(Versteekte veld %(name)s) %(error)s"
 #. Translators: If found as last label character, these punctuation
 #. characters will prevent the default label_suffix to be appended to the
 #. label
 msgid ":?.!"
 msgstr ":?.!"
 msgid "ManagementForm data is missing or has been tampered with"
 msgstr ""
--- a/django/conf/locale/ar/LC_MESSAGES/django.mo
+++ b/django/conf/locale/ar/LC_MESSAGES/django.mo
--- a/django/conf/locale/ar/LC_MESSAGES/django.po
+++ b/django/conf/locale/ar/LC_MESSAGES/django.po
@ -1,7 +1,7 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
-# Bashar Al-Abdulhadi, 2015-2016
+# Bashar Al-Abdulhadi, 2015
 # Bashar Al-Abdulhadi, 2014
 # Eyad Toma <d.eyad.t@gmail.com>, 2013-2014
 # Jannis Leidel <jannis@leidel.info>, 2011
@ -10,10 +10,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-19 16:49+0100\n"
+"POT-Creation-Date: 2015-03-18 09:16+0100\n"
-"PO-Revision-Date: 2017-01-20 09:03+0000\n"
+"PO-Revision-Date: 2015-03-18 08:44+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Arabic (http://www.transifex.com/django/django/language/ar/)\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/django/language/"
 "ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@ -63,9 +64,6 @@ msgstr "الدنماركيّة"
 msgid "German"
 msgstr "الألمانيّة"
 msgid "Lower Sorbian"
 msgstr "الصربية السفلى"
 msgid "Greek"
 msgstr "اليونانيّة"
@ -87,9 +85,6 @@ msgstr "الإسبانيّة"
 msgid "Argentinian Spanish"
 msgstr "الأسبانية الأرجنتينية"
 msgid "Colombian Spanish"
 msgstr "الكولومبية الإسبانية"
 msgid "Mexican Spanish"
 msgstr "الأسبانية المكسيكية"
@ -120,9 +115,6 @@ msgstr "الفريزيّة"
 msgid "Irish"
 msgstr "الإيرلنديّة"
 msgid "Scottish Gaelic"
 msgstr "الغيلية الأسكتلندية"
 msgid "Galician"
 msgstr "الجليقيّة"
@ -135,9 +127,6 @@ msgstr "الهندية"
 msgid "Croatian"
 msgstr "الكرواتيّة"
 msgid "Upper Sorbian"
 msgstr "الصربية العليا"
 msgid "Hungarian"
 msgstr "الهنغاريّة"
@ -198,8 +187,8 @@ msgstr "المهاراتية"
 msgid "Burmese"
 msgstr "البورمية"
-msgid "Norwegian Bokmål"
+msgid "Norwegian Bokmal"
-msgstr "النرويجية"
+msgstr "البوكمال نرويجيّة"
 msgid "Nepali"
 msgstr "النيبالية"
@ -286,7 +275,7 @@ msgid "Traditional Chinese"
 msgstr "الصينيّة التقليدية"
 msgid "Messages"
-msgstr "الرسائل"
+msgstr ""
 msgid "Site Maps"
 msgstr "خرائط الموقع"
@ -297,14 +286,8 @@ msgstr "الملفات الثابتة"
 msgid "Syndication"
 msgstr "توظيف النشر"
-msgid "That page number is not an integer"
+msgid "Web Design"
-msgstr ""
+msgstr "تصميم الموقع"
 msgid "That page number is less than 1"
 msgstr ""
 msgid "That page contains no results"
 msgstr ""
 msgid "Enter a valid value."
 msgstr "أدخل قيمة صحيحة."
@ -322,11 +305,6 @@ msgid ""
 "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 "
 "hyphens."
 msgstr "أدخل اختصار 'slug' صحيح يتكوّن من أحرف، أرقام، شرطات سفلية وعاديّة."
 msgid "Enter a valid IPv4 address."
 msgstr "أدخل عنوان IPv4 صحيح."
@ -403,44 +381,6 @@ msgstr[5] ""
 "تأكد أن هذه القيمة تحتوي على %(limit_value)d حرف أو رمز على الأكثر (هي تحتوي "
 "حالياً على %(show_value)d)."
 #, python-format
 msgid "Ensure that there are no more than %(max)s digit in total."
 msgid_plural "Ensure that there are no more than %(max)s digits in total."
 msgstr[0] "تحقق من أن تدخل %(max)s أرقام لا أكثر."
 msgstr[1] "تحقق من أن تدخل رقم %(max)s لا أكثر."
 msgstr[2] "تحقق من أن تدخل %(max)s رقمين لا أكثر."
 msgstr[3] "تحقق من أن تدخل %(max)s أرقام لا أكثر."
 msgstr[4] "تحقق من أن تدخل %(max)s أرقام لا أكثر."
 msgstr[5] "تحقق من أن تدخل %(max)s أرقام لا أكثر."
 #, python-format
 msgid "Ensure that there are no more than %(max)s decimal place."
 msgid_plural "Ensure that there are no more than %(max)s decimal places."
 msgstr[0] "تحقق من أن تدخل %(max)s خانات عشرية لا أكثر."
 msgstr[1] "تحقق من أن تدخل خانة %(max)s عشرية لا أكثر."
 msgstr[2] "تحقق من أن تدخل %(max)s خانتين عشريتين لا أكثر."
 msgstr[3] "تحقق من أن تدخل %(max)s خانات عشرية لا أكثر."
 msgstr[4] "تحقق من أن تدخل %(max)s خانات عشرية لا أكثر."
 msgstr[5] "تحقق من أن تدخل %(max)s خانات عشرية لا أكثر."
 #, python-format
 msgid ""
 "Ensure that there are no more than %(max)s digit before the decimal point."
 msgid_plural ""
 "Ensure that there are no more than %(max)s digits before the decimal point."
 msgstr[0] "تحقق من أن تدخل %(max)s أرقام قبل الفاصل العشري لا أكثر."
 msgstr[1] "تحقق من أن تدخل رقم %(max)s قبل الفاصل العشري لا أكثر."
 msgstr[2] "تحقق من أن تدخل %(max)s رقمين قبل الفاصل العشري لا أكثر."
 msgstr[3] "تحقق من أن تدخل %(max)s أرقام قبل الفاصل العشري لا أكثر."
 msgstr[4] "تحقق من أن تدخل %(max)s أرقام قبل الفاصل العشري لا أكثر."
 msgstr[5] "تحقق من أن تدخل %(max)s أرقام قبل الفاصل العشري لا أكثر."
 #, python-format
 msgid ""
 "File extension '%(extension)s' is not allowed. Allowed extensions are: "
 "'%(allowed_extensions)s'."
 msgstr ""
 msgid "and"
 msgstr "و"
@ -481,9 +421,6 @@ msgstr "عدد صحيح"
 msgid "'%(value)s' value must be an integer."
 msgstr "قيمة '%(value)s' يجب ان تكون عدد صحيح."
 msgid "Big (8 byte) integer"
 msgstr "عدد صحيح كبير (8 بايت)"
 #, python-format
 msgid "'%(value)s' value must be either True or False."
 msgstr "قيمة '%(value)s' يجب أن تكون True أو False."
@ -546,8 +483,6 @@ msgid ""
 "'%(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]."
 msgid "Duration"
 msgstr "المدّة"
@ -565,6 +500,9 @@ msgstr "قيمة '%(value)s' يجب ان تكون عدد فاصل عائم."
 msgid "Floating point number"
 msgstr "رقم فاصلة عائمة"
 msgid "Big (8 byte) integer"
 msgstr "عدد صحيح كبير (8 بايت)"
 msgid "IPv4 address"
 msgstr "عنوان IPv4"
@ -620,7 +558,7 @@ msgstr "البيانات الثنائية الخام"
 #, python-format
 msgid "'%(value)s' is not a valid UUID."
-msgstr "'%(value)s' ليست قيمة UUID صحيحة."
+msgstr ""
 msgid "File"
 msgstr "ملف"
@ -630,7 +568,7 @@ msgstr "صورة"
 #, python-format
 msgid "%(model)s instance with %(field)s %(value)r does not exist."
-msgstr "النموذج %(model)s ذو الحقل و القيمة %(field)s %(value)r غير موجود."
+msgstr ""
 msgid "Foreign Key (type determined by related field)"
 msgstr "الحقل المرتبط (تم تحديد النوع وفقاً للحقل المرتبط)"
@ -638,23 +576,9 @@ msgstr "الحقل المرتبط (تم تحديد النوع وفقاً للح
 msgid "One-to-one relationship"
 msgstr "علاقة واحد إلى واحد"
 #, python-format
 msgid "%(from)s-%(to)s relationship"
 msgstr "%(from)s-%(to)s علاقة"
 #, python-format
 msgid "%(from)s-%(to)s relationships"
 msgstr "%(from)s-%(to)s علاقات"
 msgid "Many-to-many relationship"
 msgstr "علاقة متعدد إلى متعدد"
 #. Translators: If found as last label character, these punctuation
 #. characters will prevent the default label_suffix to be appended to the
 #. label
 msgid ":?.!"
 msgstr ":?.!"
 msgid "This field is required."
 msgstr "هذا الحقل مطلوب."
@ -664,6 +588,38 @@ msgstr "أدخل رقما صحيحا."
 msgid "Enter a number."
 msgstr "أدخل رقماً."
 #, python-format
 msgid "Ensure that there are no more than %(max)s digit in total."
 msgid_plural "Ensure that there are no more than %(max)s digits in total."
 msgstr[0] "تحقق من أن تدخل %(max)s أرقام لا أكثر."
 msgstr[1] "تحقق من أن تدخل رقم %(max)s لا أكثر."
 msgstr[2] "تحقق من أن تدخل %(max)s رقمين لا أكثر."
 msgstr[3] "تحقق من أن تدخل %(max)s أرقام لا أكثر."
 msgstr[4] "تحقق من أن تدخل %(max)s أرقام لا أكثر."
 msgstr[5] "تحقق من أن تدخل %(max)s أرقام لا أكثر."
 #, python-format
 msgid "Ensure that there are no more than %(max)s decimal place."
 msgid_plural "Ensure that there are no more than %(max)s decimal places."
 msgstr[0] "تحقق من أن تدخل %(max)s خانات عشرية لا أكثر."
 msgstr[1] "تحقق من أن تدخل خانة %(max)s عشرية لا أكثر."
 msgstr[2] "تحقق من أن تدخل %(max)s خانتين عشريتين لا أكثر."
 msgstr[3] "تحقق من أن تدخل %(max)s خانات عشرية لا أكثر."
 msgstr[4] "تحقق من أن تدخل %(max)s خانات عشرية لا أكثر."
 msgstr[5] "تحقق من أن تدخل %(max)s خانات عشرية لا أكثر."
 #, python-format
 msgid ""
 "Ensure that there are no more than %(max)s digit before the decimal point."
 msgid_plural ""
 "Ensure that there are no more than %(max)s digits before the decimal point."
 msgstr[0] "تحقق من أن تدخل %(max)s أرقام قبل الفاصل العشري لا أكثر."
 msgstr[1] "تحقق من أن تدخل رقم %(max)s قبل الفاصل العشري لا أكثر."
 msgstr[2] "تحقق من أن تدخل %(max)s رقمين قبل الفاصل العشري لا أكثر."
 msgstr[3] "تحقق من أن تدخل %(max)s أرقام قبل الفاصل العشري لا أكثر."
 msgstr[4] "تحقق من أن تدخل %(max)s أرقام قبل الفاصل العشري لا أكثر."
 msgstr[5] "تحقق من أن تدخل %(max)s أرقام قبل الفاصل العشري لا أكثر."
 msgid "Enter a valid date."
 msgstr "أدخل تاريخاً صحيحاً."
@ -729,7 +685,7 @@ msgid "Enter a complete value."
 msgstr "إدخال قيمة كاملة."
 msgid "Enter a valid UUID."
-msgstr "أدخل قيمة UUID صحيحة."
+msgstr ""
 #. Translators: This is the default suffix added to form field labels
 msgid ":"
@ -739,6 +695,12 @@ msgstr ":"
 msgid "(Hidden field %(name)s) %(error)s"
 msgstr "(الحقل الخفي %(name)s) %(error)s"
 #. Translators: If found as last label character, these punctuation
 #. characters will prevent the default label_suffix to be appended to the
 #. label
 msgid ":?.!"
 msgstr ":?.!"
 msgid "ManagementForm data is missing or has been tampered with"
 msgstr "بيانات ManagementForm مفقودة أو تم العبث بها"
@ -805,15 +767,15 @@ msgstr ""
 "%(datetime)s لا يمكن تفسيرها في المنطقة الزمنية %(current_timezone)s; قد "
 "تكون غامضة أو أنها غير موجودة."
 msgid "Clear"
 msgstr "تفريغ"
 msgid "Currently"
 msgstr "حالياً"
 msgid "Change"
 msgstr "عدّل"
 msgid "Clear"
 msgstr "تفريغ"
 msgid "Unknown"
 msgstr "مجهول"
@ -1213,19 +1175,17 @@ msgid "It worked!"
 msgstr "أنه فعّال!"
 msgid "Congratulations on your first Django-powered page."
-msgstr "تهانينا على صفحتك الأولى بدعم من جانغو."
+msgstr ""
 msgid ""
-"Next, start your first app by running <code>python manage.py startapp "
+"Of course, you haven't actually done any work yet. Next, start your first "
-"[app_label]</code>."
+"app by running <code>python manage.py startapp [app_label]</code>."
 msgstr ""
 msgid ""
 "You're seeing this message because you have <code>DEBUG = True</code> in "
 "your Django settings file and you haven't configured any URLs. Get to work!"
 msgstr ""
 "تظهر لك هذه الرسالة لأنه لديك <code>DEBUG = True</code> في ملف إعدادات جانغو "
 "الخاص بك، و ايضا لعدم تكوين أي عناوين المواقع. إبدأ العمل!"
 msgid "No year specified"
 msgstr "لم تحدد السنة"
--- a/django/conf/locale/ast/LC_MESSAGES/django.mo
+++ b/django/conf/locale/ast/LC_MESSAGES/django.mo
--- a/django/conf/locale/ast/LC_MESSAGES/django.po
+++ b/django/conf/locale/ast/LC_MESSAGES/django.po
@ -6,10 +6,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-29 20:57+0200\n"
+"POT-Creation-Date: 2015-03-18 09:16+0100\n"
-"PO-Revision-Date: 2016-06-30 08:31+0000\n"
+"PO-Revision-Date: 2015-03-18 08:44+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Asturian (http://www.transifex.com/django/django/language/"
+"Language-Team: Asturian (http://www.transifex.com/projects/p/django/language/"
 "ast/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@ -59,9 +59,6 @@ msgstr "Danés"
 msgid "German"
 msgstr "Alemán"
 msgid "Lower Sorbian"
 msgstr ""
 msgid "Greek"
 msgstr "Griegu"
@ -83,9 +80,6 @@ msgstr "Castellán"
 msgid "Argentinian Spanish"
 msgstr "Español arxentín"
 msgid "Colombian Spanish"
 msgstr ""
 msgid "Mexican Spanish"
 msgstr "Español mexicanu"
@ -116,9 +110,6 @@ msgstr "Frisón"
 msgid "Irish"
 msgstr "Irlandés"
 msgid "Scottish Gaelic"
 msgstr ""
 msgid "Galician"
 msgstr "Gallegu"
@ -131,9 +122,6 @@ msgstr "Hindi"
 msgid "Croatian"
 msgstr "Croata"
 msgid "Upper Sorbian"
 msgstr ""
 msgid "Hungarian"
 msgstr "Húngaru"
@ -194,8 +182,8 @@ msgstr ""
 msgid "Burmese"
 msgstr "Birmanu"
-msgid "Norwegian Bokmål"
+msgid "Norwegian Bokmal"
-msgstr ""
+msgstr "Bokmal noruegu"
 msgid "Nepali"
 msgstr "Nepalí"
@ -293,6 +281,9 @@ msgstr ""
 msgid "Syndication"
 msgstr ""
 msgid "Web Design"
 msgstr ""
 msgid "Enter a valid value."
 msgstr "Introduz un valor válidu."
@ -311,11 +302,6 @@ msgstr ""
 "Introduz un 'slug' válidu que consista en lletres, númberu, guiones baxos o "
 "medios. "
 msgid ""
 "Enter a valid 'slug' consisting of Unicode letters, numbers, underscores, or "
 "hyphens."
 msgstr ""
 msgid "Enter a valid IPv4 address."
 msgstr "Introduz una direición IPv4 válida."
@ -368,28 +354,6 @@ msgstr[1] ""
 "Asegúrate qu'esti valor tien como muncho %(limit_value)d caráuteres (tien "
 "%(show_value)d)."
 #, python-format
 msgid "Ensure that there are no more than %(max)s digit in total."
 msgid_plural "Ensure that there are no more than %(max)s digits in total."
 msgstr[0] "Asegúrate que nun hai más de %(max)s díxitu en total."
 msgstr[1] "Asegúrate que nun hai más de %(max)s díxitos en total."
 #, python-format
 msgid "Ensure that there are no more than %(max)s decimal place."
 msgid_plural "Ensure that there are no more than %(max)s decimal places."
 msgstr[0] "Asegúrate que nun hai más de %(max)s allugamientu decimal."
 msgstr[1] "Asegúrate que nun hai más de %(max)s allugamientos decimales."
 #, python-format
 msgid ""
 "Ensure that there are no more than %(max)s digit before the decimal point."
 msgid_plural ""
 "Ensure that there are no more than %(max)s digits before the decimal point."
 msgstr[0] ""
 "Asegúrate que nun hai más de %(max)s díxitu enantes del puntu decimal."
 msgstr[1] ""
 "Asegúrate que nun hai más de %(max)s díxitos enantes del puntu decimal."
 msgid "and"
 msgstr "y"
@ -429,9 +393,6 @@ msgstr "Enteru"
 msgid "'%(value)s' value must be an integer."
 msgstr ""
 msgid "Big (8 byte) integer"
 msgstr "Enteru big (8 byte)"
 #, python-format
 msgid "'%(value)s' value must be either True or False."
 msgstr ""
@ -505,6 +466,9 @@ msgstr ""
 msgid "Floating point number"
 msgstr "Númberu de puntu flotante"
 msgid "Big (8 byte) integer"
 msgstr "Enteru big (8 byte)"
 msgid "IPv4 address"
 msgstr "Direición IPv4"
@ -575,23 +539,9 @@ msgstr "Clave foriata (triba determinada pol campu rellacionáu)"
 msgid "One-to-one relationship"
 msgstr "Rellación a ún"
 #, python-format
 msgid "%(from)s-%(to)s relationship"
 msgstr ""
 #, python-format
 msgid "%(from)s-%(to)s relationships"
 msgstr ""
 msgid "Many-to-many relationship"
 msgstr "Rellación a munchos"
 #. Translators: If found as last label character, these punctuation
 #. characters will prevent the default label_suffix to be appended to the
 #. label
 msgid ":?.!"
 msgstr ":?.!"
 msgid "This field is required."
 msgstr "Requierse esti campu."
@ -601,6 +551,28 @@ msgstr "Introduz un númberu completu"
 msgid "Enter a number."
 msgstr "Introduz un númberu."
 #, python-format
 msgid "Ensure that there are no more than %(max)s digit in total."
 msgid_plural "Ensure that there are no more than %(max)s digits in total."
 msgstr[0] "Asegúrate que nun hai más de %(max)s díxitu en total."
 msgstr[1] "Asegúrate que nun hai más de %(max)s díxitos en total."
 #, python-format
 msgid "Ensure that there are no more than %(max)s decimal place."
 msgid_plural "Ensure that there are no more than %(max)s decimal places."
 msgstr[0] "Asegúrate que nun hai más de %(max)s allugamientu decimal."
 msgstr[1] "Asegúrate que nun hai más de %(max)s allugamientos decimales."
 #, python-format
 msgid ""
 "Ensure that there are no more than %(max)s digit before the decimal point."
 msgid_plural ""
 "Ensure that there are no more than %(max)s digits before the decimal point."
 msgstr[0] ""
 "Asegúrate que nun hai más de %(max)s díxitu enantes del puntu decimal."
 msgstr[1] ""
 "Asegúrate que nun hai más de %(max)s díxitos enantes del puntu decimal."
 msgid "Enter a valid date."
 msgstr "Introduz una data válida."
@ -666,6 +638,12 @@ msgstr ":"
 msgid "(Hidden field %(name)s) %(error)s"
 msgstr "(Campu anubríu %(name)s) %(error)s"
 #. Translators: If found as last label character, these punctuation
 #. characters will prevent the default label_suffix to be appended to the
 #. label
 msgid ":?.!"
 msgstr ":?.!"
 msgid "ManagementForm data is missing or has been tampered with"
 msgstr ""
--- a/django/conf/locale/az/LC_MESSAGES/django.mo
+++ b/django/conf/locale/az/LC_MESSAGES/django.mo
--- a/django/conf/locale/az/LC_MESSAGES/django.po
+++ b/django/conf/locale/az/LC_MESSAGES/django.po
@ -1,17 +1,17 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
-# Emin Mastizada <emin@linux.com>, 2015-2016
+# Emin Mastizada <emin@mastizada.com>, 2015
 # Metin Amiroff <amiroff@gmail.com>, 2011
 msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-19 16:49+0100\n"
+"POT-Creation-Date: 2015-03-18 09:16+0100\n"
-"PO-Revision-Date: 2017-01-20 09:03+0000\n"
+"PO-Revision-Date: 2015-03-18 08:44+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Azerbaijani (http://www.transifex.com/django/django/language/"
+"Language-Team: Azerbaijani (http://www.transifex.com/projects/p/django/"
-"az/)\n"
+"language/az/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@ -60,9 +60,6 @@ msgstr "Danimarkaca"
 msgid "German"
 msgstr "Almanca"
 msgid "Lower Sorbian"
 msgstr "Aşağı Sorbca"
 msgid "Greek"
 msgstr "Yunanca"
@ -84,9 +81,6 @@ msgstr "İspanca"
 msgid "Argentinian Spanish"
 msgstr "Argentina İspancası"
 msgid "Colombian Spanish"
 msgstr "Kolumbia İspancası"
 msgid "Mexican Spanish"
 msgstr "Meksika İspancası"
@ -117,9 +111,6 @@ msgstr "Friscə"
 msgid "Irish"
 msgstr "İrlandca"
 msgid "Scottish Gaelic"
 msgstr "Şotland Keltcəsi"
 msgid "Galician"
 msgstr "Qallik dili"
@ -132,9 +123,6 @@ msgstr "Hindcə"
 msgid "Croatian"
 msgstr "Xorvatca"
 msgid "Upper Sorbian"
 msgstr "Üst Sorbca"
 msgid "Hungarian"
 msgstr "Macarca"
@ -195,8 +183,8 @@ msgstr "Marathicə"
 msgid "Burmese"
 msgstr "Burmescə"
-msgid "Norwegian Bokmål"
+msgid "Norwegian Bokmal"
-msgstr "Norveç Bukmolcası"
+msgstr "Bokmal Norveçcəsi"
 msgid "Nepali"
 msgstr "Nepal"
@ -283,7 +271,7 @@ msgid "Traditional Chinese"
 msgstr "Ənənəvi Çincə"
 msgid "Messages"
-msgstr "Mesajlar"
+msgstr ""
 msgid "Site Maps"
 msgstr "Sayt Xəritələri"
@ -294,14 +282,8 @@ msgstr "Statik Fayllar"
 msgid "Syndication"
 msgstr "Sindikasiya"
-msgid "That page number is not an integer"
+msgid "Web Design"
-msgstr ""
+msgstr "Web Dizayn"
 msgid "That page number is less than 1"
 msgstr ""
 msgid "That page contains no results"
 msgstr ""
 msgid "Enter a valid value."
 msgstr "Düzgün qiymət daxil edin."
@ -321,13 +303,6 @@ msgstr ""
 "Hərflərdən, rəqəmlərdən, alt-xətlərdən və ya defislərdən ibarət düzgün "
 "qısaltma daxil edin."
 msgid ""
 "Enter a valid 'slug' consisting of Unicode letters, numbers, underscores, or "
 "hyphens."
 msgstr ""
 "Keçərli Unicode hərfləri, rəqəmlər, alt xətt və ya defis olan 'slug' daxil "
 "edin."
 msgid "Enter a valid IPv4 address."
 msgstr "Düzgün IPv4 ünvanı daxil edin."
@ -362,11 +337,7 @@ msgid_plural ""
 "Ensure this value has at least %(limit_value)d characters (it has "
 "%(show_value)d)."
 msgstr[0] ""
 "Bu dəyərin ən az %(limit_value)d simvol olduğuna əmin olun (%(show_value)d "
 "var)"
 msgstr[1] ""
 "Bu dəyərin ən az %(limit_value)d simvol olduğuna əmin olun (%(show_value)d "
 "var)"
 #, python-format
 msgid ""
@ -376,44 +347,14 @@ msgid_plural ""
 "Ensure this value has at most %(limit_value)d characters (it has "
 "%(show_value)d)."
 msgstr[0] ""
 "Bu dəyərin ən çox %(limit_value)d simvol olduğuna əmin olun (%(show_value)d "
 "var)"
 msgstr[1] ""
 "Bu dəyərin ən çox %(limit_value)d simvol olduğuna əmin olun (%(show_value)d "
 "var)"
 #, python-format
 msgid "Ensure that there are no more than %(max)s digit in total."
 msgid_plural "Ensure that there are no more than %(max)s digits in total."
 msgstr[0] "Toplamda %(max)s rəqəmdən çox olmadığına əmin olun."
 msgstr[1] "Toplamda %(max)s rəqəmdən çox olmadığına əmin olun."
 #, python-format
 msgid "Ensure that there are no more than %(max)s decimal place."
 msgid_plural "Ensure that there are no more than %(max)s decimal places."
 msgstr[0] "Onluq hissənin %(max)s rəqəmdən çox olmadığına əmin olun."
 msgstr[1] "Onluq hissənin %(max)s rəqəmdən çox olmadığına əmin olun."
 #, python-format
 msgid ""
 "Ensure that there are no more than %(max)s digit before the decimal point."
 msgid_plural ""
 "Ensure that there are no more than %(max)s digits before the decimal point."
 msgstr[0] "Onluq hissədən əvvəl %(max)s rəqəmdən çox olmadığına əmin olun."
 msgstr[1] "Onluq hissədən əvvəl %(max)s rəqəmdən çox olmadığına əmin olun."
 #, python-format
 msgid ""
 "File extension '%(extension)s' is not allowed. Allowed extensions are: "
 "'%(allowed_extensions)s'."
 msgstr ""
 msgid "and"
 msgstr "və"
 #, python-format
 msgid "%(model_name)s with this %(field_labels)s already exists."
-msgstr "%(field_labels)s ilə %(model_name)s artıq mövcuddur."
+msgstr ""
 #, python-format
 msgid "Value %(value)r is not a valid choice."
@ -449,9 +390,6 @@ msgstr "Tam ədəd"
 msgid "'%(value)s' value must be an integer."
 msgstr "'%(value)s' dəyəri tam rəqəm olmalıdır."
 msgid "Big (8 byte) integer"
 msgstr "Böyük (8 bayt) tam ədəd"
 #, python-format
 msgid "'%(value)s' value must be either True or False."
 msgstr "'%(value)s' dəyəri True və ya False olmalıdır."
@ -471,15 +409,12 @@ msgid ""
 "'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
 "format."
 msgstr ""
 "'%(value)s' dəyəri səhv tarix formatındadır. Bu İİİİ-AA-GG formatında "
 "olmalıdır."
 #, python-format
 msgid ""
 "'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
 "date."
 msgstr ""
 "'%(value)s dəyəri düzgün formatdadır (İİİİ-AA-GG) amma bu xətalı tarixdir."
 msgid "Date (without time)"
 msgstr "Tarix (saatsız)"
@ -528,6 +463,9 @@ msgstr ""
 msgid "Floating point number"
 msgstr "Sürüşən vergüllü ədəd"
 msgid "Big (8 byte) integer"
 msgstr "Böyük (8 bayt) tam ədəd"
 msgid "IPv4 address"
 msgstr "IPv4 ünvanı"
@ -580,7 +518,7 @@ msgstr ""
 #, python-format
 msgid "'%(value)s' is not a valid UUID."
-msgstr "'%(value)s' keçərli UUID deyil."
+msgstr ""
 msgid "File"
 msgstr "Fayl"
@ -598,23 +536,9 @@ msgstr "Xarici açar (bağlı olduğu sahəyə uyğun tipi alır)"
 msgid "One-to-one relationship"
 msgstr "Birin-birə münasibət"
 #, python-format
 msgid "%(from)s-%(to)s relationship"
 msgstr ""
 #, python-format
 msgid "%(from)s-%(to)s relationships"
 msgstr ""
 msgid "Many-to-many relationship"
 msgstr "Çoxun-çoxa münasibət"
 #. Translators: If found as last label character, these punctuation
 #. characters will prevent the default label_suffix to be appended to the
 #. label
 msgid ":?.!"
 msgstr ":?.!"
 msgid "This field is required."
 msgstr "Bu sahə vacibdir."
@ -624,6 +548,26 @@ msgstr "Tam ədəd daxil edin."
 msgid "Enter a number."
 msgstr "Ədəd daxil edin."
 #, python-format
 msgid "Ensure that there are no more than %(max)s digit in total."
 msgid_plural "Ensure that there are no more than %(max)s digits in total."
 msgstr[0] ""
 msgstr[1] ""
 #, python-format
 msgid "Ensure that there are no more than %(max)s decimal place."
 msgid_plural "Ensure that there are no more than %(max)s decimal places."
 msgstr[0] ""
 msgstr[1] ""
 #, python-format
 msgid ""
 "Ensure that there are no more than %(max)s digit before the decimal point."
 msgid_plural ""
 "Ensure that there are no more than %(max)s digits before the decimal point."
 msgstr[0] ""
 msgstr[1] ""
 msgid "Enter a valid date."
 msgstr "Düzgün tarix daxil edin."
@ -634,7 +578,7 @@ msgid "Enter a valid date/time."
 msgstr "Düzgün tarix/vaxt daxil edin."
 msgid "Enter a valid duration."
-msgstr "Keçərli müddət daxil edin."
+msgstr ""
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr "Fayl göndərilməyib. Vərəqənin (\"form\") şifrələmə tipini yoxlayın."
@ -671,10 +615,10 @@ msgid "Enter a list of values."
 msgstr "Qiymətlərin siyahısını daxil edin."
 msgid "Enter a complete value."
-msgstr "Tam dəyər daxil edin."
+msgstr ""
 msgid "Enter a valid UUID."
-msgstr "Keçərli UUID daxil et."
+msgstr ""
 #. Translators: This is the default suffix added to form field labels
 msgid ":"
@ -682,7 +626,13 @@ msgstr ":"
 #, python-format
 msgid "(Hidden field %(name)s) %(error)s"
-msgstr "(Gizli %(name)s sahəsi) %(error)s"
+msgstr ""
 #. Translators: If found as last label character, these punctuation
 #. characters will prevent the default label_suffix to be appended to the
 #. label
 msgid ":?.!"
 msgstr ":?.!"
 msgid "ManagementForm data is missing or has been tampered with"
 msgstr ""
@ -690,14 +640,14 @@ msgstr ""
 #, python-format
 msgid "Please submit %d or fewer forms."
 msgid_plural "Please submit %d or fewer forms."
-msgstr[0] "Lütfən %d və ya daha az forma göndərin."
+msgstr[0] ""
-msgstr[1] "Lütfən %d və ya daha az forma göndərin."
+msgstr[1] ""
 #, python-format
 msgid "Please submit %d or more forms."
 msgid_plural "Please submit %d or more forms."
-msgstr[0] "Lütfən %d və ya daha çox forma göndərin."
+msgstr[0] ""
-msgstr[1] "Lütfən %d və ya daha çox forma göndərin."
+msgstr[1] ""
 msgid "Order"
 msgstr "Sırala"
@ -734,7 +684,7 @@ msgstr "Düzgün seçim edin. Bu seçim mümkün deyil."
 #, python-format
 msgid "\"%(pk)s\" is not a valid value for a primary key."
-msgstr "\"%(pk)s\" əsas açar üçün keçərli dəyər deyil."
+msgstr ""
 #, python-format
 msgid ""
@ -744,15 +694,15 @@ msgstr ""
 "%(datetime)s %(current_timezone)s zaman qurşağında ifadə oluna bilmir; ya "
 "duallıq, ya da yanlışlıq var."
 msgid "Clear"
 msgstr "Təmizlə"
 msgid "Currently"
 msgstr "Hal-hazırda"
 msgid "Change"
 msgstr "Dəyiş"
 msgid "Clear"
 msgstr "Təmizlə"
 msgid "Unknown"
 msgstr "Məlum deyil"
@ -1116,8 +1066,8 @@ msgid "Congratulations on your first Django-powered page."
 msgstr "İlk Django ilə işləyən səhifəniz münasibəti ilə təbrik edirik."
 msgid ""
-"Next, start your first app by running <code>python manage.py startapp "
+"Of course, you haven't actually done any work yet. Next, start your first "
-"[app_label]</code>."
+"app by running <code>python manage.py startapp [app_label]</code>."
 msgstr ""
 msgid ""
--- a/django/conf/locale/az/formats.py
+++ b/django/conf/locale/az/formats.py
@ -5,10 +5,10 @@ from __future__ import unicode_literals
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
-DATE_FORMAT = 'j E Y'
+DATE_FORMAT = 'j E Y г.'
 TIME_FORMAT = 'G:i'
-DATETIME_FORMAT = 'j E Y, G:i'
+DATETIME_FORMAT = 'j E Y г. G:i'
-YEAR_MONTH_FORMAT = 'F Y'
+YEAR_MONTH_FORMAT = 'F Y г.'
 MONTH_DAY_FORMAT = 'j F'
 SHORT_DATE_FORMAT = 'd.m.Y'
 SHORT_DATETIME_FORMAT = 'd.m.Y H:i'
--- a/django/conf/locale/be/LC_MESSAGES/django.mo
+++ b/django/conf/locale/be/LC_MESSAGES/django.mo
--- a/django/conf/locale/be/LC_MESSAGES/django.po
+++ b/django/conf/locale/be/LC_MESSAGES/django.po
@ -2,24 +2,21 @@
 #
 # Translators:
 # Viktar Palstsiuk <vipals@gmail.com>, 2014-2015
 # znotdead <zhirafchik@gmail.com>, 2016-2017
 # Дмитрий Шатера <mr.bobsans@gmail.com>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-19 16:49+0100\n"
+"POT-Creation-Date: 2015-03-18 09:16+0100\n"
-"PO-Revision-Date: 2017-02-15 07:12+0000\n"
+"PO-Revision-Date: 2015-04-08 18:14+0000\n"
-"Last-Translator: znotdead <zhirafchik@gmail.com>\n"
+"Last-Translator: Viktar Palstsiuk <vipals@gmail.com>\n"
-"Language-Team: Belarusian (http://www.transifex.com/django/django/language/"
+"Language-Team: Belarusian (http://www.transifex.com/projects/p/django/"
-"be/)\n"
+"language/be/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: be\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "%100>=11 && n%100<=14)? 2 : 3);\n"
 msgid "Afrikaans"
 msgstr "Афрыкаанс"
@ -63,9 +60,6 @@ msgstr "Дацкая"
 msgid "German"
 msgstr "Нямецкая"
 msgid "Lower Sorbian"
 msgstr "Ніжнелужыцкая"
 msgid "Greek"
 msgstr "Грэцкая"
@ -87,9 +81,6 @@ msgstr "Гішпанская"
 msgid "Argentinian Spanish"
 msgstr "Гішпанская (Арґентына)"
 msgid "Colombian Spanish"
 msgstr "Гішпанская (Калумбія)"
 msgid "Mexican Spanish"
 msgstr "Гішпанская (Мэксыка)"
@ -120,9 +111,6 @@ msgstr "Фрызкая"
 msgid "Irish"
 msgstr "Ірляндзкая"
 msgid "Scottish Gaelic"
 msgstr "Гэльская шатляндзкая"
 msgid "Galician"
 msgstr "Ґальская"
@ -135,9 +123,6 @@ msgstr "Гінды"
 msgid "Croatian"
 msgstr "Харвацкая"
 msgid "Upper Sorbian"
 msgstr "Верхнелужыцкая"
 msgid "Hungarian"
 msgstr "Вугорская"
@ -198,8 +183,8 @@ msgstr "Маратхі"
 msgid "Burmese"
 msgstr "Бірманская"
-msgid "Norwegian Bokmål"
+msgid "Norwegian Bokmal"
-msgstr "Нарвэская букмал"
+msgstr "Нарвэская букмол"
 msgid "Nepali"
 msgstr "Нэпальская"
@ -297,14 +282,8 @@ msgstr "Cтатычныя файлы"
 msgid "Syndication"
 msgstr "Сындыкацыя"
-msgid "That page number is not an integer"
+msgid "Web Design"
-msgstr "Лік гэтай старонкі не з'яўляецца цэлым лікам"
+msgstr "Вэб-дызайн"
 msgid "That page number is less than 1"
 msgstr "Лік старонкі менш чым 1"
 msgid "That page contains no results"
 msgstr "Гэтая старонка не мае ніякіх вынікаў"
 msgid "Enter a valid value."
 msgstr "Пазначце правільнае значэньне."
@ -322,13 +301,6 @@ msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr "Бірка можа зьмяшчаць літары, лічбы, знакі падкрэсьліваньня ды злучкі."
 msgid ""
 "Enter a valid 'slug' consisting of Unicode letters, numbers, underscores, or "
 "hyphens."
 msgstr ""
 "Значэнне павінна быць толькі з літараў стандарту Unicode, личбаў, знакаў "
 "падкрэслівання ці злучкі."
 msgid "Enter a valid IPv4 address."
 msgstr "Пазначце чынны адрас IPv4."
@ -363,17 +335,9 @@ msgid_plural ""
 "Ensure this value has at least %(limit_value)d characters (it has "
 "%(show_value)d)."
 msgstr[0] ""
 "Упэўніцеся, што гэтае значэнне мае не менш %(limit_value)d сімвал (зараз "
 "%(show_value)d)."
 msgstr[1] ""
 "Упэўніцеся, што гэтае значэнне мае не менш %(limit_value)d сімвала (зараз "
 "%(show_value)d)."
 msgstr[2] ""
 "Упэўніцеся, што гэтае значэнне мае не менш %(limit_value)d сімвалаў (зараз "
 "%(show_value)d)."
 msgstr[3] ""
 "Упэўніцеся, што гэтае значэнне мае не менш %(limit_value)d сімвалаў (зараз "
 "%(show_value)d)."
 #, python-format
 msgid ""
@ -383,62 +347,20 @@ msgid_plural ""
 "Ensure this value has at most %(limit_value)d characters (it has "
 "%(show_value)d)."
 msgstr[0] ""
 "Упэўніцеся, што гэтае значэнне мае не болей %(limit_value)d сімвал (зараз "
 "%(show_value)d)."
 msgstr[1] ""
 "Упэўніцеся, што гэтае значэнне мае не болей %(limit_value)d сімвала (зараз "
 "%(show_value)d)."
 msgstr[2] ""
 "Упэўніцеся, што гэтае значэнне мае не болей %(limit_value)d сімвалаў (зараз "
 "%(show_value)d)."
 msgstr[3] ""
 "Упэўніцеся, што гэтае значэнне мае не болей %(limit_value)d сімвалаў (зараз "
 "%(show_value)d)."
 #, python-format
 msgid "Ensure that there are no more than %(max)s digit in total."
 msgid_plural "Ensure that there are no more than %(max)s digits in total."
 msgstr[0] "Упэўніцеся, што набралі ня болей за %(max)s лічбу."
 msgstr[1] "Упэўніцеся, што набралі ня болей за %(max)s лічбы."
 msgstr[2] "Упэўніцеся, што набралі ня болей за %(max)s лічбаў."
 msgstr[3] "Упэўніцеся, што набралі ня болей за %(max)s лічбаў."
 #, python-format
 msgid "Ensure that there are no more than %(max)s decimal place."
 msgid_plural "Ensure that there are no more than %(max)s decimal places."
 msgstr[0] "Упэўніцеся, што набралі ня болей за %(max)s лічбу пасьля коскі."
 msgstr[1] "Упэўніцеся, што набралі ня болей за %(max)s лічбы пасьля коскі."
 msgstr[2] "Упэўніцеся, што набралі ня болей за %(max)s лічбаў пасьля коскі."
 msgstr[3] "Упэўніцеся, што набралі ня болей за %(max)s лічбаў пасьля коскі."
 #, python-format
 msgid ""
 "Ensure that there are no more than %(max)s digit before the decimal point."
 msgid_plural ""
 "Ensure that there are no more than %(max)s digits before the decimal point."
 msgstr[0] "Упэўніцеся, што набралі ня болей за %(max)s лічбу да коскі."
 msgstr[1] "Упэўніцеся, што набралі ня болей за %(max)s лічбы да коскі."
 msgstr[2] "Упэўніцеся, што набралі ня болей за %(max)s лічбаў да коскі."
 msgstr[3] "Упэўніцеся, што набралі ня болей за %(max)s лічбаў да коскі."
 #, python-format
 msgid ""
 "File extension '%(extension)s' is not allowed. Allowed extensions are: "
 "'%(allowed_extensions)s'."
 msgstr ""
 "Пашырэнне файла '%(extension)s' не дапускаецца. Дапушчальныя пашырэння: "
 "'%(allowed_extensions)s'."
 msgid "and"
 msgstr "і"
 #, python-format
 msgid "%(model_name)s with this %(field_labels)s already exists."
-msgstr "%(model_name)s з такім %(field_labels)s ужо існуе."
+msgstr ""
 #, python-format
 msgid "Value %(value)r is not a valid choice."
-msgstr "Значэнне %(value)r не з'яўляецца правільным выбарам."
+msgstr ""
 msgid "This field cannot be null."
 msgstr "Поле ня можа мець значэньне «null»."
@ -456,8 +378,6 @@ msgstr "%(model_name)s з такім %(field_label)s ужо існуе."
 msgid ""
 "%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
 msgstr ""
 "%(field_label)s павінна быць унікальна для %(date_field_label)s "
 "%(lookup_type)s."
 #, python-format
 msgid "Field of type: %(field_type)s"
@ -470,9 +390,6 @@ msgstr "Цэлы лік"
 msgid "'%(value)s' value must be an integer."
 msgstr "Значэньне '%(value)s' павінна быць цэлым лікам."
 msgid "Big (8 byte) integer"
 msgstr "Вялікі (8 байтаў) цэлы"
 #, python-format
 msgid "'%(value)s' value must be either True or False."
 msgstr "Значэньне '%(value)s' павінна быць True або False."
@ -492,16 +409,12 @@ msgid ""
 "'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
 "format."
 msgstr ""
 "Значэнне '%(value)s' мае няправільны фармат. Яно павінна быць у фармаце ГГГГ-"
 "ММ-ДД."
 #, python-format
 msgid ""
 "'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
 "date."
 msgstr ""
 "Значэнне '%(value)s' мае правільны фармат(ГГГГ-ММ-ДД) але гэта несапраўдная "
 "дата."
 msgid "Date (without time)"
 msgstr "Дата (бяз часу)"
@ -511,16 +424,12 @@ msgid ""
 "'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
 "uuuuuu]][TZ] format."
 msgstr ""
 "Значэнне '%(value)s' мае няправільны фармат. Яно павінна быць у фармаце ГГГГ-"
 "ММ-ДД ГГ:ХХ[:сс[.мммммм]][ЧА], дзе ЧА — часавы абсяг."
 #, python-format
 msgid ""
 "'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
 "[TZ]) but it is an invalid date/time."
 msgstr ""
 "Значэнне '%(value)s' мае правільны фармат (ГГГГ-ММ-ДД ГГ:ХХ[:сс[.мммммм]]"
 "[ЧА], дзе ЧА — часавы абсяг) але гэта несапраўдныя дата/час."
 msgid "Date (with time)"
 msgstr "Дата (разам з часам)"
@ -537,8 +446,6 @@ msgid ""
 "'%(value)s' value has an invalid format. It must be in [DD] [HH:[MM:]]ss[."
 "uuuuuu] format."
 msgstr ""
 "Значэньне '%(value)s' мае няправільны фармат. Яно павінна быць у фармаце "
 "[ДД] [ГГ:[ХХ:]]сс[.мммммм]."
 msgid "Duration"
 msgstr "Працягласць"
@ -551,11 +458,14 @@ msgstr "Шлях да файла"
 #, python-format
 msgid "'%(value)s' value must be a float."
-msgstr "Значэньне '%(value)s' павінна быць дробным лікам."
+msgstr ""
 msgid "Floating point number"
 msgstr "Лік зь пераноснай коскаю"
 msgid "Big (8 byte) integer"
 msgstr "Вялікі (8 байтаў) цэлы"
 msgid "IPv4 address"
 msgstr "Адрас IPv4"
@ -598,8 +508,6 @@ msgid ""
 "'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
 "invalid time."
 msgstr ""
 "Значэнне '%(value)s' мае правільны фармат (ГГ:ХХ[:сс[.мммммм]]) але гэта "
 "несапраўдны час."
 msgid "Time"
 msgstr "Час"
@ -622,7 +530,7 @@ msgstr "Выява"
 #, python-format
 msgid "%(model)s instance with %(field)s %(value)r does not exist."
-msgstr "Экземпляр %(model)s з %(field)s %(value)r не iснуе."
+msgstr ""
 msgid "Foreign Key (type determined by related field)"
 msgstr "Вонкавы ключ (від вызначаецца паводле зьвязанага поля)"
@ -630,23 +538,9 @@ msgstr "Вонкавы ключ (від вызначаецца паводле з
 msgid "One-to-one relationship"
 msgstr "Сувязь «адзін да аднаго»"
 #, python-format
 msgid "%(from)s-%(to)s relationship"
 msgstr "Сувязь %(from)s-%(to)s"
 #, python-format
 msgid "%(from)s-%(to)s relationships"
 msgstr "Сувязi %(from)s-%(to)s"
 msgid "Many-to-many relationship"
 msgstr "Сувязь «некалькі да некалькіх»"
 #. Translators: If found as last label character, these punctuation
 #. characters will prevent the default label_suffix to be appended to the
 #. label
 msgid ":?.!"
 msgstr ":?.!"
 msgid "This field is required."
 msgstr "Поле трэба запоўніць."
@ -656,6 +550,32 @@ msgstr "Набярыце ўвесь лік."
 msgid "Enter a number."
 msgstr "Набярыце лік."
 #, python-format
 msgid "Ensure that there are no more than %(max)s digit in total."
 msgid_plural "Ensure that there are no more than %(max)s digits in total."
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 #, python-format
 msgid "Ensure that there are no more than %(max)s decimal place."
 msgid_plural "Ensure that there are no more than %(max)s decimal places."
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 #, python-format
 msgid ""
 "Ensure that there are no more than %(max)s digit before the decimal point."
 msgid_plural ""
 "Ensure that there are no more than %(max)s digits before the decimal point."
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 msgid "Enter a valid date."
 msgstr "Пазначце чынную дату."
@ -682,17 +602,9 @@ msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
 msgid_plural ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
 msgstr[0] ""
 "Упэўніцеся, што гэтае імя файлу мае не болей %(max)d сімвал (зараз "
 "%(length)d)."
 msgstr[1] ""
 "Упэўніцеся, што гэтае імя файлу мае не болей %(max)d сімвала (зараз "
 "%(length)d)."
 msgstr[2] ""
 "Упэўніцеся, што гэтае імя файлу мае не болей %(max)d сімвалаў (зараз "
 "%(length)d)."
 msgstr[3] ""
 "Упэўніцеся, што гэтае імя файлу мае не болей %(max)d сімвалаў (зараз "
 "%(length)d)."
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr ""
@ -726,8 +638,14 @@ msgstr ":"
 msgid "(Hidden field %(name)s) %(error)s"
 msgstr "(Схаванае поле %(name)s) %(error)s"
 #. Translators: If found as last label character, these punctuation
 #. characters will prevent the default label_suffix to be appended to the
 #. label
 msgid ":?.!"
 msgstr ":?.!"
 msgid "ManagementForm data is missing or has been tampered with"
-msgstr "Данныя ManagementForm адсутнічаюць ці былі пашкоджаны"
+msgstr ""
 #, python-format
 msgid "Please submit %d or fewer forms."
@ -788,15 +706,15 @@ msgstr ""
 "У часавым абсягу «%(current_timezone)s» нельга зразумець дату %(datetime)s: "
 "яна можа быць неадназначнаю або яе можа не існаваць."
 msgid "Clear"
 msgstr "Ачысьціць"
 msgid "Currently"
 msgstr "Зараз"
 msgid "Change"
 msgstr "Зьмяніць"
 msgid "Clear"
 msgstr "Ачысьціць"
 msgid "Unknown"
 msgstr "Невядома"
@ -1153,9 +1071,6 @@ msgid ""
 "enable them, at least for this site, or for HTTPS connections, or for 'same-"
 "origin' requests."
 msgstr ""
 "Калі вы сканфігуравалі ваш браўзэр так, каб ён не працаваў з 'Referer' "
 "загалоўкамі, калі ласка дазвольце іх хаця б для гэтага сайту, ці для HTTPS "
 "злучэнняў, ці для 'same-origin' запытаў."
 msgid ""
 "You are seeing this message because this site requires a CSRF cookie when "
@ -1170,8 +1085,6 @@ msgid ""
 "If you have configured your browser to disable cookies, please re-enable "
 "them, at least for this site, or for 'same-origin' requests."
 msgstr ""
 "Калі вы сканфігуравалі ваш браўзэр так, каб ён не працаваў з кукамі, калі "
 "ласка дазвольце іх хаця б для гэтага сайту ці для 'same-origin' запытаў."
 msgid "More information is available with DEBUG=True."
 msgstr "Больш падрабязная інфармацыя даступная з DEBUG=True."
@ -1186,19 +1099,14 @@ msgid "Congratulations on your first Django-powered page."
 msgstr "Віншуем Вас з першай старонкай на базе Django."
 msgid ""
-"Next, start your first app by running <code>python manage.py startapp "
+"Of course, you haven't actually done any work yet. Next, start your first "
-"[app_label]</code>."
+"app by running <code>python manage.py startapp [app_label]</code>."
 msgstr ""
 "Затым пачніце сваю першую праграму, выканаўшы <code>python manage.py "
 "startapp [app_label]</code>."
 msgid ""
 "You're seeing this message because you have <code>DEBUG = True</code> in "
 "your Django settings file and you haven't configured any URLs. Get to work!"
 msgstr ""
 "Вы бачыце гэта паведамленне, таму што вы маеце <code>DEBUG = True</code> у "
 "вашым файлу настройцы Django і вы не сканфігуравалі ніякіх спасылак URL. За "
 "працу!"
 msgid "No year specified"
 msgstr "Не пазначылі год"
--- a/django/conf/locale/bg/LC_MESSAGES/django.mo
+++ b/django/conf/locale/bg/LC_MESSAGES/django.mo
--- a/django/conf/locale/bg/LC_MESSAGES/django.po
+++ b/django/conf/locale/bg/LC_MESSAGES/django.po
@ -4,19 +4,18 @@
 # Boris Chervenkov <office@sentido.bg>, 2012
 # Jannis Leidel <jannis@leidel.info>, 2011
 # Lyuboslav  Petrov <petrov.lyuboslav@gmail.com>, 2014
-# Todor Lubenov <tgl.sysdev@gmail.com>, 2013-2015
+# Todor Lubenov <tlubenov@gmail.com>, 2013-2014
 # Venelin Stoykov <vkstoykov@gmail.com>, 2015-2017
 # vestimir <vestimir@gmail.com>, 2014
 # Alexander Atanasov <aatanasov@gmail.com>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-19 16:49+0100\n"
+"POT-Creation-Date: 2015-03-18 09:16+0100\n"
-"PO-Revision-Date: 2017-01-25 23:04+0000\n"
+"PO-Revision-Date: 2015-03-18 08:44+0000\n"
-"Last-Translator: Venelin Stoykov <vkstoykov@gmail.com>\n"
+"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Bulgarian (http://www.transifex.com/django/django/language/"
+"Language-Team: Bulgarian (http://www.transifex.com/projects/p/django/"
-"bg/)\n"
+"language/bg/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@ -65,9 +64,6 @@ msgstr "датски език"
 msgid "German"
 msgstr "немски език"
 msgid "Lower Sorbian"
 msgstr ""
 msgid "Greek"
 msgstr "гръцки език"
@ -89,9 +85,6 @@ msgstr "испански език"
 msgid "Argentinian Spanish"
 msgstr "кастилски"
 msgid "Colombian Spanish"
 msgstr "Колумбийски Испански"
 msgid "Mexican Spanish"
 msgstr "Мексикански испански"
@ -122,9 +115,6 @@ msgstr "фризийски език"
 msgid "Irish"
 msgstr "ирландски език"
 msgid "Scottish Gaelic"
 msgstr ""
 msgid "Galician"
 msgstr "галицейски език"
@ -137,9 +127,6 @@ msgstr "хинди"
 msgid "Croatian"
 msgstr "хърватски език"
 msgid "Upper Sorbian"
 msgstr ""
 msgid "Hungarian"
 msgstr "унгарски език"
@ -200,8 +187,8 @@ msgstr "Марати"
 msgid "Burmese"
 msgstr "Бурмесе"
-msgid "Norwegian Bokmål"
+msgid "Norwegian Bokmal"
-msgstr ""
+msgstr "норвежки букмол"
 msgid "Nepali"
 msgstr "Непалски"
@ -288,24 +275,18 @@ msgid "Traditional Chinese"
 msgstr "традиционен китайски"
 msgid "Messages"
-msgstr "Съобщения"
+msgstr ""
 msgid "Site Maps"
-msgstr "Бързи Maps"
+msgstr ""
 msgid "Static Files"
-msgstr "Статични файлове"
+msgstr ""
 msgid "Syndication"
 msgstr "Syndication"
 msgid "That page number is not an integer"
 msgstr ""
-msgid "That page number is less than 1"
+msgid "Web Design"
 msgstr ""
 msgid "That page contains no results"
 msgstr ""
 msgid "Enter a valid value."
@ -325,12 +306,6 @@ msgid ""
 msgstr ""
 "Въведете валиден 'слъг', състоящ се от букви, цифри, тирета или долни тирета."
 msgid ""
 "Enter a valid 'slug' consisting of Unicode letters, numbers, underscores, or "
 "hyphens."
 msgstr ""
 "Въведете валиден 'слъг', състоящ се от букви, цифри, тирета или долни тирета."
 msgid "Enter a valid IPv4 address."
 msgstr "Въведете валиден IPv4 адрес."
@ -364,10 +339,10 @@ msgid_plural ""
 "Ensure this value has at least %(limit_value)d characters (it has "
 "%(show_value)d)."
 msgstr[0] ""
-"Уверете се, че тази стойност е най-малко %(limit_value)d знака (тя има "
+"Уверете се, тази стойност е най-малко %(limit_value)d знака (тя има "
 "%(show_value)d )."
 msgstr[1] ""
-"Уверете се, че тази стойност е най-малко %(limit_value)d знака (тя има "
+"Уверете се, тази стойност е най-малко %(limit_value)d знака (тя има "
 "%(show_value)d)."
 #, python-format
@ -381,51 +356,19 @@ msgstr[0] ""
 "Уверете се, тази стойност има най-много %(limit_value)d знака (тя има "
 "%(show_value)d)."
 msgstr[1] ""
-"Уверете се, че тази стойност има най-много %(limit_value)d знака (тя има "
+"Уверете се, тази стойност има най-много %(limit_value)d знака (тя има "
 "%(show_value)d)."
 #, python-format
 msgid "Ensure that there are no more than %(max)s digit in total."
 msgid_plural "Ensure that there are no more than %(max)s digits in total."
 msgstr[0] "Уверете се, че има не повече от %(max)s цифри в общо."
 msgstr[1] "Уверете се, че има не повече от %(max)s цифри общо."
 #, python-format
 msgid "Ensure that there are no more than %(max)s decimal place."
 msgid_plural "Ensure that there are no more than %(max)s decimal places."
 msgstr[0] ""
 "Уверете се, че има не повече от%(max)s знак след десетичната запетая."
 msgstr[1] ""
 "Уверете се, че има не повече от %(max)s знака след десетичната запетая."
 #, python-format
 msgid ""
 "Ensure that there are no more than %(max)s digit before the decimal point."
 msgid_plural ""
 "Ensure that there are no more than %(max)s digits before the decimal point."
 msgstr[0] ""
 "Уверете се, че има не повече от %(max)s цифри преди десетичната запетая."
 msgstr[1] ""
 "Уверете се, че има не повече от %(max)s цифри преди десетичната запетая."
 #, python-format
 msgid ""
 "File extension '%(extension)s' is not allowed. Allowed extensions are: "
 "'%(allowed_extensions)s'."
 msgstr ""
 "Не са разрешени файлове с раширение '%(extension)s'. Позволените разширения "
 "са:  '%(allowed_extensions)s'."
 msgid "and"
 msgstr "и"
 #, python-format
 msgid "%(model_name)s with this %(field_labels)s already exists."
-msgstr "%(model_name)s с тези %(field_labels)s вече съществува."
+msgstr ""
 #, python-format
 msgid "Value %(value)r is not a valid choice."
-msgstr "Стойността %(value)r не е валиден избор."
+msgstr ""
 msgid "This field cannot be null."
 msgstr "Това поле не може да има празна стойност."
@ -443,8 +386,6 @@ msgstr "%(model_name)s с този %(field_label)s вече съществува
 msgid ""
 "%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
 msgstr ""
 "%(field_label)s трябва да са уникални за %(date_field_label)s "
 "%(lookup_type)s."
 #, python-format
 msgid "Field of type: %(field_type)s"
@ -455,14 +396,11 @@ msgstr "Цяло число"
 #, python-format
 msgid "'%(value)s' value must be an integer."
-msgstr "'%(value)s' стойност трябва да е цяло число."
+msgstr ""
 msgid "Big (8 byte) integer"
 msgstr "Голямо (8 байта) цяло число"
 #, python-format
 msgid "'%(value)s' value must be either True or False."
-msgstr "Стойността на '%(value)s' трябва да бъде или True или False."
+msgstr ""
 msgid "Boolean (Either True or False)"
 msgstr "Boolean (True или False)"
@ -479,16 +417,12 @@ msgid ""
 "'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
 "format."
 msgstr ""
 "'%(value)s' стойност е с формат невалидна дата. Тя трябва да бъде в YYYY-MM-"
 "DD формат."
 #, python-format
 msgid ""
 "'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
 "date."
 msgstr ""
 "Стойността на '%(value)s' е в правилния формат (ГГГГ-ММ-ДД), но тя е "
 "невалидна дата."
 msgid "Date (without time)"
 msgstr "Дата (без час)"
@ -498,24 +432,19 @@ msgid ""
 "'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
 "uuuuuu]][TZ] format."
 msgstr ""
 "Стойността на '%(value)s' е с невалиден формат. Трябва да бъде във формат "
 "ГГГГ-ММ-ДД ЧЧ:ММ[:сс[.uuuuuu]][TZ] (където u означава милисекунда, а TZ - "
 "часова зона)"
 #, python-format
 msgid ""
 "'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
 "[TZ]) but it is an invalid date/time."
 msgstr ""
 "Стойността на  '%(value)s' е с правилен формат ( ГГГГ-ММ-ДД ЧЧ:ММ[:сс[."
 "μμμμμμ]][TZ]), но датата/часът са невалидни"
 msgid "Date (with time)"
 msgstr "Дата (и час)"
 #, python-format
 msgid "'%(value)s' value must be a decimal number."
-msgstr "Стойността на '%(value)s' трябва да е десетично число."
+msgstr ""
 msgid "Decimal number"
 msgstr "Десетична дроб"
@ -525,11 +454,9 @@ msgid ""
 "'%(value)s' value has an invalid format. It must be in [DD] [HH:[MM:]]ss[."
 "uuuuuu] format."
 msgstr ""
 "Стойността на '%(value)s'  е с невалиден формат. Тя трябва да бъде в [ДД] "
 "[ЧЧ:[ММ:]]сс[.μμμμμμ]"
 msgid "Duration"
-msgstr "Продължителност"
+msgstr ""
 msgid "Email address"
 msgstr "Email адрес"
@ -539,11 +466,14 @@ msgstr "Път към файл"
 #, python-format
 msgid "'%(value)s' value must be a float."
-msgstr "'%(value)s' стойност трябва да е число с плаваща запетая."
+msgstr ""
 msgid "Floating point number"
 msgstr "Число с плаваща запетая"
 msgid "Big (8 byte) integer"
 msgstr "Голямо (8 байта) цяло число"
 msgid "IPv4 address"
 msgstr "IPv4 адрес"
@ -552,7 +482,7 @@ msgstr "IP адрес"
 #, python-format
 msgid "'%(value)s' value must be either None, True or False."
-msgstr "Стойност '%(value)s' трябва да бъде или None, True или False."
+msgstr ""
 msgid "Boolean (Either True, False or None)"
 msgstr "Boolean (Възможните стойности са True, False или None)"
@ -578,16 +508,12 @@ msgid ""
 "'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
 "format."
 msgstr ""
 "Стойността '%(value)s'  е с невалиден формат. Тя трябва да бъде в ЧЧ:ММ [:"
 "сс[.μμμμμμ]]"
 #, python-format
 msgid ""
 "'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
 "invalid time."
 msgstr ""
 "Стойността на '%(value)s' е в правилния формат (ЧЧ:ММ [:сс[.μμμμμμ]]), но "
 "часът е невалиден."
 msgid "Time"
 msgstr "Време"
@ -600,7 +526,7 @@ msgstr "сурови двоични данни"
 #, python-format
 msgid "'%(value)s' is not a valid UUID."
-msgstr "'%(value)s' не е валиден UUID."
+msgstr ""
 msgid "File"
 msgstr "Файл"
@ -610,7 +536,7 @@ msgstr "Изображение"
 #, python-format
 msgid "%(model)s instance with %(field)s %(value)r does not exist."
-msgstr "Инстанция на %(model)s с %(field)s %(value)r не съществува."
+msgstr ""
 msgid "Foreign Key (type determined by related field)"
 msgstr "Външен ключ (тип, определен от свързаното поле)"
@ -618,23 +544,9 @@ msgstr "Външен ключ (тип, определен от свързано
 msgid "One-to-one relationship"
 msgstr "словенски език"
 #, python-format
 msgid "%(from)s-%(to)s relationship"
 msgstr ""
 #, python-format
 msgid "%(from)s-%(to)s relationships"
 msgstr ""
 msgid "Many-to-many relationship"
 msgstr "Много-към-много връзка"
 #. Translators: If found as last label character, these punctuation
 #. characters will prevent the default label_suffix to be appended to the
 #. label
 msgid ":?.!"
 msgstr ":?.!"
 msgid "This field is required."
 msgstr "Това поле е задължително."
@ -644,6 +556,30 @@ msgstr "Въведете цяло число.  "
 msgid "Enter a number."
 msgstr "Въведете число."
 #, python-format
 msgid "Ensure that there are no more than %(max)s digit in total."
 msgid_plural "Ensure that there are no more than %(max)s digits in total."
 msgstr[0] "Уверете се, че има не повече от %(max)s цифри в общо."
 msgstr[1] "Уверете се, че има не повече от %(max)s цифри общо."
 #, python-format
 msgid "Ensure that there are no more than %(max)s decimal place."
 msgid_plural "Ensure that there are no more than %(max)s decimal places."
 msgstr[0] ""
 "Уверете се, че има не повече от%(max)s знак след десетичната запетая."
 msgstr[1] ""
 "Уверете се, че има не повече от %(max)s знака след десетичната запетая."
 #, python-format
 msgid ""
 "Ensure that there are no more than %(max)s digit before the decimal point."
 msgid_plural ""
 "Ensure that there are no more than %(max)s digits before the decimal point."
 msgstr[0] ""
 "Уверете се, че има не повече от %(max)s цифри преди десетичната запетая."
 msgstr[1] ""
 "Уверете се, че има не повече от %(max)s цифри преди десетичната запетая."
 msgid "Enter a valid date."
 msgstr "Въведете валидна дата.  "
@ -654,7 +590,7 @@ msgid "Enter a valid date/time."
 msgstr "Въведете валидна дата/час.  "
 msgid "Enter a valid duration."
-msgstr "Въведете валидна продължителност."
+msgstr ""
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr "Не е получен файл.  Проверете типа кодиране на формата.  "
@ -671,8 +607,7 @@ msgid_plural ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
 msgstr[0] "Уверете се, това име е най-много %(max)d знака (то има %(length)d)."
 msgstr[1] ""
-"Уверете се, че това файлово име има най-много  %(max)d знаци (има "
+"Уверете се, това файлово име има най-много  %(max)d знаци (има %(length)d)."
 "%(length)d)."
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr ""
@ -693,10 +628,10 @@ msgid "Enter a list of values."
 msgstr "Въведете списък от стойности"
 msgid "Enter a complete value."
-msgstr "Въведете пълна стойност."
+msgstr ""
 msgid "Enter a valid UUID."
-msgstr "Въведете валиден UUID."
+msgstr ""
 #. Translators: This is the default suffix added to form field labels
 msgid ":"
@ -706,8 +641,14 @@ msgstr ":"
 msgid "(Hidden field %(name)s) %(error)s"
 msgstr "(Скрито поле %(name)s) %(error)s"
 #. Translators: If found as last label character, these punctuation
 #. characters will prevent the default label_suffix to be appended to the
 #. label
 msgid ":?.!"
 msgstr ":?.!"
 msgid "ManagementForm data is missing or has been tampered with"
-msgstr "Данни за мениджърската форма липсват или са били променени."
+msgstr ""
 #, python-format
 msgid "Please submit %d or fewer forms."
@ -718,8 +659,8 @@ msgstr[1] "Моля, въведете %d по-малко форми."
 #, python-format
 msgid "Please submit %d or more forms."
 msgid_plural "Please submit %d or more forms."
-msgstr[0] "Моля, въведете %d или по-вече форми."
+msgstr[0] ""
-msgstr[1] "Моля, въведете %d или по-вече форми."
+msgstr[1] ""
 msgid "Order"
 msgstr "Ред"
@ -766,15 +707,15 @@ msgstr ""
 "%(datetime)s не може да бъде разчетено в  %(current_timezone)s; може да е "
 "двусмислен или да не съществува"
 msgid "Clear"
 msgstr "Изчисти"
 msgid "Currently"
 msgstr "Сега"
 msgid "Change"
 msgstr "Промени"
 msgid "Clear"
 msgstr "Изчисти"
 msgid "Unknown"
 msgstr "Неизвестно"
@ -1096,10 +1037,10 @@ msgid "0 minutes"
 msgstr "0 минути"
 msgid "Forbidden"
-msgstr "Забранен"
+msgstr ""
 msgid "CSRF verification failed. Request aborted."
-msgstr "CSRF проверката се провали. Заявката прекратена."
+msgstr ""
 msgid ""
 "You are seeing this message because this HTTPS site requires a 'Referer "
@ -1107,52 +1048,39 @@ msgid ""
 "required for security reasons, to ensure that your browser is not being "
 "hijacked by third parties."
 msgstr ""
 "Вие виждате това съобщение, защото този HTTPS сайт изисква 'Referer header' "
 "да бъде изпратен от вашият WEB браузър, но такъв не бе изпратен. Този "
 "header  е задължителен от съображения за сигурност, за да се гарантира, че "
 "вашият браузър не е компрометиран от трети страни."
 msgid ""
 "If you have configured your browser to disable 'Referer' headers, please re-"
 "enable them, at least for this site, or for HTTPS connections, or for 'same-"
 "origin' requests."
 msgstr ""
 "Ако сте конфигурирали вашия браузър, да забраните 'Referer' headers, моля да "
 "ги активирате отново, поне за този сайт, или за HTTPS връзки, или за 'same-"
 "origin' заявки."
 msgid ""
 "You are seeing this message because this site requires a CSRF cookie when "
 "submitting forms. This cookie is required for security reasons, to ensure "
 "that your browser is not being hijacked by third parties."
 msgstr ""
 "Вие виждате това съобщение, защото този сайт изисква CSRF бисквитка когато "
 "се подават формуляри. Тази бисквитка е задължителна от съображения за "
 "сигурност, за да се гарантира, че вашият браузър не е компрометиран от трети "
 "страни."
 msgid ""
 "If you have configured your browser to disable cookies, please re-enable "
 "them, at least for this site, or for 'same-origin' requests."
 msgstr ""
 "Ако сте конфигурирали вашия браузър, да забраните бисквитките, моля да ги "
 "активирате отново, поне за този сайт, или за'same-origin' заявки."
 msgid "More information is available with DEBUG=True."
-msgstr "Повече информация е на разположение с DEBUG=True."
+msgstr ""
 msgid "Welcome to Django"
-msgstr "Добре дошли в Django"
+msgstr ""
 msgid "It worked!"
-msgstr "Той работи!"
+msgstr ""
 msgid "Congratulations on your first Django-powered page."
-msgstr "Поздравления за първата си Django страница."
+msgstr ""
 msgid ""
-"Next, start your first app by running <code>python manage.py startapp "
+"Of course, you haven't actually done any work yet. Next, start your first "
-"[app_label]</code>."
+"app by running <code>python manage.py startapp [app_label]</code>."
 msgstr ""
 msgid ""
--- a/django/conf/locale/bn/LC_MESSAGES/django.mo
+++ b/django/conf/locale/bn/LC_MESSAGES/django.mo
--- a/django/conf/locale/bn/LC_MESSAGES/django.po
+++ b/django/conf/locale/bn/LC_MESSAGES/django.po
@ -9,10 +9,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-19 16:49+0100\n"
+"POT-Creation-Date: 2015-03-18 09:16+0100\n"
-"PO-Revision-Date: 2017-01-20 09:03+0000\n"
+"PO-Revision-Date: 2015-03-18 08:44+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Bengali (http://www.transifex.com/django/django/language/"
+"Language-Team: Bengali (http://www.transifex.com/projects/p/django/language/"
 "bn/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@ -62,9 +62,6 @@ msgstr "ড্যানিশ"
 msgid "German"
 msgstr "জার্মান"
 msgid "Lower Sorbian"
 msgstr ""
 msgid "Greek"
 msgstr "গ্রিক"
@ -86,9 +83,6 @@ msgstr "স্প্যানিশ"
 msgid "Argentinian Spanish"
 msgstr "আর্জেন্টিনিয়ান স্প্যানিশ"
 msgid "Colombian Spanish"
 msgstr ""
 msgid "Mexican Spanish"
 msgstr "মেক্সিকান স্প্যানিশ"
@ -119,9 +113,6 @@ msgstr "ফ্রিজ্ল্যানডের ভাষা"
 msgid "Irish"
 msgstr "আইরিশ"
 msgid "Scottish Gaelic"
 msgstr ""
 msgid "Galician"
 msgstr "গ্যালিসিয়ান"
@ -134,9 +125,6 @@ msgstr "হিন্দী"
 msgid "Croatian"
 msgstr "ক্রোয়েশিয়ান"
 msgid "Upper Sorbian"
 msgstr ""
 msgid "Hungarian"
 msgstr "হাঙ্গেরিয়ান"
@ -197,8 +185,8 @@ msgstr ""
 msgid "Burmese"
 msgstr "বার্মিজ"
-msgid "Norwegian Bokmål"
+msgid "Norwegian Bokmal"
-msgstr ""
+msgstr "নরওয়েজীয় বোকমাল"
 msgid "Nepali"
 msgstr "নেপালি"
@ -296,13 +284,7 @@ msgstr ""
 msgid "Syndication"
 msgstr ""
-msgid "That page number is not an integer"
+msgid "Web Design"
 msgstr ""
 msgid "That page number is less than 1"
 msgstr ""
 msgid "That page contains no results"
 msgstr ""
 msgid "Enter a valid value."
@ -323,11 +305,6 @@ msgstr ""
 "বৈধ ’slug' প্রবেশ করান যাতে শুধুমাত্র ইংরেজী বর্ণ, অঙ্ক, আন্ডারস্কোর অথবা হাইফেন "
 "রয়েছে।"
 msgid ""
 "Enter a valid 'slug' consisting of Unicode letters, numbers, underscores, or "
 "hyphens."
 msgstr ""
 msgid "Enter a valid IPv4 address."
 msgstr "একটি বৈধ IPv4 ঠিকানা দিন।"
@ -372,32 +349,6 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 #, python-format
 msgid "Ensure that there are no more than %(max)s digit in total."
 msgid_plural "Ensure that there are no more than %(max)s digits in total."
 msgstr[0] ""
 msgstr[1] ""
 #, python-format
 msgid "Ensure that there are no more than %(max)s decimal place."
 msgid_plural "Ensure that there are no more than %(max)s decimal places."
 msgstr[0] ""
 msgstr[1] ""
 #, python-format
 msgid ""
 "Ensure that there are no more than %(max)s digit before the decimal point."
 msgid_plural ""
 "Ensure that there are no more than %(max)s digits before the decimal point."
 msgstr[0] ""
 msgstr[1] ""
 #, python-format
 msgid ""
 "File extension '%(extension)s' is not allowed. Allowed extensions are: "
 "'%(allowed_extensions)s'."
 msgstr ""
 msgid "and"
 msgstr "এবং"
@ -437,9 +388,6 @@ msgstr "ইন্টিজার"
 msgid "'%(value)s' value must be an integer."
 msgstr ""
 msgid "Big (8 byte) integer"
 msgstr "বিগ (৮ বাইট) ইন্টিজার"
 #, python-format
 msgid "'%(value)s' value must be either True or False."
 msgstr ""
@ -513,6 +461,9 @@ msgstr ""
 msgid "Floating point number"
 msgstr "ফ্লোটিং পয়েন্ট সংখ্যা"
 msgid "Big (8 byte) integer"
 msgstr "বিগ (৮ বাইট) ইন্টিজার"
 msgid "IPv4 address"
 msgstr "IPv4 ঠিকানা"
@ -583,23 +534,9 @@ msgstr "ফরেন কি (টাইপ রিলেটেড ফিল্ড
 msgid "One-to-one relationship"
 msgstr "ওয়ান-টু-ওয়ান রিলেশানশিপ"
 #, python-format
 msgid "%(from)s-%(to)s relationship"
 msgstr ""
 #, python-format
 msgid "%(from)s-%(to)s relationships"
 msgstr ""
 msgid "Many-to-many relationship"
 msgstr "ম্যানি-টু-ম্যানি রিলেশানশিপ"
 #. Translators: If found as last label character, these punctuation
 #. characters will prevent the default label_suffix to be appended to the
 #. label
 msgid ":?.!"
 msgstr ""
 msgid "This field is required."
 msgstr "এটি আবশ্যক।"
@ -609,6 +546,26 @@ msgstr "একটি পূর্ণসংখ্যা দিন"
 msgid "Enter a number."
 msgstr "একটি সংখ্যা প্রবেশ করান।"
 #, python-format
 msgid "Ensure that there are no more than %(max)s digit in total."
 msgid_plural "Ensure that there are no more than %(max)s digits in total."
 msgstr[0] ""
 msgstr[1] ""
 #, python-format
 msgid "Ensure that there are no more than %(max)s decimal place."
 msgid_plural "Ensure that there are no more than %(max)s decimal places."
 msgstr[0] ""
 msgstr[1] ""
 #, python-format
 msgid ""
 "Ensure that there are no more than %(max)s digit before the decimal point."
 msgid_plural ""
 "Ensure that there are no more than %(max)s digits before the decimal point."
 msgstr[0] ""
 msgstr[1] ""
 msgid "Enter a valid date."
 msgstr "বৈধ তারিখ দিন।"
@ -669,6 +626,12 @@ msgstr ""
 msgid "(Hidden field %(name)s) %(error)s"
 msgstr ""
 #. Translators: If found as last label character, these punctuation
 #. characters will prevent the default label_suffix to be appended to the
 #. label
 msgid ":?.!"
 msgstr ""
 msgid "ManagementForm data is missing or has been tampered with"
 msgstr ""
@ -723,15 +686,15 @@ msgid ""
 "may be ambiguous or it may not exist."
 msgstr ""
 msgid "Clear"
 msgstr "পরিষ্কার করুন"
 msgid "Currently"
 msgstr "এই মুহুর্তে"
 msgid "Change"
 msgstr "পরিবর্তন"
 msgid "Clear"
 msgstr "পরিষ্কার করুন"
 msgid "Unknown"
 msgstr "অজানা"
@ -1095,8 +1058,8 @@ msgid "Congratulations on your first Django-powered page."
 msgstr ""
 msgid ""
-"Next, start your first app by running <code>python manage.py startapp "
+"Of course, you haven't actually done any work yet. Next, start your first "
-"[app_label]</code>."
+"app by running <code>python manage.py startapp [app_label]</code>."
 msgstr ""
 msgid ""
--- a/django/conf/locale/bn/formats.py
+++ b/django/conf/locale/bn/formats.py
@ -12,24 +12,13 @@ YEAR_MONTH_FORMAT = 'F Y'
 MONTH_DAY_FORMAT = 'j F'
 SHORT_DATE_FORMAT = 'j M, Y'
 # SHORT_DATETIME_FORMAT =
-FIRST_DAY_OF_WEEK = 6  # Saturday
+# FIRST_DAY_OF_WEEK =
 # The *_INPUT_FORMATS strings use the Python strftime format syntax,
 # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
-DATE_INPUT_FORMATS = [
+# DATE_INPUT_FORMATS =
-    '%d/%m/%Y',  # 25/10/2016
+# TIME_INPUT_FORMATS =
-    '%d/%m/%y',  # 25/10/16
+# DATETIME_INPUT_FORMATS =
    '%d-%m-%Y',  # 25-10-2016
    '%d-%m-%y',  # 25-10-16
 ]
 TIME_INPUT_FORMATS = [
    '%H:%M:%S',  # 14:30:59
    '%H:%M',  # 14:30
 ]
 DATETIME_INPUT_FORMATS = [
    '%d/%m/%Y %H:%M:%S',  # 25/10/2006 14:30:59
    '%d/%m/%Y %H:%M',  # 25/10/2006 14:30
 ]
 DECIMAL_SEPARATOR = '.'
 THOUSAND_SEPARATOR = ','
 # NUMBER_GROUPING =
--- a/django/conf/locale/br/LC_MESSAGES/django.mo
+++ b/django/conf/locale/br/LC_MESSAGES/django.mo
--- a/django/conf/locale/br/LC_MESSAGES/django.po
+++ b/django/conf/locale/br/LC_MESSAGES/django.po
@ -6,10 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-29 20:57+0200\n"
+"POT-Creation-Date: 2015-03-18 09:16+0100\n"
-"PO-Revision-Date: 2016-06-30 08:31+0000\n"
+"PO-Revision-Date: 2015-03-18 08:44+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Breton (http://www.transifex.com/django/django/language/br/)\n"
+"Language-Team: Breton (http://www.transifex.com/projects/p/django/language/"
 "br/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@ -58,9 +59,6 @@ msgstr "Daneg"
 msgid "German"
 msgstr "Alamaneg"
 msgid "Lower Sorbian"
 msgstr ""
 msgid "Greek"
 msgstr "Gresianeg"
@ -82,9 +80,6 @@ msgstr "Spagnoleg"
 msgid "Argentinian Spanish"
 msgstr "Spagnoleg Arc'hantina"
 msgid "Colombian Spanish"
 msgstr ""
 msgid "Mexican Spanish"
 msgstr "Spagnoleg Mec'hiko"
@ -115,9 +110,6 @@ msgstr "Frizeg"
 msgid "Irish"
 msgstr "Iwerzhoneg"
 msgid "Scottish Gaelic"
 msgstr ""
 msgid "Galician"
 msgstr "Galizeg"
@ -130,9 +122,6 @@ msgstr "Hindi"
 msgid "Croatian"
 msgstr "Kroateg"
 msgid "Upper Sorbian"
 msgstr ""
 msgid "Hungarian"
 msgstr "Hungareg"
@ -193,8 +182,8 @@ msgstr "Marathi"
 msgid "Burmese"
 msgstr "Burmeg"
-msgid "Norwegian Bokmål"
+msgid "Norwegian Bokmal"
-msgstr ""
+msgstr "Norvegeg Bokmal"
 msgid "Nepali"
 msgstr "nepaleg"
@ -292,6 +281,9 @@ msgstr "Restroù statek"
 msgid "Syndication"
 msgstr "Sindikadur"
 msgid "Web Design"
 msgstr "Dizagn  Web"
 msgid "Enter a valid value."
 msgstr "Merkit un talvoud reizh"
@ -310,11 +302,6 @@ msgstr ""
 "N'hall bezañ er vaezienn-mañ nemet lizherennoù, niveroù, tiredoù izel _ ha "
 "barrennigoù-stagañ."
 msgid ""
 "Enter a valid 'slug' consisting of Unicode letters, numbers, underscores, or "
 "hyphens."
 msgstr ""
 msgid "Enter a valid IPv4 address."
 msgstr "Merkit ur chomlec'h IPv4 reizh."
@ -361,26 +348,6 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 #, python-format
 msgid "Ensure that there are no more than %(max)s digit in total."
 msgid_plural "Ensure that there are no more than %(max)s digits in total."
 msgstr[0] ""
 msgstr[1] ""
 #, python-format
 msgid "Ensure that there are no more than %(max)s decimal place."
 msgid_plural "Ensure that there are no more than %(max)s decimal places."
 msgstr[0] ""
 msgstr[1] ""
 #, python-format
 msgid ""
 "Ensure that there are no more than %(max)s digit before the decimal point."
 msgid_plural ""
 "Ensure that there are no more than %(max)s digits before the decimal point."
 msgstr[0] ""
 msgstr[1] ""
 msgid "and"
 msgstr "ha"
@ -420,9 +387,6 @@ msgstr "Anterin"
 msgid "'%(value)s' value must be an integer."
 msgstr ""
 msgid "Big (8 byte) integer"
 msgstr "Anterin bras (8 okted)"
 #, python-format
 msgid "'%(value)s' value must be either True or False."
 msgstr ""
@ -496,6 +460,9 @@ msgstr ""
 msgid "Floating point number"
 msgstr "Niver gant skej nij"
 msgid "Big (8 byte) integer"
 msgstr "Anterin bras (8 okted)"
 msgid "IPv4 address"
 msgstr "Chomlec'h IPv4"
@ -566,23 +533,9 @@ msgstr "Alc'hwez estren (seurt termenet dre ar vaezienn liammet)"
 msgid "One-to-one relationship"
 msgstr "Darempred unan-ouzh-unan"
 #, python-format
 msgid "%(from)s-%(to)s relationship"
 msgstr ""
 #, python-format
 msgid "%(from)s-%(to)s relationships"
 msgstr ""
 msgid "Many-to-many relationship"
 msgstr "Darempred lies-ouzh-lies"
 #. Translators: If found as last label character, these punctuation
 #. characters will prevent the default label_suffix to be appended to the
 #. label
 msgid ":?.!"
 msgstr ""
 msgid "This field is required."
 msgstr "Rekis eo leuniañ ar vaezienn."
@ -592,6 +545,26 @@ msgstr "Merkit un niver anterin."
 msgid "Enter a number."
 msgstr "Merkit un niver."
 #, python-format
 msgid "Ensure that there are no more than %(max)s digit in total."
 msgid_plural "Ensure that there are no more than %(max)s digits in total."
 msgstr[0] ""
 msgstr[1] ""
 #, python-format
 msgid "Ensure that there are no more than %(max)s decimal place."
 msgid_plural "Ensure that there are no more than %(max)s decimal places."
 msgstr[0] ""
 msgstr[1] ""
 #, python-format
 msgid ""
 "Ensure that there are no more than %(max)s digit before the decimal point."
 msgid_plural ""
 "Ensure that there are no more than %(max)s digits before the decimal point."
 msgstr[0] ""
 msgstr[1] ""
 msgid "Enter a valid date."
 msgstr "Merkit un deiziad reizh"
@ -651,6 +624,12 @@ msgstr ""
 msgid "(Hidden field %(name)s) %(error)s"
 msgstr ""
 #. Translators: If found as last label character, these punctuation
 #. characters will prevent the default label_suffix to be appended to the
 #. label
 msgid ":?.!"
 msgstr ""
 msgid "ManagementForm data is missing or has been tampered with"
 msgstr ""
--- a/django/conf/locale/bs/LC_MESSAGES/django.mo
+++ b/django/conf/locale/bs/LC_MESSAGES/django.mo
--- a/django/conf/locale/bs/LC_MESSAGES/django.po
+++ b/django/conf/locale/bs/LC_MESSAGES/django.po
@ -7,10 +7,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-19 16:49+0100\n"
+"POT-Creation-Date: 2015-03-18 09:16+0100\n"
-"PO-Revision-Date: 2017-01-20 09:03+0000\n"
+"PO-Revision-Date: 2015-03-18 08:44+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Bosnian (http://www.transifex.com/django/django/language/"
+"Language-Team: Bosnian (http://www.transifex.com/projects/p/django/language/"
 "bs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@ -61,9 +61,6 @@ msgstr "danski"
 msgid "German"
 msgstr "njemački"
 msgid "Lower Sorbian"
 msgstr ""
 msgid "Greek"
 msgstr "grčki"
@ -85,9 +82,6 @@ msgstr "španski"
 msgid "Argentinian Spanish"
 msgstr "Argentinski španski"
 msgid "Colombian Spanish"
 msgstr ""
 msgid "Mexican Spanish"
 msgstr "Meksički španski"
@ -118,9 +112,6 @@ msgstr "frišanski"
 msgid "Irish"
 msgstr "irski"
 msgid "Scottish Gaelic"
 msgstr ""
 msgid "Galician"
 msgstr "galski"
@ -133,9 +124,6 @@ msgstr "hindi"
 msgid "Croatian"
 msgstr "hrvatski"
 msgid "Upper Sorbian"
 msgstr ""
 msgid "Hungarian"
 msgstr "mađarski"
@ -196,8 +184,8 @@ msgstr ""
 msgid "Burmese"
 msgstr ""
-msgid "Norwegian Bokmål"
+msgid "Norwegian Bokmal"
-msgstr ""
+msgstr "Norveški književni"
 msgid "Nepali"
 msgstr ""
@ -295,13 +283,7 @@ msgstr ""
 msgid "Syndication"
 msgstr ""
-msgid "That page number is not an integer"
+msgid "Web Design"
 msgstr ""
 msgid "That page number is less than 1"
 msgstr ""
 msgid "That page contains no results"
 msgstr ""
 msgid "Enter a valid value."
@ -322,11 +304,6 @@ msgstr ""
 "Unesite ispravan „slug“, koji se sastoji od slova, brojki, donjih crta ili "
 "crtica."
 msgid ""
 "Enter a valid 'slug' consisting of Unicode letters, numbers, underscores, or "
 "hyphens."
 msgstr ""
 msgid "Enter a valid IPv4 address."
 msgstr "Unesite ispravnu IPv4 adresu."
@ -375,35 +352,6 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 #, python-format
 msgid "Ensure that there are no more than %(max)s digit in total."
 msgid_plural "Ensure that there are no more than %(max)s digits in total."
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 #, python-format
 msgid "Ensure that there are no more than %(max)s decimal place."
 msgid_plural "Ensure that there are no more than %(max)s decimal places."
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 #, python-format
 msgid ""
 "Ensure that there are no more than %(max)s digit before the decimal point."
 msgid_plural ""
 "Ensure that there are no more than %(max)s digits before the decimal point."
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 #, python-format
 msgid ""
 "File extension '%(extension)s' is not allowed. Allowed extensions are: "
 "'%(allowed_extensions)s'."
 msgstr ""
 msgid "and"
 msgstr "i"
@ -443,9 +391,6 @@ msgstr "Cijeo broj"
 msgid "'%(value)s' value must be an integer."
 msgstr ""
 msgid "Big (8 byte) integer"
 msgstr "Big (8 bajtni) integer"
 #, python-format
 msgid "'%(value)s' value must be either True or False."
 msgstr ""
@ -519,6 +464,9 @@ msgstr ""
 msgid "Floating point number"
 msgstr "Broj sa pokrenom zapetom"
 msgid "Big (8 byte) integer"
 msgstr "Big (8 bajtni) integer"
 msgid "IPv4 address"
 msgstr ""
@ -589,23 +537,9 @@ msgstr "Strani ključ (tip određen povezanim poljem)"
 msgid "One-to-one relationship"
 msgstr "Jedan-na-jedan odnos"
 #, python-format
 msgid "%(from)s-%(to)s relationship"
 msgstr ""
 #, python-format
 msgid "%(from)s-%(to)s relationships"
 msgstr ""
 msgid "Many-to-many relationship"
 msgstr "Više-na-više odsnos"
 #. Translators: If found as last label character, these punctuation
 #. characters will prevent the default label_suffix to be appended to the
 #. label
 msgid ":?.!"
 msgstr ""
 msgid "This field is required."
 msgstr "Ovo polje se mora popuniti."
@ -615,6 +549,29 @@ msgstr "Unesite cijeo broj."
 msgid "Enter a number."
 msgstr "Unesite broj."
 #, python-format
 msgid "Ensure that there are no more than %(max)s digit in total."
 msgid_plural "Ensure that there are no more than %(max)s digits in total."
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 #, python-format
 msgid "Ensure that there are no more than %(max)s decimal place."
 msgid_plural "Ensure that there are no more than %(max)s decimal places."
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 #, python-format
 msgid ""
 "Ensure that there are no more than %(max)s digit before the decimal point."
 msgid_plural ""
 "Ensure that there are no more than %(max)s digits before the decimal point."
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 msgid "Enter a valid date."
 msgstr "Unesite ispravan datum."
@ -676,6 +633,12 @@ msgstr ""
 msgid "(Hidden field %(name)s) %(error)s"
 msgstr ""
 #. Translators: If found as last label character, these punctuation
 #. characters will prevent the default label_suffix to be appended to the
 #. label
 msgid ":?.!"
 msgstr ""
 msgid "ManagementForm data is missing or has been tampered with"
 msgstr ""
@ -736,15 +699,15 @@ msgid ""
 "may be ambiguous or it may not exist."
 msgstr ""
 msgid "Clear"
 msgstr "Očisti"
 msgid "Currently"
 msgstr "Trenutno"
 msgid "Change"
 msgstr "Izmjeni"
 msgid "Clear"
 msgstr "Očisti"
 msgid "Unknown"
 msgstr "Nepoznato"
@ -1115,8 +1078,8 @@ msgid "Congratulations on your first Django-powered page."
 msgstr ""
 msgid ""
-"Next, start your first app by running <code>python manage.py startapp "
+"Of course, you haven't actually done any work yet. Next, start your first "
-"[app_label]</code>."
+"app by running <code>python manage.py startapp [app_label]</code>."
 msgstr ""
 msgid ""
--- a/django/conf/locale/ca/LC_MESSAGES/django.mo
+++ b/django/conf/locale/ca/LC_MESSAGES/django.mo
--- a/django/conf/locale/ca/LC_MESSAGES/django.po
+++ b/django/conf/locale/ca/LC_MESSAGES/django.po
@ -1,20 +1,17 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
-# Antoni Aloy <aaloy@apsl.net>, 2012,2015-2017
+# Antoni Aloy <aaloy@apsl.net>, 2012,2015
 # Carles Barrobés <carles@barrobes.com>, 2011-2012,2014
 # duub qnnp, 2015
 # Jannis Leidel <jannis@leidel.info>, 2011
 # Manuel Miranda <manu.mirandad@gmail.com>, 2015
 # Roger Pons <rogerpons@gmail.com>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-19 16:49+0100\n"
+"POT-Creation-Date: 2015-03-18 09:16+0100\n"
-"PO-Revision-Date: 2017-02-14 07:18+0000\n"
+"PO-Revision-Date: 2015-03-18 08:44+0000\n"
-"Last-Translator: Antoni Aloy <aaloy@apsl.net>\n"
+"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Catalan (http://www.transifex.com/django/django/language/"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/django/language/"
 "ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@ -64,9 +61,6 @@ msgstr "danès"
 msgid "German"
 msgstr "alemany"
 msgid "Lower Sorbian"
 msgstr "Lower Sorbian"
 msgid "Greek"
 msgstr "grec"
@ -88,9 +82,6 @@ msgstr "espanyol"
 msgid "Argentinian Spanish"
 msgstr "castellà d'Argentina"
 msgid "Colombian Spanish"
 msgstr "Español de Colombia"
 msgid "Mexican Spanish"
 msgstr "espanyol de Mèxic"
@ -121,9 +112,6 @@ msgstr "frisi"
 msgid "Irish"
 msgstr "irlandès"
 msgid "Scottish Gaelic"
 msgstr "Escocés Gaélico"
 msgid "Galician"
 msgstr "gallec"
@ -136,9 +124,6 @@ msgstr "hindi"
 msgid "Croatian"
 msgstr "croat"
 msgid "Upper Sorbian"
 msgstr "Upper Sorbian"
 msgid "Hungarian"
 msgstr "hongarès"
@ -199,8 +184,8 @@ msgstr "Maratí"
 msgid "Burmese"
 msgstr "Burmès"
-msgid "Norwegian Bokmål"
+msgid "Norwegian Bokmal"
-msgstr "Norwegian Bokmål"
+msgstr "noruec bokmal"
 msgid "Nepali"
 msgstr "Nepalí"
@ -287,7 +272,7 @@ msgid "Traditional Chinese"
 msgstr "xinès tradicional"
 msgid "Messages"
-msgstr "Missatges"
+msgstr ""
 msgid "Site Maps"
 msgstr "Mapes del lloc"
@ -298,14 +283,8 @@ msgstr "Arxius estàtics"
 msgid "Syndication"
 msgstr "Sindicació"
-msgid "That page number is not an integer"
+msgid "Web Design"
-msgstr "Aquesta plana no és un sencer"
+msgstr "Disseny web"
 msgid "That page number is less than 1"
 msgstr "El nombre de plana és inferior a 1"
 msgid "That page contains no results"
 msgstr "La plana no conté cap resultat"
 msgid "Enter a valid value."
 msgstr "Introduïu un valor vàlid."
@ -325,13 +304,6 @@ msgstr ""
 "Introduïu un 'slug' vàlid, consistent en lletres, números, guions o guions "
 "baixos."
 msgid ""
 "Enter a valid 'slug' consisting of Unicode letters, numbers, underscores, or "
 "hyphens."
 msgstr ""
 "Introduïu un 'slug' vàlid format per lletres Unicode, números, guions o "
 "guions baixos."
 msgid "Enter a valid IPv4 address."
 msgstr "Introduïu una adreça IPv4 vàlida."
@ -386,36 +358,6 @@ msgstr[1] ""
 "Assegureu-vos que aquest valor té com a molt %(limit_value)d caràcters (en "
 "té %(show_value)d)."
 #, python-format
 msgid "Ensure that there are no more than %(max)s digit in total."
 msgid_plural "Ensure that there are no more than %(max)s digits in total."
 msgstr[0] "Assegureu-vos que no hi ha més de %(max)s dígit en total."
 msgstr[1] "Assegureu-vos que no hi ha més de %(max)s dígits en total."
 #, python-format
 msgid "Ensure that there are no more than %(max)s decimal place."
 msgid_plural "Ensure that there are no more than %(max)s decimal places."
 msgstr[0] "Assegureu-vos que no hi ha més de %(max)s decimal."
 msgstr[1] "Assegureu-vos que no hi ha més de %(max)s decimals."
 #, python-format
 msgid ""
 "Ensure that there are no more than %(max)s digit before the decimal point."
 msgid_plural ""
 "Ensure that there are no more than %(max)s digits before the decimal point."
 msgstr[0] ""
 "Assegureu-vos que no hi ha més de %(max)s dígit abans de la coma decimal."
 msgstr[1] ""
 "Assegureu-vos que no hi ha més de %(max)s dígits abans de la coma decimal."
 #, python-format
 msgid ""
 "File extension '%(extension)s' is not allowed. Allowed extensions are: "
 "'%(allowed_extensions)s'."
 msgstr ""
 "L'extensió d'arxiu  '%(extension)s' no es permesa. Les extensions permeses "
 "són: '%(allowed_extensions)s'."
 msgid "and"
 msgstr "i"
@ -456,9 +398,6 @@ msgstr "Enter"
 msgid "'%(value)s' value must be an integer."
 msgstr "El valor '%(value)s' ha de ser un nombre enter."
 msgid "Big (8 byte) integer"
 msgstr "Enter gran (8 bytes)"
 #, python-format
 msgid "'%(value)s' value must be either True or False."
 msgstr "El valor '%(value)s' ha de ser \"True\" o \"False\"."
@ -542,6 +481,9 @@ msgstr "El valor '%(value)s' ha de ser un número de coma flotant."
 msgid "Floating point number"
 msgstr "Número de coma flotant"
 msgid "Big (8 byte) integer"
 msgstr "Enter gran (8 bytes)"
 msgid "IPv4 address"
 msgstr "Adreça IPv4"
@ -616,23 +558,9 @@ msgstr "Clau forana (tipus determinat pel camp relacionat)"
 msgid "One-to-one relationship"
 msgstr "Inter-relació un-a-un"
 #, python-format
 msgid "%(from)s-%(to)s relationship"
 msgstr "relació %(from)s-%(to)s "
 #, python-format
 msgid "%(from)s-%(to)s relationships"
 msgstr "relacions %(from)s-%(to)s "
 msgid "Many-to-many relationship"
 msgstr "Inter-relació molts-a-molts"
 #. Translators: If found as last label character, these punctuation
 #. characters will prevent the default label_suffix to be appended to the
 #. label
 msgid ":?.!"
 msgstr ":?.!"
 msgid "This field is required."
 msgstr "Aquest camp és obligatori."
@ -642,6 +570,28 @@ msgstr "Introduïu un número sencer."
 msgid "Enter a number."
 msgstr "Introduïu un número."
 #, python-format
 msgid "Ensure that there are no more than %(max)s digit in total."
 msgid_plural "Ensure that there are no more than %(max)s digits in total."
 msgstr[0] "Assegureu-vos que no hi ha més de %(max)s dígit en total."
 msgstr[1] "Assegureu-vos que no hi ha més de %(max)s dígits en total."
 #, python-format
 msgid "Ensure that there are no more than %(max)s decimal place."
 msgid_plural "Ensure that there are no more than %(max)s decimal places."
 msgstr[0] "Assegureu-vos que no hi ha més de %(max)s decimal."
 msgstr[1] "Assegureu-vos que no hi ha més de %(max)s decimals."
 #, python-format
 msgid ""
 "Ensure that there are no more than %(max)s digit before the decimal point."
 msgid_plural ""
 "Ensure that there are no more than %(max)s digits before the decimal point."
 msgstr[0] ""
 "Assegureu-vos que no hi ha més de %(max)s dígit abans de la coma decimal."
 msgstr[1] ""
 "Assegureu-vos que no hi ha més de %(max)s dígits abans de la coma decimal."
 msgid "Enter a valid date."
 msgstr "Introduïu una data vàlida."
@ -708,6 +658,12 @@ msgstr ":"
 msgid "(Hidden field %(name)s) %(error)s"
 msgstr "(Camp ocult %(name)s) %(error)s"
 #. Translators: If found as last label character, these punctuation
 #. characters will prevent the default label_suffix to be appended to the
 #. label
 msgid ":?.!"
 msgstr ":?.!"
 msgid "ManagementForm data is missing or has been tampered with"
 msgstr "Falten dades de ManagementForm o s'ha manipulat"
@ -771,15 +727,15 @@ msgstr ""
 "No s'ha pogut interpretar %(datetime)s a la zona horària "
 "%(current_timezone)s; potser és ambigua o no existeix."
 msgid "Clear"
 msgstr "Netejar"
 msgid "Currently"
 msgstr "Actualment"
 msgid "Change"
 msgstr "Modificar"
 msgid "Clear"
 msgstr "Netejar"
 msgid "Unknown"
 msgstr "Desconegut"
@ -1098,7 +1054,7 @@ msgstr[0] "%d minut"
 msgstr[1] "%d minuts"
 msgid "0 minutes"
-msgstr "0 minuts"
+msgstr "0 minutes"
 msgid "Forbidden"
 msgstr "Prohibit"
@ -1157,11 +1113,12 @@ msgid "Congratulations on your first Django-powered page."
 msgstr "Enhorabona per la teva primera plana amb Django."
 msgid ""
-"Next, start your first app by running <code>python manage.py startapp "
+"Of course, you haven't actually done any work yet. Next, start your first "
-"[app_label]</code>."
+"app by running <code>python manage.py startapp [app_label]</code>."
 msgstr ""
-"Seguidament, inicii la seva primera aplicación executant <code>python manage."
+"Per suposat, encara no has fet cap feina real encara. Seguidament crea la "
-"py startapp [app_label]</code>."
+"teva primera aplicació executant <code>python manage.py startapp "
 "[app_label]</code>."
 msgid ""
 "You're seeing this message because you have <code>DEBUG = True</code> in "
@ -1207,14 +1164,14 @@ msgstr "La pàgina no és 'last', ni es pot convertir en un enter"
 #, python-format
 msgid "Invalid page (%(page_number)s): %(message)s"
-msgstr "Pàgina invàlida (%(page_number)s): %(message)s"
+msgstr "Plana invàlida  (%(page_number)s): %(message)s"
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
 msgstr "Llista buida i '%(class_name)s.allow_empty' és Fals."
 msgid "Directory indexes are not allowed here."
-msgstr "Aquí no es permeten índexs de directori."
+msgstr "No es permeten índexos de directori aquí"
 #, python-format
 msgid "\"%(path)s\" does not exist"
--- a/django/conf/locale/ca/formats.py
+++ b/django/conf/locale/ca/formats.py
@ -16,18 +16,18 @@ FIRST_DAY_OF_WEEK = 1  # Monday
 # The *_INPUT_FORMATS strings use the Python strftime format syntax,
 # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
-DATE_INPUT_FORMATS = [
+DATE_INPUT_FORMATS = (
    # '31/12/2009', '31/12/09'
    '%d/%m/%Y', '%d/%m/%y'
-]
+)
-DATETIME_INPUT_FORMATS = [
+DATETIME_INPUT_FORMATS = (
    '%d/%m/%Y %H:%M:%S',
    '%d/%m/%Y %H:%M:%S.%f',
    '%d/%m/%Y %H:%M',
    '%d/%m/%y %H:%M:%S',
    '%d/%m/%y %H:%M:%S.%f',
    '%d/%m/%y %H:%M',
-]
+)
 DECIMAL_SEPARATOR = ','
 THOUSAND_SEPARATOR = '.'
 NUMBER_GROUPING = 3
--- a/django/conf/locale/cs/LC_MESSAGES/django.mo
+++ b/django/conf/locale/cs/LC_MESSAGES/django.mo
--- a/django/conf/locale/cs/LC_MESSAGES/django.po
+++ b/django/conf/locale/cs/LC_MESSAGES/django.po
@ -6,15 +6,16 @@
 # Jirka Vejrazka <Jirka.Vejrazka@gmail.com>, 2011
 # Tomáš Ehrlich <tomas.ehrlich@gmail.com>, 2015
 # Vláďa Macek <macek@sandbox.cz>, 2012-2014
-# Vláďa Macek <macek@sandbox.cz>, 2015-2017
+# Vláďa Macek <macek@sandbox.cz>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-19 16:49+0100\n"
+"POT-Creation-Date: 2015-03-18 09:16+0100\n"
-"PO-Revision-Date: 2017-02-21 09:47+0000\n"
+"PO-Revision-Date: 2015-03-20 08:46+0000\n"
 "Last-Translator: Vláďa Macek <macek@sandbox.cz>\n"
-"Language-Team: Czech (http://www.transifex.com/django/django/language/cs/)\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/django/language/"
 "cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@ -63,9 +64,6 @@ msgstr "dánsky"
 msgid "German"
 msgstr "německy"
 msgid "Lower Sorbian"
 msgstr "Dolnolužická srbština"
 msgid "Greek"
 msgstr "řecky"
@ -87,9 +85,6 @@ msgstr "španělsky"
 msgid "Argentinian Spanish"
 msgstr "argentinskou španělštinou"
 msgid "Colombian Spanish"
 msgstr "kolumbijskou španělštinou"
 msgid "Mexican Spanish"
 msgstr "Mexická španělština"
@ -120,9 +115,6 @@ msgstr "frísky"
 msgid "Irish"
 msgstr "irsky"
 msgid "Scottish Gaelic"
 msgstr "skotskou keltštinou"
 msgid "Galician"
 msgstr "galicijsky"
@ -135,9 +127,6 @@ msgstr "hindsky"
 msgid "Croatian"
 msgstr "chorvatsky"
 msgid "Upper Sorbian"
 msgstr "Hornolužická srbština"
 msgid "Hungarian"
 msgstr "maďarsky"
@ -198,8 +187,8 @@ msgstr "Marathi"
 msgid "Burmese"
 msgstr "barmštinou"
-msgid "Norwegian Bokmål"
+msgid "Norwegian Bokmal"
-msgstr "Bokmål Norština"
+msgstr "norsky (Bokmål)"
 msgid "Nepali"
 msgstr "nepálsky"
@ -297,14 +286,8 @@ msgstr "Statické soubory"
 msgid "Syndication"
 msgstr "Syndikace"
-msgid "That page number is not an integer"
+msgid "Web Design"
-msgstr "Číslo stránky není celé číslo."
+msgstr "Design webu"
 msgid "That page number is less than 1"
 msgstr "Číslo stránky je menší než 1"
 msgid "That page contains no results"
 msgstr "Stránka je bez výsledků"
 msgid "Enter a valid value."
 msgstr "Zadejte platnou hodnotu."
@ -324,13 +307,6 @@ msgstr ""
 "Zadejte platný identifikátor složený pouze z písmen, čísel, podtržítek a "
 "pomlček."
 msgid ""
 "Enter a valid 'slug' consisting of Unicode letters, numbers, underscores, or "
 "hyphens."
 msgstr ""
 "Zadejte platný identifikátor složený pouze z písmen, čísel, podtržítek a "
 "pomlček typu Unicode."
 msgid "Enter a valid IPv4 address."
 msgstr "Zadejte platnou adresu typu IPv4."
@ -383,43 +359,6 @@ msgstr[1] ""
 msgstr[2] ""
 "Tato hodnota má mít nejvýše %(limit_value)d znaků (nyní má %(show_value)d)."
 #, python-format
 msgid "Ensure that there are no more than %(max)s digit in total."
 msgid_plural "Ensure that there are no more than %(max)s digits in total."
 msgstr[0] "Ujistěte se, že pole neobsahuje celkem více než %(max)s číslici."
 msgstr[1] "Ujistěte se, že pole neobsahuje celkem více než %(max)s číslice."
 msgstr[2] "Ujistěte se, že pole neobsahuje celkem více než %(max)s číslic."
 #, python-format
 msgid "Ensure that there are no more than %(max)s decimal place."
 msgid_plural "Ensure that there are no more than %(max)s decimal places."
 msgstr[0] "Ujistěte se, že pole neobsahuje více než %(max)s desetinné místo."
 msgstr[1] "Ujistěte se, že pole neobsahuje více než %(max)s desetinná místa."
 msgstr[2] "Ujistěte se, že pole neobsahuje více než %(max)s desetinných míst."
 #, python-format
 msgid ""
 "Ensure that there are no more than %(max)s digit before the decimal point."
 msgid_plural ""
 "Ensure that there are no more than %(max)s digits before the decimal point."
 msgstr[0] ""
 "Ujistěte se, že hodnota neobsahuje více než %(max)s místo před desetinnou "
 "čárkou (tečkou)."
 msgstr[1] ""
 "Ujistěte se, že hodnota neobsahuje více než %(max)s místa před desetinnou "
 "čárkou (tečkou)."
 msgstr[2] ""
 "Ujistěte se, že hodnota neobsahuje více než %(max)s míst před desetinnou "
 "čárkou (tečkou)."
 #, python-format
 msgid ""
 "File extension '%(extension)s' is not allowed. Allowed extensions are: "
 "'%(allowed_extensions)s'."
 msgstr ""
 "Přípona souboru '%(extension)s' není povolena. Povolené jsou tyto: "
 "'%(allowed_extensions)s'."
 msgid "and"
 msgstr "a"
@ -464,9 +403,6 @@ msgstr "Celé číslo"
 msgid "'%(value)s' value must be an integer."
 msgstr "Hodnota '%(value)s' musí být celé číslo."
 msgid "Big (8 byte) integer"
 msgstr "Velké číslo (8 bajtů)"
 #, python-format
 msgid "'%(value)s' value must be either True or False."
 msgstr "Hodnota '%(value)s' musí být buď True nebo False."
@ -548,6 +484,9 @@ msgstr "Hodnota '%(value)s' musí být reálné číslo."
 msgid "Floating point number"
 msgstr "Číslo s pohyblivou řádovou čárkou"
 msgid "Big (8 byte) integer"
 msgstr "Velké číslo (8 bajtů)"
 msgid "IPv4 address"
 msgstr "Adresa IPv4"
@ -622,23 +561,9 @@ msgstr "Cizí klíč (typ určen pomocí souvisejícího pole)"
 msgid "One-to-one relationship"
 msgstr "Vazba jedna-jedna"
 #, python-format
 msgid "%(from)s-%(to)s relationship"
 msgstr "Vazba z %(from)s do %(to)s"
 #, python-format
 msgid "%(from)s-%(to)s relationships"
 msgstr "Vazby z %(from)s do %(to)s"
 msgid "Many-to-many relationship"
 msgstr "Vazba mnoho-mnoho"
 #. Translators: If found as last label character, these punctuation
 #. characters will prevent the default label_suffix to be appended to the
 #. label
 msgid ":?.!"
 msgstr ":?!"
 msgid "This field is required."
 msgstr "Toto pole je třeba vyplnit."
@ -648,6 +573,35 @@ msgstr "Zadejte celé číslo."
 msgid "Enter a number."
 msgstr "Zadejte číslo."
 #, python-format
 msgid "Ensure that there are no more than %(max)s digit in total."
 msgid_plural "Ensure that there are no more than %(max)s digits in total."
 msgstr[0] "Ujistěte se, že pole neobsahuje celkem více než %(max)s číslici."
 msgstr[1] "Ujistěte se, že pole neobsahuje celkem více než %(max)s číslice."
 msgstr[2] "Ujistěte se, že pole neobsahuje celkem více než %(max)s číslic."
 #, python-format
 msgid "Ensure that there are no more than %(max)s decimal place."
 msgid_plural "Ensure that there are no more than %(max)s decimal places."
 msgstr[0] "Ujistěte se, že pole neobsahuje více než %(max)s desetinné místo."
 msgstr[1] "Ujistěte se, že pole neobsahuje více než %(max)s desetinná místa."
 msgstr[2] "Ujistěte se, že pole neobsahuje více než %(max)s desetinných míst."
 #, python-format
 msgid ""
 "Ensure that there are no more than %(max)s digit before the decimal point."
 msgid_plural ""
 "Ensure that there are no more than %(max)s digits before the decimal point."
 msgstr[0] ""
 "Ujistěte se, že hodnota neobsahuje více než %(max)s místo před desetinnou "
 "čárkou (tečkou)."
 msgstr[1] ""
 "Ujistěte se, že hodnota neobsahuje více než %(max)s místa před desetinnou "
 "čárkou (tečkou)."
 msgstr[2] ""
 "Ujistěte se, že hodnota neobsahuje více než %(max)s míst před desetinnou "
 "čárkou (tečkou)."
 msgid "Enter a valid date."
 msgstr "Zadejte platné datum."
@ -711,6 +665,12 @@ msgstr ":"
 msgid "(Hidden field %(name)s) %(error)s"
 msgstr "(Skryté pole %(name)s) %(error)s"
 #. Translators: If found as last label character, these punctuation
 #. characters will prevent the default label_suffix to be appended to the
 #. label
 msgid ":?.!"
 msgstr ":?!"
 msgid "ManagementForm data is missing or has been tampered with"
 msgstr "Data objektu ManagementForm chybí nebo byla pozměněna."
@ -772,15 +732,15 @@ msgstr ""
 "Hodnotu %(datetime)s nelze interpretovat v časové zóně %(current_timezone)s; "
 "může to být nejednoznačné nebo nemusí existovat."
 msgid "Clear"
 msgstr "Zrušit"
 msgid "Currently"
 msgstr "Aktuálně"
 msgid "Change"
 msgstr "Změnit"
 msgid "Clear"
 msgstr "Zrušit"
 msgid "Unknown"
 msgstr "Neznámé"
@ -1163,11 +1123,12 @@ msgid "Congratulations on your first Django-powered page."
 msgstr "Gratulujeme, toto je vaše první stránka generována v prostředí Django."
 msgid ""
-"Next, start your first app by running <code>python manage.py startapp "
+"Of course, you haven't actually done any work yet. Next, start your first "
-"[app_label]</code>."
+"app by running <code>python manage.py startapp [app_label]</code>."
 msgstr ""
-"Nyní můžete začít práce na své první aplikaci spuštěním příkazu <code>python "
+"Samozřejmě máte před sebou ještě spoustu práce. Začněte vytvořením Vaší "
-"manage.py startapp [identifikátor_aplikace]</code>."
+"první aplikace pomocí příkazu <code>python manage.py startapp [app_label]</"
 "code>. "
 msgid ""
 "You're seeing this message because you have <code>DEBUG = True</code> in "
--- a/django/conf/locale/cs/formats.py
+++ b/django/conf/locale/cs/formats.py
@ -16,18 +16,18 @@ FIRST_DAY_OF_WEEK = 1  # Monday
 # The *_INPUT_FORMATS strings use the Python strftime format syntax,
 # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
-DATE_INPUT_FORMATS = [
+DATE_INPUT_FORMATS = (
    '%d.%m.%Y', '%d.%m.%y',     # '05.01.2006', '05.01.06'
    '%d. %m. %Y', '%d. %m. %y',  # '5. 1. 2006', '5. 1. 06'
    # '%d. %B %Y', '%d. %b. %Y',  # '25. October 2006', '25. Oct. 2006'
-]
+)
 # Kept ISO formats as one is in first position
-TIME_INPUT_FORMATS = [
+TIME_INPUT_FORMATS = (
    '%H:%M:%S',  # '04:30:59'
    '%H.%M',    # '04.30'
    '%H:%M',    # '04:30'
-]
+)
-DATETIME_INPUT_FORMATS = [
+DATETIME_INPUT_FORMATS = (
    '%d.%m.%Y %H:%M:%S',    # '05.01.2006 04:30:59'
    '%d.%m.%Y %H:%M:%S.%f',  # '05.01.2006 04:30:59.000200'
    '%d.%m.%Y %H.%M',       # '05.01.2006 04.30'
@ -39,7 +39,7 @@ DATETIME_INPUT_FORMATS = [
    '%d. %m. %Y %H:%M',     # '05. 01. 2006 04:30'
    '%d. %m. %Y',           # '05. 01. 2006'
    '%Y-%m-%d %H.%M',       # '2006-01-05 04.30'
-]
+)
 DECIMAL_SEPARATOR = ','
 THOUSAND_SEPARATOR = '\xa0'  # non-breaking space
 NUMBER_GROUPING = 3
--- a/django/conf/locale/cy/LC_MESSAGES/django.mo
+++ b/django/conf/locale/cy/LC_MESSAGES/django.mo
--- a/django/conf/locale/cy/LC_MESSAGES/django.po
+++ b/django/conf/locale/cy/LC_MESSAGES/django.po
@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-19 16:49+0100\n"
+"POT-Creation-Date: 2015-03-18 09:16+0100\n"
-"PO-Revision-Date: 2017-01-20 09:03+0000\n"
+"PO-Revision-Date: 2015-03-18 08:44+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Welsh (http://www.transifex.com/django/django/language/cy/)\n"
+"Language-Team: Welsh (http://www.transifex.com/projects/p/django/language/"
 "cy/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@ -60,9 +61,6 @@ msgstr "Daneg"
 msgid "German"
 msgstr "Almaeneg"
 msgid "Lower Sorbian"
 msgstr ""
 msgid "Greek"
 msgstr "Groegedd"
@ -84,9 +82,6 @@ msgstr "Sbaeneg"
 msgid "Argentinian Spanish"
 msgstr "Sbaeneg Ariannin"
 msgid "Colombian Spanish"
 msgstr ""
 msgid "Mexican Spanish"
 msgstr "Sbaeneg Mecsico"
@ -117,9 +112,6 @@ msgstr "Ffrisieg"
 msgid "Irish"
 msgstr "Gwyddeleg"
 msgid "Scottish Gaelic"
 msgstr ""
 msgid "Galician"
 msgstr "Galisieg"
@ -132,9 +124,6 @@ msgstr "Hindi"
 msgid "Croatian"
 msgstr "Croasieg"
 msgid "Upper Sorbian"
 msgstr ""
 msgid "Hungarian"
 msgstr "Hwngareg"
@ -195,8 +184,8 @@ msgstr "Marathi"
 msgid "Burmese"
 msgstr "Byrmaneg"
-msgid "Norwegian Bokmål"
+msgid "Norwegian Bokmal"
-msgstr ""
+msgstr "Bocmal Norwyeg "
 msgid "Nepali"
 msgstr "Nepaleg"
@ -294,14 +283,8 @@ msgstr "Ffeiliau Statig"
 msgid "Syndication"
 msgstr "Syndicetiad"
-msgid "That page number is not an integer"
+msgid "Web Design"
-msgstr ""
+msgstr "Dylunio Gwe"
 msgid "That page number is less than 1"
 msgstr ""
 msgid "That page contains no results"
 msgstr ""
 msgid "Enter a valid value."
 msgstr "Rhowch werth dilys."
@ -321,11 +304,6 @@ msgstr ""
 "Rhowch 'falwen' dilys yn cynnwys llythrennau, rhifau, tanlinellau neu "
 "cysylltnodau."
 msgid ""
 "Enter a valid 'slug' consisting of Unicode letters, numbers, underscores, or "
 "hyphens."
 msgstr ""
 msgid "Enter a valid IPv4 address."
 msgstr "Rhowch gyfeiriad IPv4 dilys."
@ -391,38 +369,6 @@ msgstr[3] ""
 "Sicrhewch fod gan y gwerth hwn ddim mwy na %(limit_value)d nod (mae ganddo "
 "%(show_value)d)."
 #, python-format
 msgid "Ensure that there are no more than %(max)s digit in total."
 msgid_plural "Ensure that there are no more than %(max)s digits in total."
 msgstr[0] "Sicrhewch nad oes mwy nag %(max)s digid i gyd."
 msgstr[1] "Sicrhewch nad oes mwy na %(max)s ddigid i gyd."
 msgstr[2] "Sicrhewch nad oes mwy na %(max)s digid i gyd."
 msgstr[3] "Sicrhewch nad oes mwy na %(max)s digid i gyd."
 #, python-format
 msgid "Ensure that there are no more than %(max)s decimal place."
 msgid_plural "Ensure that there are no more than %(max)s decimal places."
 msgstr[0] "Sicrhewch nad oes mwy nag %(max)s lle degol."
 msgstr[1] "Sicrhewch nad oes mwy na %(max)s le degol."
 msgstr[2] "Sicrhewch nad oes mwy na %(max)s lle degol."
 msgstr[3] "Sicrhewch nad oes mwy na %(max)s lle degol."
 #, python-format
 msgid ""
 "Ensure that there are no more than %(max)s digit before the decimal point."
 msgid_plural ""
 "Ensure that there are no more than %(max)s digits before the decimal point."
 msgstr[0] "Sicrhewch nad oes mwy nag %(max)s digid cyn y pwynt degol."
 msgstr[1] "Sicrhewch nad oes mwy na %(max)s ddigid cyn y pwynt degol."
 msgstr[2] "Sicrhewch nad oes mwy na %(max)s digid cyn y pwynt degol."
 msgstr[3] "Sicrhewch nad oes mwy na %(max)s digid cyn y pwynt degol."
 #, python-format
 msgid ""
 "File extension '%(extension)s' is not allowed. Allowed extensions are: "
 "'%(allowed_extensions)s'."
 msgstr ""
 msgid "and"
 msgstr "a"
@ -462,9 +408,6 @@ msgstr "cyfanrif"
 msgid "'%(value)s' value must be an integer."
 msgstr "Rhaid i'r gwerth '%(value)s' fod yn gyfanrif."
 msgid "Big (8 byte) integer"
 msgstr "Cyfanrif mawr (8 beit)"
 #, python-format
 msgid "'%(value)s' value must be either True or False."
 msgstr "Rhaid i werth '%(value)s' for unai'n True neu False."
@ -546,6 +489,9 @@ msgstr "Rhaid i '%(value)s' fod yn rif pwynt arnawf."
 msgid "Floating point number"
 msgstr "Rhif pwynt symudol"
 msgid "Big (8 byte) integer"
 msgstr "Cyfanrif mawr (8 beit)"
 msgid "IPv4 address"
 msgstr "Cyfeiriad IPv4"
@ -620,23 +566,9 @@ msgstr "Allwedd Estron (math yn ddibynol ar y maes cysylltiedig)"
 msgid "One-to-one relationship"
 msgstr "Perthynas un-i-un"
 #, python-format
 msgid "%(from)s-%(to)s relationship"
 msgstr ""
 #, python-format
 msgid "%(from)s-%(to)s relationships"
 msgstr ""
 msgid "Many-to-many relationship"
 msgstr "Perthynas llawer-i-lawer"
 #. Translators: If found as last label character, these punctuation
 #. characters will prevent the default label_suffix to be appended to the
 #. label
 msgid ":?.!"
 msgstr ":?.!"
 msgid "This field is required."
 msgstr "Mae angen y maes hwn."
@ -646,6 +578,32 @@ msgstr "Rhowch cyfanrif."
 msgid "Enter a number."
 msgstr "Rhowch rif."
 #, python-format
 msgid "Ensure that there are no more than %(max)s digit in total."
 msgid_plural "Ensure that there are no more than %(max)s digits in total."
 msgstr[0] "Sicrhewch nad oes mwy nag %(max)s digid i gyd."
 msgstr[1] "Sicrhewch nad oes mwy na %(max)s ddigid i gyd."
 msgstr[2] "Sicrhewch nad oes mwy na %(max)s digid i gyd."
 msgstr[3] "Sicrhewch nad oes mwy na %(max)s digid i gyd."
 #, python-format
 msgid "Ensure that there are no more than %(max)s decimal place."
 msgid_plural "Ensure that there are no more than %(max)s decimal places."
 msgstr[0] "Sicrhewch nad oes mwy nag %(max)s lle degol."
 msgstr[1] "Sicrhewch nad oes mwy na %(max)s le degol."
 msgstr[2] "Sicrhewch nad oes mwy na %(max)s lle degol."
 msgstr[3] "Sicrhewch nad oes mwy na %(max)s lle degol."
 #, python-format
 msgid ""
 "Ensure that there are no more than %(max)s digit before the decimal point."
 msgid_plural ""
 "Ensure that there are no more than %(max)s digits before the decimal point."
 msgstr[0] "Sicrhewch nad oes mwy nag %(max)s digid cyn y pwynt degol."
 msgstr[1] "Sicrhewch nad oes mwy na %(max)s ddigid cyn y pwynt degol."
 msgstr[2] "Sicrhewch nad oes mwy na %(max)s digid cyn y pwynt degol."
 msgstr[3] "Sicrhewch nad oes mwy na %(max)s digid cyn y pwynt degol."
 msgid "Enter a valid date."
 msgstr "Rhif ddyddiad dilys."
@ -713,6 +671,12 @@ msgstr ":"
 msgid "(Hidden field %(name)s) %(error)s"
 msgstr "(Maes cudd %(name)s) %(error)s"
 #. Translators: If found as last label character, these punctuation
 #. characters will prevent the default label_suffix to be appended to the
 #. label
 msgid ":?.!"
 msgstr ":?.!"
 msgid "ManagementForm data is missing or has been tampered with"
 msgstr "Mae data ManagementForm ar goll neu mae rhywun wedi ymyrryd ynddo"
@ -780,15 +744,15 @@ msgstr ""
 "Ni ellir dehongli %(datetime)s yn y gylchfa amser %(current_timezone)s; "
 "mae'n amwys neu ddim yn bodoli."
 msgid "Clear"
 msgstr "Clirio"
 msgid "Currently"
 msgstr "Ar hyn o bryd"
 msgid "Change"
 msgstr "Newid"
 msgid "Clear"
 msgstr "Clirio"
 msgid "Unknown"
 msgstr "Anhysbys"
@ -1177,8 +1141,8 @@ msgid "Congratulations on your first Django-powered page."
 msgstr ""
 msgid ""
-"Next, start your first app by running <code>python manage.py startapp "
+"Of course, you haven't actually done any work yet. Next, start your first "
-"[app_label]</code>."
+"app by running <code>python manage.py startapp [app_label]</code>."
 msgstr ""
 msgid ""
--- a/django/conf/locale/cy/formats.py
+++ b/django/conf/locale/cy/formats.py
@ -16,10 +16,10 @@ FIRST_DAY_OF_WEEK = 1                   # 'Dydd Llun'
 # The *_INPUT_FORMATS strings use the Python strftime format syntax,
 # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
-DATE_INPUT_FORMATS = [
+DATE_INPUT_FORMATS = (
    '%d/%m/%Y', '%d/%m/%y',             # '25/10/2006', '25/10/06'
-]
+)
-DATETIME_INPUT_FORMATS = [
+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'
@ -32,7 +32,7 @@ DATETIME_INPUT_FORMATS = [
    '%d/%m/%y %H:%M:%S.%f',             # '25/10/06 14:30:59.000200'
    '%d/%m/%y %H:%M',                   # '25/10/06 14:30'
    '%d/%m/%y',                         # '25/10/06'
-]
+)
 DECIMAL_SEPARATOR = '.'
 THOUSAND_SEPARATOR = ','
 NUMBER_GROUPING = 3
--- a/django/conf/locale/da/LC_MESSAGES/django.mo
+++ b/django/conf/locale/da/LC_MESSAGES/django.mo
--- a/django/conf/locale/da/LC_MESSAGES/django.po
+++ b/django/conf/locale/da/LC_MESSAGES/django.po
@ -3,7 +3,7 @@
 # Translators:
 # Christian Joergensen <christian@gmta.info>, 2012
 # Danni Randeris <danniranderis+djangocore@gmail.com>, 2014
-# Erik Wognsen <r4mses@gmail.com>, 2013-2017
+# Erik Wognsen <r4mses@gmail.com>, 2013-2015
 # Finn Gruwier Larsen, 2011
 # Jannis Leidel <jannis@leidel.info>, 2011
 # jonaskoelker <jonaskoelker@gnu.org>, 2012
@ -13,10 +13,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-19 16:49+0100\n"
+"POT-Creation-Date: 2015-03-18 09:16+0100\n"
-"PO-Revision-Date: 2017-01-20 22:58+0000\n"
+"PO-Revision-Date: 2015-03-20 10:22+0000\n"
 "Last-Translator: Erik Wognsen <r4mses@gmail.com>\n"
-"Language-Team: Danish (http://www.transifex.com/django/django/language/da/)\n"
+"Language-Team: Danish (http://www.transifex.com/projects/p/django/language/"
 "da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@ -65,9 +66,6 @@ msgstr "dansk"
 msgid "German"
 msgstr "tysk"
 msgid "Lower Sorbian"
 msgstr "nedresorbisk"
 msgid "Greek"
 msgstr "græsk"
@ -89,9 +87,6 @@ msgstr "spansk"
 msgid "Argentinian Spanish"
 msgstr "argentinsk spansk"
 msgid "Colombian Spanish"
 msgstr "colombiansk spansk"
 msgid "Mexican Spanish"
 msgstr "mexikansk spansk"
@ -122,9 +117,6 @@ msgstr "frisisk"
 msgid "Irish"
 msgstr "irsk"
 msgid "Scottish Gaelic"
 msgstr "skotsk gælisk"
 msgid "Galician"
 msgstr "galicisk"
@ -137,9 +129,6 @@ msgstr "hindi"
 msgid "Croatian"
 msgstr "kroatisk"
 msgid "Upper Sorbian"
 msgstr "øvresorbisk"
 msgid "Hungarian"
 msgstr "ungarsk"
@ -200,7 +189,7 @@ msgstr "Marathi"
 msgid "Burmese"
 msgstr "burmesisk"
-msgid "Norwegian Bokmål"
+msgid "Norwegian Bokmal"
 msgstr "norsk bokmål"
 msgid "Nepali"
@ -299,14 +288,8 @@ msgstr "Static Files"
 msgid "Syndication"
 msgstr "Syndication"
-msgid "That page number is not an integer"
+msgid "Web Design"
-msgstr "Det sidetal er ikke et heltal"
+msgstr "Web Design"
 msgid "That page number is less than 1"
 msgstr "Det sidetal er mindre end 1"
 msgid "That page contains no results"
 msgstr "Den side indeholder ingen resultater"
 msgid "Enter a valid value."
 msgstr "Indtast en gyldig værdi."
@ -326,13 +309,6 @@ msgstr ""
 "Indtast en \"slug\" bestående af bogstaver, cifre, understreger og "
 "bindestreger."
 msgid ""
 "Enter a valid 'slug' consisting of Unicode letters, numbers, underscores, or "
 "hyphens."
 msgstr ""
 "Indtast en \"slug\" bestående af bogstaver, cifre, understreger og "
 "bindestreger."
 msgid "Enter a valid IPv4 address."
 msgstr "Indtast en gyldig IPv4-adresse."
@ -381,34 +357,6 @@ msgstr[0] ""
 msgstr[1] ""
 "Denne værdi må højst have %(limit_value)d tegn (den har %(show_value)d)."
 #, python-format
 msgid "Ensure that there are no more than %(max)s digit in total."
 msgid_plural "Ensure that there are no more than %(max)s digits in total."
 msgstr[0] "Der må maksimalt være %(max)s ciffer i alt."
 msgstr[1] "Der må maksimalt være %(max)s cifre i alt."
 #, python-format
 msgid "Ensure that there are no more than %(max)s decimal place."
 msgid_plural "Ensure that there are no more than %(max)s decimal places."
 msgstr[0] "Der må maksimalt være %(max)s decimal."
 msgstr[1] "Der må maksimalt være %(max)s decimaler."
 #, python-format
 msgid ""
 "Ensure that there are no more than %(max)s digit before the decimal point."
 msgid_plural ""
 "Ensure that there are no more than %(max)s digits before the decimal point."
 msgstr[0] "Der må maksimalt være %(max)s ciffer før kommaet."
 msgstr[1] "Der må maksimalt være %(max)s cifre før kommaet."
 #, python-format
 msgid ""
 "File extension '%(extension)s' is not allowed. Allowed extensions are: "
 "'%(allowed_extensions)s'."
 msgstr ""
 "Filendelse '%(extension)s' er ikke tilladt. Tilladte filendelser er: "
 "'%(allowed_extensions)s'."
 msgid "and"
 msgstr "og"
@ -449,9 +397,6 @@ msgstr "Heltal"
 msgid "'%(value)s' value must be an integer."
 msgstr "'%(value)s'-værdien skal være et heltal."
 msgid "Big (8 byte) integer"
 msgstr "Stort heltal (8 byte)"
 #, python-format
 msgid "'%(value)s' value must be either True or False."
 msgstr "'%(value)s'-værdien skal være enten True eller False."
@ -535,6 +480,9 @@ msgstr "'%(value)s'-værdien skal være en float (et kommatal)."
 msgid "Floating point number"
 msgstr "Flydende-komma-tal"
 msgid "Big (8 byte) integer"
 msgstr "Stort heltal (8 byte)"
 msgid "IPv4 address"
 msgstr "IPv4-adresse"
@ -609,23 +557,9 @@ msgstr "Fremmednøgle (type bestemt af relateret felt)"
 msgid "One-to-one relationship"
 msgstr "En-til-en-relation"
 #, python-format
 msgid "%(from)s-%(to)s relationship"
 msgstr "%(from)s-%(to)s-relation"
 #, python-format
 msgid "%(from)s-%(to)s relationships"
 msgstr "%(from)s-%(to)s-relationer"
 msgid "Many-to-many relationship"
 msgstr "Mange-til-mange-relation"
 #. Translators: If found as last label character, these punctuation
 #. characters will prevent the default label_suffix to be appended to the
 #. label
 msgid ":?.!"
 msgstr ":?.!"
 msgid "This field is required."
 msgstr "Dette felt er påkrævet."
@ -635,6 +569,26 @@ msgstr "Indtast et heltal."
 msgid "Enter a number."
 msgstr "Indtast et tal."
 #, python-format
 msgid "Ensure that there are no more than %(max)s digit in total."
 msgid_plural "Ensure that there are no more than %(max)s digits in total."
 msgstr[0] "Der må maksimalt være %(max)s ciffer i alt."
 msgstr[1] "Der må maksimalt være %(max)s cifre i alt."
 #, python-format
 msgid "Ensure that there are no more than %(max)s decimal place."
 msgid_plural "Ensure that there are no more than %(max)s decimal places."
 msgstr[0] "Der må maksimalt være %(max)s decimal."
 msgstr[1] "Der må maksimalt være %(max)s decimaler."
 #, python-format
 msgid ""
 "Ensure that there are no more than %(max)s digit before the decimal point."
 msgid_plural ""
 "Ensure that there are no more than %(max)s digits before the decimal point."
 msgstr[0] "Der må maksimalt være %(max)s ciffer før kommaet."
 msgstr[1] "Der må maksimalt være %(max)s cifre før kommaet."
 msgid "Enter a valid date."
 msgstr "Indtast en gyldig dato."
@ -698,6 +652,12 @@ msgstr ":"
 msgid "(Hidden field %(name)s) %(error)s"
 msgstr "(Skjult felt %(name)s) %(error)s"
 #. Translators: If found as last label character, these punctuation
 #. characters will prevent the default label_suffix to be appended to the
 #. label
 msgid ":?.!"
 msgstr ":?.!"
 msgid "ManagementForm data is missing or has been tampered with"
 msgstr "ManagementForm-data mangler eller er blevet manipuleret"
@ -759,15 +719,15 @@ msgstr ""
 "%(datetime)s kunne ikke fortolkes i tidszonen %(current_timezone)s; den kan "
 "være tvetydig eller den eksisterer måske ikke."
 msgid "Clear"
 msgstr "Afmarkér"
 msgid "Currently"
 msgstr "Aktuelt"
 msgid "Change"
 msgstr "Ret"
 msgid "Clear"
 msgstr "Afmarkér"
 msgid "Unknown"
 msgstr "Ukendt"
@ -1143,11 +1103,11 @@ msgid "Congratulations on your first Django-powered page."
 msgstr "Tillykke med din første Django-drevne side."
 msgid ""
-"Next, start your first app by running <code>python manage.py startapp "
+"Of course, you haven't actually done any work yet. Next, start your first "
-"[app_label]</code>."
+"app by running <code>python manage.py startapp [app_label]</code>."
 msgstr ""
-"Start derefter din første app ved at køre <code>python manage.py startapp "
+"Du har dog ikke gjort noget endnu. Start din første app ved at køre  "
-"[app_label]</code>."
+"<code>python manage.py startapp [app_label]</code>."
 msgid ""
 "You're seeing this message because you have <code>DEBUG = True</code> in "
--- a/django/conf/locale/da/formats.py
+++ b/django/conf/locale/da/formats.py
@ -16,14 +16,14 @@ FIRST_DAY_OF_WEEK = 1
 # The *_INPUT_FORMATS strings use the Python strftime format syntax,
 # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
-DATE_INPUT_FORMATS = [
+DATE_INPUT_FORMATS = (
    '%d.%m.%Y',                         # '25.10.2006'
-]
+)
-DATETIME_INPUT_FORMATS = [
+DATETIME_INPUT_FORMATS = (
    '%d.%m.%Y %H:%M:%S',                # '25.10.2006 14:30:59'
    '%d.%m.%Y %H:%M:%S.%f',             # '25.10.2006 14:30:59.000200'
    '%d.%m.%Y %H:%M',                   # '25.10.2006 14:30'
-]
+)
 DECIMAL_SEPARATOR = ','
 THOUSAND_SEPARATOR = '.'
 NUMBER_GROUPING = 3
--- a/django/conf/locale/de/LC_MESSAGES/django.mo
+++ b/django/conf/locale/de/LC_MESSAGES/django.mo
--- a/django/conf/locale/de/LC_MESSAGES/django.po
+++ b/django/conf/locale/de/LC_MESSAGES/django.po
@ -3,19 +3,18 @@
 # Translators:
 # André Hagenbruch, 2011-2012
 # Florian Apolloner <florian@apolloner.eu>, 2011
-# Dunedan <dunedan@phoenitydawn.de>, 2016
+# Jannis Vajen, 2011,2013
-# Jannis, 2011,2013
+# Jannis Leidel <jannis@leidel.info>, 2013-2015
 # Jannis Leidel <jannis@leidel.info>, 2013-2017
 # Jannis, 2016
 # Markus Holtermann <inyoka@markusholtermann.eu>, 2013,2015
 msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-19 16:49+0100\n"
+"POT-Creation-Date: 2015-03-18 09:16+0100\n"
-"PO-Revision-Date: 2017-03-22 10:43+0000\n"
+"PO-Revision-Date: 2015-03-20 08:54+0000\n"
-"Last-Translator: Markus Holtermann <inyoka@markusholtermann.eu>\n"
+"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: German (http://www.transifex.com/django/django/language/de/)\n"
+"Language-Team: German (http://www.transifex.com/projects/p/django/language/"
 "de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@ -64,9 +63,6 @@ msgstr "Dänisch"
 msgid "German"
 msgstr "Deutsch"
 msgid "Lower Sorbian"
 msgstr "Niedersorbisch"
 msgid "Greek"
 msgstr "Griechisch"
@ -88,9 +84,6 @@ msgstr "Spanisch"
 msgid "Argentinian Spanish"
 msgstr "Argentinisches Spanisch"
 msgid "Colombian Spanish"
 msgstr "Kolumbianisches Spanisch"
 msgid "Mexican Spanish"
 msgstr "Mexikanisches Spanisch"
@ -121,9 +114,6 @@ msgstr "Friesisch"
 msgid "Irish"
 msgstr "Irisch"
 msgid "Scottish Gaelic"
 msgstr "Schottisch-Gälisch"
 msgid "Galician"
 msgstr "Galicisch"
@ -136,9 +126,6 @@ msgstr "Hindi"
 msgid "Croatian"
 msgstr "Kroatisch"
 msgid "Upper Sorbian"
 msgstr "Obersorbisch"
 msgid "Hungarian"
 msgstr "Ungarisch"
@ -199,14 +186,14 @@ msgstr "Marathi"
 msgid "Burmese"
 msgstr "Birmanisch"
-msgid "Norwegian Bokmål"
+msgid "Norwegian Bokmal"
 msgstr "Norwegisch (Bokmål)"
 msgid "Nepali"
 msgstr "Nepali"
 msgid "Dutch"
-msgstr "Niederländisch"
+msgstr "Holländisch"
 msgid "Norwegian Nynorsk"
 msgstr "Norwegisch (Nynorsk)"
@ -298,14 +285,8 @@ msgstr "Statische Dateien"
 msgid "Syndication"
 msgstr "Syndication"
-msgid "That page number is not an integer"
+msgid "Web Design"
-msgstr "Diese Seitennummer ist keine Ganzzahl"
+msgstr "Webdesign"
 msgid "That page number is less than 1"
 msgstr "Diese Seitennummer ist kleiner als 1"
 msgid "That page contains no results"
 msgstr "Diese Seite enthält keine Ergebnisse"
 msgid "Enter a valid value."
 msgstr "Bitte einen gültigen Wert eingeben."
@ -322,24 +303,17 @@ msgstr "Bitte gültige E-Mail-Adresse eingeben."
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
-"Bitte ein gültiges Kürzel eingeben, bestehend aus Buchstaben, Ziffern, "
+"Bitte ein gültiges Kürzel, bestehend aus Buchstaben, Ziffern, Unter- und "
-"Unter- und Bindestrichen."
+"Bindestrichen, eingeben."
 msgid ""
 "Enter a valid 'slug' consisting of Unicode letters, numbers, underscores, or "
 "hyphens."
 msgstr ""
 "Bitte ein gültiges Kürzel eingeben, bestehend aus Buchstaben (Unicode), "
 "Ziffern, Unter- und Bindestrichen."
 msgid "Enter a valid IPv4 address."
 msgstr "Bitte eine gültige IPv4-Adresse eingeben."
 msgid "Enter a valid IPv6 address."
-msgstr "Bitte eine gültige IPv6-Adresse eingeben."
+msgstr "Eine gültige IPv6-Adresse eingeben."
 msgid "Enter a valid IPv4 or IPv6 address."
-msgstr "Bitte eine gültige IPv4- oder IPv6-Adresse eingeben"
+msgstr "Eine gültige IPv4- oder IPv6-Adresse eingeben"
 msgid "Enter only digits separated by commas."
 msgstr "Bitte nur durch Komma getrennte Ziffern eingeben."
@ -386,42 +360,6 @@ msgstr[1] ""
 "Bitte sicherstellen, dass der Wert aus höchstens %(limit_value)d Zeichen "
 "besteht. (Er besteht aus %(show_value)d Zeichen)."
 #, python-format
 msgid "Ensure that there are no more than %(max)s digit in total."
 msgid_plural "Ensure that there are no more than %(max)s digits in total."
 msgstr[0] ""
 "Bitte sicherstellen, dass der Wert höchstens %(max)s Ziffer enthält."
 msgstr[1] ""
 "Bitte sicherstellen, dass der Wert höchstens %(max)s Ziffern enthält."
 #, python-format
 msgid "Ensure that there are no more than %(max)s decimal place."
 msgid_plural "Ensure that there are no more than %(max)s decimal places."
 msgstr[0] ""
 "Bitte sicherstellen, dass der Wert höchstens %(max)s Dezimalstelle enthält."
 msgstr[1] ""
 "Bitte sicherstellen, dass der Wert höchstens %(max)s Dezimalstellen enthält."
 #, python-format
 msgid ""
 "Ensure that there are no more than %(max)s digit before the decimal point."
 msgid_plural ""
 "Ensure that there are no more than %(max)s digits before the decimal point."
 msgstr[0] ""
 "Bitte sicherstellen, dass der Wert höchstens %(max)s Ziffer vor dem Komma "
 "enthält."
 msgstr[1] ""
 "Bitte sicherstellen, dass der Wert höchstens %(max)s Ziffern vor dem Komma "
 "enthält."
 #, python-format
 msgid ""
 "File extension '%(extension)s' is not allowed. Allowed extensions are: "
 "'%(allowed_extensions)s'."
 msgstr ""
 "Dateiendung „%(extension)s“ ist nicht erlaubt. Erlaubte Dateiendungen: sind: "
 "„%(allowed_extensions)s“."
 msgid "and"
 msgstr "und"
@ -460,14 +398,11 @@ msgstr "Ganzzahl"
 #, python-format
 msgid "'%(value)s' value must be an integer."
-msgstr "„%(value)s“ Wert muss eine Ganzzahl sein."
+msgstr "‚%(value)s‛ Wert muss eine Ganzzahl sein."
 msgid "Big (8 byte) integer"
 msgstr "Große Ganzzahl (8 Byte)"
 #, python-format
 msgid "'%(value)s' value must be either True or False."
-msgstr "„%(value)s“ Wert muss entweder True oder False sein."
+msgstr "‚%(value)s‛ Wert muss entweder True oder False sein."
 msgid "Boolean (Either True or False)"
 msgstr "Boolescher Wert (True oder False)"
@ -484,7 +419,7 @@ msgid ""
 "'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
 "format."
 msgstr ""
-"„%(value)s“ Wert hat ein ungültiges Datumsformat. Es muss YYYY-MM-DD "
+"‚%(value)s‛ Wert hat ein ungültiges Datumsformat. Es muss YYYY-MM-DD "
 "entsprechen."
 #, python-format
@ -492,7 +427,7 @@ msgid ""
 "'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
 "date."
 msgstr ""
-"„%(value)s“ hat das korrekte Format (YYYY-MM-DD) aber ein ungültiges Datum."
+"‚%(value)s‛ hat das korrekte Format (YYYY-MM-DD) aber ein ungültiges Datum."
 msgid "Date (without time)"
 msgstr "Datum (ohne Uhrzeit)"
@ -502,7 +437,7 @@ msgid ""
 "'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
 "uuuuuu]][TZ] format."
 msgstr ""
-"„%(value)s“ Wert hat ein ungültiges Format. Es muss YYYY-MM-DD HH:MM[:ss[."
+"‚%(value)s‛ Wert hat ein ungültiges Format. Es muss YYYY-MM-DD HH:MM[:ss[."
 "uuuuuu]][TZ] entsprechen."
 #, python-format
@ -510,7 +445,7 @@ msgid ""
 "'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
 "[TZ]) but it is an invalid date/time."
 msgstr ""
-"„%(value)s“ Wert hat das korrekte Format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
+"‚%(value)s‛ Wert hat das korrekte Format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
 "[TZ]) aber eine ungültige Zeit-/Datumsangabe."
 msgid "Date (with time)"
@ -518,7 +453,7 @@ msgstr "Datum (mit Uhrzeit)"
 #, python-format
 msgid "'%(value)s' value must be a decimal number."
-msgstr "„%(value)s“ Wert muss eine Dezimalzahl sein."
+msgstr "‚%(value)s‛ Wert muss eine Dezimalzahl sein."
 msgid "Decimal number"
 msgstr "Dezimalzahl"
@ -528,7 +463,7 @@ msgid ""
 "'%(value)s' value has an invalid format. It must be in [DD] [HH:[MM:]]ss[."
 "uuuuuu] format."
 msgstr ""
-"„%(value)s“ Wert hat ein ungültiges Format. Es muss der Form [DD] [HH:"
+"'%(value)s' Wert hat ein ungültiges Format. Es muss der Form [DD] [HH:"
 "[MM:]]ss[.uuuuuu] entsprechen."
 msgid "Duration"
@ -542,11 +477,14 @@ msgstr "Dateipfad"
 #, python-format
 msgid "'%(value)s' value must be a float."
-msgstr "„%(value)s“ Wert muss eine Fließkommazahl sein."
+msgstr "‚%(value)s‛ Wert muss eine Fließkommazahl sein."
 msgid "Floating point number"
 msgstr "Gleitkommazahl"
 msgid "Big (8 byte) integer"
 msgstr "Große Ganzzahl (8 Byte)"
 msgid "IPv4 address"
 msgstr "IPv4-Adresse"
@ -555,7 +493,7 @@ msgstr "IP-Adresse"
 #, python-format
 msgid "'%(value)s' value must be either None, True or False."
-msgstr "„%(value)s“ Wert muss entweder None, True oder False sein."
+msgstr "‚%(value)s‛ Wert muss entweder None, True oder False sein."
 msgid "Boolean (Either True, False or None)"
 msgstr "Boolescher Wert (True, False oder None)"
@ -581,7 +519,7 @@ msgid ""
 "'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
 "format."
 msgstr ""
-"„%(value)s“ Wert hat ein ungültiges Format. Es muss HH:MM[:ss[.uuuuuu]] "
+"‚%(value)s‛ Wert hat ein ungültiges Format. Es muss HH:MM[:ss[.uuuuuu]] "
 "entsprechen."
 #, python-format
@ -589,7 +527,7 @@ msgid ""
 "'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
 "invalid time."
 msgstr ""
-"„%(value)s“ Wert hat das korrekte Format (HH:MM[:ss[.uuuuuu]]) aber ist eine "
+"‚%(value)s‛ Wert hat das korrekte Format (HH:MM[:ss[.uuuuuu]]) aber ist eine "
 "ungültige Zeitangabe."
 msgid "Time"
@ -603,7 +541,7 @@ msgstr "Binärdaten"
 #, python-format
 msgid "'%(value)s' is not a valid UUID."
-msgstr "Wert „%(value)s“ ist keine gültige UUID."
+msgstr "Wert '%(value)s' ist keine gültige UUID."
 msgid "File"
 msgstr "Datei"
@ -621,23 +559,9 @@ msgstr "Fremdschlüssel (Typ definiert durch verknüpftes Feld)"
 msgid "One-to-one relationship"
 msgstr "1:1-Beziehung"
 #, python-format
 msgid "%(from)s-%(to)s relationship"
 msgstr "%(from)s-%(to)s-Beziehung"
 #, python-format
 msgid "%(from)s-%(to)s relationships"
 msgstr "%(from)s-%(to)s-Beziehungen"
 msgid "Many-to-many relationship"
 msgstr "n:m-Beziehung"
 #. Translators: If found as last label character, these punctuation
 #. characters will prevent the default label_suffix to be appended to the
 #. label
 msgid ":?.!"
 msgstr ":?.!"
 msgid "This field is required."
 msgstr "Dieses Feld ist zwingend erforderlich."
@ -647,6 +571,34 @@ msgstr "Bitte eine ganze Zahl eingeben."
 msgid "Enter a number."
 msgstr "Bitte eine Zahl eingeben."
 #, python-format
 msgid "Ensure that there are no more than %(max)s digit in total."
 msgid_plural "Ensure that there are no more than %(max)s digits in total."
 msgstr[0] ""
 "Bitte sicherstellen, dass der Wert höchstens %(max)s Ziffer enthält."
 msgstr[1] ""
 "Bitte sicherstellen, dass der Wert höchstens %(max)s Ziffern enthält."
 #, python-format
 msgid "Ensure that there are no more than %(max)s decimal place."
 msgid_plural "Ensure that there are no more than %(max)s decimal places."
 msgstr[0] ""
 "Bitte sicherstellen, dass der Wert höchstens %(max)s Dezimalstelle enthält."
 msgstr[1] ""
 "Bitte sicherstellen, dass der Wert höchstens %(max)s Dezimalstellen enthält."
 #, python-format
 msgid ""
 "Ensure that there are no more than %(max)s digit before the decimal point."
 msgid_plural ""
 "Ensure that there are no more than %(max)s digits before the decimal point."
 msgstr[0] ""
 "Bitte sicherstellen, dass der Wert höchstens %(max)s Ziffer vor dem Komma "
 "enthält."
 msgstr[1] ""
 "Bitte sicherstellen, dass der Wert höchstens %(max)s Ziffern vor dem Komma "
 "enthält."
 msgid "Enter a valid date."
 msgstr "Bitte ein gültiges Datum eingeben."
@ -714,6 +666,12 @@ msgstr ":"
 msgid "(Hidden field %(name)s) %(error)s"
 msgstr "(Verstecktes Feld %(name)s) %(error)s"
 #. Translators: If found as last label character, these punctuation
 #. characters will prevent the default label_suffix to be appended to the
 #. label
 msgid ":?.!"
 msgstr ":?.!"
 msgid "ManagementForm data is missing or has been tampered with"
 msgstr "ManagementForm-Daten fehlen oder wurden manipuliert."
@ -765,7 +723,7 @@ msgstr "Bitte eine gültige Auswahl treffen. Dies ist keine gültige Auswahl."
 #, python-format
 msgid "\"%(pk)s\" is not a valid value for a primary key."
-msgstr "„%(pk)s“ ist kein gültiger Wert für einen Primärschlüssel."
+msgstr "\"%(pk)s\" ist kein gültiger Wert für einen Primärschlüssel."
 #, python-format
 msgid ""
@ -775,15 +733,15 @@ msgstr ""
 "%(datetime)s konnte mit der Zeitzone %(current_timezone)s nicht eindeutig "
 "interpretiert werden, da es doppeldeutig oder eventuell inkorrekt ist."
 msgid "Clear"
 msgstr "Zurücksetzen"
 msgid "Currently"
 msgstr "Derzeit"
 msgid "Change"
 msgstr "Ändern"
 msgid "Clear"
 msgstr "Zurücksetzen"
 msgid "Unknown"
 msgstr "Unbekannt"
@ -1146,7 +1104,7 @@ msgid ""
 "them, at least for this site, or for 'same-origin' requests."
 msgstr ""
 "Falls Sie Cookies in Ihren Webbrowser deaktiviert haben, müssen Sie sie "
-"mindestens für diese Seite oder für „Same-Origin“-Verbindungen reaktivieren."
+"midestens für diese Seite oder für „Same-Origin“-Verbindungen reaktivieren."
 msgid "More information is available with DEBUG=True."
 msgstr "Mehr Information ist verfügbar mit DEBUG=True."
@ -1161,11 +1119,12 @@ msgid "Congratulations on your first Django-powered page."
 msgstr "Herzlichen Glückwunsch zur ersten Django-basierten Seite."
 msgid ""
-"Next, start your first app by running <code>python manage.py startapp "
+"Of course, you haven't actually done any work yet. Next, start your first "
-"[app_label]</code>."
+"app by running <code>python manage.py startapp [app_label]</code>."
 msgstr ""
-"Bitte als Nächstes eine neue Anwendung durch Ausführen von <code>python "
+"Natürlich ist hier noch nichts weiter zu sehen. Bitte als Nächstes eine neue "
-"manage.py startapp [app_label]</code> anlegen."
+"Anwendung durch Ausführen von <code>python manage.py startapp [app_label]</"
 "code> anlegen."
 msgid ""
 "You're seeing this message because you have <code>DEBUG = True</code> in "
@ -1200,7 +1159,7 @@ msgstr ""
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
-msgstr "Ungültiges Datum „%(datestr)s“ für das Format „%(format)s“"
+msgstr "Ungültiges Datum '%(datestr)s' für das Format '%(format)s'"
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
@ -1208,7 +1167,7 @@ msgstr "Konnte keine %(verbose_name)s mit diesen Parametern finden."
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr ""
-"Weder ist dies die letzte Seite („last“) noch konnte sie in einen "
+"Weder ist dies die letzte Seite ('last') noch konnte sie in einen "
 "ganzzahligen Wert umgewandelt werden."
 #, python-format
@ -1217,14 +1176,14 @@ msgstr "Ungültige Seite (%(page_number)s): %(message)s"
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
-msgstr "Leere Liste und „%(class_name)s.allow_empty“ ist False."
+msgstr "Leere Liste und '%(class_name)s.allow_empty' ist False."
 msgid "Directory indexes are not allowed here."
 msgstr "Dateilisten sind untersagt."
 #, python-format
 msgid "\"%(path)s\" does not exist"
-msgstr "„%(path)s“ ist nicht vorhanden"
+msgstr "\"%(path)s\" ist nicht vorhanden"
 #, python-format
 msgid "Index of %(directory)s"
--- a/django/conf/locale/de/formats.py
+++ b/django/conf/locale/de/formats.py
@ -16,16 +16,16 @@ FIRST_DAY_OF_WEEK = 1  # Monday
 # The *_INPUT_FORMATS strings use the Python strftime format syntax,
 # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
-DATE_INPUT_FORMATS = [
+DATE_INPUT_FORMATS = (
    '%d.%m.%Y', '%d.%m.%y',     # '25.10.2006', '25.10.06'
    # '%d. %B %Y', '%d. %b. %Y',  # '25. October 2006', '25. Oct. 2006'
-]
+)
-DATETIME_INPUT_FORMATS = [
+DATETIME_INPUT_FORMATS = (
    '%d.%m.%Y %H:%M:%S',    # '25.10.2006 14:30:59'
    '%d.%m.%Y %H:%M:%S.%f',  # '25.10.2006 14:30:59.000200'
    '%d.%m.%Y %H:%M',       # '25.10.2006 14:30'
    '%d.%m.%Y',             # '25.10.2006'
-]
+)
 DECIMAL_SEPARATOR = ','
 THOUSAND_SEPARATOR = '.'
 NUMBER_GROUPING = 3
--- a/django/conf/locale/de_CH/formats.py
+++ b/django/conf/locale/de_CH/formats.py
@ -17,16 +17,16 @@ FIRST_DAY_OF_WEEK = 1  # Monday
 # The *_INPUT_FORMATS strings use the Python strftime format syntax,
 # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
-DATE_INPUT_FORMATS = [
+DATE_INPUT_FORMATS = (
    '%d.%m.%Y', '%d.%m.%y',     # '25.10.2006', '25.10.06'
    # '%d. %B %Y', '%d. %b. %Y',  # '25. October 2006', '25. Oct. 2006'
-]
+)
-DATETIME_INPUT_FORMATS = [
+DATETIME_INPUT_FORMATS = (
    '%d.%m.%Y %H:%M:%S',    # '25.10.2006 14:30:59'
    '%d.%m.%Y %H:%M:%S.%f',  # '25.10.2006 14:30:59.000200'
    '%d.%m.%Y %H:%M',       # '25.10.2006 14:30'
    '%d.%m.%Y',             # '25.10.2006'
-]
+)
 # these are the separators for non-monetary numbers. For monetary numbers,
 # the DECIMAL_SEPARATOR is a . (decimal point) and the THOUSAND_SEPARATOR is a
--- a/django/conf/locale/dsb/LC_MESSAGES/django.mo
+++ b/django/conf/locale/dsb/LC_MESSAGES/django.mo
--- a/django/conf/locale/dsb/LC_MESSAGES/django.po
+++ b/django/conf/locale/dsb/LC_MESSAGES/django.po
--- a/django/conf/locale/el/LC_MESSAGES/django.mo
+++ b/django/conf/locale/el/LC_MESSAGES/django.mo
--- a/django/conf/locale/el/LC_MESSAGES/django.po
+++ b/django/conf/locale/el/LC_MESSAGES/django.po
@ -5,22 +5,19 @@
 # Dimitris Glezos <glezos@transifex.com>, 2011,2013
 # Giannis Meletakis <meletakis@gmail.com>, 2015
 # Jannis Leidel <jannis@leidel.info>, 2011
 # Nick Mavrakis <mavrakis.n@gmail.com>, 2017
 # Nikolas Demiridis <nikolas@demiridis.gr>, 2014
-# Nick Mavrakis <mavrakis.n@gmail.com>, 2016
+# Panos Laganakos <panos.laganakos@gmail.com>, 2014
-# Pãnoș <panos.laganakos@gmail.com>, 2014
+# Stavros Korokithakis <stavros@korokithakis.net>, 2014
 # Pãnoș <panos.laganakos@gmail.com>, 2016
 # Serafeim Papastefanos <spapas@gmail.com>, 2016
 # Stavros Korokithakis <stavros@korokithakis.net>, 2014,2016
 # Yorgos Pagles <y.pagles@gmail.com>, 2011-2012
 msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-19 16:49+0100\n"
+"POT-Creation-Date: 2015-03-18 09:16+0100\n"
-"PO-Revision-Date: 2017-01-21 10:58+0000\n"
+"PO-Revision-Date: 2015-03-18 08:44+0000\n"
-"Last-Translator: Nick Mavrakis <mavrakis.n@gmail.com>\n"
+"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Greek (http://www.transifex.com/django/django/language/el/)\n"
+"Language-Team: Greek (http://www.transifex.com/projects/p/django/language/"
 "el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@ -69,9 +66,6 @@ msgstr "Δανέζικα"
 msgid "German"
 msgstr "Γερμανικά"
 msgid "Lower Sorbian"
 msgstr "Κάτω Σορβικά"
 msgid "Greek"
 msgstr "Ελληνικά"
@ -93,9 +87,6 @@ msgstr "Ισπανικά"
 msgid "Argentinian Spanish"
 msgstr "Ισπανικά Αργεντινής"
 msgid "Colombian Spanish"
 msgstr "Ισπανικά Κολομβίας"
 msgid "Mexican Spanish"
 msgstr "Μεξικανική διάλεκτος Ισπανικών"
@ -126,9 +117,6 @@ msgstr "Frisian"
 msgid "Irish"
 msgstr "Ιρλανδικά"
 msgid "Scottish Gaelic"
 msgstr "Σκωτσέζικα Γαελικά"
 msgid "Galician"
 msgstr "Γαελικά"
@ -141,9 +129,6 @@ msgstr "Ινδικά"
 msgid "Croatian"
 msgstr "Κροατικά"
 msgid "Upper Sorbian"
 msgstr "Άνω Σορβικά"
 msgid "Hungarian"
 msgstr "Ουγγρικά"
@ -154,7 +139,7 @@ msgid "Indonesian"
 msgstr "Ινδονησιακά"
 msgid "Ido"
-msgstr "Ίντο"
+msgstr ""
 msgid "Icelandic"
 msgstr "Ισλανδικά"
@ -204,8 +189,8 @@ msgstr "Μαράθι"
 msgid "Burmese"
 msgstr "Βιρμανικά"
-msgid "Norwegian Bokmål"
+msgid "Norwegian Bokmal"
-msgstr "Νορβηγικά Μποκμάλ"
+msgstr "Νορβηγική διάλεκτος Μποκμάλ - \"γλώσσα των βιβλίων\""
 msgid "Nepali"
 msgstr "Νεπαλέζικα"
@ -292,7 +277,7 @@ msgid "Traditional Chinese"
 msgstr "Παραδοσιακά Κινέζικα"
 msgid "Messages"
-msgstr "Μηνύματα"
+msgstr ""
 msgid "Site Maps"
 msgstr "Χάρτες Ιστότοπου"
@ -301,16 +286,10 @@ msgid "Static Files"
 msgstr "Στατικά Αρχεία"
 msgid "Syndication"
-msgstr "Syndication"
+msgstr ""
-msgid "That page number is not an integer"
+msgid "Web Design"
-msgstr "Ο αριθμός αυτής της σελίδας δεν είναι ακέραιος"
+msgstr "Σχεδιασμός Ιστοσελίδων"
 msgid "That page number is less than 1"
 msgstr "Ο αριθμός αυτής της σελίδας είναι μικρότερος του 1"
 msgid "That page contains no results"
 msgstr "Η σελίδα αυτή δεν περιέχει αποτελέσματα"
 msgid "Enter a valid value."
 msgstr "Εισάγετε μια έγκυρη τιμή."
@ -327,18 +306,10 @@ msgstr "Εισάγετε μια έγκυρη διεύθυνση ηλ. ταχυδ
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
-"Εισάγετε ένα έγκυρο 'slug' αποτελούμενο από γράμματα, αριθμούς, παύλες ή "
+"Ένα έγκυρο 'slug' αποτελείται από γράμματα, αριθμούς, παύλες ή κάτω παύλες."
 "κάτω παύλες."
 msgid ""
 "Enter a valid 'slug' consisting of Unicode letters, numbers, underscores, or "
 "hyphens."
 msgstr ""
 "Ένα έγκυρο 'slug' αποτελείται από Unicode γράμματα, αριθμούς, παύλες ή κάτω "
 "παύλες."
 msgid "Enter a valid IPv4 address."
-msgstr "Εισάγετε μια έγκυρη IPv4 διεύθυνση."
+msgstr "Εισάγετε μια έγκυρη διεύθυνση IPv4."
 msgid "Enter a valid IPv6 address."
 msgstr "Εισάγετε μία έγκυρη IPv6 διεύθυνση"
@ -374,8 +345,8 @@ msgstr[0] ""
 "Βεβαιωθείται πως η τιμή αυτή έχει τουλάχιστον %(limit_value)d χαρακτήρες "
 "(έχει %(show_value)d)."
 msgstr[1] ""
-"Βεβαιωθείτε πως η τιμή έχει τουλάχιστον %(limit_value)d χαρακτήρες (έχει "
+"Βεβαιωθείται πως η τιμή αυτή έχει τουλάχιστον %(limit_value)d χαρακτήρες "
-"%(show_value)d)."
+"(έχει %(show_value)d)."
 #, python-format
 msgid ""
@ -388,40 +359,8 @@ msgstr[0] ""
 "Βεβαιωθείται πως η τιμή αυτή έχει τοπολύ %(limit_value)d χαρακτήρες (έχει "
 "%(show_value)d)."
 msgstr[1] ""
-"Βεβαιωθείτε πως η τιμή έχει το πολύ %(limit_value)d χαρακτήρες (έχει "
+"Βεβαιωθείται πως η τιμή αυτή έχει τουλάχιστον %(limit_value)d χαρακτήρες "
-"%(show_value)d)."
+"(έχει %(show_value)d)."
 #, python-format
 msgid "Ensure that there are no more than %(max)s digit in total."
 msgid_plural "Ensure that there are no more than %(max)s digits in total."
 msgstr[0] ""
 "Σιγουρευτείτε οτι τα σύνολο των ψηφίων δεν είναι παραπάνω από %(max)s"
 msgstr[1] ""
 "Σιγουρευτείτε οτι τα σύνολο των ψηφίων δεν είναι παραπάνω από %(max)s"
 #, python-format
 msgid "Ensure that there are no more than %(max)s decimal place."
 msgid_plural "Ensure that there are no more than %(max)s decimal places."
 msgstr[0] "Σιγουρευτείτε ότι το δεκαδικό ψηφίο δεν είναι παραπάνω από %(max)s."
 msgstr[1] "Σιγουρευτείτε ότι τα δεκαδικά ψηφία δεν είναι παραπάνω από %(max)s."
 #, python-format
 msgid ""
 "Ensure that there are no more than %(max)s digit before the decimal point."
 msgid_plural ""
 "Ensure that there are no more than %(max)s digits before the decimal point."
 msgstr[0] ""
 "Βεβαιωθείτε ότι δεν υπάρχουν πάνω από %(max)s ψηφία πριν την υποδιαστολή."
 msgstr[1] ""
 "Βεβαιωθείτε ότι δεν υπάρχουν πάνω από %(max)s ψηφία πριν την υποδιαστολή."
 #, python-format
 msgid ""
 "File extension '%(extension)s' is not allowed. Allowed extensions are: "
 "'%(allowed_extensions)s'."
 msgstr ""
 "Η επέκταση '%(extension)s' του αρχείου δεν επιτρέπεται. Οι επιτρεπόμενες "
 "επεκτάσεις είναι: '%(allowed_extensions)s'."
 msgid "and"
 msgstr "και"
@ -435,7 +374,7 @@ msgid "Value %(value)r is not a valid choice."
 msgstr "Η τιμή %(value)r δεν είναι έγκυρη επιλογή."
 msgid "This field cannot be null."
-msgstr "Το πεδίο αυτό δεν μπορεί να είναι μηδενικό (null)."
+msgstr "Αυτό το πεδίο δεν μπορεί να είναι κενό (null)."
 msgid "This field cannot be blank."
 msgstr "Το πεδίο αυτό δεν μπορεί να είναι κενό."
@ -455,7 +394,7 @@ msgstr ""
 #, python-format
 msgid "Field of type: %(field_type)s"
-msgstr "Πεδίο τύπου: %(field_type)s"
+msgstr "Είδος πεδίου: %(field_type)s"
 msgid "Integer"
 msgstr "Ακέραιος"
@ -464,9 +403,6 @@ msgstr "Ακέραιος"
 msgid "'%(value)s' value must be an integer."
 msgstr "Η τιμή '%(value)s' πρέπει να είναι ακέραιος."
 msgid "Big (8 byte) integer"
 msgstr "Μεγάλος ακέραιος - big integer (8 bytes)"
 #, python-format
 msgid "'%(value)s' value must be either True or False."
 msgstr "Η τιμή '%(value)s' πρέπει να είναι είτε True ή False."
@ -513,15 +449,13 @@ msgid ""
 "'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
 "[TZ]) but it is an invalid date/time."
 msgstr ""
 "Η τιμή '%(value)s' έχει τη σωστή μορφή (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) "
 "αλλά δεν αντιστοιχεί σε σωστή ημερομηνία και ώρα."
 msgid "Date (with time)"
-msgstr "Ημερομηνία (με ώρα)"
+msgstr "Ημερομηνία (με την ώρα)"
 #, python-format
 msgid "'%(value)s' value must be a decimal number."
-msgstr "Η τιμή '%(value)s' πρέπει να είναι ακέραιος."
+msgstr "Η '%(value)s' τιμή πρέπει να είναι ακέραιος."
 msgid "Decimal number"
 msgstr "Δεκαδικός αριθμός"
@ -531,8 +465,6 @@ msgid ""
 "'%(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]."
 msgid "Duration"
 msgstr "Διάρκεια"
@ -550,11 +482,14 @@ msgstr "Η '%(value)s' τιμή πρέπει να είναι δεκαδικός.
 msgid "Floating point number"
 msgstr "Αριθμός κινητής υποδιαστολής"
 msgid "Big (8 byte) integer"
 msgstr "Μεγάλος ακέραιος - big integer (8 bytes)"
 msgid "IPv4 address"
 msgstr "Διεύθυνση IPv4"
 msgid "IP address"
-msgstr "IP διεύθυνση"
+msgstr "διεύθυνση IP"
 #, python-format
 msgid "'%(value)s' value must be either None, True or False."
@ -584,16 +519,12 @@ msgid ""
 "'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
 "format."
 msgstr ""
 "Η τιμή '%(value)s' έχει εσφαλμένη μορφή. Πρέπει να είναι της μορφής HH:MM[:"
 "ss[.uuuuuu]]."
 #, python-format
 msgid ""
 "'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
 "invalid time."
 msgstr ""
 "Η τιμή '%(value)s' έχει τη σωστή μορφή (HH:MM[:ss[.uuuuuu]]) αλλά δεν "
 "αντιστοιχή σε σωστή ώρα."
 msgid "Time"
 msgstr "Ώρα"
@ -602,11 +533,11 @@ msgid "URL"
 msgstr "URL"
 msgid "Raw binary data"
-msgstr "Δυαδικά δεδομένα"
+msgstr ""
 #, python-format
 msgid "'%(value)s' is not a valid UUID."
-msgstr "'%(value)s' δεν είναι ένα έγκυρο UUID."
+msgstr ""
 msgid "File"
 msgstr "Αρχείο"
@ -617,31 +548,18 @@ msgstr "Εικόνα"
 #, python-format
 msgid "%(model)s instance with %(field)s %(value)r does not exist."
 msgstr ""
 "Το μοντέλο %(model)s με την τιμή %(value)r του πεδίου %(field)s δεν υπάρχει."
 msgid "Foreign Key (type determined by related field)"
-msgstr "Foreign Key (ο τύπος καθορίζεται από το πεδίο του συσχετισμού)"
+msgstr ""
 "Εξωτερικό Κλειδί - Foreign Key (ο τύπος καθορίζεται από το πεδίο του "
 "συσχετισμού)"
 msgid "One-to-one relationship"
 msgstr "Σχέση ένα-προς-ένα"
 #, python-format
 msgid "%(from)s-%(to)s relationship"
 msgstr "σχέση %(from)s-%(to)s"
 #, python-format
 msgid "%(from)s-%(to)s relationships"
 msgstr "σχέσεις %(from)s-%(to)s"
 msgid "Many-to-many relationship"
 msgstr "Σχέση πολλά-προς-πολλά"
 #. Translators: If found as last label character, these punctuation
 #. characters will prevent the default label_suffix to be appended to the
 #. label
 msgid ":?.!"
 msgstr ":?.!"
 msgid "This field is required."
 msgstr "Αυτό το πεδίο είναι απαραίτητο."
@ -651,6 +569,28 @@ msgstr "Εισάγετε έναν ακέραιο αριθμό."
 msgid "Enter a number."
 msgstr "Εισάγετε έναν αριθμό."
 #, python-format
 msgid "Ensure that there are no more than %(max)s digit in total."
 msgid_plural "Ensure that there are no more than %(max)s digits in total."
 msgstr[0] ""
 "Σιγουρευτείτε οτι τα σύνολο των ψηφίων δεν είναι παραπάνω από %(max)s"
 msgstr[1] ""
 "Σιγουρευτείτε οτι τα σύνολο των ψηφίων δεν είναι παραπάνω από %(max)s"
 #, python-format
 msgid "Ensure that there are no more than %(max)s decimal place."
 msgid_plural "Ensure that there are no more than %(max)s decimal places."
 msgstr[0] "Σιγουρευτείτε ότι το δεκαδικό ψηφίο δεν είναι παραπάνω από %(max)s."
 msgstr[1] "Σιγουρευτείτε ότι τα δεκαδικά ψηφία δεν είναι παραπάνω από %(max)s."
 #, python-format
 msgid ""
 "Ensure that there are no more than %(max)s digit before the decimal point."
 msgid_plural ""
 "Ensure that there are no more than %(max)s digits before the decimal point."
 msgstr[0] ""
 msgstr[1] ""
 msgid "Enter a valid date."
 msgstr "Εισάγετε μια έγκυρη ημερομηνία."
@ -661,14 +601,14 @@ msgid "Enter a valid date/time."
 msgstr "Εισάγετε μια έγκυρη ημερομηνία/ώρα."
 msgid "Enter a valid duration."
-msgstr "Εισάγετε μια έγκυρη διάρκεια."
+msgstr ""
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr ""
 "Δεν έχει υποβληθεί κάποιο αρχείο. Ελέγξτε τον τύπο κωδικοποίησης στη φόρμα."
 msgid "No file was submitted."
-msgstr "Δεν υποβλήθηκε κάποιο αρχείο."
+msgstr "Δεν έχει υποβληθεί κάποιο αρχείο."
 msgid "The submitted file is empty."
 msgstr "Το αρχείο που υποβλήθηκε είναι κενό."
@ -678,11 +618,7 @@ msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
 msgid_plural ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
 msgstr[0] ""
 "Βεβαιωθείται πως το όνομα του αρχείου έχει το πολύ %(max)d χαρακτήρα (το "
 "παρόν έχει %(length)d)."
 msgstr[1] ""
 "Βεβαιωθείται πως το όνομα του αρχείου έχει το πολύ %(max)d χαρακτήρα (το "
 "παρόν έχει %(length)d)."
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr ""
@ -694,7 +630,7 @@ msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr ""
-"Βεβαιωθείτε ότι το αρχείο που έχετε επιλέξει για αποστολή είναι αρχείο "
+"Βεβεαιωθείτε ότι το αρχείο που έχετε επιλέξει για αποστολή είναι αρχείο "
 "εικόνας. Το τρέχον είτε δεν ήταν εικόνα είτε έχει υποστεί φθορά."
 #, python-format
@ -710,7 +646,7 @@ msgid "Enter a complete value."
 msgstr "Εισάγετε μια πλήρης τιμή"
 msgid "Enter a valid UUID."
-msgstr "Εισάγετε μια έγκυρη UUID."
+msgstr ""
 #. Translators: This is the default suffix added to form field labels
 msgid ":"
@ -718,7 +654,13 @@ msgstr ":"
 #, python-format
 msgid "(Hidden field %(name)s) %(error)s"
-msgstr "(Κρυφό πεδίο %(name)s) %(error)s"
+msgstr ""
 #. Translators: If found as last label character, these punctuation
 #. characters will prevent the default label_suffix to be appended to the
 #. label
 msgid ":?.!"
 msgstr ":?.!"
 msgid "ManagementForm data is missing or has been tampered with"
 msgstr "Τα δεδομένα του ManagementForm λείπουν ή έχουν αλλοιωθεί"
@ -764,8 +706,8 @@ msgstr "Έχετε ξαναεισάγει την ίδια τιμη. Βεβαιω
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr ""
-"Το inline foreign key δεν αντιστοιχεί με το primary κλειδί του γονικού "
+"Το ενσωματωμένο εξωτερικό κλειδί δεν αντιστοιχεί με το κλειδί του "
-"object."
+"αντικειμένου από το οποίο πηγάζει."
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr ""
@ -781,11 +723,6 @@ msgid ""
 "%(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; ίσως να είναι ασαφής ή να μην υπάρχει."
 msgid "Clear"
 msgstr "Εκκαθάριση"
 msgid "Currently"
 msgstr "Τώρα"
@ -793,6 +730,9 @@ msgstr "Τώρα"
 msgid "Change"
 msgstr "Επεξεργασία"
 msgid "Clear"
 msgstr "Εκκαθάσριση"
 msgid "Unknown"
 msgstr "Άγνωστο"
@ -1117,7 +1057,7 @@ msgid "Forbidden"
 msgstr "Απαγορευμένο"
 msgid "CSRF verification failed. Request aborted."
-msgstr "Η πιστοποίηση CSRF απέτυχε. Το αίτημα ματαιώθηκε."
+msgstr "Η πιστοποίηση CSRF απέτυχε. Το αίτημα απέτυχε"
 msgid ""
 "You are seeing this message because this HTTPS site requires a 'Referer "
@ -1125,63 +1065,45 @@ msgid ""
 "required for security reasons, to ensure that your browser is not being "
 "hijacked by third parties."
 msgstr ""
 "Βλέπετε αυτό το μήνυμα επειδή αυτή η HTTPS σελίδα απαιτεί από τον Web "
 "browser σας να σταλεί ένας 'Referer header', όμως τίποτα δεν στάλθηκε. Αυτός "
 "ο header είναι απαραίτητος για λόγους ασφαλείας, για να εξασφαλιστεί ότι ο "
 "browser δεν έχει γίνει hijacked από τρίτους."
 msgid ""
 "If you have configured your browser to disable 'Referer' headers, please re-"
 "enable them, at least for this site, or for HTTPS connections, or for 'same-"
 "origin' requests."
 msgstr ""
 "Αν οι 'Referer' headers είναι απενεργοποιημένοι στον browser σας από εσάς, "
 "παρακαλούμε να τους ξανά-ενεργοποιήσετε, τουλάχιστον για αυτό το site ή για "
 "τις συνδέσεις HTTPS ή για τα 'same-origin' requests."
 msgid ""
 "You are seeing this message because this site requires a CSRF cookie when "
 "submitting forms. This cookie is required for security reasons, to ensure "
 "that your browser is not being hijacked by third parties."
 msgstr ""
 "Βλέπετε αυτό το μήνυμα επειδή αυτή η σελίδα απαιτεί ένα CSRF cookie, όταν "
 "κατατίθενται φόρμες. Αυτό το cookie είναι απαραίτητο για λόγους ασφαλείας, "
 "για να εξασφαλιστεί ότι ο browser δεν έχει γίνει hijacked από τρίτους."
 msgid ""
 "If you have configured your browser to disable cookies, please re-enable "
 "them, at least for this site, or for 'same-origin' requests."
 msgstr ""
 "Αν τα cookies είναι απενεργοποιημένα στον browser σας από εσάς, παρακαλούμε "
 "να τα ξανά-ενεργοποιήσετε, τουλάχιστον για αυτό το site ή για τα 'same-"
 "origin' requests."
 msgid "More information is available with DEBUG=True."
-msgstr "Περισσότερες πληροφορίες είναι διαθέσιμες με DEBUG=True."
+msgstr "Περισσότερες πληροφορίες είναι διαθέσιμες με DEBUG=True"
 msgid "Welcome to Django"
-msgstr "Καλωσήρθατε στο Django"
+msgstr ""
 msgid "It worked!"
-msgstr "Δούλεψε!"
+msgstr ""
 msgid "Congratulations on your first Django-powered page."
-msgstr "Συγχαρητήρια στην πρώτη Django-τροφοδοτούμενη σελίδα σας."
+msgstr ""
 msgid ""
-"Next, start your first app by running <code>python manage.py startapp "
+"Of course, you haven't actually done any work yet. Next, start your first "
-"[app_label]</code>."
+"app by running <code>python manage.py startapp [app_label]</code>."
 msgstr ""
 "Επόμενο βήμα, είναι να ξεκινήσετε την πρώτη σας εφαρμογή εκτελώντας την "
 "εντολή <code>python manage.py startapp [app_label]</code>."
 msgid ""
 "You're seeing this message because you have <code>DEBUG = True</code> in "
 "your Django settings file and you haven't configured any URLs. Get to work!"
 msgstr ""
 "Βλέπετε αυτό το μήνυμα επείδη έχετε <code>DEBUG = True</code> στο αρχείο "
 "settings του Django σας και δεν έχετε ρυθμίσει καμία URL. Στρωθείτε στην "
 "δουλειά!"
 msgid "No year specified"
 msgstr "Δεν έχει οριστεί χρονιά"
@ -1228,7 +1150,7 @@ 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."
+msgstr "Άδεια λίστα ενώ '%(class_name)s.allow_empty' δεν έχει τεθεί."
 msgid "Directory indexes are not allowed here."
 msgstr "Τα ευρετήρια καταλόγων δεν επιτρέπονται εδώ."
--- a/django/conf/locale/el/formats.py
+++ b/django/conf/locale/el/formats.py
@ -16,10 +16,10 @@ FIRST_DAY_OF_WEEK = 0  # Sunday
 # The *_INPUT_FORMATS strings use the Python strftime format syntax,
 # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
-DATE_INPUT_FORMATS = [
+DATE_INPUT_FORMATS = (
    '%d/%m/%Y', '%d/%m/%y', '%Y-%m-%d',  # '25/10/2006', '25/10/06', '2006-10-25',
-]
+)
-DATETIME_INPUT_FORMATS = [
+DATETIME_INPUT_FORMATS = (
    '%d/%m/%Y %H:%M:%S',     # '25/10/2006 14:30:59'
    '%d/%m/%Y %H:%M:%S.%f',  # '25/10/2006 14:30:59.000200'
    '%d/%m/%Y %H:%M',        # '25/10/2006 14:30'
@ -32,7 +32,7 @@ DATETIME_INPUT_FORMATS = [
    '%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'
-]
+)
 DECIMAL_SEPARATOR = ','
-THOUSAND_SEPARATOR = '.'
+THOUSAND_SEPARATOR = '\xa0'  # non-breaking space
 NUMBER_GROUPING = 3
--- a/django/conf/locale/en/LC_MESSAGES/django.po
+++ b/django/conf/locale/en/LC_MESSAGES/django.po
--- a/django/conf/locale/en/formats.py
+++ b/django/conf/locale/en/formats.py
@ -17,14 +17,14 @@ FIRST_DAY_OF_WEEK = 0  # Sunday
 # The *_INPUT_FORMATS strings use the Python strftime format syntax,
 # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
 # Kept ISO formats as they are in first position
-DATE_INPUT_FORMATS = [
+DATE_INPUT_FORMATS = (
    '%Y-%m-%d', '%m/%d/%Y', '%m/%d/%y',  # '2006-10-25', '10/25/2006', '10/25/06'
    # '%b %d %Y', '%b %d, %Y',            # 'Oct 25 2006', 'Oct 25, 2006'
    # '%d %b %Y', '%d %b, %Y',            # '25 Oct 2006', '25 Oct, 2006'
    # '%B %d %Y', '%B %d, %Y',            # 'October 25 2006', 'October 25, 2006'
    # '%d %B %Y', '%d %B, %Y',            # '25 October 2006', '25 October, 2006'
-]
+)
-DATETIME_INPUT_FORMATS = [
+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'
@ -37,7 +37,7 @@ DATETIME_INPUT_FORMATS = [
    '%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'
-]
+)
 DECIMAL_SEPARATOR = '.'
 THOUSAND_SEPARATOR = ','
 NUMBER_GROUPING = 3
--- a/django/conf/locale/en_AU/LC_MESSAGES/django.mo
+++ b/django/conf/locale/en_AU/LC_MESSAGES/django.mo
--- a/django/conf/locale/en_AU/LC_MESSAGES/django.po
+++ b/django/conf/locale/en_AU/LC_MESSAGES/django.po
@ -6,11 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-29 20:57+0200\n"
+"POT-Creation-Date: 2015-03-18 09:16+0100\n"
-"PO-Revision-Date: 2016-06-30 08:31+0000\n"
+"PO-Revision-Date: 2015-03-18 08:44+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: English (Australia) (http://www.transifex.com/django/django/"
+"Language-Team: English (Australia) (http://www.transifex.com/projects/p/"
-"language/en_AU/)\n"
+"django/language/en_AU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@ -59,9 +59,6 @@ msgstr "Danish"
 msgid "German"
 msgstr "German"
 msgid "Lower Sorbian"
 msgstr ""
 msgid "Greek"
 msgstr "Greek"
@ -83,9 +80,6 @@ msgstr "Spanish"
 msgid "Argentinian Spanish"
 msgstr "Argentinian Spanish"
 msgid "Colombian Spanish"
 msgstr ""
 msgid "Mexican Spanish"
 msgstr "Mexican Spanish"
@ -116,9 +110,6 @@ msgstr "Frisian"
 msgid "Irish"
 msgstr "Irish"
 msgid "Scottish Gaelic"
 msgstr ""
 msgid "Galician"
 msgstr "Galician"
@ -131,9 +122,6 @@ msgstr "Hindi"
 msgid "Croatian"
 msgstr "Croatian"
 msgid "Upper Sorbian"
 msgstr ""
 msgid "Hungarian"
 msgstr "Hungarian"
@ -194,8 +182,8 @@ msgstr ""
 msgid "Burmese"
 msgstr "Burmese"
-msgid "Norwegian Bokmål"
+msgid "Norwegian Bokmal"
-msgstr ""
+msgstr "Norwegian Bokmal"
 msgid "Nepali"
 msgstr "Nepali"
@ -293,6 +281,9 @@ msgstr ""
 msgid "Syndication"
 msgstr ""
 msgid "Web Design"
 msgstr ""
 msgid "Enter a valid value."
 msgstr "Enter a valid value."
@ -310,11 +301,6 @@ msgid ""
 msgstr ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgid ""
 "Enter a valid 'slug' consisting of Unicode letters, numbers, underscores, or "
 "hyphens."
 msgstr ""
 msgid "Enter a valid IPv4 address."
 msgstr "Enter a valid IPv4 address."
@ -367,28 +353,6 @@ msgstr[1] ""
 "Ensure this value has at most %(limit_value)d characters (it has "
 "%(show_value)d)."
 #, python-format
 msgid "Ensure that there are no more than %(max)s digit in total."
 msgid_plural "Ensure that there are no more than %(max)s digits in total."
 msgstr[0] "Ensure that there are no more than %(max)s digit in total."
 msgstr[1] "Ensure that there are no more than %(max)s digits in total."
 #, python-format
 msgid "Ensure that there are no more than %(max)s decimal place."
 msgid_plural "Ensure that there are no more than %(max)s decimal places."
 msgstr[0] "Ensure that there are no more than %(max)s decimal place."
 msgstr[1] "Ensure that there are no more than %(max)s decimal places."
 #, python-format
 msgid ""
 "Ensure that there are no more than %(max)s digit before the decimal point."
 msgid_plural ""
 "Ensure that there are no more than %(max)s digits before the decimal point."
 msgstr[0] ""
 "Ensure that there are no more than %(max)s digit before the decimal point."
 msgstr[1] ""
 "Ensure that there are no more than %(max)s digits before the decimal point."
 msgid "and"
 msgstr "and"
@ -428,9 +392,6 @@ msgstr "Integer"
 msgid "'%(value)s' value must be an integer."
 msgstr ""
 msgid "Big (8 byte) integer"
 msgstr "Big (8 byte) integer"
 #, python-format
 msgid "'%(value)s' value must be either True or False."
 msgstr ""
@ -504,6 +465,9 @@ msgstr ""
 msgid "Floating point number"
 msgstr "Floating point number"
 msgid "Big (8 byte) integer"
 msgstr "Big (8 byte) integer"
 msgid "IPv4 address"
 msgstr "IPv4 address"
@ -574,23 +538,9 @@ msgstr "Foreign Key (type determined by related field)"
 msgid "One-to-one relationship"
 msgstr "One-to-one relationship"
 #, python-format
 msgid "%(from)s-%(to)s relationship"
 msgstr ""
 #, python-format
 msgid "%(from)s-%(to)s relationships"
 msgstr ""
 msgid "Many-to-many relationship"
 msgstr "Many-to-many relationship"
 #. Translators: If found as last label character, these punctuation
 #. characters will prevent the default label_suffix to be appended to the
 #. label
 msgid ":?.!"
 msgstr ":?.!"
 msgid "This field is required."
 msgstr "This field is required."
@ -600,6 +550,28 @@ msgstr "Enter a whole number."
 msgid "Enter a number."
 msgstr "Enter a number."
 #, python-format
 msgid "Ensure that there are no more than %(max)s digit in total."
 msgid_plural "Ensure that there are no more than %(max)s digits in total."
 msgstr[0] "Ensure that there are no more than %(max)s digit in total."
 msgstr[1] "Ensure that there are no more than %(max)s digits in total."
 #, python-format
 msgid "Ensure that there are no more than %(max)s decimal place."
 msgid_plural "Ensure that there are no more than %(max)s decimal places."
 msgstr[0] "Ensure that there are no more than %(max)s decimal place."
 msgstr[1] "Ensure that there are no more than %(max)s decimal places."
 #, python-format
 msgid ""
 "Ensure that there are no more than %(max)s digit before the decimal point."
 msgid_plural ""
 "Ensure that there are no more than %(max)s digits before the decimal point."
 msgstr[0] ""
 "Ensure that there are no more than %(max)s digit before the decimal point."
 msgstr[1] ""
 "Ensure that there are no more than %(max)s digits before the decimal point."
 msgid "Enter a valid date."
 msgstr "Enter a valid date."
@ -661,6 +633,12 @@ msgstr ":"
 msgid "(Hidden field %(name)s) %(error)s"
 msgstr "(Hidden field %(name)s) %(error)s"
 #. Translators: If found as last label character, these punctuation
 #. characters will prevent the default label_suffix to be appended to the
 #. label
 msgid ":?.!"
 msgstr ":?.!"
 msgid "ManagementForm data is missing or has been tampered with"
 msgstr ""
--- a/django/conf/locale/en_AU/formats.py
+++ b/django/conf/locale/en_AU/formats.py
@ -16,14 +16,14 @@ FIRST_DAY_OF_WEEK = 0                   # Sunday
 # The *_INPUT_FORMATS strings use the Python strftime format syntax,
 # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
-DATE_INPUT_FORMATS = [
+DATE_INPUT_FORMATS = (
    '%d/%m/%Y', '%d/%m/%y',             # '25/10/2006', '25/10/06'
    # '%b %d %Y', '%b %d, %Y',          # 'Oct 25 2006', 'Oct 25, 2006'
    # '%d %b %Y', '%d %b, %Y',          # '25 Oct 2006', '25 Oct, 2006'
    # '%B %d %Y', '%B %d, %Y',          # 'October 25 2006', 'October 25, 2006'
    # '%d %B %Y', '%d %B, %Y',          # '25 October 2006', '25 October, 2006'
-]
+)
-DATETIME_INPUT_FORMATS = [
+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'
@ -36,7 +36,7 @@ DATETIME_INPUT_FORMATS = [
    '%d/%m/%y %H:%M:%S.%f',             # '25/10/06 14:30:59.000200'
    '%d/%m/%y %H:%M',                   # '25/10/06 14:30'
    '%d/%m/%y',                         # '25/10/06'
-]
+)
 DECIMAL_SEPARATOR = '.'
 THOUSAND_SEPARATOR = ','
 NUMBER_GROUPING = 3
--- a/django/conf/locale/en_GB/LC_MESSAGES/django.mo
+++ b/django/conf/locale/en_GB/LC_MESSAGES/django.mo
--- a/django/conf/locale/en_GB/LC_MESSAGES/django.po
+++ b/django/conf/locale/en_GB/LC_MESSAGES/django.po
@ -8,10 +8,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-19 16:49+0100\n"
+"POT-Creation-Date: 2015-03-18 09:16+0100\n"
-"PO-Revision-Date: 2017-01-20 09:03+0000\n"
+"PO-Revision-Date: 2015-03-18 08:44+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: English (United Kingdom) (http://www.transifex.com/django/"
+"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/"
 "django/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@ -61,9 +61,6 @@ msgstr "Danish"
 msgid "German"
 msgstr "German"
 msgid "Lower Sorbian"
 msgstr ""
 msgid "Greek"
 msgstr "Greek"
@ -85,9 +82,6 @@ msgstr "Spanish"
 msgid "Argentinian Spanish"
 msgstr "Argentinian Spanish"
 msgid "Colombian Spanish"
 msgstr ""
 msgid "Mexican Spanish"
 msgstr "Mexican Spanish"
@ -118,9 +112,6 @@ msgstr "Frisian"
 msgid "Irish"
 msgstr "Irish"
 msgid "Scottish Gaelic"
 msgstr ""
 msgid "Galician"
 msgstr "Galician"
@ -133,9 +124,6 @@ msgstr "Hindi"
 msgid "Croatian"
 msgstr "Croatian"
 msgid "Upper Sorbian"
 msgstr ""
 msgid "Hungarian"
 msgstr "Hungarian"
@ -196,8 +184,8 @@ msgstr ""
 msgid "Burmese"
 msgstr ""
-msgid "Norwegian Bokmål"
+msgid "Norwegian Bokmal"
-msgstr ""
+msgstr "Norwegian Bokmal"
 msgid "Nepali"
 msgstr "Nepali"
@ -295,13 +283,7 @@ msgstr ""
 msgid "Syndication"
 msgstr ""
-msgid "That page number is not an integer"
+msgid "Web Design"
 msgstr ""
 msgid "That page number is less than 1"
 msgstr ""
 msgid "That page contains no results"
 msgstr ""
 msgid "Enter a valid value."
@ -321,11 +303,6 @@ msgid ""
 msgstr ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgid ""
 "Enter a valid 'slug' consisting of Unicode letters, numbers, underscores, or "
 "hyphens."
 msgstr ""
 msgid "Enter a valid IPv4 address."
 msgstr "Enter a valid IPv4 address."
@ -370,32 +347,6 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 #, python-format
 msgid "Ensure that there are no more than %(max)s digit in total."
 msgid_plural "Ensure that there are no more than %(max)s digits in total."
 msgstr[0] ""
 msgstr[1] ""
 #, python-format
 msgid "Ensure that there are no more than %(max)s decimal place."
 msgid_plural "Ensure that there are no more than %(max)s decimal places."
 msgstr[0] ""
 msgstr[1] ""
 #, python-format
 msgid ""
 "Ensure that there are no more than %(max)s digit before the decimal point."
 msgid_plural ""
 "Ensure that there are no more than %(max)s digits before the decimal point."
 msgstr[0] ""
 msgstr[1] ""
 #, python-format
 msgid ""
 "File extension '%(extension)s' is not allowed. Allowed extensions are: "
 "'%(allowed_extensions)s'."
 msgstr ""
 msgid "and"
 msgstr "and"
@ -435,9 +386,6 @@ msgstr "Integer"
 msgid "'%(value)s' value must be an integer."
 msgstr ""
 msgid "Big (8 byte) integer"
 msgstr "Big (8 byte) integer"
 #, python-format
 msgid "'%(value)s' value must be either True or False."
 msgstr ""
@ -511,6 +459,9 @@ msgstr ""
 msgid "Floating point number"
 msgstr "Floating point number"
 msgid "Big (8 byte) integer"
 msgstr "Big (8 byte) integer"
 msgid "IPv4 address"
 msgstr "IPv4 address"
@ -581,23 +532,9 @@ msgstr "Foreign Key (type determined by related field)"
 msgid "One-to-one relationship"
 msgstr "One-to-one relationship"
 #, python-format
 msgid "%(from)s-%(to)s relationship"
 msgstr ""
 #, python-format
 msgid "%(from)s-%(to)s relationships"
 msgstr ""
 msgid "Many-to-many relationship"
 msgstr "Many-to-many relationship"
 #. Translators: If found as last label character, these punctuation
 #. characters will prevent the default label_suffix to be appended to the
 #. label
 msgid ":?.!"
 msgstr ""
 msgid "This field is required."
 msgstr "This field is required."
@ -607,6 +544,26 @@ msgstr "Enter a whole number."
 msgid "Enter a number."
 msgstr "Enter a number."
 #, python-format
 msgid "Ensure that there are no more than %(max)s digit in total."
 msgid_plural "Ensure that there are no more than %(max)s digits in total."
 msgstr[0] ""
 msgstr[1] ""
 #, python-format
 msgid "Ensure that there are no more than %(max)s decimal place."
 msgid_plural "Ensure that there are no more than %(max)s decimal places."
 msgstr[0] ""
 msgstr[1] ""
 #, python-format
 msgid ""
 "Ensure that there are no more than %(max)s digit before the decimal point."
 msgid_plural ""
 "Ensure that there are no more than %(max)s digits before the decimal point."
 msgstr[0] ""
 msgstr[1] ""
 msgid "Enter a valid date."
 msgstr "Enter a valid date."
@ -666,6 +623,12 @@ msgstr ""
 msgid "(Hidden field %(name)s) %(error)s"
 msgstr ""
 #. Translators: If found as last label character, these punctuation
 #. characters will prevent the default label_suffix to be appended to the
 #. label
 msgid ":?.!"
 msgstr ""
 msgid "ManagementForm data is missing or has been tampered with"
 msgstr ""
@ -725,15 +688,15 @@ msgstr ""
 "%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
 "may be ambiguous or it may not exist."
 msgid "Clear"
 msgstr "Clear"
 msgid "Currently"
 msgstr "Currently"
 msgid "Change"
 msgstr "Change"
 msgid "Clear"
 msgstr "Clear"
 msgid "Unknown"
 msgstr "Unknown"
@ -1097,8 +1060,8 @@ msgid "Congratulations on your first Django-powered page."
 msgstr ""
 msgid ""
-"Next, start your first app by running <code>python manage.py startapp "
+"Of course, you haven't actually done any work yet. Next, start your first "
-"[app_label]</code>."
+"app by running <code>python manage.py startapp [app_label]</code>."
 msgstr ""
 msgid ""
--- a/django/conf/locale/en_GB/formats.py
+++ b/django/conf/locale/en_GB/formats.py
@ -16,14 +16,14 @@ FIRST_DAY_OF_WEEK = 1                   # Monday
 # The *_INPUT_FORMATS strings use the Python strftime format syntax,
 # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
-DATE_INPUT_FORMATS = [
+DATE_INPUT_FORMATS = (
    '%d/%m/%Y', '%d/%m/%y',             # '25/10/2006', '25/10/06'
    # '%b %d %Y', '%b %d, %Y',          # 'Oct 25 2006', 'Oct 25, 2006'
    # '%d %b %Y', '%d %b, %Y',          # '25 Oct 2006', '25 Oct, 2006'
    # '%B %d %Y', '%B %d, %Y',          # 'October 25 2006', 'October 25, 2006'
    # '%d %B %Y', '%d %B, %Y',          # '25 October 2006', '25 October, 2006'
-]
+)
-DATETIME_INPUT_FORMATS = [
+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'
@ -36,7 +36,7 @@ DATETIME_INPUT_FORMATS = [
    '%d/%m/%y %H:%M:%S.%f',             # '25/10/06 14:30:59.000200'
    '%d/%m/%y %H:%M',                   # '25/10/06 14:30'
    '%d/%m/%y',                         # '25/10/06'
-]
+)
 DECIMAL_SEPARATOR = '.'
 THOUSAND_SEPARATOR = ','
 NUMBER_GROUPING = 3
--- a/django/conf/locale/eo/LC_MESSAGES/django.mo
+++ b/django/conf/locale/eo/LC_MESSAGES/django.mo
--- a/django/conf/locale/eo/LC_MESSAGES/django.po
+++ b/django/conf/locale/eo/LC_MESSAGES/django.po
@ -2,21 +2,20 @@
 #
 # Translators:
 # Baptiste Darthenay <baptiste+transifex@darthenay.fr>, 2012-2013
-# Baptiste Darthenay <baptiste+transifex@darthenay.fr>, 2013-2017
+# Baptiste Darthenay <baptiste+transifex@darthenay.fr>, 2013-2015
 # batisteo <bapdarth@yahoo·fr>, 2011
 # Dinu Gherman <gherman@darwin.in-berlin.de>, 2011
 # kristjan <kristjan.schmidt@googlemail.com>, 2011
 # Nikolay Korotkiy <sikmir@gmail.com>, 2017
 # Adamo Mesha <adam.raizen@gmail.com>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-19 16:49+0100\n"
+"POT-Creation-Date: 2015-03-18 09:16+0100\n"
-"PO-Revision-Date: 2017-03-22 00:08+0000\n"
+"PO-Revision-Date: 2015-03-22 12:44+0000\n"
 "Last-Translator: Baptiste Darthenay <baptiste+transifex@darthenay.fr>\n"
-"Language-Team: Esperanto (http://www.transifex.com/django/django/language/"
+"Language-Team: Esperanto (http://www.transifex.com/projects/p/django/"
-"eo/)\n"
+"language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@ -65,9 +64,6 @@ msgstr "Dana"
 msgid "German"
 msgstr "Germana"
 msgid "Lower Sorbian"
 msgstr "Malsuprasaroba"
 msgid "Greek"
 msgstr "Greka"
@ -89,9 +85,6 @@ msgstr "Hispana"
 msgid "Argentinian Spanish"
 msgstr "Hispana (Argentinio)"
 msgid "Colombian Spanish"
 msgstr "Hispana (Kolombio)"
 msgid "Mexican Spanish"
 msgstr "Hispana (Meksiko)"
@ -122,9 +115,6 @@ msgstr "Frisa"
 msgid "Irish"
 msgstr "Irlanda"
 msgid "Scottish Gaelic"
 msgstr "Skota gaela"
 msgid "Galician"
 msgstr "Galega"
@ -137,9 +127,6 @@ msgstr "Hinda"
 msgid "Croatian"
 msgstr "Kroata"
 msgid "Upper Sorbian"
 msgstr "Suprasoraba"
 msgid "Hungarian"
 msgstr "Hungara"
@ -200,8 +187,8 @@ msgstr "Marata"
 msgid "Burmese"
 msgstr "Birma"
-msgid "Norwegian Bokmål"
+msgid "Norwegian Bokmal"
-msgstr "Norvega Bbokmål"
+msgstr "Norvega (bokmål)"
 msgid "Nepali"
 msgstr "Nepala"
@ -299,14 +286,8 @@ msgstr "Statikaj dosieroj"
 msgid "Syndication"
 msgstr "Abonrilato"
-msgid "That page number is not an integer"
+msgid "Web Design"
-msgstr "Tuo paĝnumero ne estas entjero"
+msgstr "Reteja dezajno"
 msgid "That page number is less than 1"
 msgstr "Tuo paĝnumero estas malpli ol 1"
 msgid "That page contains no results"
 msgstr "Tiu paĝo ne enhavas rezultojn"
 msgid "Enter a valid value."
 msgstr "Enigu validan valoron."
@ -325,13 +306,6 @@ msgid ""
 msgstr ""
 "Tiu kampo nur devas havi literojn, nombrojn, substrekojn aŭ streketojn."
 msgid ""
 "Enter a valid 'slug' consisting of Unicode letters, numbers, underscores, or "
 "hyphens."
 msgstr ""
 "Tiu kampo nur devas enhavi Unikodajn literojn, nombrojn, substrekojn aŭ "
 "streketojn."
 msgid "Enter a valid IPv4 address."
 msgstr "Enigu validan IPv4-adreson."
@ -385,34 +359,6 @@ msgstr[1] ""
 "Certigu, ke tio valuto maksimume havas %(limit_value)d karakterojn (ĝi havas "
 "%(show_value)d)."
 #, python-format
 msgid "Ensure that there are no more than %(max)s digit in total."
 msgid_plural "Ensure that there are no more than %(max)s digits in total."
 msgstr[0] "Certigu ke ne estas pli ol %(max)s cifero entute."
 msgstr[1] "Certigu ke ne estas pli ol %(max)s ciferoj entute."
 #, python-format
 msgid "Ensure that there are no more than %(max)s decimal place."
 msgid_plural "Ensure that there are no more than %(max)s decimal places."
 msgstr[0] "Certigu, ke ne estas pli ol %(max)s dekumaj lokoj."
 msgstr[1] "Certigu, ke ne estas pli ol %(max)s dekumaj lokoj."
 #, python-format
 msgid ""
 "Ensure that there are no more than %(max)s digit before the decimal point."
 msgid_plural ""
 "Ensure that there are no more than %(max)s digits before the decimal point."
 msgstr[0] "Certigu ke ne estas pli ol %(max)s ciferoj antaŭ la dekuma punkto."
 msgstr[1] "Certigu ke ne estas pli ol %(max)s ciferoj antaŭ la dekuma punkto."
 #, python-format
 msgid ""
 "File extension '%(extension)s' is not allowed. Allowed extensions are: "
 "'%(allowed_extensions)s'."
 msgstr ""
 "dosiersufikso '%(extension)s' ne estas permesita. Permesitaj dosiersufiksoj "
 "estas: '%(allowed_extensions)s'."
 msgid "and"
 msgstr "kaj"
@ -453,9 +399,6 @@ msgstr "Entjero"
 msgid "'%(value)s' value must be an integer."
 msgstr "'%(value)s' valoro devas esti entjero."
 msgid "Big (8 byte) integer"
 msgstr "Granda (8 bitoka) entjero"
 #, python-format
 msgid "'%(value)s' value must be either True or False."
 msgstr "'%(value)s' valoro devas esti Vera aŭ Malvera"
@ -539,6 +482,9 @@ msgstr "'%(value)s' valoro devas esti glitkoma nombro."
 msgid "Floating point number"
 msgstr "Glitkoma nombro"
 msgid "Big (8 byte) integer"
 msgstr "Granda (8 bitoka) entjero"
 msgid "IPv4 address"
 msgstr "IPv4-adreso"
@ -613,23 +559,9 @@ msgstr "Fremda ŝlosilo (tipo determinita per rilata kampo)"
 msgid "One-to-one relationship"
 msgstr "Unu-al-unu rilato"
 #, python-format
 msgid "%(from)s-%(to)s relationship"
 msgstr "%(from)s-%(to)s rilato"
 #, python-format
 msgid "%(from)s-%(to)s relationships"
 msgstr "%(from)s-%(to)s rilatoj"
 msgid "Many-to-many relationship"
 msgstr "Mult-al-multa rilato"
 #. Translators: If found as last label character, these punctuation
 #. characters will prevent the default label_suffix to be appended to the
 #. label
 msgid ":?.!"
 msgstr ":?.!"
 msgid "This field is required."
 msgstr "Ĉi tiu kampo estas deviga."
@ -639,6 +571,26 @@ msgstr "Enigu plenan nombron."
 msgid "Enter a number."
 msgstr "Enigu nombron."
 #, python-format
 msgid "Ensure that there are no more than %(max)s digit in total."
 msgid_plural "Ensure that there are no more than %(max)s digits in total."
 msgstr[0] "Certigu ke ne estas pli ol %(max)s cifero entute."
 msgstr[1] "Certigu ke ne estas pli ol %(max)s ciferoj entute."
 #, python-format
 msgid "Ensure that there are no more than %(max)s decimal place."
 msgid_plural "Ensure that there are no more than %(max)s decimal places."
 msgstr[0] "Certigu, ke ne estas pli ol %(max)s dekumaj lokoj."
 msgstr[1] "Certigu, ke ne estas pli ol %(max)s dekumaj lokoj."
 #, python-format
 msgid ""
 "Ensure that there are no more than %(max)s digit before the decimal point."
 msgid_plural ""
 "Ensure that there are no more than %(max)s digits before the decimal point."
 msgstr[0] "Certigu ke ne estas pli ol %(max)s ciferoj antaŭ la dekuma punkto."
 msgstr[1] "Certigu ke ne estas pli ol %(max)s ciferoj antaŭ la dekuma punkto."
 msgid "Enter a valid date."
 msgstr "Enigu validan daton."
@ -705,6 +657,12 @@ msgstr ":"
 msgid "(Hidden field %(name)s) %(error)s"
 msgstr "(Kaŝita kampo %(name)s) %(error)s"
 #. Translators: If found as last label character, these punctuation
 #. characters will prevent the default label_suffix to be appended to the
 #. label
 msgid ":?.!"
 msgstr ":?.!"
 msgid "ManagementForm data is missing or has been tampered with"
 msgstr "ManagementForm datumoj mankas, aŭ estas tuŝaĉitaj kun"
@ -764,15 +722,15 @@ msgstr ""
 "%(datetime)s ne povus esti interpretita en horzono %(current_timezone)s; ĝi "
 "povas esti plursenca aŭ ne ekzistas."
 msgid "Clear"
 msgstr "Vakigi"
 msgid "Currently"
 msgstr "Nuntempe"
 msgid "Change"
 msgstr "Ŝanĝi"
 msgid "Clear"
 msgstr "Vakigi"
 msgid "Unknown"
 msgstr "Nekonate"
@ -1148,11 +1106,12 @@ msgid "Congratulations on your first Django-powered page."
 msgstr "Gratulojn por via unua Dĵanga paĝo."
 msgid ""
-"Next, start your first app by running <code>python manage.py startapp "
+"Of course, you haven't actually done any work yet. Next, start your first "
-"[app_label]</code>."
+"app by running <code>python manage.py startapp [app_label]</code>."
 msgstr ""
-"Poste, komencu vian unuan aplikaĵon rulante <code>python manage.py startapp "
+"Kompreneble, vi ankoraŭ ne reale faris ajnan laboron. Poste, komencu vian "
-"[app_label]</code>."
+"unuan aplikaĵon lanĉante <code>python manage.py startapp [aplikaĵo_etikedo]</"
 "code>."
 msgid ""
 "You're seeing this message because you have <code>DEBUG = True</code> in "
--- a/django/conf/locale/eo/formats.py
+++ b/django/conf/locale/eo/formats.py
@ -16,7 +16,7 @@ FIRST_DAY_OF_WEEK = 1  # Monday (lundo)
 # The *_INPUT_FORMATS strings use the Python strftime format syntax,
 # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
-DATE_INPUT_FORMATS = [
+DATE_INPUT_FORMATS = (
    '%Y-%m-%d',                         # '1887-07-26'
    '%y-%m-%d',                         # '87-07-26'
    '%Y %m %d',                         # '1887 07 26'
@ -25,12 +25,12 @@ DATE_INPUT_FORMATS = [
    '%d-a de %B %Y',                    # '26-a de julio 1887'
    '%d %B %Y',                         # '26 julio 1887'
    '%d %m %Y',                         # '26 07 1887'
-]
+)
-TIME_INPUT_FORMATS = [
+TIME_INPUT_FORMATS = (
    '%H:%M:%S',                         # '18:59:00'
    '%H:%M',                            # '18:59'
-]
+)
-DATETIME_INPUT_FORMATS = [
+DATETIME_INPUT_FORMATS = (
    '%Y-%m-%d %H:%M:%S',                # '1887-07-26 18:59:00'
    '%Y-%m-%d %H:%M',                   # '1887-07-26 18:59'
    '%Y-%m-%d',                         # '1887-07-26'
@ -46,7 +46,7 @@ DATETIME_INPUT_FORMATS = [
    '%y-%m-%d %H:%M:%S',                # '87-07-26 18:59:00'
    '%y-%m-%d %H:%M',                   # '87-07-26 18:59'
    '%y-%m-%d',                         # '87-07-26'
-]
+)
 DECIMAL_SEPARATOR = ','
 THOUSAND_SEPARATOR = '\xa0'  # non-breaking space
 NUMBER_GROUPING = 3
--- a/django/conf/locale/es/LC_MESSAGES/django.mo
+++ b/django/conf/locale/es/LC_MESSAGES/django.mo
--- a/django/conf/locale/es/LC_MESSAGES/django.po
+++ b/django/conf/locale/es/LC_MESSAGES/django.po
@ -1,18 +1,16 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
-# Abraham Estrada, 2013
+# Abraham Estrada <abraham.estrada@gmail.com>, 2013
 # albertoalcolea <albertoalcolea@gmail.com>, 2014
-# Amanda Copete, 2017
+# Antoni Aloy <aaloy@apsl.net>, 2011-2014
 # Antoni Aloy <aaloy@apsl.net>, 2011-2014,2017
 # Diego Andres Sanabria Martin <diegueus9@gmail.com>, 2012
 # Diego Schulz <dschulz@gmail.com>, 2012
-# Ernesto Avilés Vázquez <whippiii@gmail.com>, 2015-2016
+# Ernesto Avilés Vázquez <whippiii@gmail.com>, 2015
 # Ernesto Avilés Vázquez <whippiii@gmail.com>, 2014
 # franchukelly <inactive+franchukelly@transifex.com>, 2011
 # Igor Támara <igor@tamarapatino.org>, 2015
 # Jannis Leidel <jannis@leidel.info>, 2011
 # Yusuf (Josè) Luis <alagunajs@gmail.com>, 2016
 # Josue Naaman Nistal Guerra <josuenistal@hotmail.com>, 2014
 # Leonardo J. Caballero G. <leonardocaballero@gmail.com>, 2011,2013
 # Marc Garcia <garcia.marc@gmail.com>, 2011
@ -21,15 +19,14 @@
 # ntrrgc <ntrrgc@gmail.com>, 2013
 # Pablo, 2015
 # Sebastián Ramírez Magrí <sebasmagri@gmail.com>, 2013
 # Veronicabh <vero.blazher@gmail.com>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-19 16:49+0100\n"
+"POT-Creation-Date: 2015-03-18 09:16+0100\n"
-"PO-Revision-Date: 2017-03-22 14:20+0000\n"
+"PO-Revision-Date: 2015-03-20 21:49+0000\n"
-"Last-Translator: Amanda Copete\n"
+"Last-Translator: Igor Támara <igor@tamarapatino.org>\n"
-"Language-Team: Spanish (http://www.transifex.com/django/django/language/"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/django/language/"
 "es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@ -38,7 +35,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 msgid "Afrikaans"
-msgstr "Africano"
+msgstr "Afrikaans"
 msgid "Arabic"
 msgstr "Árabe"
@ -79,9 +76,6 @@ msgstr "Danés"
 msgid "German"
 msgstr "Alemán"
 msgid "Lower Sorbian"
 msgstr "Bajo sorbio"
 msgid "Greek"
 msgstr "Griego"
@ -103,9 +97,6 @@ msgstr "Español"
 msgid "Argentinian Spanish"
 msgstr "Español de Argentina"
 msgid "Colombian Spanish"
 msgstr "Español Colombiano"
 msgid "Mexican Spanish"
 msgstr "Español de México"
@ -136,9 +127,6 @@ msgstr "Frisón"
 msgid "Irish"
 msgstr "Irlandés"
 msgid "Scottish Gaelic"
 msgstr "Gaélico Escocés"
 msgid "Galician"
 msgstr "Gallego"
@ -151,9 +139,6 @@ msgstr "Hindi"
 msgid "Croatian"
 msgstr "Croata"
 msgid "Upper Sorbian"
 msgstr "Alto sorbio"
 msgid "Hungarian"
 msgstr "Húngaro"
@ -214,8 +199,8 @@ msgstr "Maratí"
 msgid "Burmese"
 msgstr "Birmano"
-msgid "Norwegian Bokmål"
+msgid "Norwegian Bokmal"
-msgstr "Bokmål noruego"
+msgstr "Nokmål"
 msgid "Nepali"
 msgstr "Nepalí"
@ -313,17 +298,11 @@ msgstr "Archivos estáticos"
 msgid "Syndication"
 msgstr "Sindicación"
-msgid "That page number is not an integer"
+msgid "Web Design"
-msgstr "Este número de página no es un entero"
+msgstr "Diseño Web"
 msgid "That page number is less than 1"
 msgstr "Este número de página es menor que 1"
 msgid "That page contains no results"
 msgstr "Esa página no contiene resultados"
 msgid "Enter a valid value."
-msgstr "Introduzca un valor válido."
+msgstr "Introduzca un valor correcto."
 msgid "Enter a valid URL."
 msgstr "Introduzca una URL válida."
@ -340,12 +319,6 @@ msgstr ""
 "Introduzca un 'slug' válido, consistente en letras, números, guiones bajos o "
 "medios."
 msgid ""
 "Enter a valid 'slug' consisting of Unicode letters, numbers, underscores, or "
 "hyphens."
 msgstr ""
 "Introduzca un 'slug' consistente en letras, números, subrayados o guiones."
 msgid "Enter a valid IPv4 address."
 msgstr "Introduzca una dirección IPv4 válida."
@ -400,36 +373,6 @@ msgstr[1] ""
 "Asegúrese de que este valor tenga menos de %(limit_value)d caracteres (tiene "
 "%(show_value)d)."
 #, python-format
 msgid "Ensure that there are no more than %(max)s digit in total."
 msgid_plural "Ensure that there are no more than %(max)s digits in total."
 msgstr[0] "Asegúrese de que no hay más de %(max)s dígito en total."
 msgstr[1] "Asegúrese de que no haya más de %(max)s dígitos en total."
 #, python-format
 msgid "Ensure that there are no more than %(max)s decimal place."
 msgid_plural "Ensure that there are no more than %(max)s decimal places."
 msgstr[0] "Asegúrese de que no haya más de %(max)s dígito decimal."
 msgstr[1] "Asegúrese de que no haya más de %(max)s dígitos decimales."
 #, python-format
 msgid ""
 "Ensure that there are no more than %(max)s digit before the decimal point."
 msgid_plural ""
 "Ensure that there are no more than %(max)s digits before the decimal point."
 msgstr[0] ""
 "Asegúrese de que no haya más de %(max)s dígito antes del punto decimal"
 msgstr[1] ""
 "Asegúrese de que no haya más de %(max)s dígitos antes del punto decimal."
 #, python-format
 msgid ""
 "File extension '%(extension)s' is not allowed. Allowed extensions are: "
 "'%(allowed_extensions)s'."
 msgstr ""
 "La extensión de fichero '%(extension)s' no está permitida.  Únicamente se "
 "permiten: '%(allowed_extensions)s'."
 msgid "and"
 msgstr "y"
@ -457,7 +400,7 @@ msgstr "Ya existe %(model_name)s con este %(field_label)s."
 msgid ""
 "%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
 msgstr ""
-"%(field_label)s debe ser único para %(date_field_label)s %(lookup_type)s."
+"%(field_label)s debe ser unico para %(date_field_label)s %(lookup_type)s."
 #, python-format
 msgid "Field of type: %(field_type)s"
@ -468,14 +411,11 @@ msgstr "Entero"
 #, python-format
 msgid "'%(value)s' value must be an integer."
-msgstr "El valor'%(value)s' debe ser un entero."
+msgstr "'%(value)s' valor debe ser un entero."
 msgid "Big (8 byte) integer"
 msgstr "Entero grande (8 bytes)"
 #, python-format
 msgid "'%(value)s' value must be either True or False."
-msgstr "El valor '%(value)s' debe ser verdadero o falso."
+msgstr "Valor '%(value)s' debe ser verdadero o falso."
 msgid "Boolean (Either True or False)"
 msgstr "Booleano (Verdadero o Falso)"
@ -492,16 +432,16 @@ msgid ""
 "'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
 "format."
 msgstr ""
-"El valor '%(value)s' tiene un formato de fecha no válida. Debe estar en "
+"'%(value)s' valor tiene un formato de fecha no válida. Debe estar en formato "
-"formato AAAA-MM-DD."
+"AAAA-MM-DD."
 #, python-format
 msgid ""
 "'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
 "date."
 msgstr ""
-"El valor '%(value)s' tiene el formato correcto (AAAA-MM-DD), pero la fecha "
+"'%(value)s' valor tiene el formato correcto (AAAA-MM-DD), pero es una fecha "
-"no es válida."
+"no válida."
 msgid "Date (without time)"
 msgstr "Fecha (sin hora)"
@ -511,23 +451,23 @@ msgid ""
 "'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
 "uuuuuu]][TZ] format."
 msgstr ""
-"El valor'%(value)s' no tiene un formato válido. Debe estar en formato AAAA-"
+"'%(value)s' valor tiene un formato válido. Debe estar en formato AAAA-MM-DD "
-"MM-DD HH: [TZ]: MM [ss [uuuuuu].]."
+"HH: [TZ]: MM [ss [uuuuuu].]."
 #, python-format
 msgid ""
 "'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
 "[TZ]) but it is an invalid date/time."
 msgstr ""
-"El valor '%(value)s' tiene el formato correcto (AAAA-MM-DD HH: MM [:. Ss "
+"'%(value)s' valor tiene el formato correcto (AAAA-MM-DD HH: MM [:. Ss "
-"[uuuuuu]] [TZ]), pero la fecha/hora no es válida."
+"[uuuuuu]] [TZ]), pero es una fecha no válida / hora."
 msgid "Date (with time)"
 msgstr "Fecha (con hora)"
 #, python-format
 msgid "'%(value)s' value must be a decimal number."
-msgstr "El valor '%(value)s' debe ser un número decimal."
+msgstr "'%(value)s' valor debe ser un número decimal."
 msgid "Decimal number"
 msgstr "Número decimal"
@ -544,18 +484,21 @@ msgid "Duration"
 msgstr "Duración"
 msgid "Email address"
-msgstr "Correo electrónico"
+msgstr "dirección de correo electrónico"
 msgid "File path"
 msgstr "Ruta de fichero"
 #, python-format
 msgid "'%(value)s' value must be a float."
-msgstr "El valor '%(value)s' debe ser un float."
+msgstr "Valor '%(value)s' debe ser un float."
 msgid "Floating point number"
 msgstr "Número en coma flotante"
 msgid "Big (8 byte) integer"
 msgstr "Entero grande (8 bytes)"
 msgid "IPv4 address"
 msgstr "Dirección IPv4"
@ -564,7 +507,7 @@ msgstr "Dirección IP"
 #, python-format
 msgid "'%(value)s' value must be either None, True or False."
-msgstr "El valor '%(value)s' debe ser Ninguno, Verdadero o Falso."
+msgstr "Valor '%(value)s' debe ser Ninguno, Verdadero o Falso."
 msgid "Boolean (Either True, False or None)"
 msgstr "Booleano (Verdadero, Falso o Nulo)"
@ -590,16 +533,16 @@ msgid ""
 "'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
 "format."
 msgstr ""
-"El valor '%(value)s' no tiene un formato válido. Debe estar en formato HH: "
+"'%(value)s' valor tiene un formato inválido. Debe estar en  formato HH: MM "
-"MM [: SS [uuuuuu].] ."
+"[: SS [uuuuuu].] ."
 #, python-format
 msgid ""
 "'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
 "invalid time."
 msgstr ""
-"El valor '%(value)s' tiene el formato correcto (HH: MM [:. Ss [uuuuuu]]), "
+"'%(value)s' valor tiene el formato correcto (HH: MM [:. Ss [uuuuuu]]), pero "
-"pero es una hora no válida."
+"es un tiempo no válido."
 msgid "Time"
 msgstr "Hora"
@ -622,31 +565,17 @@ msgstr "Imagen"
 #, python-format
 msgid "%(model)s instance with %(field)s %(value)r does not exist."
-msgstr "La instancia de %(model)s con %(field)s %(value)r no existe."
+msgstr "La instancia de %(model)s with %(field)s %(value)r no existe."
 msgid "Foreign Key (type determined by related field)"
-msgstr "Clave foránea (tipo determinado por el campo relacionado)"
+msgstr "Llave foránea (tipo determinado por el campo relacionado)"
 msgid "One-to-one relationship"
 msgstr "Relación uno-a-uno"
 #, python-format
 msgid "%(from)s-%(to)s relationship"
 msgstr "relación %(from)s-%(to)s"
 #, python-format
 msgid "%(from)s-%(to)s relationships"
 msgstr "relaciones %(from)s-%(to)s"
 msgid "Many-to-many relationship"
 msgstr "Relación muchos-a-muchos"
 #. Translators: If found as last label character, these punctuation
 #. characters will prevent the default label_suffix to be appended to the
 #. label
 msgid ":?.!"
 msgstr ":?.!"
 msgid "This field is required."
 msgstr "Este campo es obligatorio."
@ -656,6 +585,28 @@ msgstr "Introduzca un número entero."
 msgid "Enter a number."
 msgstr "Introduzca un número."
 #, python-format
 msgid "Ensure that there are no more than %(max)s digit in total."
 msgid_plural "Ensure that there are no more than %(max)s digits in total."
 msgstr[0] "Asegúrese de que no hay más de %(max)s dígito en total."
 msgstr[1] "Asegúrese de que no hay más de %(max)s dígitos en total."
 #, python-format
 msgid "Ensure that there are no more than %(max)s decimal place."
 msgid_plural "Ensure that there are no more than %(max)s decimal places."
 msgstr[0] "Asegúrese de que no haya más de %(max)s dígito decimal."
 msgstr[1] "Asegúrese de que no haya más de %(max)s dígitos decimales."
 #, python-format
 msgid ""
 "Ensure that there are no more than %(max)s digit before the decimal point."
 msgid_plural ""
 "Ensure that there are no more than %(max)s digits before the decimal point."
 msgstr[0] ""
 "Asegúrese de que no haya más de %(max)s dígito antes del punto decimal"
 msgstr[1] ""
 "Asegúrese de que no haya más de %(max)s dígitos antes del punto decimal."
 msgid "Enter a valid date."
 msgstr "Introduzca una fecha válida."
@ -721,22 +672,28 @@ msgstr ":"
 #, python-format
 msgid "(Hidden field %(name)s) %(error)s"
-msgstr "(Campo oculto %(name)s) *%(error)s"
+msgstr "(Compo oculto %(name)s) *%(error)s"
 #. Translators: If found as last label character, these punctuation
 #. characters will prevent the default label_suffix to be appended to the
 #. label
 msgid ":?.!"
 msgstr ":?.!"
 msgid "ManagementForm data is missing or has been tampered with"
-msgstr "Los datos de ManagementForm faltan o han sido manipulados"
+msgstr "Datos ManagementForm falta o ha sido manipulado"
 #, python-format
 msgid "Please submit %d or fewer forms."
 msgid_plural "Please submit %d or fewer forms."
-msgstr[0] "Por favor, envíe %d formulario o menos."
+msgstr[0] "Por favor, envíe %d o menos formas."
-msgstr[1] "Por favor, envíe %d formularios o menos"
+msgstr[1] "Por favor, envíe %d o menos formas."
 #, python-format
 msgid "Please submit %d or more forms."
 msgid_plural "Please submit %d or more forms."
-msgstr[0] "Por favor, envíe %d formulario o más."
+msgstr[0] "Por favor, envíe %d o más formas."
-msgstr[1] "Por favor, envíe %d formularios o más."
+msgstr[1] "Por favor, envíe %d o más formas."
 msgid "Order"
 msgstr "Orden"
@ -751,14 +708,14 @@ msgstr "Por favor, corrija el dato duplicado para %(field)s."
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr ""
-"Por favor corrija el dato duplicado para %(field)s, ya que debe ser único."
+"Por favor corriga el dato duplicado para %(field)s, el cual debe ser único."
 #, python-format
 msgid ""
 "Please correct the duplicate data for %(field_name)s which must be unique "
 "for the %(lookup)s in %(date_field)s."
 msgstr ""
-"Por favor corrija los datos duplicados para %(field_name)s ya que debe ser "
+"Por favor corriga los datos duplicados para %(field_name)s el cual debe ser "
 "único para %(lookup)s en %(date_field)s."
 msgid "Please correct the duplicate values below."
@ -784,15 +741,15 @@ msgstr ""
 "%(datetime)s no puede interpretarse en la zona temporal "
 "%(current_timezone)s; puede ser ambiguo o puede no existir."
 msgid "Clear"
 msgstr "Limpiar"
 msgid "Currently"
 msgstr "Actualmente"
 msgid "Change"
 msgstr "Modificar"
 msgid "Clear"
 msgstr "Limpiar"
 msgid "Unknown"
 msgstr "Desconocido"
@ -937,7 +894,7 @@ msgid "mar"
 msgstr "mar"
 msgid "apr"
-msgstr "abr"
+msgstr "apr"
 msgid "may"
 msgstr "may"
@ -1060,7 +1017,7 @@ msgid "December"
 msgstr "Diciembre"
 msgid "This is not a valid IPv6 address."
-msgstr "Esta no es una dirección IPv6 válida."
+msgstr "Esto no es una dirección IPv6 válida."
 #, python-format
 msgctxt "String to return when truncating text"
@ -1117,7 +1074,7 @@ msgid "Forbidden"
 msgstr "Prohibido"
 msgid "CSRF verification failed. Request aborted."
-msgstr "Verificación CSRF fallida. Solicitud abortada"
+msgstr "CSRF verificacion fallida. Solicitud abortada"
 msgid ""
 "You are seeing this message because this HTTPS site requires a 'Referer "
@ -1168,11 +1125,12 @@ msgid "Congratulations on your first Django-powered page."
 msgstr "Enhorabuena por tu primer página hecha en Django."
 msgid ""
-"Next, start your first app by running <code>python manage.py startapp "
+"Of course, you haven't actually done any work yet. Next, start your first "
-"[app_label]</code>."
+"app by running <code>python manage.py startapp [app_label]</code>."
 msgstr ""
-"Seguidamente, inicie su primera aplicación ejecutando <code>python manage.py "
+"Por supuesto, todavía no has hecho ningún trabajo. Para continuar, inicia tu "
-"startapp [app_label]</code>."
+"primera aplicación ejecutando <code>python manage.py startapp [app_label]</"
 "code>."
 msgid ""
 "You're seeing this message because you have <code>DEBUG = True</code> in "
--- a/django/conf/locale/es/formats.py
+++ b/django/conf/locale/es/formats.py
@ -16,18 +16,18 @@ FIRST_DAY_OF_WEEK = 1  # Monday
 # The *_INPUT_FORMATS strings use the Python strftime format syntax,
 # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
-DATE_INPUT_FORMATS = [
+DATE_INPUT_FORMATS = (
    # '31/12/2009', '31/12/09'
    '%d/%m/%Y', '%d/%m/%y'
-]
+)
-DATETIME_INPUT_FORMATS = [
+DATETIME_INPUT_FORMATS = (
    '%d/%m/%Y %H:%M:%S',
    '%d/%m/%Y %H:%M:%S.%f',
    '%d/%m/%Y %H:%M',
    '%d/%m/%y %H:%M:%S',
    '%d/%m/%y %H:%M:%S.%f',
    '%d/%m/%y %H:%M',
-]
+)
 DECIMAL_SEPARATOR = ','
 THOUSAND_SEPARATOR = '.'
 NUMBER_GROUPING = 3
--- a/django/conf/locale/es_AR/LC_MESSAGES/django.mo
+++ b/django/conf/locale/es_AR/LC_MESSAGES/django.mo
--- a/django/conf/locale/es_AR/LC_MESSAGES/django.po
+++ b/django/conf/locale/es_AR/LC_MESSAGES/django.po
@ -4,16 +4,16 @@
 # Jannis Leidel <jannis@leidel.info>, 2011
 # lardissone <lardissone@gmail.com>, 2014
 # poli <poli@devartis.com>, 2014
-# Ramiro Morales, 2013-2017
+# Ramiro Morales, 2013-2015
 msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-19 16:49+0100\n"
+"POT-Creation-Date: 2015-03-18 09:16+0100\n"
-"PO-Revision-Date: 2017-02-23 14:26+0000\n"
+"PO-Revision-Date: 2015-03-24 00:31+0000\n"
 "Last-Translator: Ramiro Morales\n"
-"Language-Team: Spanish (Argentina) (http://www.transifex.com/django/django/"
+"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/"
-"language/es_AR/)\n"
+"django/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@ -62,9 +62,6 @@ msgstr "danés"
 msgid "German"
 msgstr "alemán"
 msgid "Lower Sorbian"
 msgstr "bajo sorabo"
 msgid "Greek"
 msgstr "griego"
@ -84,19 +81,16 @@ msgid "Spanish"
 msgstr "español"
 msgid "Argentinian Spanish"
-msgstr "español (Argentina)"
+msgstr "español de Argentina"
 msgid "Colombian Spanish"
 msgstr "español (Colombia)"
 msgid "Mexican Spanish"
-msgstr "español (México)"
+msgstr "Español de México"
 msgid "Nicaraguan Spanish"
-msgstr "español (Nicaragua)"
+msgstr "Español (Nicaragua)"
 msgid "Venezuelan Spanish"
-msgstr "español (Venezuela)"
+msgstr "español de Venezuela"
 msgid "Estonian"
 msgstr "estonio"
@ -119,9 +113,6 @@ msgstr "frisón"
 msgid "Irish"
 msgstr "irlandés"
 msgid "Scottish Gaelic"
 msgstr "gaélico escocés"
 msgid "Galician"
 msgstr "gallego"
@ -134,9 +125,6 @@ msgstr "hindi"
 msgid "Croatian"
 msgstr "croata"
 msgid "Upper Sorbian"
 msgstr "alto sorabo"
 msgid "Hungarian"
 msgstr "húngaro"
@ -197,8 +185,8 @@ msgstr "maratí"
 msgid "Burmese"
 msgstr "burmés"
-msgid "Norwegian Bokmål"
+msgid "Norwegian Bokmal"
-msgstr "bokmål noruego"
+msgstr "bokmål"
 msgid "Nepali"
 msgstr "nepalés"
@ -243,7 +231,7 @@ msgid "Serbian"
 msgstr "serbio"
 msgid "Serbian Latin"
-msgstr "latín de Serbia"
+msgstr "Latín de Serbia"
 msgid "Swedish"
 msgstr "sueco"
@ -296,14 +284,8 @@ msgstr "Archivos estáticos"
 msgid "Syndication"
 msgstr "Sindicación"
-msgid "That page number is not an integer"
+msgid "Web Design"
-msgstr "El número de página no es un entero"
+msgstr "Diseño Web"
 msgid "That page number is less than 1"
 msgstr "El número de página es menor a 1"
 msgid "That page contains no results"
 msgstr "Esa página no contiene resultados"
 msgid "Enter a valid value."
 msgstr "Introduzca un valor válido."
@ -319,19 +301,10 @@ msgstr "Introduzca una dirección de email válida."
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
-msgstr ""
+msgstr "Introduzca un 'slug' válido consistente de letras, números o guiones."
 "Introduzca un 'slug' válido consistente de letras, números, guiones bajos o "
 "guiones."
 msgid ""
 "Enter a valid 'slug' consisting of Unicode letters, numbers, underscores, or "
 "hyphens."
 msgstr ""
 "Introduzca un 'slug' válido consistente de letras Unicode, números, guiones "
 "bajos o guiones."
 msgid "Enter a valid IPv4 address."
-msgstr "Introduzca una dirección IPv4 válida."
+msgstr "Introduzca una dirección IPv4 válida"
 msgid "Enter a valid IPv6 address."
 msgstr "Introduzca una dirección IPv6 válida."
@ -384,36 +357,6 @@ msgstr[1] ""
 "Asegúrese de que este valor tenga como máximo %(limit_value)d caracteres "
 "(tiene %(show_value)d)."
 #, python-format
 msgid "Ensure that there are no more than %(max)s digit in total."
 msgid_plural "Ensure that there are no more than %(max)s digits in total."
 msgstr[0] "Asegúrese de que no exista en total mas de %(max)s dígito."
 msgstr[1] "Asegúrese de que no existan en total mas de %(max)s dígitos."
 #, python-format
 msgid "Ensure that there are no more than %(max)s decimal place."
 msgid_plural "Ensure that there are no more than %(max)s decimal places."
 msgstr[0] "Asegúrese de que no exista mas de %(max)s lugar decimal."
 msgstr[1] "Asegúrese de que no existan mas de %(max)s lugares decimales."
 #, python-format
 msgid ""
 "Ensure that there are no more than %(max)s digit before the decimal point."
 msgid_plural ""
 "Ensure that there are no more than %(max)s digits before the decimal point."
 msgstr[0] ""
 "Asegúrese de que no exista mas de %(max)s dígito antes del punto decimal."
 msgstr[1] ""
 "Asegúrese de que no existan mas de %(max)s dígitos antes del punto decimal."
 #, python-format
 msgid ""
 "File extension '%(extension)s' is not allowed. Allowed extensions are: "
 "'%(allowed_extensions)s'."
 msgstr ""
 "La extensión de archivo '%(extension)s' no está permitida. Las extensiones "
 "aceptadas son: '%(allowed_extensions)s'."
 msgid "and"
 msgstr "y"
@ -455,9 +398,6 @@ msgstr "Entero"
 msgid "'%(value)s' value must be an integer."
 msgstr "El valor de '%(value)s' debe ser un número entero."
 msgid "Big (8 byte) integer"
 msgstr "Entero grande (8 bytes)"
 #, python-format
 msgid "'%(value)s' value must be either True or False."
 msgstr "El valor de '%(value)s' debe ser Verdadero o Falso."
@ -541,6 +481,9 @@ msgstr "El valor de '%(value)s' debe ser un número de coma flotante."
 msgid "Floating point number"
 msgstr "Número de punto flotante"
 msgid "Big (8 byte) integer"
 msgstr "Entero grande (8 bytes)"
 msgid "IPv4 address"
 msgstr "Dirección IPv4"
@ -615,23 +558,9 @@ msgstr "Clave foránea (el tipo está determinado por el campo relacionado)"
 msgid "One-to-one relationship"
 msgstr "Relación uno-a-uno"
 #, python-format
 msgid "%(from)s-%(to)s relationship"
 msgstr "relación %(from)s-%(to)s"
 #, python-format
 msgid "%(from)s-%(to)s relationships"
 msgstr "relaciones %(from)s-%(to)s"
 msgid "Many-to-many relationship"
 msgstr "Relación muchos-a-muchos"
 #. Translators: If found as last label character, these punctuation
 #. characters will prevent the default label_suffix to be appended to the
 #. label
 msgid ":?.!"
 msgstr ":?.!"
 msgid "This field is required."
 msgstr "Este campo es obligatorio."
@ -641,6 +570,28 @@ msgstr "Introduzca un número entero."
 msgid "Enter a number."
 msgstr "Introduzca un número."
 #, python-format
 msgid "Ensure that there are no more than %(max)s digit in total."
 msgid_plural "Ensure that there are no more than %(max)s digits in total."
 msgstr[0] "Asegúrese de que no exista en total mas de %(max)s dígito."
 msgstr[1] "Asegúrese de que no existan en total mas de %(max)s dígitos."
 #, python-format
 msgid "Ensure that there are no more than %(max)s decimal place."
 msgid_plural "Ensure that there are no more than %(max)s decimal places."
 msgstr[0] "Asegúrese de que no exista mas de %(max)s lugar decimal."
 msgstr[1] "Asegúrese de que no existan mas de %(max)s lugares decimales."
 #, python-format
 msgid ""
 "Ensure that there are no more than %(max)s digit before the decimal point."
 msgid_plural ""
 "Ensure that there are no more than %(max)s digits before the decimal point."
 msgstr[0] ""
 "Asegúrese de que no exista mas de %(max)s dígito antes del punto decimal."
 msgstr[1] ""
 "Asegúrese de que no existan mas de %(max)s dígitos antes del punto decimal."
 msgid "Enter a valid date."
 msgstr "Introduzca una fecha válida."
@ -707,6 +658,12 @@ msgstr ":"
 msgid "(Hidden field %(name)s) %(error)s"
 msgstr "(Campo oculto %(name)s) %(error)s"
 #. Translators: If found as last label character, these punctuation
 #. characters will prevent the default label_suffix to be appended to the
 #. label
 msgid ":?.!"
 msgstr ":?.!"
 msgid "ManagementForm data is missing or has been tampered with"
 msgstr ""
 "Los datos correspondientes al ManagementForm no existen o han sido "
@ -721,8 +678,8 @@ msgstr[1] "Por favor envíe un máximo de %d formularios."
 #, python-format
 msgid "Please submit %d or more forms."
 msgid_plural "Please submit %d or more forms."
-msgstr[0] "Por favor envíe %d o mas formularios."
+msgstr[0] "Por favor envíe un máximo de %d formularios."
-msgstr[1] "Por favor envíe %d o mas formularios."
+msgstr[1] "Por favor envíe un máximo de %d formularios."
 msgid "Order"
 msgstr "Ordenar"
@ -772,15 +729,15 @@ msgstr ""
 "%(datetime)s no puede ser interpretado en la zona horaria "
 "%(current_timezone)s; ya que podría ser ambiguo o podría no existir."
 msgid "Clear"
 msgstr "Eliminar"
 msgid "Currently"
 msgstr "Actualmente"
 msgid "Change"
 msgstr "Modificar"
 msgid "Clear"
 msgstr "Eliminar"
 msgid "Unknown"
 msgstr "Desconocido"
@ -1159,17 +1116,17 @@ msgid "Congratulations on your first Django-powered page."
 msgstr "Felicitationes por tu primera página Django-powered."
 msgid ""
-"Next, start your first app by running <code>python manage.py startapp "
+"Of course, you haven't actually done any work yet. Next, start your first "
-"[app_label]</code>."
+"app by running <code>python manage.py startapp [app_label]</code>."
 msgstr ""
-"A continuación cree su primera aplicación ejecutando <code>python manage.py "
+"Obviamente en realidad todavia no has hecho nada. Ahora crea tu primera "
-"startapp [app_label]</code>."
+"aplicación ejecutando <code>python manage.py startapp [app_label]</code>."
 msgid ""
 "You're seeing this message because you have <code>DEBUG = True</code> in "
 "your Django settings file and you haven't configured any URLs. Get to work!"
 msgstr ""
-"Estás viendo este mensaje porque tienes <code>DEBUG = True</code> en tu "
+"Estás viendo este mensaje porque tienes <code>DEBUG = true</code> en tu "
 "archivo de settings Django y porque no has configurado ninguna URL. ¡A "
 "trabajar!"
--- a/django/conf/locale/es_AR/formats.py
+++ b/django/conf/locale/es_AR/formats.py
@ -16,18 +16,18 @@ FIRST_DAY_OF_WEEK = 0  # 0: Sunday, 1: Monday
 # The *_INPUT_FORMATS strings use the Python strftime format syntax,
 # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
-DATE_INPUT_FORMATS = [
+DATE_INPUT_FORMATS = (
    '%d/%m/%Y',  # '31/12/2009'
    '%d/%m/%y',  # '31/12/09'
-]
+)
-DATETIME_INPUT_FORMATS = [
+DATETIME_INPUT_FORMATS = (
    '%d/%m/%Y %H:%M:%S',
    '%d/%m/%Y %H:%M:%S.%f',
    '%d/%m/%Y %H:%M',
    '%d/%m/%y %H:%M:%S',
    '%d/%m/%y %H:%M:%S.%f',
    '%d/%m/%y %H:%M',
-]
+)
 DECIMAL_SEPARATOR = ','
 THOUSAND_SEPARATOR = '.'
 NUMBER_GROUPING = 3
--- a/django/conf/locale/es_CO/LC_MESSAGES/django.mo
+++ b/django/conf/locale/es_CO/LC_MESSAGES/django.mo
--- a/django/conf/locale/es_CO/formats.py
+++ b/django/conf/locale/es_CO/formats.py
@ -1,29 +0,0 @@
 # -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
 from __future__ import unicode_literals
 DATE_FORMAT = r'j \d\e F \d\e Y'
 TIME_FORMAT = 'H:i'
 DATETIME_FORMAT = r'j \d\e F \d\e Y \a \l\a\s H:i'
 YEAR_MONTH_FORMAT = r'F \d\e Y'
 MONTH_DAY_FORMAT = r'j \d\e F'
 SHORT_DATE_FORMAT = 'd/m/Y'
 SHORT_DATETIME_FORMAT = 'd/m/Y H:i'
 FIRST_DAY_OF_WEEK = 1
 DATE_INPUT_FORMATS = [
    '%d/%m/%Y', '%d/%m/%y',  # '25/10/2006', '25/10/06'
    '%Y%m%d',                # '20061025'
 ]
 DATETIME_INPUT_FORMATS = [
    '%d/%m/%Y %H:%M:%S',
    '%d/%m/%Y %H:%M:%S.%f',
    '%d/%m/%Y %H:%M',
    '%d/%m/%y %H:%M:%S',
    '%d/%m/%y %H:%M:%S.%f',
    '%d/%m/%y %H:%M',
 ]
 DECIMAL_SEPARATOR = ','
 THOUSAND_SEPARATOR = '.'
 NUMBER_GROUPING = 3
--- a/django/conf/locale/es_MX/LC_MESSAGES/django.mo
+++ b/django/conf/locale/es_MX/LC_MESSAGES/django.mo
--- a/django/conf/locale/es_MX/LC_MESSAGES/django.po
+++ b/django/conf/locale/es_MX/LC_MESSAGES/django.po
@ -7,10 +7,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-29 20:57+0200\n"
+"POT-Creation-Date: 2015-03-18 09:16+0100\n"
-"PO-Revision-Date: 2016-06-30 08:31+0000\n"
+"PO-Revision-Date: 2015-03-18 08:44+0000\n"
 "Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: Spanish (Mexico) (http://www.transifex.com/django/django/"
+"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/django/"
 "language/es_MX/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@ -60,9 +60,6 @@ msgstr "Danés"
 msgid "German"
 msgstr "Alemán"
 msgid "Lower Sorbian"
 msgstr ""
 msgid "Greek"
 msgstr "Griego"
@ -84,9 +81,6 @@ msgstr "Español"
 msgid "Argentinian Spanish"
 msgstr "Español de Argentina"
 msgid "Colombian Spanish"
 msgstr ""
 msgid "Mexican Spanish"
 msgstr "Español de México"
@ -117,9 +111,6 @@ msgstr "Frisón"
 msgid "Irish"
 msgstr "Irlandés"
 msgid "Scottish Gaelic"
 msgstr ""
 msgid "Galician"
 msgstr "Gallego"
@ -132,9 +123,6 @@ msgstr "Hindi"
 msgid "Croatian"
 msgstr "Croata"
 msgid "Upper Sorbian"
 msgstr ""
 msgid "Hungarian"
 msgstr "Húngaro"
@ -195,8 +183,8 @@ msgstr ""
 msgid "Burmese"
 msgstr "burmés"
-msgid "Norwegian Bokmål"
+msgid "Norwegian Bokmal"
-msgstr ""
+msgstr "Noruego Bokmal"
 msgid "Nepali"
 msgstr "Nepal"
@ -294,6 +282,9 @@ msgstr ""
 msgid "Syndication"
 msgstr ""
 msgid "Web Design"
 msgstr ""
 msgid "Enter a valid value."
 msgstr "Introduzca un valor válido."
@ -312,11 +303,6 @@ msgstr ""
 "Introduzca un \"slug\", compuesto por letras, números, guiones bajos o "
 "medios."
 msgid ""
 "Enter a valid 'slug' consisting of Unicode letters, numbers, underscores, or "
 "hyphens."
 msgstr ""
 msgid "Enter a valid IPv4 address."
 msgstr "Introduzca una dirección IPv4 válida."
@ -365,26 +351,6 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 #, python-format
 msgid "Ensure that there are no more than %(max)s digit in total."
 msgid_plural "Ensure that there are no more than %(max)s digits in total."
 msgstr[0] ""
 msgstr[1] ""
 #, python-format
 msgid "Ensure that there are no more than %(max)s decimal place."
 msgid_plural "Ensure that there are no more than %(max)s decimal places."
 msgstr[0] ""
 msgstr[1] ""
 #, python-format
 msgid ""
 "Ensure that there are no more than %(max)s digit before the decimal point."
 msgid_plural ""
 "Ensure that there are no more than %(max)s digits before the decimal point."
 msgstr[0] ""
 msgstr[1] ""
 msgid "and"
 msgstr "y"
@ -424,9 +390,6 @@ msgstr "Entero"
 msgid "'%(value)s' value must be an integer."
 msgstr ""
 msgid "Big (8 byte) integer"
 msgstr "Entero grande (8 bytes)"
 #, python-format
 msgid "'%(value)s' value must be either True or False."
 msgstr ""
@ -500,6 +463,9 @@ msgstr ""
 msgid "Floating point number"
 msgstr "Número de punto flotante"
 msgid "Big (8 byte) integer"
 msgstr "Entero grande (8 bytes)"
 msgid "IPv4 address"
 msgstr "Dirección IPv4"
@ -570,23 +536,9 @@ msgstr "Clave foránea (el tipo está determinado por el campo relacionado)"
 msgid "One-to-one relationship"
 msgstr "Relación uno-a-uno"
 #, python-format
 msgid "%(from)s-%(to)s relationship"
 msgstr ""
 #, python-format
 msgid "%(from)s-%(to)s relationships"
 msgstr ""
 msgid "Many-to-many relationship"
 msgstr "Relación muchos-a-muchos"
 #. Translators: If found as last label character, these punctuation
 #. characters will prevent the default label_suffix to be appended to the
 #. label
 msgid ":?.!"
 msgstr ":?.!"
 msgid "This field is required."
 msgstr "Este campo es obligatorio."
@ -596,6 +548,26 @@ msgstr "Introduzca un número entero."
 msgid "Enter a number."
 msgstr "Introduzca un número."
 #, python-format
 msgid "Ensure that there are no more than %(max)s digit in total."
 msgid_plural "Ensure that there are no more than %(max)s digits in total."
 msgstr[0] ""
 msgstr[1] ""
 #, python-format
 msgid "Ensure that there are no more than %(max)s decimal place."
 msgid_plural "Ensure that there are no more than %(max)s decimal places."
 msgstr[0] ""
 msgstr[1] ""
 #, python-format
 msgid ""
 "Ensure that there are no more than %(max)s digit before the decimal point."
 msgid_plural ""
 "Ensure that there are no more than %(max)s digits before the decimal point."
 msgstr[0] ""
 msgstr[1] ""
 msgid "Enter a valid date."
 msgstr "Introduzca una fecha válida."
@ -658,6 +630,12 @@ msgstr ":"
 msgid "(Hidden field %(name)s) %(error)s"
 msgstr ""
 #. Translators: If found as last label character, these punctuation
 #. characters will prevent the default label_suffix to be appended to the
 #. label
 msgid ":?.!"
 msgstr ":?.!"
 msgid "ManagementForm data is missing or has been tampered with"
 msgstr ""
--- a/django/conf/locale/es_MX/formats.py
+++ b/django/conf/locale/es_MX/formats.py
@ -11,18 +11,18 @@ MONTH_DAY_FORMAT = r'j \d\e F'
 SHORT_DATE_FORMAT = 'd/m/Y'
 SHORT_DATETIME_FORMAT = 'd/m/Y H:i'
 FIRST_DAY_OF_WEEK = 1  # Monday: ISO 8601
-DATE_INPUT_FORMATS = [
+DATE_INPUT_FORMATS = (
    '%d/%m/%Y', '%d/%m/%y',             # '25/10/2006', '25/10/06'
    '%Y%m%d',                           # '20061025'
-]
+)
-DATETIME_INPUT_FORMATS = [
+DATETIME_INPUT_FORMATS = (
    '%d/%m/%Y %H:%M:%S',
    '%d/%m/%Y %H:%M:%S.%f',
    '%d/%m/%Y %H:%M',
    '%d/%m/%y %H:%M:%S',
    '%d/%m/%y %H:%M:%S.%f',
    '%d/%m/%y %H:%M',
-]
+)
 DECIMAL_SEPARATOR = '.'   # ',' is also official (less common): NOM-008-SCFI-2002
 THOUSAND_SEPARATOR = '\xa0'  # non-breaking space
 NUMBER_GROUPING = 3
--- a/django/conf/locale/es_NI/formats.py
+++ b/django/conf/locale/es_NI/formats.py
@ -11,19 +11,19 @@ MONTH_DAY_FORMAT = r'j \d\e F'
 SHORT_DATE_FORMAT = 'd/m/Y'
 SHORT_DATETIME_FORMAT = 'd/m/Y H:i'
 FIRST_DAY_OF_WEEK = 1  # Monday: ISO 8601
-DATE_INPUT_FORMATS = [
+DATE_INPUT_FORMATS = (
    '%d/%m/%Y', '%d/%m/%y',            # '25/10/2006', '25/10/06'
    '%Y%m%d',                          # '20061025'
-]
+)
-DATETIME_INPUT_FORMATS = [
+DATETIME_INPUT_FORMATS = (
    '%d/%m/%Y %H:%M:%S',
    '%d/%m/%Y %H:%M:%S.%f',
    '%d/%m/%Y %H:%M',
    '%d/%m/%y %H:%M:%S',
    '%d/%m/%y %H:%M:%S.%f',
    '%d/%m/%y %H:%M',
-]
+)
 DECIMAL_SEPARATOR = '.'
 THOUSAND_SEPARATOR = ','
 NUMBER_GROUPING = 3
--- a/django/conf/locale/es_PR/formats.py
+++ b/django/conf/locale/es_PR/formats.py
@ -12,18 +12,18 @@ SHORT_DATE_FORMAT = 'd/m/Y'
 SHORT_DATETIME_FORMAT = 'd/m/Y H:i'
 FIRST_DAY_OF_WEEK = 0  # Sunday
-DATE_INPUT_FORMATS = [
+DATE_INPUT_FORMATS = (
    # '31/12/2009', '31/12/09'
    '%d/%m/%Y', '%d/%m/%y'
-]
+)
-DATETIME_INPUT_FORMATS = [
+DATETIME_INPUT_FORMATS = (
    '%d/%m/%Y %H:%M:%S',
    '%d/%m/%Y %H:%M:%S.%f',
    '%d/%m/%Y %H:%M',
    '%d/%m/%y %H:%M:%S',
    '%d/%m/%y %H:%M:%S.%f',
    '%d/%m/%y %H:%M',
-]
+)
 DECIMAL_SEPARATOR = '.'
 THOUSAND_SEPARATOR = ','
--- a/django/conf/locale/es_VE/LC_MESSAGES/django.mo
+++ b/django/conf/locale/es_VE/LC_MESSAGES/django.mo
--- a/django/conf/locale/es_VE/LC_MESSAGES/django.po
+++ b/django/conf/locale/es_VE/LC_MESSAGES/django.po
--- a/django/conf/locale/et/LC_MESSAGES/django.mo
+++ b/django/conf/locale/et/LC_MESSAGES/django.mo
--- a/Show More
+++ b/Show More
		`@ -0,0 +1,3 @@`
							`from django.contrib import admin`

							`# Register your models here.`
		`@ -1,3 +0,0 @@`
			`{{ unicode_literals }}from django.contrib import admin`

			`# Register your models here.`
		`@ -0,0 +1,3 @@`
							`from django.db import models`

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

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

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

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

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

			`# Create your views here.`