Changeset 7430

Timestamp:

04/15/08 23:59:55 (5 months ago)

Author:

mtredinnick

Message:

queryset-refactor: Merged from trunk up to [7424].

Files:

• django/branches/queryset-refactor/django/conf/locale/pl/LC_MESSAGES/django.mo (modified) (previous)
• django/branches/queryset-refactor/django/conf/locale/pl/LC_MESSAGES/django.po (modified) (32 diffs)
• django/branches/queryset-refactor/django/contrib/admin/media/img/admin/changelist-bg_rtl.gif (added)
• django/branches/queryset-refactor/django/contrib/contenttypes/generic.py (modified) (3 diffs)
• django/branches/queryset-refactor/django/contrib/markup/templatetags/markup.py (modified) (1 diff)

django/branches/queryset-refactor/django/conf/locale/pl/LC_MESSAGES/django.po

@@ -6 +6 @@
-"Project-Id-Version: Django\n"
-"Report-Msgid-Bugs-To: \n"
-3-29 20:56+01
+4-14 18:02+02
-"PO-Revision-Date: 2008-02-25 15:53+0100\n"
-Łukasz CzyŌykowki <lukasz.czyzykowski@gmail.com
+Piotr Lewandowski <django@icomputing.pl
-"Language-Team: Polish <pl@li.org>\n"
-"MIME-Version: 1.0\n"
@@ -99 +99 @@
-#: conf/global_settings.py:59
-msgid "Croatian"
-H
+Ch
-
-#: conf/global_settings.py:60
@@ -154 +154 @@
-
-#: conf/global_settings.py:73
-
-
+ Portuguese
+ portugalski
-
-#: conf/global_settings.py:74
@@ -265 +265 @@
-#: contrib/admin/models.py:22
-msgid "object repr"
-
+a
-
-#: contrib/admin/models.py:23
@@ -290 +290 @@
-#: contrib/admin/templates/admin/404.html:10
-msgid "We're sorry, but the requested page could not be found."
- nie moÅŒna znaleźć rz
-ej strony
+, Ō
+a strona nie została znaleziona
-
-#: contrib/admin/templates/admin/500.html:4
@@ -318 +318 @@
-#: contrib/admin/templates/admin/500.html:6
-msgid "Server error (500)"
-
+
+
-
-#: contrib/admin/templates/admin/500.html:9
@@ -332 +333 @@
-"WystÄ
-pił niespodziewany błÄ
-mailem administratorowi
-
+-mailem
+administratorowi 
-
-#: contrib/admin/templates/admin/base.html:26
@@ -617 +618 @@
-"lub kliknij prawym klawiszem na łÄ
-czu i dodaj je do zakładek. Teraz moÅŒesz\n"
- 
+
-"skryptozakładek wymagajÄ
- przeglÄ
@@ -656 +657 @@
-#: contrib/admin/templates/admin_doc/bookmarklets.html:25
-msgid "Jumps to the admin page for pages that represent a single object."
-
-
+
+
+
+
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:27
-msgid "Edit this object (new window)"
-nk
+kn
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:28
@@ -730 +733 @@
-"should be receiving it shortly."
-msgstr ""
-
+-
-"niebawem."
-
-#: contrib/admin/templates/registration/password_reset_email.html:2
-msgid "You're receiving this e-mail because you requested a password reset"
-e
+ten e-
-dałeś zresetowania hasła"
-
@@ -758 +761 @@
-#: contrib/admin/templates/registration/password_reset_email.html:13
-msgid "Thanks for using our site!"
-
+naszej 
-
-#: contrib/admin/templates/registration/password_reset_email.html:15
@@ -770 +773 @@
-"your password and e-mail the new one to you."
-msgstr ""
-
-
+
-
-#: contrib/admin/templates/registration/password_reset_form.html:16
@@ -1218 +1220 @@
-#: contrib/auth/models.py:137
-msgid ""
-can log into the Django admin
+should be treated as active
-"instead of deleting accounts."
-msgstr ""
- moÅŒe zalogować się do panelu administratora. Odznacz
-to zamiast usuwać 
+a naleÅŒy uwaÅŒać za aktywnego. Odznacz tozamiast usuwać
+
-
-#: contrib/auth/models.py:138
@@ -1346 +1348 @@
-#: contrib/comments/models.py:88 contrib/comments/models.py:180
-msgid "is public"
-e
+ę
-
-#: contrib/comments/models.py:90
@@ -1548 +1550 @@
-"%(text)s"
-msgstr ""
-e
+
-"\n"
-"%(text)s"
@@ -1565 +1567 @@
-#: contrib/comments/views/comments.py:289
-msgid "Somebody tampered with the comment form (security violation)"
-
+
+
+
-
-#: contrib/comments/views/comments.py:208
@@ -1936 +1940 @@
-#: contrib/localflavor/cl/forms.py:29
-msgid "Enter a valid Chilean RUT."
-z
+h
-
-#: contrib/localflavor/cl/forms.py:30
-msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
-z
+h
-
-#: contrib/localflavor/cl/forms.py:31
-msgid "The Chilean RUT is not valid."
-z
+h
-
-#: contrib/localflavor/de/de_states.py:5
@@ -2020 +2024 @@
-"format."
-msgstr ""
-iemiecki numer
+umer niemieckiego
-"XXXXXXX-XXXXXXX-X."
-
@@ -2610 +2614 @@
-
-#: contrib/localflavor/mx/mx_states.py:26
-#, fuzzy
-msgid "Estado de México"
-msgstr "Meksyk (stan)"
-
-#: contrib/localflavor/mx/mx_states.py:27
-#, fuzzy
-msgid "Michoacán"
-msgstr "Michocan"
@@ -2628 +2630 @@
-
-#: contrib/localflavor/mx/mx_states.py:30
-#, fuzzy
-msgid "Nuevo León"
-msgstr "Nuevo Leon"
@@ -2641 +2642 @@
-
-#: contrib/localflavor/mx/mx_states.py:33
-#, fuzzy
-msgid "Querétaro"
-msgstr "Queretaro"
@@ -2654 +2654 @@
-
-#: contrib/localflavor/mx/mx_states.py:36
-#, fuzzy
-msgid "San Luis Potosí"
-msgstr "San Luis Potasi"
@@ -2679 +2678 @@
-
-#: contrib/localflavor/mx/mx_states.py:42
-#, fuzzy
-msgid "Yucatán"
-msgstr "Jukatan"
@@ -3509 +3507 @@
-msgid "Eastern Cape"
-msgstr "Prowincja PrzylÄ
-
+c
-
-#: contrib/localflavor/za/za_provinces.py:5
@@ -3638 +3636 @@
-#: core/validators.py:95
-msgid "Enter only digits separated by commas."
-d
+
-
-#: core/validators.py:107
@@ -3865 +3863 @@
- zawierajÄ
-cÄ
-
-
+
-msgstr[2] ""
-"Proszę wpisać poprawnÄ
@@ -3872 +3869 @@
- zawierajÄ
-cÄ
- 
+
-
-#: core/validators.py:450
@@ -4014 +4011 @@
-#: db/models/fields/__init__.py:466
-msgid "This value must be either True or False."
-
+
+
+
+
-
-#: db/models/fields/__init__.py:490
@@ -4035 +4035 @@
-msgstr ""
-"Ta wartość musi być jednÄ
-ÅŒadne
+nic
-
-#: db/models/fields/related.py:93
@@ -4355 +4355 @@
-#: utils/dates.py:19
-msgid "October"
-Œ
+º
-
-#: utils/dates.py:19
@@ -4457 +4457 @@
-msgstr[0] "miesiÄ
-c"
-
+
+
-msgstr[2] "miesięcy"
-
@@ -4537 +4538 @@
-msgstr "%(verbose_name)s zostało usunięte."
-
+#~ msgid "Brazilian"
+#~ msgstr "Brazylijski"
+
-#~ msgid "Gaeilge"
-#~ msgstr "Gaelicki"

django/branches/queryset-refactor/django/contrib/contenttypes/generic.py

@@ -36 +36 @@
-
-    def instance_pre_init(self, signal, sender, args, kwargs):
-
-
+
+
+
+
-        if self.name in kwargs:
-            value = kwargs.pop(self.name)
@@ -44 +46 @@
-
-    def get_content_type(self, obj=None, id=None):
-
+
+
-        ContentType = get_model("contenttypes", "contenttype")
-        if obj:
@@ -62 +65 @@
-        except AttributeError:
-            rel_obj = None
-
+
-            # Make sure to use ContentType.objects.get_for_id() to ensure that
-            # lookups are cached (see ticket #5570). This takes more code than
- 
+
-            # performance when dealing with GFKs in loops and such.
-            f = self.model._meta.get_field(self.ct_field)

django/branches/queryset-refactor/django/contrib/markup/templatetags/markup.py

@@ -66 +66 @@
-            else:
-                safe_mode = False
-
+
+
+
+
+
+
+
-        else:
-            return mark_safe(force_unicode(markdown.markdown(smart_str(value))))