Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge branch 'master' into schema-alteration

Conflicts:
	django/db/backends/__init__.py
	django/db/backends/mysql/base.py
	django/db/backends/oracle/base.py
	django/db/backends/oracle/creation.py
	django/db/backends/postgresql_psycopg2/base.py
	django/db/backends/sqlite3/base.py
	django/db/models/fields/related.py
  • Loading branch information...
commit 7f3678dc4cd7146c49bac3fb8f5211f647636aa3 2 parents b62e823 + 93c1576
Andrew Godwin authored April 18, 2013

Showing 97 changed files with 12,491 additions and 7,024 deletions. Show diff stats Hide diff stats

  1. 5  .tx/config
  2. 24  AUTHORS
  3. 9  CONTRIBUTING.rst
  4. 1  MANIFEST.in
  5. 2  django/bin/daily_cleanup.py
  6. 64  django/conf/__init__.py
  7. 3  django/conf/app_template/admin.py
  8. 15  django/conf/app_template/tests.py
  9. 2  django/conf/app_template/views.py
  10. 24  django/conf/global_settings.py
  11. 131  django/conf/locale/__init__.py
  12. BIN  django/conf/locale/af/LC_MESSAGES/django.mo
  13. 1,263  django/conf/locale/af/LC_MESSAGES/django.po
  14. BIN  django/conf/locale/ar/LC_MESSAGES/django.mo
  15. 477  django/conf/locale/ar/LC_MESSAGES/django.po
  16. BIN  django/conf/locale/az/LC_MESSAGES/django.mo
  17. 541  django/conf/locale/az/LC_MESSAGES/django.po
  18. BIN  django/conf/locale/be/LC_MESSAGES/django.mo
  19. 1,261  django/conf/locale/be/LC_MESSAGES/django.po
  20. BIN  django/conf/locale/bg/LC_MESSAGES/django.mo
  21. 516  django/conf/locale/bg/LC_MESSAGES/django.po
  22. BIN  django/conf/locale/bn/LC_MESSAGES/django.mo
  23. 605  django/conf/locale/bn/LC_MESSAGES/django.po
  24. 1  django/conf/locale/bn/formats.py
  25. BIN  django/conf/locale/br/LC_MESSAGES/django.mo
  26. 1,259  django/conf/locale/br/LC_MESSAGES/django.po
  27. BIN  django/conf/locale/bs/LC_MESSAGES/django.mo
  28. 475  django/conf/locale/bs/LC_MESSAGES/django.po
  29. 1  django/conf/locale/bs/formats.py
  30. BIN  django/conf/locale/ca/LC_MESSAGES/django.mo
  31. 490  django/conf/locale/ca/LC_MESSAGES/django.po
  32. 3  django/conf/locale/ca/formats.py
  33. BIN  django/conf/locale/cs/LC_MESSAGES/django.mo
  34. 500  django/conf/locale/cs/LC_MESSAGES/django.po
  35. 2  django/conf/locale/cs/formats.py
  36. BIN  django/conf/locale/cy/LC_MESSAGES/django.mo
  37. 585  django/conf/locale/cy/LC_MESSAGES/django.po
  38. 1  django/conf/locale/cy/formats.py
  39. BIN  django/conf/locale/da/LC_MESSAGES/django.mo
  40. 653  django/conf/locale/da/LC_MESSAGES/django.po
  41. 2  django/conf/locale/da/formats.py
  42. BIN  django/conf/locale/de/LC_MESSAGES/django.mo
  43. 489  django/conf/locale/de/LC_MESSAGES/django.po
  44. 2  django/conf/locale/de/formats.py
  45. 1  django/conf/locale/de_CH/formats.py
  46. BIN  django/conf/locale/el/LC_MESSAGES/django.mo
  47. 497  django/conf/locale/el/LC_MESSAGES/django.po
  48. 1  django/conf/locale/el/formats.py
  49. BIN  django/conf/locale/en/LC_MESSAGES/django.mo
  50. 485  django/conf/locale/en/LC_MESSAGES/django.po
  51. 4  django/conf/locale/en/formats.py
  52. BIN  django/conf/locale/en_GB/LC_MESSAGES/django.mo
  53. 487  django/conf/locale/en_GB/LC_MESSAGES/django.po
  54. 4  django/conf/locale/en_GB/formats.py
  55. BIN  django/conf/locale/eo/LC_MESSAGES/django.mo
  56. 610  django/conf/locale/eo/LC_MESSAGES/django.po
  57. BIN  django/conf/locale/es/LC_MESSAGES/django.mo
  58. 765  django/conf/locale/es/LC_MESSAGES/django.po
  59. 3  django/conf/locale/es/formats.py
  60. BIN  django/conf/locale/es_AR/LC_MESSAGES/django.mo
  61. 489  django/conf/locale/es_AR/LC_MESSAGES/django.po
  62. 3  django/conf/locale/es_AR/formats.py
  63. BIN  django/conf/locale/es_MX/LC_MESSAGES/django.mo
  64. 485  django/conf/locale/es_MX/LC_MESSAGES/django.po
  65. 2  django/conf/locale/es_MX/formats.py
  66. 3  django/conf/locale/es_NI/formats.py
  67. 0  django/{contrib/databrowse/plugins → conf/locale/es_PR}/__init__.py
  68. 30  django/conf/locale/es_PR/formats.py
  69. BIN  django/conf/locale/es_VE/LC_MESSAGES/django.mo
  70. 1,229  django/conf/locale/es_VE/LC_MESSAGES/django.po
  71. BIN  django/conf/locale/et/LC_MESSAGES/django.mo
  72. 477  django/conf/locale/et/LC_MESSAGES/django.po
  73. BIN  django/conf/locale/eu/LC_MESSAGES/django.mo
  74. 565  django/conf/locale/eu/LC_MESSAGES/django.po
  75. 1  django/conf/locale/eu/formats.py
  76. BIN  django/conf/locale/fa/LC_MESSAGES/django.mo
  77. 537  django/conf/locale/fa/LC_MESSAGES/django.po
  78. BIN  django/conf/locale/fi/LC_MESSAGES/django.mo
  79. 477  django/conf/locale/fi/LC_MESSAGES/django.po
  80. BIN  django/conf/locale/fr/LC_MESSAGES/django.mo
  81. 500  django/conf/locale/fr/LC_MESSAGES/django.po
  82. 2  django/conf/locale/fr/formats.py
  83. BIN  django/conf/locale/fy_NL/LC_MESSAGES/django.mo
  84. 471  django/conf/locale/fy_NL/LC_MESSAGES/django.po
  85. 1  django/conf/locale/fy_NL/formats.py
  86. BIN  django/conf/locale/ga/LC_MESSAGES/django.mo
  87. 479  django/conf/locale/ga/LC_MESSAGES/django.po
  88. 1  django/conf/locale/ga/formats.py
  89. BIN  django/conf/locale/gl/LC_MESSAGES/django.mo
  90. 512  django/conf/locale/gl/LC_MESSAGES/django.po
  91. BIN  django/conf/locale/he/LC_MESSAGES/django.mo
  92. 497  django/conf/locale/he/LC_MESSAGES/django.po
  93. BIN  django/conf/locale/hi/LC_MESSAGES/django.mo
  94. 490  django/conf/locale/hi/LC_MESSAGES/django.po
  95. 1  django/conf/locale/hi/formats.py
  96. BIN  django/conf/locale/hr/LC_MESSAGES/django.mo
