Changeset 4096

Timestamp:

11/23/06 22:17:58 (2 years ago)

Author:

adrian

Message:

per-object-permissions: Merged to trunk [4095]

Files:

• django/branches/per-object-permissions/AUTHORS (modified) (4 diffs)
• django/branches/per-object-permissions/django/conf/global_settings.py (modified) (2 diffs)
• django/branches/per-object-permissions/django/conf/__init__.py (modified) (2 diffs)
• django/branches/per-object-permissions/django/conf/locale/de/LC_MESSAGES/django.mo (modified) (previous)
• django/branches/per-object-permissions/django/conf/locale/de/LC_MESSAGES/django.po (modified) (37 diffs)
• django/branches/per-object-permissions/django/conf/locale/el/LC_MESSAGES/djangojs.mo (copied) (copied from django/trunk/django/conf/locale/el/LC_MESSAGES/djangojs.mo)
• django/branches/per-object-permissions/django/conf/locale/el/LC_MESSAGES/djangojs.po (copied) (copied from django/trunk/django/conf/locale/el/LC_MESSAGES/djangojs.po)
• django/branches/per-object-permissions/django/conf/locale/el/LC_MESSAGES/django.mo (modified) (previous)
• django/branches/per-object-permissions/django/conf/locale/el/LC_MESSAGES/django.po (modified) (40 diffs)
• django/branches/per-object-permissions/django/conf/locale/es_AR/LC_MESSAGES/djangojs.mo (modified) (previous)
• django/branches/per-object-permissions/django/conf/locale/es_AR/LC_MESSAGES/djangojs.po (modified) (4 diffs)
• django/branches/per-object-permissions/django/conf/locale/es_AR/LC_MESSAGES/django.mo (modified) (previous)
• django/branches/per-object-permissions/django/conf/locale/es_AR/LC_MESSAGES/django.po (modified) (30 diffs)
• django/branches/per-object-permissions/django/conf/locale/pt_BR/LC_MESSAGES/djangojs.mo (modified) (previous)
• django/branches/per-object-permissions/django/conf/locale/pt_BR/LC_MESSAGES/djangojs.po (modified) (3 diffs)
• django/branches/per-object-permissions/django/conf/locale/pt_BR/LC_MESSAGES/django.mo (modified) (previous)
• django/branches/per-object-permissions/django/conf/locale/pt_BR/LC_MESSAGES/django.po (modified) (51 diffs)
• django/branches/per-object-permissions/django/contrib/admin/media/js/admin/DateTimeShortcuts.js (modified) (2 diffs)
• django/branches/per-object-permissions/django/contrib/admin/media/js/core.js (modified) (2 diffs)
• django/branches/per-object-permissions/django/contrib/admin/media/js/dateparse.js (modified) (1 diff)
• django/branches/per-object-permissions/django/contrib/admin/templatetags/admin_modify.py (modified) (1 diff)
• django/branches/per-object-permissions/django/contrib/admin/views/doc.py (modified) (4 diffs)
• django/branches/per-object-permissions/django/contrib/admin/views/template.py (modified) (1 diff)
• django/branches/per-object-permissions/django/contrib/auth/__init__.py (modified) (1 diff)
• django/branches/per-object-permissions/django/contrib/comments/models.py (modified) (1 diff)
• django/branches/per-object-permissions/django/contrib/sitemaps/templates/sitemap_index.xml (modified) (1 diff)
• django/branches/per-object-permissions/django/contrib/sitemaps/templates/sitemap.xml (modified) (1 diff)
• django/branches/per-object-permissions/django/core/cache/__init__.py (modified) (1 diff)
• django/branches/per-object-permissions/django/core/handlers/base.py (modified) (1 diff)
• django/branches/per-object-permissions/django/core/handlers/wsgi.py (modified) (1 diff)
• django/branches/per-object-permissions/django/core/mail.py (modified) (2 diffs)
• django/branches/per-object-permissions/django/core/management.py (modified) (6 diffs)
• django/branches/per-object-permissions/django/core/paginator.py (modified) (5 diffs)
• django/branches/per-object-permissions/django/core/serializers/base.py (modified) (2 diffs)
• django/branches/per-object-permissions/django/core/serializers/__init__.py (modified) (1 diff)
• django/branches/per-object-permissions/django/core/serializers/python.py (modified) (1 diff)
• django/branches/per-object-permissions/django/core/serializers/xml_serializer.py (modified) (1 diff)
• django/branches/per-object-permissions/django/core/servers/fastcgi.py (modified) (3 diffs)
• django/branches/per-object-permissions/django/core/urlresolvers.py (modified) (6 diffs)
• django/branches/per-object-permissions/django/core/validators.py (modified) (3 diffs)
• django/branches/per-object-permissions/django/core/xheaders.py (modified) (1 diff)
• django/branches/per-object-permissions/django/db/backends/ado_mssql/base.py (modified) (1 diff)
• django/branches/per-object-permissions/django/db/backends/dummy/base.py (modified) (1 diff)
• django/branches/per-object-permissions/django/db/backends/mysql/base.py (modified) (2 diffs)
• django/branches/per-object-permissions/django/db/backends/oracle/base.py (modified) (2 diffs)
• django/branches/per-object-permissions/django/db/backends/postgresql/base.py (modified) (2 diffs)
• django/branches/per-object-permissions/django/db/backends/postgresql_psycopg2/base.py (modified) (2 diffs)
• django/branches/per-object-permissions/django/db/backends/sqlite3/base.py (modified) (1 diff)
• django/branches/per-object-permissions/django/db/backends/util.py (modified) (1 diff)
• django/branches/per-object-permissions/django/db/__init__.py (modified) (2 diffs)
• django/branches/per-object-permissions/django/db/models/base.py (modified) (1 diff)
• django/branches/per-object-permissions/django/db/models/fields/__init__.py (modified) (4 diffs)
• django/branches/per-object-permissions/django/db/models/loading.py (modified) (1 diff)
• django/branches/per-object-permissions/django/db/models/manipulators.py (modified) (2 diffs)
• django/branches/per-object-permissions/django/forms/__init__.py (modified) (1 diff)
• django/branches/per-object-permissions/django/middleware/gzip.py (modified) (1 diff)
• django/branches/per-object-permissions/django/newforms (copied) (copied from django/trunk/django/newforms)
• django/branches/per-object-permissions/django/newforms/fields.py (copied) (copied from django/trunk/django/newforms/fields.py)
• django/branches/per-object-permissions/django/newforms/forms.py (copied) (copied from django/trunk/django/newforms/forms.py)
• django/branches/per-object-permissions/django/newforms/__init__.py (copied) (copied from django/trunk/django/newforms/__init__.py)
• django/branches/per-object-permissions/django/newforms/util.py (copied) (copied from django/trunk/django/newforms/util.py)
• django/branches/per-object-permissions/django/newforms/widgets.py (copied) (copied from django/trunk/django/newforms/widgets.py)
• django/branches/per-object-permissions/django/template/context.py (modified) (1 diff)
• django/branches/per-object-permissions/django/template/defaultfilters.py (modified) (1 diff)
• django/branches/per-object-permissions/django/template/defaulttags.py (modified) (2 diffs)
• django/branches/per-object-permissions/django/template/__init__.py (modified) (2 diffs)
• django/branches/per-object-permissions/django/template/loaders/app_directories.py (modified) (1 diff)
• django/branches/per-object-permissions/django/templatetags/__init__.py (modified) (1 diff)
• django/branches/per-object-permissions/django/test/simple.py (modified) (1 diff)
• django/branches/per-object-permissions/django/views/debug.py (modified) (1 diff)
• django/branches/per-object-permissions/django/views/generic/simple.py (modified) (2 diffs)
• django/branches/per-object-permissions/docs/authentication.txt (modified) (1 diff)
• django/branches/per-object-permissions/docs/forms.txt (modified) (1 diff)
• django/branches/per-object-permissions/docs/generic_views.txt (modified) (2 diffs)
• django/branches/per-object-permissions/docs/modpython.txt (modified) (1 diff)
• django/branches/per-object-permissions/docs/settings.txt (modified) (2 diffs)
• django/branches/per-object-permissions/docs/sitemaps.txt (modified) (3 diffs)
• django/branches/per-object-permissions/docs/static_files.txt (modified) (2 diffs)
• django/branches/per-object-permissions/docs/syndication_feeds.txt (modified) (4 diffs)
• django/branches/per-object-permissions/docs/templates_python.txt (modified) (1 diff)
• django/branches/per-object-permissions/docs/templates.txt (modified) (3 diffs)
• django/branches/per-object-permissions/docs/testing.txt (modified) (1 diff)
• django/branches/per-object-permissions/docs/tutorial04.txt (modified) (2 diffs)
• django/branches/per-object-permissions/tests/modeltests/pagination/models.py (modified) (1 diff)
• django/branches/per-object-permissions/tests/regressiontests/forms (copied) (copied from django/trunk/tests/regressiontests/forms)
• django/branches/per-object-permissions/tests/regressiontests/forms/__init__.py (copied) (copied from django/trunk/tests/regressiontests/forms/__init__.py)
• django/branches/per-object-permissions/tests/regressiontests/forms/models.py (copied) (copied from django/trunk/tests/regressiontests/forms/models.py)
• django/branches/per-object-permissions/tests/regressiontests/forms/tests.py (copied) (copied from django/trunk/tests/regressiontests/forms/tests.py)
• django/branches/per-object-permissions/tests/regressiontests/templates/tests.py (modified) (1 diff)

