Skip to content

Commit 6001ba0

Browse files
alexalex
committed
[soc2010/query-refactor] Merged up to trunk r13556, resolved merge conflicts
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/query-refactor@13565 bcc190cf-cafb-0310-a4f2-bffc1f526a37
1 parent c7bd48c commit 6001ba0

File tree

141 files changed

+8814
-1986
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

141 files changed

+8814
-1986
lines changed

‎AUTHORS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,11 +184,13 @@ answer newbie questions, and generally made Django that much better:
184184
Idan Gazit
185185
geber@datacollect.com
186186
Baishampayan Ghose
187+
Joshua Ginsberg <jag@flowtheory.net>
187188
Dimitris Glezos <dimitris@glezos.com>
188189
glin@seznam.cz
189190
martin.glueck@gmail.com
190191
Artyom Gnilov <boobsd@gmail.com>
191192
Ben Godfrey <http://aftnn.org>
193+
Andrew Godwin <andrew@aeracode.org>
192194
GomoX <gomo@datafull.com>
193195
Guilherme Mesquita Gondim <semente@taurinus.org>
194196
Mario Gonzalez <gonzalemario@gmail.com>
@@ -337,6 +339,7 @@ answer newbie questions, and generally made Django that much better:
337339
Aljosa Mohorovic <aljosa.mohorovic@gmail.com>
338340
Ramiro Morales <rm0@gmx.net>
339341
Eric Moritz <http://eric.themoritzfamily.com/>
342+
Gregor Müllegger <gregor@muellegger.de>
340343
Robin Munn <http://www.geekforgod.com/>
341344
James Murty
342345
msundstr

‎django/conf/global_settings.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
('en', gettext_noop('English')),
5555
('en-gb', gettext_noop('British English')),
5656
('es', gettext_noop('Spanish')),
57-
('es-ar', gettext_noop('Argentinean Spanish')),
57+
('es-ar', gettext_noop('Argentinian Spanish')),
5858
('et', gettext_noop('Estonian')),
5959
('eu', gettext_noop('Basque')),
6060
('fa', gettext_noop('Persian')),
@@ -78,6 +78,7 @@
7878
('lt', gettext_noop('Lithuanian')),
7979
('lv', gettext_noop('Latvian')),
8080
('mk', gettext_noop('Macedonian')),
81+
('ml', gettext_noop('Malayalam')),
8182
('mn', gettext_noop('Mongolian')),
8283
('nl', gettext_noop('Dutch')),
8384
('no', gettext_noop('Norwegian')),

‎django/conf/locale/cs/LC_MESSAGES/django.mo

163 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)