5  .tx/config
@@ -57,11 +57,6 @@ file_filter = django/contrib/humanize/locale/<lang>/LC_MESSAGES/django.po
57 57
 source_file = django/contrib/humanize/locale/en/LC_MESSAGES/django.po
58 58
 source_lang = en
59 59
 
60  
-[django.contrib-localflavor]
61  
-file_filter = django/contrib/localflavor/locale/<lang>/LC_MESSAGES/django.po
62  
-source_file = django/contrib/localflavor/locale/en/LC_MESSAGES/django.po
63  
-source_lang = en
64  
-
65 60
 [django.contrib-messages]
66 61
 file_filter = django/contrib/messages/locale/<lang>/LC_MESSAGES/django.po
67 62
 source_file = django/contrib/messages/locale/en/LC_MESSAGES/django.po
24  AUTHORS
@@ -34,6 +34,8 @@ The PRIMARY AUTHORS are (and/or have been):
34 34
     * Jeremy Dunck
35 35
     * Bryan Veloso
36 36
     * Preston Holmes
  37
+    * Simon Charette
  38
+    * Donald Stufft
37 39
 
38 40
 More information on the main contributors to Django can be found in
39 41
 docs/internals/committers.txt.
@@ -97,7 +99,9 @@ answer newbie questions, and generally made Django that much better:
97 99
     Natalia Bidart <nataliabidart@gmail.com>
98 100
     Mark Biggers <biggers@utsl.com>
99 101
     Paul Bissex <http://e-scribe.com/>
  102
+    Loïc Bistuer <loic.bistuer@sixmedia.com>
100 103
     Simon Blanchard
  104
+    Craig Blaszczyk <masterjakul@gmail.com>
101 105
     David Blewett <david@dawninglight.net>
102 106
     Matt Boersma <matt@sprout.org>
103 107
     Artem Gnilov <boobsd@gmail.com>
@@ -140,7 +144,10 @@ answer newbie questions, and generally made Django that much better:
140 144
     colin@owlfish.com
141 145
     crankycoder@gmail.com
142 146
     Paul Collier <paul@paul-collier.com>
  147
+    Paul Collins <paul.collins.iii@gmail.com>
143 148
     Robert Coup
  149
+    Deric Crago <deric.crago@gmail.com>
  150
+    David Cramer <dcramer@gmail.com>
144 151
     Pete Crosier <pete.crosier@gmail.com>
145 152
     Matt Croydon <http://www.postneo.com/>
146 153
     Jure Cuhalev <gandalf@owca.info>
@@ -162,6 +169,7 @@ answer newbie questions, and generally made Django that much better:
162 169
     Matt Dennenbaum
163 170
     deric@monowerks.com
164 171
     Max Derkachev <mderk@yandex.ru>
  172
+    Carlos Matías de la Torre <cmdelatorre@gmail.com>
165 173
     Rajesh Dhawan <rajesh.dhawan@gmail.com>
166 174
     Sander Dijkhuis <sander.dijkhuis@gmail.com>
167 175
     Jordan Dimov <s3x3y1@gmail.com>
@@ -202,6 +210,7 @@ answer newbie questions, and generally made Django that much better:
202 210
     Stefane Fermgier <sf@fermigier.com>
203 211
     J. Pablo Fernandez <pupeno@pupeno.com>
204 212
     Maciej Fijalkowski
  213
+    Juan Pedro Fisanotti <fisadev@gmail.com>
205 214
     Ben Firshman <ben@firshman.co.uk>
206 215
     Matthew Flanagan <http://wadofstuff.blogspot.com>
207 216
     Eric Floehr <eric@intellovations.com>
@@ -303,6 +312,7 @@ answer newbie questions, and generally made Django that much better:
303 312
     Garth Kidd <http://www.deadlybloodyserious.com/>
304 313
     kilian <kilian.cavalotti@lip6.fr>
305 314
     Sune Kirkeby <http://ibofobi.dk/>
  315
+    Hiroki Kiyohara <hirokiky@gmail.com>
306 316
     Bastian Kleineidam <calvin@debian.org>
307 317
     Cameron Knight (ckknight)
308 318
     Nena Kojadin <nena@kiberpipa.org>
@@ -324,6 +334,7 @@ answer newbie questions, and generally made Django that much better:
324 334
     Denis Kuzmichyov <kuzmichyov@gmail.com>
325 335
     Panos Laganakos <panos.laganakos@gmail.com>
326 336
     Nick Lane <nick.lane.au@gmail.com>
  337
+    Łukasz Langa <lukasz@langa.pl>
327 338
     Stuart Langridge <http://www.kryogenix.org/>
328 339
     Paul Lanier <planier@google.com>
329 340
     David Larlet <http://david.larlet.fr>
@@ -358,6 +369,7 @@ answer newbie questions, and generally made Django that much better:
358 369
     Mike Malone <mjmalone@gmail.com>
359 370
     Martin Maney <http://www.chipy.org/Martin_Maney>
360 371
     Michael Manfre <mmanfre@gmail.com>
  372
+    Javier Mansilla <javimansilla@gmail.com>
361 373
     masonsimon+django@gmail.com
362 374
     Manuzhai
363 375
     Petr Marhoun <petr.marhoun@gmail.com>
@@ -378,6 +390,7 @@ answer newbie questions, and generally made Django that much better:
378 390
     Paul McLanahan <paul@mclanahan.net>
379 391
     Tobias McNulty <http://www.caktusgroup.com/blog>
380 392
     Andrews Medina <andrewsmedina@gmail.com>
  393
+    Christoph Mędrela <chris.medrela@gmail.com>
381 394
     Zain Memon
382 395
     Christian Metts
383 396
     michal@plovarna.cz
@@ -414,6 +427,7 @@ answer newbie questions, and generally made Django that much better:
414 427
     Christian Oudard <christian.oudard@gmail.com>
415 428
     oggie rob <oz.robharvey@gmail.com>
416 429
     oggy <ognjen.maric@gmail.com>
  430
+    Tomek Paczkowski <tomek@hauru.eu>
417 431
     Jens Page
418 432
     Jay Parlar <parlar@gmail.com>
419 433
     Carlos Eduardo de Paula <carlosedp@gmail.com>
@@ -423,6 +437,7 @@ answer newbie questions, and generally made Django that much better:
423 437
     Andreas Pelme <andreas@pelme.se>