django/branches/per-object-permissions/AUTHORS

@@ -52 +52 @@
-    Ned Batchelder <http://www.nedbatchelder.com/>
-    Shannon -jj Behrens <http://jjinux.blogspot.com/>
+    Esdras Beleza <linux@esdrasbeleza.com>
-    James Bennett
-    Paul Bissex <http://e-scribe.com/>
@@ -92 +93 @@
-    Robert Rock Howard <http://djangomojo.com/>
-    Jason Huggins <http://www.jrandolph.com/blog/>
+        Baurzhan Ismagulov <ibr@radix50.net>
-    jcrasta@gmail.com
-    Michael Josephson <http://www.sdjournal.com/>
@@ -113 +115 @@
-    mattmcc
-    Martin Maney <http://www.chipy.org/Martin_Maney>
+    masonsimon+django@gmail.com
-    Manuzhai
-    Petar Marić
@@ -160 +163 @@
-    Geert Vanderkelen
-    Milton Waddams
+    wam-djangobug@wamber.net
-    Dan Watson <http://theidioteque.net/>
-    Rachel Willmer <http://www.willmer.com/kb/>

django/branches/per-object-permissions/django/conf/global_settings.py

@@ -102 +102 @@
-DATABASE_HOST = ''             # Set to empty string for localhost. Not used with sqlite3.
-DATABASE_PORT = ''             # Set to empty string for default. Not used with sqlite3.
+DATABASE_OPTIONS = {}          # Set to empty dictionary for default.
-
-# Host for sending e-mail.
@@ -229 +230 @@
-TRANSACTIONS_MANAGED = False
-
+# The User-Agent string to use when checking for URL validity through the
+# isExistingURL validator.
+URL_VALIDATOR_USER_AGENT = "Django/0.96pre (http://www.djangoproject.com)"
+
-##############
-# MIDDLEWARE #