424 438
     permonik@mesias.brnonet.cz
425 439
     peter@mymart.com
  440
+    Christophe Pettus <xof@thebuild.com>
426 441
     pgross@thoughtworks.com
427 442
     phaedo <http://phaedo.cx/>
428 443
     phil@produxion.net
@@ -461,6 +476,7 @@ answer newbie questions, and generally made Django that much better:
461 476
     Mike Richardson
462 477
     Matt Riggott
463 478
     Alex Robbins <alexander.j.robbins@gmail.com>
  479
+    Matt Robenolt <m@robenolt.com>
464 480
     Henrique Romano <onaiort@gmail.com>
465 481
     Armin Ronacher
466 482
     Daniel Roseman <http://roseman.org.uk/>
@@ -513,6 +529,7 @@ answer newbie questions, and generally made Django that much better:
513 529
     Johan C. Stöver <johan@nilling.nl>
514 530
     Nowell Strite <http://nowell.strite.org/>
515 531
     Thomas Stromberg <tstromberg@google.com>
  532
+    Hannes Struß <x@hannesstruss.de>
516 533
     Ben Sturmfels <ben@sturm.com.au>
517 534
     Travis Swicegood <travis@domain51.com>
518 535
     Pascal Varet
@@ -541,6 +558,7 @@ answer newbie questions, and generally made Django that much better:
541 558
     Tom Tobin
542 559
     Joe Topjian <http://joe.terrarum.net/geek/code/python/django/>
543 560
     torne-django@wolfpuppy.org.uk
  561
+    Matthew Tretter <m@tthewwithanm.com>
544 562
     Jeff Triplett <jeff.triplett@gmail.com>
545 563
     tstromberg@google.com
546 564
     Makoto Tsuyuki <mtsuyuki@gmail.com>
@@ -585,12 +603,13 @@ answer newbie questions, and generally made Django that much better:
585 603
     ye7cakf02@sneakemail.com
586 604
     ymasuda@ethercube.com
587 605
     Jesse Young <adunar@gmail.com>
  606
+    Marc Aymerich Gubern
  607
+    Wiktor Kołodziej <wiktor@pykonik.org>
588 608
     Mykola Zamkovoi <nickzam@gmail.com>
589 609
     zegor
590 610
     Gasper Zejn <zejn@kiberpipa.org>
591 611
     Jarek Zgoda <jarek.zgoda@gmail.com>
592 612
     Cheng Zhang
593  
-    Hannes Struß <x@hannesstruss.de>
594 613
 
595 614
 A big THANK YOU goes to:
596 615
 
@@ -601,6 +620,7 @@ A big THANK YOU goes to:
601 620
 
602 621
     Ian Bicking for convincing Adrian to ditch code generation.
603 622
 
604  
-    Mark Pilgrim for diveintopython.org. (RIP!)
  623
+    Mark Pilgrim for "Dive Into Python" (http://diveintopython.net,
  624
+    http://www.diveintopython3.net).
605 625
 
606 626
     Guido van Rossum for creating Python.
9  CONTRIBUTING.rst
Source Rendered
@@ -14,3 +14,12 @@ Extensive contribution guidelines are available in the repository at
14 14
 ``docs/internals/contributing/``, or online at:
15 15
 
16 16
 https://docs.djangoproject.com/en/dev/internals/contributing/
  17
+
  18
+**Warning: pull requests are ignored!** `File a ticket`__ to suggest changes.
  19
+
  20
+__ https://code.djangoproject.com/newticket
  21
+
  22
+Django uses Trac to keep track of bugs, feature requests, and associated
  23
+patches because GitHub doesn't provide adequate tooling for its community.
  24
+Patches can be submitted as pull requests, but if you don't file a ticket,
  25
+it's unlikely that we'll notice your contribution.
1  MANIFEST.in
@@ -19,7 +19,6 @@ recursive-include django/contrib/auth/fixtures *
19 19
 recursive-include django/contrib/auth/templates *
20 20
 recursive-include django/contrib/auth/tests/templates *
21 21
 recursive-include django/contrib/comments/templates *
22  
-recursive-include django/contrib/databrowse/templates *
23 22
 recursive-include django/contrib/formtools/templates *
24 23
 recursive-include django/contrib/formtools/tests/templates *
25 24
 recursive-include django/contrib/flatpages/fixtures *
2  django/bin/daily_cleanup.py
@@ -15,5 +15,5 @@
15 15
     warnings.warn(
16 16
         "The `daily_cleanup` script has been deprecated "
17 17
         "in favor of `django-admin.py clearsessions`.",
18  
-        PendingDeprecationWarning)
  18
+        DeprecationWarning)
19 19
     management.call_command('clearsessions')
64  django/conf/__init__.py
@@ -8,6 +8,7 @@
8 8
 
9 9
 import logging
10 10
 import os
  11
+import sys
11 12
 import time     # Needed for Windows
12 13
 import warnings
13 14
 
@@ -15,6 +16,7 @@
15 16
 from django.core.exceptions import ImproperlyConfigured
16 17
 from django.utils.functional import LazyObject, empty
17 18
 from django.utils import importlib
  19
+from django.utils.module_loading import import_by_path
18 20
 from django.utils import six
19 21
 
20 22
 ENVIRONMENT_VARIABLE = "DJANGO_SETTINGS_MODULE"
@@ -56,29 +58,25 @@ def _configure_logging(self):
56 58
         """
57 59
         Setup logging from LOGGING_CONFIG and LOGGING settings.
58 60
         """
59  
-        try:
60  
-            # Route warnings through python logging
61  
-            logging.captureWarnings(True)
62  
-            # Allow DeprecationWarnings through the warnings filters
63  
-            warnings.simplefilter("default", DeprecationWarning)
64  
-        except AttributeError:
65  
-            # No captureWarnings on Python 2.6, DeprecationWarnings are on anyway
66  
-            pass
  61
+        if not sys.warnoptions:
  62
+            try:
  63
+                # Route warnings through python logging
  64
+                logging.captureWarnings(True)
  65
+                # Allow DeprecationWarnings through the warnings filters
  66
+                warnings.simplefilter("default", DeprecationWarning)
  67
+            except AttributeError:
  68
+                # No captureWarnings on Python 2.6, DeprecationWarnings are on anyway
  69
+                pass
67 70
 
68 71
         if self.LOGGING_CONFIG:
69 72
             from django.utils.log import DEFAULT_LOGGING
70 73
             # First find the logging configuration function ...
71  
-            logging_config_path, logging_config_func_name = self.LOGGING_CONFIG.rsplit('.', 1)
72  
-            logging_config_module = importlib.import_module(logging_config_path)
73  
-            logging_config_func = getattr(logging_config_module, logging_config_func_name)
  74
+            logging_config_func = import_by_path(self.LOGGING_CONFIG)
74 75
 
75 76
             logging_config_func(DEFAULT_LOGGING)
76 77
 
  78
+            # ... then invoke it with the logging settings
77 79
             if self.LOGGING:
78  
-                # Backwards-compatibility shim for #16288 fix
79  
-                compat_patch_logging_config(self.LOGGING)
80  
-
81  
-                # ... then invoke it with the logging settings
82 80
                 logging_config_func(self.LOGGING)
83 81
 
84 82
     def configure(self, default_settings=global_settings, **options):
@@ -142,7 +140,7 @@ def __init__(self, settings_module):
142 140
                         isinstance(setting_value, six.string_types):
143 141
                     warnings.warn("The %s setting must be a tuple. Please fix your "
144 142
                                   "settings, as auto-correction is now deprecated." % setting,
145  
-                        PendingDeprecationWarning)
  143
+                                  DeprecationWarning, stacklevel=2)
146 144
                     setting_value = (setting_value,) # In case the user forgot the comma.
147 145
                 setattr(self, setting, setting_value)
148 146
 
@@ -195,37 +193,3 @@ def __dir__(self):
195 193
         return list(self.__dict__) + dir(self.default_settings)
196 194
 
197 195
 settings = LazySettings()
198  
-
199  
-
200  
-
201  
-def compat_patch_logging_config(logging_config):
202  
-    """
203  
-    Backwards-compatibility shim for #16288 fix. Takes initial value of
204  
-    ``LOGGING`` setting and patches it in-place (issuing deprecation warning)
205  
-    if "mail_admins" logging handler is configured but has no filters.
206  
-
207  
-    """
208  
-    #  Shim only if LOGGING["handlers"]["mail_admins"] exists,
209  
-    #  but has no "filters" key
210  
-    if "filters" not in logging_config.get(
211  
-        "handlers", {}).get(
212  
-        "mail_admins", {"filters": []}):
213  
-
214  
-        warnings.warn(
215  
-            "You have no filters defined on the 'mail_admins' logging "
216  
-            "handler: adding implicit debug-false-only filter. "
217  
-            "See http://docs.djangoproject.com/en/dev/releases/1.4/"
218  
-            "#request-exceptions-are-now-always-logged",
219  
-            DeprecationWarning)
220  
-
221  
-        filter_name = "require_debug_false"
222  
-
223  
-        filters = logging_config.setdefault("filters", {})
224  
-        while filter_name in filters:
225  
-            filter_name = filter_name + "_"
226  
-
227  
-        filters[filter_name] = {
228  
-            "()": "django.utils.log.RequireDebugFalse",
229  
-        }
230  
-
231  
-        logging_config["handlers"]["mail_admins"]["filters"] = [filter_name]
3  django/conf/app_template/admin.py
... ...
@@ -0,0 +1,3 @@
  1
+from django.contrib import admin
  2
+
  3
+# Register your models here.
15  django/conf/app_template/tests.py
... ...
@@ -1,16 +1,3 @@
1  
-"""
2  
-This file demonstrates writing tests using the unittest module. These will pass
3  
-when you run "manage.py test".
4  
-
5  
-Replace this with more appropriate tests for your application.
6  
-"""
7  
-
8 1
 from django.test import TestCase
9 2
 
10  
-
11  
-class SimpleTest(TestCase):
12  
-    def test_basic_addition(self):
13  
-        """
14  
-        Tests that 1 + 1 always equals 2.
15  
-        """
16  
-        self.assertEqual(1 + 1, 2)
  3
+# Create your tests here.
2  django/conf/app_template/views.py
... ...
@@ -1 +1,3 @@
  1
+from django.shortcuts import render
  2
+
1 3
 # Create your views here.
24  django/conf/global_settings.py
@@ -29,6 +29,10 @@
29 29
 #   * Receive x-headers
30 30
 INTERNAL_IPS = ()
31 31
 
  32
+# Hosts/domain names that are valid for this site.
  33
+# "*" matches anything, ".example.com" matches example.com and all subdomains
  34
+ALLOWED_HOSTS = []
  35
+
32 36
 # Local time zone for this installation. All choices can be found here:
33 37
 # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name (although not all
34 38
 # systems may support all possibilities). When USE_TZ is True, this is
@@ -42,13 +46,15 @@
42 46
 # http://www.i18nguy.com/unicode/language-identifiers.html
43 47
 LANGUAGE_CODE = 'en-us'
44 48
 
45  
-# Languages we provide translations for, out of the box. The language name
46  
-# should be the utf-8 encoded local name for the language.
  49