django/branches/per-object-permissions/django/conf/__init__.py

@@ -78 +78 @@
-
-        try:
-'', ''
+{}, {}
-        except ImportError, e:
-            raise EnvironmentError, "Could not import settings '%s' (Is it on sys.path? Does it have syntax errors?): %s" % (self.SETTINGS_MODULE, e)
@@ -98 +98 @@
-        for app in self.INSTALLED_APPS:
-            if app.endswith('.*'):
-'', ''
+{}, {}
-                for d in os.listdir(appdir):
-                    if d.isalpha() and os.path.isdir(os.path.join(appdir, d)):

django/branches/per-object-permissions/django/conf/locale/de/LC_MESSAGES/django.po

@@ -8 +8 @@
-"Project-Id-Version: Django 1.0\n"
-"Report-Msgid-Bugs-To: \n"
-09-25 16:04+02
+11-15 18:35+01
-"PO-Revision-Date: 2005-10-08 00:03+0200\n"
-"Last-Translator: Georg Bauer <gb@bofh.ms>\n"
@@ -453 +453 @@
-"cookies, reload this page, and try again."
-msgstr ""
-
+s
-"Browser Cookies aktivieren und diese Seite neu laden."
-
@@ -471 +471 @@
-msgstr "Website Verwaltung"
-
-7
+8
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "%(name)s \"%(obj)s\" wurde erfolgreich hinzugef�
-#: contrib/admin/views/main.py:261 contrib/admin/views/main.py:347
-2
+3
-msgid "You may edit it again below."
-msgstr "Das Element kann jetzt weiter ge�ert werden."
@@ -494 +494 @@
-msgstr "%s hinzugef�
-#: contrib/admin/views/main.py:335 contrib/admin/views/main.py:337
-
+ db/models/manipulators.py:306
-msgid "and"
-msgstr "und"
@@ -700 +700 @@
-msgstr "%s ist scheinbar kein urlpattern Objekt"
-
-8
+9
-msgid "Add user"
-msgstr "Benutzer zuf�
@@ -856 +856 @@
-msgid "Add %(name)s"
-msgstr "%(name)s zuf�
-#: contrib/admin/templates/admin/login.html:22
-msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
-msgstr "Haben Sie <a href=\"/password_reset/\">ihr Passwort vergessen</a>?"
-
-#: contrib/admin/templates/admin/base.html:25
-msgid "Welcome,"
@@ -886 +882 @@
-"All of the following related items will be deleted:"
-msgstr ""
-
+s
-"wollen? Es werden zus�lich die folgenden abh�igen Daten mit gel�t:"
-
@@ -1055 +1051 @@
-msgstr ""
-"Bitte geben Sie aus Sicherheitsgr�erst Ihr altes Kennwort und darunter "
-
+s
-"neue Kennwort ein."
-
@@ -1098 +1094 @@
-#: contrib/admin/templates/registration/password_reset_email.html:13
-msgid "Thanks for using our site!"
-
+s
-
-#: contrib/admin/templates/registration/password_reset_email.html:15
@@ -1361 +1357 @@
-"them."
-msgstr ""
-
+s
-"zuweisen zu m�"
-
@@ -1408 +1404 @@
-msgstr "Gruppen"
-
-6
+8
-msgid "message"
-msgstr "Mitteilung"
+
+#: contrib/auth/forms.py:16
+msgid "The two password fields didn't match."
+msgstr "Die zwei Passw�r sind nicht gleich."
+
+#: contrib/auth/forms.py:24
+msgid "A user with that username already exists."
+msgstr "Ein Benutzer mit diesem Namen existiert bereits."
-
-#: contrib/auth/forms.py:52
@@ -1425 +1429 @@
-#: contrib/auth/forms.py:84
-msgid ""
-
+c
-"you've registered?"
-msgstr ""
-
+s
-"hier angemeldet ist?"
-
@@ -1776 +1780 @@
-
-#: conf/global_settings.py:59
+msgid "Polish"
+msgstr "Polnisch"
+
+#: conf/global_settings.py:60
-msgid "Brazilian"
-msgstr "Brasilianisch"
-
-0
+1
-msgid "Romanian"
-msgstr "Rum�sch"
-
-1
+2
-msgid "Russian"
-msgstr "Russisch"
-
-2
+3
-msgid "Slovak"
-msgstr "Slowakisch"
-
-3
+4
-msgid "Slovenian"
-msgstr "Slowenisch"
-
-4
+5
-msgid "Serbian"
-msgstr "Serbisch"
-
-5
+6
-msgid "Swedish"
-msgstr "Schwedisch"
-
-6
+7
-msgid "Tamil"
-msgstr "Tamilisch"
-
-7
+8
-msgid "Turkish"
-msgstr "T�h"
-
-8
+9
-msgid "Ukrainian"
-msgstr "Ukrainisch"
-
-69
+70
-msgid "Simplified Chinese"
-msgstr "Vereinfachtes Chinesisch"
-
-0
+1
-msgid "Traditional Chinese"
-msgstr "Traditionelles Chinesisch"
-
-3
+4
-msgid "This value must contain only letters, numbers and underscores."
-msgstr "Dieser Wert darf nur Buchstaben, Ziffern und Unterstriche enthalten."
-
-7
+8
-msgid ""
-"This value must contain only letters, numbers, underscores, dashes or "
@@ -1835 +1843 @@
-"enthalten."
-
-1
+2
-msgid "This value must contain only letters, numbers, underscores or hyphens."
-msgstr ""
@@ -1841 +1849 @@
-"enthalten."
-
-5
+6
-msgid "Uppercase letters are not allowed here."
-msgstr "Gro�uchstaben sind hier nicht erlaubt."
-
-79
+80
-msgid "Lowercase letters are not allowed here."
-msgstr "Kleinbuchstaben sind hier nicht erlaubt."
-
-6
+7
-msgid "Enter only digits separated by commas."
-msgstr "Hier sind nur durch Komma getrennte Ziffern erlaubt."
-
-8
+9
-msgid "Enter valid e-mail addresses separated by commas."
-msgstr "Bitte mit Komma getrennte, g� eMail-Adressen eingeben."
-
-2
+3
-msgid "Please enter a valid IP address."
-msgstr "Bitte eine g� IP-Adresse eingeben."
-
-6
+7
-msgid "Empty values are not allowed here."
-msgstr "Dieses Feld darf nicht leer sein."
-
-0
+1
-msgid "Non-numeric characters aren't allowed here."
-msgstr "Nichtnumerische Zeichen sind hier nicht erlaubt."
-
-4
+5
-msgid "This value can't be comprised solely of digits."
-msgstr "Dieser Wert darf nicht nur aus Ziffern bestehen."
-
-19
+20
-msgid "Enter a whole number."
-msgstr "Bitte eine ganze Zahl eingeben."
-
-3
+4
-msgid "Only alphabetical characters are allowed here."
-msgstr "Nur alphabetische Zeichen sind hier erlaubt."
-
-8
+9
-msgid "Year must be 1900 or later."
-msgstr "Das Jahr muss 1900 oder sp�r sein."
-
-2
+3
-#, python-format
-msgid "Invalid date: %s."
-msgstr "Ung�s Datum: %s"
-
-6 db/models/fields/__init__.py:415
+7 db/models/fields/__init__.py:424
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "Bitte ein g�s Datum im Format JJJJ-MM-TT eingeben."
-
-1
+2
-msgid "Enter a valid time in HH:MM format."
-msgstr "Bitte eine g� Zeit im Format SS:MM eingeben."
-
-5 db/models/fields/__init__.py:477
+6 db/models/fields/__init__.py:488
-msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format."
-msgstr ""
@@ -1904 +1912 @@
-"eingeben."
-
-0
+1
-msgid "Enter a valid e-mail address."
-msgstr "Bitte eine g� eMail-Adresse eingeben"
-
-2 core/validators.py:401 forms/__init__.py:661
+3 core/validators.py:442 forms/__init__.py:667
-msgid "No file was submitted. Check the encoding type on the form."
-msgstr ""
-"Es wurde keine Datei geschickt. Eventuell ist das Formular-Encoding falsch."
-
-6
+7
-msgid ""
-"Upload a valid image. The file you uploaded was either not an image or a "
@@ -1921 +1929 @@
-"oder ist defekt."
-
-3
+4
-#, python-format
-msgid "The URL %s does not point to a valid image."
-msgstr "Die URL %s zeigt nicht auf ein g�s Bild."
-
-7
+8
-#, python-format
-msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid."
@@ -1932 +1940 @@
-"Telefonnummern m�im Format XXX-XXX-XXXX sein. \"%s\" ist ung�"
-
-5
+6
-#, python-format
-msgid "The URL %s does not point to a valid QuickTime video."
-msgstr "Die URL %s zeigt nicht auf ein g�s QuickTime video."
-
-199
+200
-msgid "A valid URL is required."
-msgstr "Eine g� URL ist hier verlangt."
-
-3
+4
-#, python-format
-msgid ""
@@ -1950 +1958 @@
-"%s"
-
-0
+1
-#, python-format
-msgid "Badly formed XML: %s"
-msgstr "Ung�s XML: %s"
-
-0
+8
-#, python-format
-msgid "Invalid URL: %s"
-msgstr "Ung� URL: %s"
-
-34 core/validators.py:236
+43 core/validators.py:245
-#, python-format
-msgid "The URL %s is a broken link."
-msgstr "Die URL %s funktioniert nicht."
-
-42
+51
-msgid "Enter a valid U.S. state abbreviation."
-msgstr "Bitte eine g� Abk� f�en US-Staat eingeben."
-
-56
+65
-#, python-format
-msgid "Watch your mouth! The word %s is not allowed here."
@@ -1976 +1984 @@
-msgstr[1] "Keine Schimpfworte! Die W�r %s sind hier nicht gern gesehen!"
-
-63
+72
-#, python-format
-msgid "This field must match the '%s' field."
-msgstr "Dieses Feld muss zum Feld '%s' passen."
-
-82
+91
-msgid "Please enter something for at least one field."
-msgstr "Bitte mindestens eines der Felder ausf�"
-
-291 core/validators.py:302
+300 core/validators.py:311
-msgid "Please enter both fields or leave them both empty."
-msgstr "Bitte entweder beide Felder ausf� oder beide leer lassen."
-
-09
+18
-#, python-format
-msgid "This field must be given if %(field)s is %(value)s"
@@ -1995 +2003 @@
-"Dieses Feld muss gef�ein, wenn Feld %(field)s den Wert %(value)s hat."
-
-21
+30
-#, python-format
-msgid "This field must be given if %(field)s is not %(value)s"
@@ -2001 +2009 @@
-"Dieses Feld muss gef�ein, wenn Feld %(field)s nicht %(value)s ist."
-
-0
+9
-msgid "Duplicate values are not allowed."
-msgstr "Doppelte Werte sind hier nicht erlaubt."
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-#, python-format
-msgid "This value must be a power of %s."
-msgstr "Dieser Wert muss eine Potenz von %s sein."
-
-374
+415
-msgid "Please enter a valid decimal number."
-msgstr "Bitte eine g� Dezimalzahl eingeben."
-
-378
+419
-#, python-format
-msgid "Please enter a valid decimal number with at most %s total digit."
@@ -2022 +2042 @@
-msgstr[1] "Bitte eine g� Dezimalzahl mit maximal %s Ziffern eingeben."
-
-381
+422
-#, python-format
-msgid ""
@@ -2031 +2051 @@
-msgstr[1] "Bitte eine g� Dezimalzahl mit maximal %s Ziffern eingeben."
-
-384
+425
-#, python-format
-msgid "Please enter a valid decimal number with at most %s decimal place."
@@ -2041 +2061 @@
-"Bitte eine g� Dezimalzahl mit maximal %s Dezimalstellen eingeben."
-
-394
+435
-#, python-format
-msgid "Make sure your uploaded file is at least %s bytes big."
@@ -2048 +2068 @@
-"ist."
-
-395
+436
-#, python-format
-msgid "Make sure your uploaded file is at most %s bytes big."
@@ -2054 +2074 @@
-"Bitte sicherstellen, da�die hochgeladene Datei maximal %s Bytes gross ist."
-
-12
+53
-msgid "The format for this field is wrong."
-msgstr "Das Format f�ses Feld ist falsch."
-
-27
+68
-msgid "This field is invalid."
-msgstr "Dieses Feld ist ung�"
-
-463
+504
-#, python-format
-msgid "Could not retrieve anything from %s."
-msgstr "Konnte nichts von %s empfangen."
-
-466
+507
-#, python-format
-msgid ""
@@ -2073 +2093 @@
-msgstr "Die URL %(url)s lieferte den falschen Content-Type '%(contenttype)s'."
-
-499
+540
-#, python-format
-msgid ""
@@ -2082 +2102 @@
-"beginnt mit \"%(start)s\"."
-
-03
+44
-#, python-format
-msgid ""
@@ -2091 +2111 @@
-"beginnt mit \"%(start)s\"."
-
-08
+49
-#, python-format
-msgid ""
@@ -2100 +2120 @@
-"\"%(start)s\"."
-
-13
+54
-#, python-format
-msgid ""
@@ -2109 +2129 @@
-"\"."
-
-17
+58
-#, python-format
-msgid ""
@@ -2118 +2138 @@
-"Zeile beginnt mit \"%(start)s\"."
-
-22
+63
-#, python-format
-msgid ""
@@ -2142 +2162 @@
-msgstr "%(verbose_name)s wurde gel�t"
-
-2
+5
-#, python-format
-msgid "%(object)s with this %(type)s already exists for the given %(field)s."
@@ -2149 +2169 @@
-"s'."
-
-0
+1
-#, python-format
-msgid "%(optname)s with this %(fieldname)s already exists."
-msgstr "Ein '%(optname)s' mit diesem '%(fieldname)s' existiert bereits."
-
-4 db/models/fields/__init__.py:265
-51 db/models/fields/__init__.py:562
-46
+5 db/models/fields/__init__.py:266
+69 db/models/fields/__init__.py:580
+52
-msgid "This field is required."
-msgstr "Dieses Feld ist zwingend."
-
-0
+9
-msgid "This value must be an integer."
-msgstr "Dieser Wert muss eine Ganzzahl sein."
-
-72
+81
-msgid "This value must be either True or False."
-msgstr "Dieser Wert muss wahr oder falsch sein."
-
-88
+97
-msgid "This field cannot be null."
-msgstr "Dieses Feld darf nicht leer sein."
-
-71
+89
-msgid "Enter a valid filename."
-msgstr "Bitte einen g�n Dateinamen eingeben"
@@ -2202 +2222 @@
-"Bitte g� IDs f�elf)s eingeben. Die Werte %(value)r sind ung�"
-
-1
+7
-#, python-format
-msgid "Ensure your text is less than %s character."
-msgid_plural "Ensure your text is less than %s characters."
-
-
-
-86
+s
+s
+
+92
-msgid "Line breaks are not allowed here."
-msgstr "Zeilenumbr�ind hier nicht erlaubt."
-
-87 forms/__init__.py:560 forms/__init__.py:599
+93 forms/__init__.py:566 forms/__init__.py:605
-#, python-format
-msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
@@ -2219 +2239 @@
-"Bitte eine g� Auswahl treffen; '%(data)s' ist nicht in %(choices)s."
-
-3
+9
-msgid "The submitted file is empty."
-msgstr "Die ausgew�te Datei ist leer."
-
-19
+25
-msgid "Enter a whole number between -32,768 and 32,767."
-msgstr "Bitte eine ganze Zahl zwischen -32.768 und 32.767 eingeben."
-
-29
+35
-msgid "Enter a positive number."
-msgstr "Bitte eine ganze, positive Zahl eingeben."
-
-39
+45
-msgid "Enter a whole number between 0 and 32,767."
-msgstr "Bitte eine ganze Zahl zwischen 0 und 32.767 eingeben."