+# Languages we provide translations for, out of the box.
47 50
 LANGUAGES = (
  51
+    ('af', gettext_noop('Afrikaans')),
48 52
     ('ar', gettext_noop('Arabic')),
49 53
     ('az', gettext_noop('Azerbaijani')),
50 54
     ('bg', gettext_noop('Bulgarian')),
  55
+    ('be', gettext_noop('Belarusian')),
51 56
     ('bn', gettext_noop('Bengali')),
  57
+    ('br', gettext_noop('Breton')),
52 58
     ('bs', gettext_noop('Bosnian')),
53 59
     ('ca', gettext_noop('Catalan')),
54 60
     ('cs', gettext_noop('Czech')),
@@ -63,6 +69,7 @@
63 69
     ('es-ar', gettext_noop('Argentinian Spanish')),
64 70
     ('es-mx', gettext_noop('Mexican Spanish')),
65 71
     ('es-ni', gettext_noop('Nicaraguan Spanish')),
  72
+    ('es-ve', gettext_noop('Venezuelan Spanish')),
66 73
     ('et', gettext_noop('Estonian')),
67 74
     ('eu', gettext_noop('Basque')),
68 75
     ('fa', gettext_noop('Persian')),
@@ -75,6 +82,7 @@
75 82
     ('hi', gettext_noop('Hindi')),
76 83
     ('hr', gettext_noop('Croatian')),
77 84
     ('hu', gettext_noop('Hungarian')),
  85
+    ('ia', gettext_noop('Interlingua')),
78 86
     ('id', gettext_noop('Indonesian')),
79 87
     ('is', gettext_noop('Icelandic')),
80 88
     ('it', gettext_noop('Italian')),
@@ -84,15 +92,18 @@
84 92
     ('km', gettext_noop('Khmer')),
85 93
     ('kn', gettext_noop('Kannada')),
86 94
     ('ko', gettext_noop('Korean')),
  95
+    ('lb', gettext_noop('Luxembourgish')),
87 96
     ('lt', gettext_noop('Lithuanian')),
88 97
     ('lv', gettext_noop('Latvian')),
89 98
     ('mk', gettext_noop('Macedonian')),
90 99
     ('ml', gettext_noop('Malayalam')),
91 100
     ('mn', gettext_noop('Mongolian')),
  101
+    ('my', gettext_noop('Burmese')),
92 102
     ('nb', gettext_noop('Norwegian Bokmal')),
93 103
     ('ne', gettext_noop('Nepali')),
94 104
     ('nl', gettext_noop('Dutch')),
95 105
     ('nn', gettext_noop('Norwegian Nynorsk')),
  106
+    ('os', gettext_noop('Ossetic')),
96 107
     ('pa', gettext_noop('Punjabi')),
97 108
     ('pl', gettext_noop('Polish')),
98 109
     ('pt', gettext_noop('Portuguese')),
@@ -111,6 +122,7 @@
111 122
     ('th', gettext_noop('Thai')),
112 123
     ('tr', gettext_noop('Turkish')),
113 124
     ('tt', gettext_noop('Tatar')),
  125
+    ('udm', gettext_noop('Udmurt')),
114 126
     ('uk', gettext_noop('Ukrainian')),
115 127
     ('ur', gettext_noop('Urdu')),
116 128
     ('vi', gettext_noop('Vietnamese')),
@@ -147,7 +159,7 @@
147 159
 # Email address that error messages come from.
148 160
 SERVER_EMAIL = 'root@localhost'
149 161
 
150  
-# Whether to send broken-link emails.
  162
+# Whether to send broken-link emails. Deprecated, must be removed in 1.8.
151 163
 SEND_BROKEN_LINK_EMAILS = False
152 164
 
153 165
 # Database connection info. If left empty, will default to the dummy backend.
@@ -246,7 +258,7 @@
246 258
 ADMIN_FOR = ()
247 259
 
248 260
 # List of compiled regular expression objects representing URLs that need not
249  
-# be reported when SEND_BROKEN_LINK_EMAILS is True. Here are a few examples:
  261
+# be reported by BrokenLinkEmailsMiddleware. Here are a few examples:
250 262
 #    import re
251 263
 #    IGNORABLE_404_URLS = (
252 264
 #        re.compile(r'^/apple-touch-icon.*\.png$'),
@@ -355,6 +367,7 @@
355 367
 # * Note that these format strings are different from the ones to display dates
356 368
 TIME_INPUT_FORMATS = (
357 369
     '%H:%M:%S',     # '14:30:59'
  370
+    '%H:%M:%S.%f',  # '14:30:59.000200'
358 371
     '%H:%M',        # '14:30'
359 372
 )
360 373
 
@@ -504,9 +517,11 @@
504 517
 PASSWORD_HASHERS = (
505 518
     'django.contrib.auth.hashers.PBKDF2PasswordHasher',
506 519
     'django.contrib.auth.hashers.PBKDF2SHA1PasswordHasher',
  520
+    'django.contrib.auth.hashers.BCryptSHA256PasswordHasher',
507 521
     'django.contrib.auth.hashers.BCryptPasswordHasher',
508 522
     'django.contrib.auth.hashers.SHA1PasswordHasher',
509 523
     'django.contrib.auth.hashers.MD5PasswordHasher',
  524
+    'django.contrib.auth.hashers.UnsaltedSHA1PasswordHasher',
510 525
     'django.contrib.auth.hashers.UnsaltedMD5PasswordHasher',
511 526
     'django.contrib.auth.hashers.CryptPasswordHasher',
512 527
 )
@@ -530,6 +545,7 @@
530 545
 CSRF_COOKIE_DOMAIN = None
531 546
 CSRF_COOKIE_PATH = '/'
532 547
 CSRF_COOKIE_SECURE = False
  548
+CSRF_COOKIE_HTTPONLY = False
533 549
 
534 550
 ############
535 551
 # MESSAGES #
131  django/conf/locale/__init__.py
... ...
@@ -1,32 +1,51 @@
  1
+# -*- encoding: utf-8 -*-
1 2
 from __future__ import unicode_literals
2 3
 
3 4
 # About name_local: capitalize it as if your language name was appearing
4 5
 # inside a sentence in your language.
5 6
 
6 7
 LANG_INFO = {
  8
+    'af': {
  9
+        'bidi': False,
  10
+        'code': 'af',
  11
+        'name': 'Afrikaans',
  12
+        'name_local': 'Afrikaans',
  13
+    },
7 14
     'ar': {
8 15
         'bidi': True,
9 16
         'code': 'ar',
10 17
         'name': 'Arabic',
11  
-        'name_local': '\u0627\u0644\u0639\u0631\u0628\u064a\u0651\u0629',
  18
+        'name_local': 'العربيّة',
12 19
     },
13 20
     'az': {
14 21
         'bidi': True,
15 22
         'code': 'az',
16 23
         'name': 'Azerbaijani',
17  
-        'name_local': 'az\u0259rbaycan dili',
  24
+        'name_local': 'azərbaycan dili',
  25
+    },
  26
+    'be': {
  27
+        'bidi': False,
  28
+        'code': 'be',
  29
+        'name': 'Belarusian',
  30
+        'name_local': 'беларуская',
18 31
     },
19 32
     'bg': {
20 33
         'bidi': False,
21 34
         'code': 'bg',
22 35
         'name': 'Bulgarian',
23  
-        'name_local': '\u0431\u044a\u043b\u0433\u0430\u0440\u0441\u043a\u0438',
  36
+        'name_local': 'български',
24 37
     },
25 38
     'bn': {
26 39
         'bidi': False,
27 40
         'code': 'bn',
28 41
         'name': 'Bengali',
29  
-        'name_local': '\u09ac\u09be\u0982\u09b2\u09be',
  42
+        'name_local': 'বাংলা',
  43
+    },
  44
+    'br': {
  45
+        'bidi': False,
  46
+        'code': 'br',
  47
+        'name': 'Breton',
  48
+        'name_local': 'brezhoneg',
30 49
     },
31 50
     'bs': {
32 51
         'bidi': False,
@@ -38,13 +57,13 @@
38 57
         'bidi': False,
39 58
         'code': 'ca',
40 59
         'name': 'Catalan',
41  
-        'name_local': 'catal\xe0',
  60
+        'name_local': 'català',
42 61
     },
43 62
     'cs': {
44 63
         'bidi': False,
45 64
         'code': 'cs',
46 65
         'name': 'Czech',
47  
-        'name_local': '\u010desky',
  66
+        'name_local': 'česky',
48 67
     },
49 68
     'cy': {
50 69
         'bidi': False,
@@ -68,7 +87,7 @@
68 87
         'bidi': False,
69 88
         'code': 'el',
70 89
         'name': 'Greek',
71  
-        'name_local': '\u0395\u03bb\u03bb\u03b7\u03bd\u03b9\u03ba\u03ac',
  90
+        'name_local': 'Ελληνικά',
72 91
     },
73 92
     'en': {
74 93
         'bidi': False,
@@ -92,25 +111,31 @@
92 111
         'bidi': False,
93 112
         'code': 'es',
94 113
         'name': 'Spanish',
95  
-        'name_local': 'espa\xf1ol',
  114
+        'name_local': 'español',
96 115
     },
97 116
     'es-ar': {
98 117
         'bidi': False,
99 118
         'code': 'es-ar',
100 119
         'name': 'Argentinian Spanish',
101  
-        'name_local': 'espa\xf1ol de Argentina',
  120
+        'name_local': 'español de Argentina',
102 121
     },
103 122
     'es-mx': {
104 123
         'bidi': False,
105 124
         'code': 'es-mx',
106 125
         'name': 'Mexican Spanish',
107  
-        'name_local': 'espa\xf1ol de Mexico',
  126
+        'name_local': 'español de Mexico',
108 127
     },
109 128
     'es-ni': {
110 129
         'bidi': False,
111 130
         'code': 'es-ni',
112 131
         'name': 'Nicaraguan Spanish',
113  
-        'name_local': 'espa\xf1ol de Nicaragua',
  132
+        'name_local': 'español de Nicaragua',
  133
+    },
  134
+    'es-ve': {
  135
+        'bidi': False,
  136
+        'code': 'es-ve',
  137
+        'name': 'Venezuelan Spanish',
  138
+        'name_local': 'español de Venezuela',
114 139
     },
115 140
     'et': {
116 141
         'bidi': False,
@@ -128,7 +153,7 @@
128 153
         'bidi': True,
129 154
         'code': 'fa',
130 155
         'name': 'Persian',
131  
-        'name_local': '\u0641\u0627\u0631\u0633\u06cc',
  156
+        'name_local': 'فارسی',
132 157
     },
133 158
     'fi': {
134 159
         'bidi': False,
@@ -140,7 +165,7 @@
140 165
         'bidi': False,
141 166
         'code': 'fr',
142 167
         'name': 'French',
143  
-        'name_local': 'fran\xe7ais',
  168
+        'name_local': 'français',
144 169
     },
145 170
     'fy-nl': {
146 171
         'bidi': False,
@@ -164,7 +189,7 @@
164 189
         'bidi': True,
165 190
         'code': 'he',
166 191
         'name': 'Hebrew',
167  
-        'name_local': '\u05e2\u05d1\u05e8\u05d9\u05ea',
  192
+        'name_local': 'עברית',
168 193
     },
169 194
     'hi': {
170 195
         'bidi': False,
@@ -184,6 +209,12 @@
184 209
         'name': 'Hungarian',
185 210
         'name_local': 'Magyar',
186 211
     },
  212
+    'ia': {
  213
+        'bidi': False,
  214
+        'code': 'ia',
  215
+        'name': 'Interlingua',
  216
+        'name_local': 'Interlingua',
  217
+    },
187 218
     'id': {
188 219
         'bidi': False,
189 220
         'code': 'id',
@@ -194,7 +225,7 @@
194 225
         'bidi': False,
195 226
         'code': 'is',
196 227
         'name': 'Icelandic',
197  
-        'name_local': '\xcdslenska',
  228
+        'name_local': 'Íslenska',
198 229
     },
199 230
     'it': {
200 231
         'bidi': False,
@@ -206,19 +237,19 @@
206 237
         'bidi': False,
207 238
         'code': 'ja',
208 239
         'name': 'Japanese',
209  
-        'name_local': '\u65e5\u672c\u8a9e',
  240
+        'name_local': '日本語',
210 241
     },
211 242
     'ka': {
212 243
         'bidi': False,
213 244
         'code': 'ka',
214 245
         'name': 'Georgian',
215  
-        'name_local': '\u10e5\u10d0\u10e0\u10d7\u10e3\u10da\u10d8',
  246
+        'name_local': 'ქართული',
216 247
     },
217 248
     'kk': {
218 249
         'bidi': False,
219 250
         'code': 'kk',
220 251
         'name': 'Kazakh',
221  
-        'name_local': '\u049a\u0430\u0437\u0430\u049b',
  252
+        'name_local': 'Қазақ',
222 253
     },
223 254
     'km': {
224 255
         'bidi': False,
@@ -236,7 +267,13 @@
236 267
         'bidi': False,
237 268
         'code': 'ko',
238 269
         'name': 'Korean',
239  
-        'name_local': '\ud55c\uad6d\uc5b4',
  270
+        'name_local': '한국어',
  271
+    },
  272
+    'lb': {
  273
+        'bidi': False,
  274
+        'code': 'lb',
  275
+        'name': 'Luxembourgish',
  276
+        'name_local': 'Lëtzebuergesch',
240 277
     },
241 278
     'lt': {
242 279
         'bidi': False,
@@ -248,13 +285,13 @@
248 285
         'bidi': False,
249 286
         'code': 'lv',
250 287
         'name': 'Latvian',
251  
-        'name_local': 'latvie\u0161u',
  288
+        'name_local': 'latviešu',
252 289
     },
253 290
     'mk': {
254 291
         'bidi': False,
255 292
         'code': 'mk',
256 293
         'name': 'Macedonian',
257  
-        'name_local': '\u041c\u0430\u043a\u0435\u0434\u043e\u043d\u0441\u043a\u0438',
  294
+        'name_local': 'Македонски',
258 295
     },
259 296
     'ml': {
260 297
         'bidi': False,
@@ -268,17 +305,23 @@
268 305
         'name': 'Mongolian',
269 306
         'name_local': 'Mongolian',
270 307
     },
  308
+    'my': {
  309
+        'bidi': False,
  310
+        'code': 'my',
  311
+        'name': 'Burmese',
  312
+        'name_local': 'မြန်မာဘာသာ',
  313
+    },
271 314
     'nb': {
272 315
         'bidi': False,
273 316
         'code': 'nb',
274 317
         'name': 'Norwegian Bokmal',
275  
-        'name_local': 'norsk (bokm\xe5l)',
  318
+        'name_local': 'norsk (bokmål)',
276 319
     },
277 320
     'ne': {
278 321
         'bidi': False,
279 322
         'code': 'ne',
280 323
         'name': 'Nepali',
281  
-        'name_local': '\u0928\u0947\u092a\u093e\u0932\u0940',
  324
+        'name_local': 'नेपाली',
282 325
     },
283 326
     'nl': {
284 327
         'bidi': False,
@@ -298,6 +341,12 @@
298 341
         'name': 'Norwegian',
299 342
         'name_local': 'norsk',
300 343
     },
  344
+    'os': {
  345
+        'bidi': False,
  346
+        'code': 'os',
  347
+        'name': 'Ossetic',
  348
+        'name_local': 'Ирон',
  349
+    },
301 350
     'pa': {
302 351
         'bidi': False,
303 352
         'code': 'pa',
@@ -314,37 +363,37 @@
314 363
         'bidi': False,
315 364
         'code': 'pt',
316 365
         'name': 'Portuguese',
317  
-        'name_local': 'Portugu\xeas',
  366
+        'name_local': 'Português',
318 367
     },
319 368
     'pt-br': {
320 369
         'bidi': False,
321 370
         'code': 'pt-br',
322 371
         'name': 'Brazilian Portuguese',
323  
-        'name_local': 'Portugu\xeas Brasileiro',
  372
+        'name_local': 'Português Brasileiro',
324 373
     },
325 374
     'ro': {
326 375
         'bidi': False,
327 376
         'code': 'ro',
328 377
         'name': 'Romanian',
329  
-        'name_local': 'Rom\xe2n\u0103',
  378
+        'name_local': 'Română',
330 379
     },
331 380
     'ru': {
332 381
         'bidi': False,
333 382
         'code': 'ru',
334 383
         'name': 'Russian',
335  
-        'name_local': '\u0420\u0443\u0441\u0441\u043a\u0438\u0439',
  384
+        'name_local': 'Русский',
336 385
     },
337 386
     'sk': {
338 387
         'bidi': False,
339 388
         'code': 'sk',
340 389
         'name': 'Slovak',
341  
-        'name_local': 'slovensk\xfd',
  390
+        'name_local': 'slovenský',
342 391
     },
343 392
     'sl': {
344 393
         'bidi': False,
345 394
         'code': 'sl',
346 395
         'name': 'Slovenian',
347  
-        'name_local': 'Sloven\u0161\u010dina',
  396
+        'name_local': 'Slovenščina',
348 397
     },
349 398
     'sq': {
350 399
         'bidi': False,
@@ -356,7 +405,7 @@
356 405
         'bidi': False,
357 406
         'code': 'sr',
358 407
         'name': 'Serbian',
359  
-        'name_local': '\u0441\u0440\u043f\u0441\u043a\u0438',
  408
+        'name_local': 'српски',
360 409
     },
361 410
     'sr-latn': {
362 411
         'bidi': False,
@@ -380,13 +429,13 @@
380 429
         'bidi': False,
381 430
         'code': 'ta',
382 431
         'name': 'Tamil',
383  
-        'name_local': '\u0ba4\u0bae\u0bbf\u0bb4\u0bcd',
  432
+        'name_local': 'தமிழ்',
384 433
     },
385 434
     'te': {
386 435
         'bidi': False,
387 436
         'code': 'te',
388 437
         'name': 'Telugu',
389  
-        'name_local': '\u0c24\u0c46\u0c32\u0c41\u0c17\u0c41',
  438
+        'name_local': 'తెలుగు',
390 439
     },
391 440
     'th': {
392 441
         'bidi': False,
@@ -398,25 +447,31 @@
398 447
         'bidi': False,
399 448
         'code': 'tr',
400 449
         'name': 'Turkish',
401  
-        'name_local': 'T\xfcrk\xe7e',
  450
+        'name_local': 'Türkçe',
402 451
     },
403 452
     'tt': {
404 453
         'bidi': False,
405 454
         'code': 'tt',
406 455
         'name': 'Tatar',
407  
-        'name_local': '\u0422\u0430\u0442\u0430\u0440\u0447\u0430',
  456
+        'name_local': 'Татарча',
  457
+    },
  458
+    'udm': {
  459
+        'bidi': False,
  460
+        'code': 'udm',
  461
+        'name': 'Udmurt',
  462
+        'name_local': 'Удмурт',
408 463
     },
409 464
     'uk': {
410 465
         'bidi': False,
411 466
         'code': 'uk',
412 467
         'name': 'Ukrainian',
413  
-        'name_local': '\u0423\u043a\u0440\u0430\u0457\u043d\u0441\u044c\u043a\u0430',
  468
+        'name_local': 'Українська',
414 469
     },
415 470
     'ur': {
416 471
         'bidi': False,
417 472
         'code': 'ur',
418 473
         'name': 'Urdu',
419  
-        'name_local': '\u0627\u0631\u062f\u0648',
  474
+        'name_local': 'اردو',
420 475
     },
421 476
     'vi': {
422 477
         'bidi': False,
@@ -428,12 +483,12 @@
428 483
         'bidi': False,
429 484
         'code': 'zh-cn',
430 485
         'name': 'Simplified Chinese',
431  
-        'name_local': '\u7b80\u4f53\u4e2d\u6587',
  486
+        'name_local': '简体中文',
432 487
     },
433 488
     'zh-tw': {
434 489
         'bidi': False,
435 490
         'code': 'zh-tw',
436 491
         'name': 'Traditional Chinese',
437  
-        'name_local': '\u7e41\u9ad4\u4e2d\u6587',
  492
+        'name_local': '繁體中文',
438 493
     }
439 494
 }
BIN  django/conf/locale/af/LC_MESSAGES/django.mo
Binary file not shown
1,263  django/conf/locale/af/LC_MESSAGES/django.po
... ...
@@ -0,0 +1,1263 @@
  1
+# This file is distributed under the same license as the Django package.
  2
+#
  3
+# Translators:
  4
+# Piet Delport <pjdelport@gmail.com>, 2012-2013.
  5
+# Stephen Cox <scox@rems2.com>, 2011, 2012.
  6
+msgid ""
  7
+msgstr ""
  8
+"Project-Id-Version: Django\n"
  9
+"Report-Msgid-Bugs-To: \n"
  10
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
  11
+"PO-Revision-Date: 2013-03-26 06:50+0000\n"
  12
+"Last-Translator: Piet Delport <pjdelport@gmail.com>\n"
  13
+"Language-Team: Afrikaans (http://www.transifex.com/projects/p/django/"
  14
+"language/af/)\n"
  15
+"MIME-Version: 1.0\n"
  16
+"Content-Type: text/plain; charset=UTF-8\n"
  17
+"Content-Transfer-Encoding: 8bit\n"
  18
+"Language: af\n"
  19
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
  20
+
  21
+#: conf/global_settings.py:48
  22
+msgid "Afrikaans"
  23
+msgstr "Afrikaans"
  24
+
  25
+#: conf/global_settings.py:49
  26
+msgid "Arabic"
  27
+msgstr "Arabies"
  28
+
  29
+#: conf/global_settings.py:50
  30
+msgid "Azerbaijani"
  31
+msgstr "Aserbeidjans"
  32
+
  33
+#: conf/global_settings.py:51
  34
+msgid "Bulgarian"
  35
+msgstr "Bulgaars"
  36
+
  37
+#: conf/global_settings.py:52
  38
+msgid "Belarusian"
  39
+msgstr "Wit-Russies"
  40
+
  41
+#: conf/global_settings.py:53
  42
+msgid "Bengali"
  43
+msgstr "Bengali"
  44
+
  45
+#: conf/global_settings.py:54
  46
+msgid "Breton"
  47
+msgstr "Bretons"
  48
+
  49
+#: conf/global_settings.py:55
  50
+msgid "Bosnian"
  51
+msgstr "Bosnies"
  52
+
  53
+#: conf/global_settings.py:56
  54
+msgid "Catalan"
  55
+msgstr "Katalaans"
  56
+
  57
+#: conf/global_settings.py:57
  58
+msgid "Czech"
  59
+msgstr "Tsjeggies"
  60
+
  61
+#: conf/global_settings.py:58
  62
+msgid "Welsh"
  63
+msgstr "Welsh"
  64
+
  65
+#: conf/global_settings.py:59
  66
+msgid "Danish"
  67
+msgstr "Deens"
  68
+
  69
+#: conf/global_settings.py:60
  70
+msgid "German"
  71
+msgstr "Duits"
  72
+
  73
+#: conf/global_settings.py:61
  74
+msgid "Greek"
  75
+msgstr "Grieks"
  76
+
  77
+#: conf/global_settings.py:62
  78
+msgid "English"
  79
+msgstr "Engels"
  80
+
  81
+#: conf/global_settings.py:63
  82
+msgid "British English"
  83
+msgstr "Britse Engels"
  84
+
  85
+#: conf/global_settings.py:64
  86
+msgid "Esperanto"
  87
+msgstr "Esperanto"
  88
+
  89
+#: conf/global_settings.py:65
  90
+msgid "Spanish"
  91
+msgstr "Spaans"
  92
+
  93
+#: conf/global_settings.py:66
  94
+msgid "Argentinian Spanish"
  95
+msgstr "Argentynse Spaans"
  96
+
  97
+#: conf/global_settings.py:67
  98
+msgid "Mexican Spanish"
  99
+msgstr "Meksikaanse Spaans"
  100
+
  101
+#: conf/global_settings.py:68
  102
+msgid "Nicaraguan Spanish"
  103
+msgstr "Nicaraguaanse Spaans"
  104
+
  105
+#: conf/global_settings.py:69
  106
+msgid "Venezuelan Spanish"
  107
+msgstr "Venezolaanse Spaans"
  108
+
  109
+#: conf/global_settings.py:70
  110
+msgid "Estonian"
  111
+msgstr "Estnies"
  112
+
  113
+#: conf/global_settings.py:71
  114
+msgid "Basque"
  115
+msgstr "Baskies"
  116
+
  117
+#: conf/global_settings.py:72
  118
+msgid "Persian"
  119
+msgstr "Persies"
  120
+
  121
+#: conf/global_settings.py:73
  122
+msgid "Finnish"
  123
+msgstr "Fins"
  124
+
  125
+#: conf/global_settings.py:74
  126
+msgid "French"
  127
+msgstr "Fraans"
  128
+
  129
+#: conf/global_settings.py:75
  130
+msgid "Frisian"
  131
+msgstr "Fries"
  132
+
  133
+#: conf/global_settings.py:76
  134
+msgid "Irish"
  135
+msgstr "Iers"
  136
+
  137
+#: conf/global_settings.py:77
  138
+msgid "Galician"
  139
+msgstr "Galicies"
  140
+
  141
+#: conf/global_settings.py:78
  142
+msgid "Hebrew"
  143
+msgstr "Hebreeus"
  144
+
  145
+#: conf/global_settings.py:79
  146
+msgid "Hindi"
  147
+msgstr "Hindoe"
  148
+
  149
+#: conf/global_settings.py:80
  150
+msgid "Croatian"
  151
+msgstr "Kroaties"
  152
+
  153
+#: conf/global_settings.py:81
  154
+msgid "Hungarian"
  155
+msgstr "Hongaars"
  156
+
  157
+#: conf/global_settings.py:82
  158
+msgid "Interlingua"
  159
+msgstr "Interlingua"
  160
+
  161
+#: conf/global_settings.py:83
  162
+msgid "Indonesian"
  163
+msgstr "Indonesies"
  164
+
  165
+#: conf/global_settings.py:84
  166
+msgid "Icelandic"
  167
+msgstr "Yslands"
  168
+
  169
+#: conf/global_settings.py:85
  170
+msgid "Italian"
  171
+msgstr "Italiaans"
  172
+
  173
+#: conf/global_settings.py:86
  174
+msgid "Japanese"
  175
+msgstr "Japannees"
  176
+
  177
+#: conf/global_settings.py:87
  178
+msgid "Georgian"
  179
+msgstr "Georgian"
  180
+
  181
+#: conf/global_settings.py:88
  182
+msgid "Kazakh"
  183
+msgstr "Kazakh"
  184
+
  185
+#: conf/global_settings.py:89
  186
+msgid "Khmer"
  187
+msgstr "Khmer"
  188
+
  189
+#: conf/global_settings.py:90
  190
+msgid "Kannada"
  191
+msgstr "Kannada"
  192
+
  193
+#: conf/global_settings.py:91
  194
+msgid "Korean"
  195
+msgstr "Koreaanse"
  196
+
  197
+#: conf/global_settings.py:92
  198
+msgid "Luxembourgish"
  199
+msgstr "Luxemburgs"
  200
+
  201
+#: conf/global_settings.py:93
  202
+msgid "Lithuanian"
  203
+msgstr "Litaus"
  204
+
  205
+#: conf/global_settings.py:94
  206
+msgid "Latvian"
  207
+msgstr "Lets"
  208
+
  209
+#: conf/global_settings.py:95
  210
+msgid "Macedonian"
  211
+msgstr "Macedonies"
  212
+
  213
+#: conf/global_settings.py:96
  214
+msgid "Malayalam"
  215
+msgstr "Malabaars"
  216
+
  217
+#: conf/global_settings.py:97
  218
+msgid "Mongolian"
  219
+msgstr "Mongools"
  220
+
  221
+#: conf/global_settings.py:98
  222
+msgid "Norwegian Bokmal"
  223
+msgstr "Noors Bokmal"
  224
+
  225
+#: conf/global_settings.py:99
  226
+msgid "Nepali"
  227
+msgstr "Nepalees"
  228
+
  229
+#: conf/global_settings.py:100
  230
+msgid "Dutch"
  231
+msgstr "Nederlands"
  232
+
  233
+#: conf/global_settings.py:101
  234
+msgid "Norwegian Nynorsk"
  235
+msgstr "Noorweegse Nynorsk"
  236
+
  237
+#: conf/global_settings.py:102
  238
+msgid "Punjabi"
  239
+msgstr "Punjabi"
  240
+
  241
+#: conf/global_settings.py:103
  242
+msgid "Polish"
  243
+msgstr "Pools"
  244
+
  245
+#: conf/global_settings.py:104
  246
+msgid "Portuguese"
  247
+msgstr "Portugees"
  248
+
  249
+#: conf/global_settings.py:105
  250
+msgid "Brazilian Portuguese"
  251
+msgstr "Brasiliaanse Portugees"
  252
+
  253
+#: conf/global_settings.py:106
  254
+msgid "Romanian"
  255
+msgstr "Roemeens"
  256
+
  257
+#: conf/global_settings.py:107
  258
+msgid "Russian"
  259
+msgstr "Russiese"
  260
+
  261
+#: conf/global_settings.py:108
  262
+msgid "Slovak"
  263
+msgstr "Slowaakse"
  264
+
  265
+#: conf/global_settings.py:109
  266