django/branches/per-object-permissions/django/conf/locale/el/LC_MESSAGES/django.po

@@ -108 +108 @@
-"http://%(domain)s%(url)s"
-msgstr ""
+"Σχόλιο από τον/την %(user)s την %(date)s\n"
+"\n"
+"%(comment)s\n"
+"\n"
+"http://%(domain)s%(url)s"
-
-#: contrib/comments/models.py:168
@@ -142 +147 @@
-#, fuzzy
-msgid "karma score"
-βαθμολογία
+karma
-
-#: contrib/comments/models.py:238
-msgid "karma scores"
-
+karma
-
-#: contrib/comments/models.py:242
@@ -160 +165 @@
-"%(text)s"
-msgstr ""
-ει
+ηκε
-"\n"
-"%(κείμενο)α"
@@ -246 +251 @@
-#: contrib/comments/views/comments.py:284
-msgid "One or more of the required fields wasn't submitted"
-οβλί
+εβλή
-
-#: contrib/comments/views/comments.py:197
@@ -269 +274 @@
-#: contrib/admin/templates/admin/login.html:17
-msgid "Username:"
-
+Όνομα χρήστη:
-
-#: contrib/comments/templates/comments/form.html:6
@@ -299 +304 @@
-#: contrib/admin/templates/admin_doc/model_index.html:5
-msgid "Log out"
-
+Αποσύνδεση
-
-#: contrib/comments/templates/comments/form.html:12
-msgid "Ratings"
-
+Βαθμολογίες
-
-#: contrib/comments/templates/comments/form.html:12
-#: contrib/comments/templates/comments/form.html:23
-msgid "Required"
-
+Απαραίτητο
-