mirror of
https://github.com/django/django.git
synced 2025-07-04 09:49:12 +00:00
[soc2009/multidb] Updated to trunk r11371.
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11373 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Alex Gaynor
parent
ac74fa7e32
commit
1a98f6ff26
4
AUTHORS
4
AUTHORS
@ -201,6 +201,7 @@ answer newbie questions, and generally made Django that much better:
|
||||
Ian Holsman <http://feh.holsman.net/>
|
||||
Kieran Holland <http://www.kieranholland.com>
|
||||
Sung-Jin Hong <serialx.net@gmail.com>
|
||||
Leo "hylje" Honkanen <sealage@gmail.com>
|
||||
Richard House <Richard.House@i-logue.com>
|
||||
Robert Rock Howard <http://djangomojo.com/>
|
||||
John Huddleston <huddlej@wwu.edu>
|
||||
@ -219,7 +220,7 @@ answer newbie questions, and generally made Django that much better:
|
||||
Michael Josephson <http://www.sdjournal.com/>
|
||||
jpellerin@gmail.com
|
||||
junzhang.jn@gmail.com
|
||||
Antti Kaihola <http://akaihola.blogspot.com/>
|
||||
Antti Kaihola <http://djangopeople.net/akaihola/>
|
||||
Bahadır Kandemir <bahadir@pardus.org.tr>
|
||||
Karderio <karderio@gmail.com>
|
||||
Nagy Károly <charlie@rendszergazda.com>
|
||||
@ -438,6 +439,7 @@ answer newbie questions, and generally made Django that much better:
|
||||
viestards.lists@gmail.com
|
||||
George Vilches <gav@thataddress.com>
|
||||
Vlado <vlado@labath.org>
|
||||
Zachary Voase <zacharyvoase@gmail.com>
|
||||
Milton Waddams
|
||||
Chris Wagner <cw264701@ohio.edu>
|
||||
Rick Wagner <rwagner@physics.ucsd.edu>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
VERSION = (1, 1, 0, 'beta', 1)
|
||||
VERSION = (1, 1, 0, 'final', 0)
|
||||
|
||||
def get_version():
|
||||
version = '%s.%s' % (VERSION[0], VERSION[1])
|
||||
@ -7,9 +7,8 @@ def get_version():
|
||||
if VERSION[3:] == ('alpha', 0):
|
||||
version = '%s pre-alpha' % version
|
||||
else:
|
||||
version = '%s %s' % (version, VERSION[3])
|
||||
if VERSION[3] != 'final':
|
||||
version = '%s %s' % (version, VERSION[4])
|
||||
version = '%s %s %s' % (version, VERSION[3], VERSION[4])
|
||||
from django.utils.version import get_svn_revision
|
||||
svn_rev = get_svn_revision()
|
||||
if svn_rev != u'SVN-unknown':
|
||||
|
||||
Binary file not shown.
@ -1,19 +1,20 @@
|
||||
# translation of django.po to Arabic
|
||||
# This file is distributed under the same license as the django package.
|
||||
#
|
||||
# Ossama M. Khayat <okhayat@yahoo.com>, 2009.
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: django\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2009-04-12 07:33+0300\n"
|
||||
"PO-Revision-Date: 2009-04-12 08:01+0300\n"
|
||||
"Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
|
||||
"POT-Creation-Date: 2009-05-10 15:09+0300\n"
|
||||
"PO-Revision-Date: 2009-05-10 15:18+0300\n"
|
||||
"Language-Team: Arabic <support@arabeyes.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Generator: KBabel 1.11.4\n"
|
||||
"Plural-Forms: nplurals=4; plural=(n == 1? 0 : (n == 2? 1 : (n <= 10? 2 : 3)))\n\n"
|
||||
"\n"
|
||||
|
||||
#: conf/global_settings.py:44
|
||||
msgid "Arabic"
|
||||
@ -219,16 +220,16 @@ msgstr "الصينيّة المبسطة"
|
||||
msgid "Traditional Chinese"
|
||||
msgstr "الصينيّة التقليدية"
|
||||
|
||||
#: contrib/admin/actions.py:56
|
||||
#: contrib/admin/actions.py:60
|
||||
#, python-format
|
||||
msgid "Successfully deleted %(count)d %(items)s."
|
||||
msgstr "تم حذف %(count)d %(items)s بنجاح."
|
||||
|
||||
#: contrib/admin/actions.py:63 contrib/admin/options.py:1023
|
||||
#: contrib/admin/actions.py:67 contrib/admin/options.py:1025
|
||||
msgid "Are you sure?"
|
||||
msgstr "هل أنت متأكد؟"
|
||||
|
||||
#: contrib/admin/actions.py:81
|
||||
#: contrib/admin/actions.py:85
|
||||
#, python-format
|
||||
msgid "Delete selected %(verbose_name_plural)s"
|
||||
msgstr "حذف %(verbose_name_plural)s المحددون"
|
||||
@ -267,15 +268,15 @@ msgstr "هذا الشهر"
|
||||
msgid "This year"
|
||||
msgstr "هذه السنة"
|
||||
|
||||
#: contrib/admin/filterspecs.py:147 forms/widgets.py:413
|
||||
#: contrib/admin/filterspecs.py:147 forms/widgets.py:434
|
||||
msgid "Yes"
|
||||
msgstr "نعم"
|
||||
|
||||
#: contrib/admin/filterspecs.py:147 forms/widgets.py:413
|
||||
#: contrib/admin/filterspecs.py:147 forms/widgets.py:434
|
||||
msgid "No"
|
||||
msgstr "لا"
|
||||
|
||||
#: contrib/admin/filterspecs.py:154 forms/widgets.py:413
|
||||
#: contrib/admin/filterspecs.py:154 forms/widgets.py:434
|
||||
msgid "Unknown"
|
||||
msgstr "مجهول"
|
||||
|
||||
@ -315,80 +316,81 @@ msgstr "مُدخلات السجل"
|
||||
msgid "None"
|
||||
msgstr "لاشيء"
|
||||
|
||||
#: contrib/admin/options.py:517
|
||||
#: contrib/admin/options.py:519
|
||||
#, python-format
|
||||
msgid "Changed %s."
|
||||
msgstr "عدّل %s."
|
||||
|
||||
#: contrib/admin/options.py:517 contrib/admin/options.py:527
|
||||
#: contrib/comments/templates/comments/preview.html:16 forms/models.py:306
|
||||
#: contrib/admin/options.py:519 contrib/admin/options.py:529
|
||||
#: contrib/comments/templates/comments/preview.html:16 forms/models.py:388
|
||||
#: forms/models.py:587
|
||||
msgid "and"
|
||||
msgstr "و"
|
||||
|
||||
#: contrib/admin/options.py:522
|
||||
#: contrib/admin/options.py:524
|
||||
#, python-format
|
||||
msgid "Added %(name)s \"%(object)s\"."
|
||||
msgstr "أضاف %(name)s \"%(object)s\"."
|
||||
|
||||
#: contrib/admin/options.py:526
|
||||
#: contrib/admin/options.py:528
|
||||
#, python-format
|
||||
msgid "Changed %(list)s for %(name)s \"%(object)s\"."
|
||||
msgstr "غيّر %(list)s في %(name)s \"%(object)s\"."
|
||||
|
||||
#: contrib/admin/options.py:531
|
||||
#: contrib/admin/options.py:533
|
||||
#, python-format
|
||||
msgid "Deleted %(name)s \"%(object)s\"."
|
||||
msgstr "حذف %(name)s \"%(object)s\"."
|
||||
|
||||
#: contrib/admin/options.py:535
|
||||
#: contrib/admin/options.py:537
|
||||
msgid "No fields changed."
|
||||
msgstr "لم يتم تغيير أية حقول."
|
||||
|
||||
#: contrib/admin/options.py:596 contrib/auth/admin.py:67
|
||||
#: contrib/admin/options.py:598 contrib/auth/admin.py:67
|
||||
#, python-format
|
||||
msgid "The %(name)s \"%(obj)s\" was added successfully."
|
||||
msgstr "تم اضافة %(name)s \"%(obj)s\" بنجاح."
|
||||
|
||||
#: contrib/admin/options.py:600 contrib/admin/options.py:633
|
||||
#: contrib/admin/options.py:602 contrib/admin/options.py:635
|
||||
#: contrib/auth/admin.py:75
|
||||
msgid "You may edit it again below."
|
||||
msgstr "يمكنك تعديله مجددا في الأسفل."
|
||||
|
||||
#: contrib/admin/options.py:610 contrib/admin/options.py:643
|
||||
#: contrib/admin/options.py:612 contrib/admin/options.py:645
|
||||
#, python-format
|
||||
msgid "You may add another %s below."
|
||||
msgstr "يمكنك إضافة %s آخر بالأسفل."
|
||||
|
||||
#: contrib/admin/options.py:631
|
||||
#: contrib/admin/options.py:633
|
||||
#, python-format
|
||||
msgid "The %(name)s \"%(obj)s\" was changed successfully."
|
||||
msgstr "تم تغيير %(name)s \"%(obj)s\" بنجاح."
|
||||
|
||||
#: contrib/admin/options.py:639
|
||||
#: contrib/admin/options.py:641
|
||||
#, python-format
|
||||
msgid "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
|
||||
msgstr "تمت إضافة %(name)s \"%(obj)s\" بنجاح، يمكنك تعديله مرة أخرى بالأسفل."
|
||||
|
||||
#: contrib/admin/options.py:770
|
||||
#: contrib/admin/options.py:772
|
||||
#, python-format
|
||||
msgid "Add %s"
|
||||
msgstr "أضف %s"
|
||||
|
||||
#: contrib/admin/options.py:801 contrib/admin/options.py:1001
|
||||
#: contrib/admin/options.py:803 contrib/admin/options.py:1003
|
||||
#, python-format
|
||||
msgid "%(name)s object with primary key %(key)r does not exist."
|
||||
msgstr "العنصر %(name)s الذي به الحقل الأساسي %(key)r غير موجود."
|
||||
|
||||
#: contrib/admin/options.py:858
|
||||
#: contrib/admin/options.py:860
|
||||
#, python-format
|
||||
msgid "Change %s"
|
||||
msgstr "عدّل %s"
|
||||
|
||||
#: contrib/admin/options.py:902
|
||||
#: contrib/admin/options.py:904
|
||||
msgid "Database error"
|
||||
msgstr "خطـأ في قاعدة البيانات"
|
||||
|
||||
#: contrib/admin/options.py:938
|
||||
#: contrib/admin/options.py:940
|
||||
#, python-format
|
||||
msgid "%(count)s %(name)s was changed successfully."
|
||||
msgid_plural "%(count)s %(name)s were changed successfully."
|
||||
@ -397,12 +399,12 @@ msgstr[1] "تم تغيير عنصري %(name)s بنجاح."
|
||||
msgstr[2] "تم تغيير %(count)s %(name)s بنجاح."
|
||||
msgstr[3] "تم تغيير %(count)s %(name)s بنجاح."
|
||||
|
||||
#: contrib/admin/options.py:1016
|
||||
#: contrib/admin/options.py:1018
|
||||
#, python-format
|
||||
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
|
||||
msgstr "تم حذف %(name)s \"%(obj)s\" بنجاح."
|
||||
|
||||
#: contrib/admin/options.py:1052
|
||||
#: contrib/admin/options.py:1054
|
||||
#, python-format
|
||||
msgid "Change history: %s"
|
||||
msgstr "تاريخ التغيير: %s"
|
||||
@ -498,7 +500,7 @@ msgstr "نحن آسفون، لكننا لم نعثر على الصفحة الم
|
||||
|
||||
#: contrib/admin/templates/admin/500.html:4
|
||||
#: contrib/admin/templates/admin/app_index.html:8
|
||||
#: contrib/admin/templates/admin/base.html:33
|
||||
#: contrib/admin/templates/admin/base.html:31
|
||||
#: contrib/admin/templates/admin/change_form.html:17
|
||||
#: contrib/admin/templates/admin/change_list.html:25
|
||||
#: contrib/admin/templates/admin/delete_confirmation.html:6
|
||||
@ -542,7 +544,6 @@ msgid "Run the selected action"
|
||||
msgstr "نفذ العملية المحدّدة"
|
||||
|
||||
#: contrib/admin/templates/admin/actions.html:4
|
||||
#: contrib/admin/templates/admin/search_form.html:8
|
||||
msgid "Go"
|
||||
msgstr "نفّذ"
|
||||
|
||||
@ -552,18 +553,18 @@ msgstr "نفّذ"
|
||||
msgid "%(name)s"
|
||||
msgstr "%(name)s"
|
||||
|
||||
#: contrib/admin/templates/admin/base.html:28
|
||||
#: contrib/admin/templates/admin/base.html:26
|
||||
msgid "Welcome,"
|
||||
msgstr "أهلا، "
|
||||
|
||||
#: contrib/admin/templates/admin/base.html:28
|
||||
#: contrib/admin/templates/admin/base.html:26
|
||||
#: contrib/admin/templates/registration/password_change_done.html:3
|
||||
#: contrib/admin/templates/registration/password_change_form.html:3
|
||||
#: contrib/admindocs/templates/admin_doc/bookmarklets.html:3
|
||||
msgid "Documentation"
|
||||
msgstr "الوثائق"
|
||||
|
||||
#: contrib/admin/templates/admin/base.html:28
|
||||
#: contrib/admin/templates/admin/base.html:26
|
||||
#: contrib/admin/templates/admin/auth/user/change_password.html:14
|
||||
#: contrib/admin/templates/admin/auth/user/change_password.html:47
|
||||
#: contrib/admin/templates/registration/password_change_done.html:3
|
||||
@ -571,7 +572,7 @@ msgstr "الوثائق"
|
||||
msgid "Change password"
|
||||
msgstr "غيّر كلمة المرور"
|
||||
|
||||
#: contrib/admin/templates/admin/base.html:28
|
||||
#: contrib/admin/templates/admin/base.html:26
|
||||
#: contrib/admin/templates/registration/password_change_done.html:3
|
||||
#: contrib/admin/templates/registration/password_change_form.html:3
|
||||
msgid "Log out"
|
||||
@ -702,6 +703,10 @@ msgstr "عملياتي"
|
||||
msgid "None available"
|
||||
msgstr "لا يوجد"
|
||||
|
||||
#: contrib/admin/templates/admin/index.html:72
|
||||
msgid "Unknown content"
|
||||
msgstr "مُحتوى مجهول"
|
||||
|
||||
#: contrib/admin/templates/admin/invalid_setup.html:7
|
||||
msgid ""
|
||||
"Something's wrong with your database installation. Make sure the appropriate "
|
||||
@ -749,6 +754,10 @@ msgstr ""
|
||||
msgid "Show all"
|
||||
msgstr "أظهر الكل"
|
||||
|
||||
#: contrib/admin/templates/admin/search_form.html:8
|
||||
msgid "Search"
|
||||
msgstr "ابحث"
|
||||
|
||||
#: contrib/admin/templates/admin/search_form.html:10
|
||||
#, python-format
|
||||
msgid "1 result"
|
||||
@ -1755,18 +1764,24 @@ msgid ""
|
||||
"form from this page."
|
||||
msgstr "نعتذر، لكنّ استمارتك انتهت صلاحيتها. رجاء أكمل تعبئة الاستمارة من هذه الصفحة."
|
||||
|
||||
#: contrib/gis/forms/fields.py:14
|
||||
#: contrib/gis/forms/fields.py:17
|
||||
msgid "No geometry value provided."
|
||||
msgstr "لم تُدخل أي أحداثيات."
|
||||
|
||||
#: contrib/gis/forms/fields.py:15
|
||||
#: contrib/gis/forms/fields.py:18
|
||||
msgid "Invalid geometry value."
|
||||
msgstr "الإحداثيات غير صحيحة."
|
||||
|
||||
#: contrib/gis/forms/fields.py:16
|
||||
#: contrib/gis/forms/fields.py:19
|
||||
msgid "Invalid geometry type."
|
||||
msgstr "نوع الإحداثيات غير صحيح."
|
||||
|
||||
#: contrib/gis/forms/fields.py:20
|
||||
msgid ""
|
||||
"An error occurred when transforming the geometry to the SRID of the geometry "
|
||||
"form field."
|
||||
msgstr "حدث خطأ أثناء تحويل geometry إلى حقل SRID."
|
||||
|
||||
#: contrib/humanize/templatetags/humanize.py:19
|
||||
msgid "th"
|
||||
msgstr " "
|
||||
@ -3699,7 +3714,7 @@ msgstr "إنجلترا"
|
||||
|
||||
#: contrib/localflavor/uk/uk_regions.py:91
|
||||
msgid "Northern Ireland"
|
||||
msgstr ""
|
||||
msgstr "شمال ايرلندا"
|
||||
|
||||
#: contrib/localflavor/uk/uk_regions.py:92
|
||||
msgid "Scotland"
|
||||
@ -3727,7 +3742,7 @@ msgstr "أدخل رمز بريد جنوب إفريقي صحيح"
|
||||
|
||||
#: contrib/localflavor/za/za_provinces.py:4
|
||||
msgid "Eastern Cape"
|
||||
msgstr ""
|
||||
msgstr "شرق كيب"
|
||||
|
||||
#: contrib/localflavor/za/za_provinces.py:5
|
||||
msgid "Free State"
|
||||
@ -3751,15 +3766,15 @@ msgstr ""
|
||||
|
||||
#: contrib/localflavor/za/za_provinces.py:10
|
||||
msgid "Northern Cape"
|
||||
msgstr ""
|
||||
msgstr "شمال كيب"
|
||||
|
||||
#: contrib/localflavor/za/za_provinces.py:11
|
||||
msgid "North West"
|
||||
msgstr ""
|
||||
msgstr "شمال شرق"
|
||||
|
||||
#: contrib/localflavor/za/za_provinces.py:12
|
||||
msgid "Western Cape"
|
||||
msgstr ""
|
||||
msgstr "غير كيب"
|
||||
|
||||
#: contrib/redirects/models.py:7
|
||||
msgid "redirect from"
|
||||
@ -3823,7 +3838,7 @@ msgstr "اسم العرض"
|
||||
msgid "sites"
|
||||
msgstr "مواقع"
|
||||
|
||||
#: db/models/fields/__init__.py:356 db/models/fields/__init__.py:707
|
||||
#: db/models/fields/__init__.py:356 db/models/fields/__init__.py:710
|
||||
msgid "This value must be an integer."
|
||||
msgstr "هذه القيمة يجب أن تكون رقما صحيحا."
|
||||
|
||||
@ -3856,15 +3871,15 @@ msgstr "أدخل تاريخ/وقت صحيح بالنسق YYYY-MM-DD HH:MM[:ss[.u
|
||||
msgid "This value must be a decimal number."
|
||||
msgstr "يجب أن تكون هذه القيمة رقماً عشرياً."
|
||||
|
||||
#: db/models/fields/__init__.py:683
|
||||
#: db/models/fields/__init__.py:686
|
||||
msgid "This value must be a float."
|
||||
msgstr "هذه القيمة يجب أن تكون عدد فاصلة عائمة."
|
||||
|
||||
#: db/models/fields/__init__.py:743
|
||||
#: db/models/fields/__init__.py:746
|
||||
msgid "This value must be either None, True or False."
|
||||
msgstr "يجب أن تكون هذه القيمة None، أو True أو False."
|
||||
|
||||
#: db/models/fields/__init__.py:846 db/models/fields/__init__.py:860
|
||||
#: db/models/fields/__init__.py:849 db/models/fields/__init__.py:863
|
||||
msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
|
||||
msgstr "أدخل توقيتاً صحيحاً بالنسق HH:MM[:ss[.uuuuuu]]."
|
||||
|
||||
@ -3934,11 +3949,11 @@ msgstr "تحقق من أن تدخل %s خانات عشرية لا أكثر."
|
||||
msgid "Ensure that there are no more than %s digits before the decimal point."
|
||||
msgstr "تحقق من أن تدخل %s أرقام قبل الفاصل العشري لا أكثر."
|
||||
|
||||
#: forms/fields.py:288 forms/fields.py:862
|
||||
#: forms/fields.py:288 forms/fields.py:863
|
||||
msgid "Enter a valid date."
|
||||
msgstr "أدخل تاريخاً صحيحاً."
|
||||
|
||||
#: forms/fields.py:322 forms/fields.py:863
|
||||
#: forms/fields.py:322 forms/fields.py:864
|
||||
msgid "Enter a valid time."
|
||||
msgstr "أدخل وقتاً صحيحاً."
|
||||
|
||||
@ -3981,20 +3996,20 @@ msgstr "أدخل رابطاً صحيحاً."
|
||||
msgid "This URL appears to be a broken link."
|
||||
msgstr "يبدو أن هذا الرابط غير متوفر."
|
||||
|
||||
#: forms/fields.py:624 forms/fields.py:702
|
||||
#: forms/fields.py:625 forms/fields.py:703
|
||||
#, python-format
|
||||
msgid "Select a valid choice. %(value)s is not one of the available choices."
|
||||
msgstr "انتق خياراً صحيحاً. %(value)s ليس أحد الخيارات المتاحة."
|
||||
|
||||
#: forms/fields.py:703 forms/fields.py:764 forms/models.py:776
|
||||
#: forms/fields.py:704 forms/fields.py:765 forms/models.py:965
|
||||
msgid "Enter a list of values."
|
||||
msgstr "أدخل قائمة من القيم."
|
||||
|
||||
#: forms/fields.py:891
|
||||
#: forms/fields.py:892
|
||||
msgid "Enter a valid IPv4 address."
|
||||
msgstr "أدخل عنوان IPv4 صحيح."
|
||||
|
||||
#: forms/fields.py:901
|
||||
#: forms/fields.py:902
|
||||
msgid "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
|
||||
msgstr "أدخل اختصار 'slug' صحيح يتكوّن من أحرف، أرقام، شرطات سفلية وعاديّة."
|
||||
|
||||
@ -4002,34 +4017,62 @@ msgstr "أدخل اختصار 'slug' صحيح يتكوّن من أحرف، أر
|
||||
msgid "Order"
|
||||
msgstr "الترتيب"
|
||||
|
||||
#: forms/models.py:299 forms/models.py:308
|
||||
#: forms/models.py:367
|
||||
#, python-format
|
||||
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
|
||||
msgstr "%(field_name)s يجب أن يكون مُميّزاً مع %(date_field)s %(lookup)s."
|
||||
|
||||
#: forms/models.py:381 forms/models.py:389
|
||||
#, python-format
|
||||
msgid "%(model_name)s with this %(field_label)s already exists."
|
||||
msgstr "النموذج %(model_name)s والحقل %(field_label)s موجود مسبقاً."
|
||||
|
||||
#: forms/models.py:651
|
||||
#: forms/models.py:581
|
||||
#, python-format
|
||||
msgid "Please correct the duplicate data for %(field)s."
|
||||
msgstr "رجاء صحّح بيانات %(field)s المتكررة."
|
||||
|
||||
#: forms/models.py:585
|
||||
#, python-format
|
||||
msgid "Please correct the duplicate data for %(field)s, which must be unique."
|
||||
msgstr "رجاء صحّح بيانات %(field)s المتكررة والتي يجب أن تكون مُميّزة."
|
||||
|
||||
#: forms/models.py:591
|
||||
#, 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 ""
|
||||
"رجاء صحّح بيانات %(field_name)s المتكررة والتي يجب أن تكون مُميّزة "
|
||||
"لـ%(lookup)s في %(date_field)s."
|
||||
|
||||
#: forms/models.py:599
|
||||
msgid "Please correct the duplicate values below."
|
||||
msgstr "رجاءً صحّح القيم المُكرّرة أدناه."
|
||||
|
||||
#: forms/models.py:837
|
||||
msgid "The inline foreign key did not match the parent instance primary key."
|
||||
msgstr "حقل foreign key المحدد لا يطابق الحقل الرئيسي له."
|
||||
|
||||
#: forms/models.py:706
|
||||
#: forms/models.py:892
|
||||
msgid "Select a valid choice. That choice is not one of the available choices."
|
||||
msgstr "انتق خياراً صحيحاً. اختيارك ليس أحد الخيارات المتاحة."
|
||||
|
||||
#: forms/models.py:777
|
||||
#: forms/models.py:966
|
||||
#, python-format
|
||||
msgid "Select a valid choice. %s is not one of the available choices."
|
||||
msgstr "انتق خياراً صحيحاً. %s ليس أحد الخيارات المتاحة."
|
||||
|
||||
#: forms/models.py:779
|
||||
#: forms/models.py:968
|
||||
#, python-format
|
||||
msgid "\"%s\" is not a valid value for a primary key."
|
||||
msgstr "القيمة \"%s\" هي صحيحة للحقل المرجعي."
|
||||
|
||||
#: template/defaultfilters.py:765
|
||||
#: template/defaultfilters.py:767
|
||||
msgid "yes,no,maybe"
|
||||
msgstr "نعم,لا,ربما"
|
||||
|
||||
#: template/defaultfilters.py:796
|
||||
#: template/defaultfilters.py:798
|
||||
#, python-format
|
||||
msgid "%(size)d byte"
|
||||
msgid_plural "%(size)d bytes"
|
||||
@ -4038,42 +4081,42 @@ msgstr[1] "%(size)d بايت"
|
||||
msgstr[2] "%(size)d بايت"
|
||||
msgstr[3] "%(size)d بايت"
|
||||
|
||||
#: template/defaultfilters.py:798
|
||||
#: template/defaultfilters.py:800
|
||||
#, python-format
|
||||
msgid "%.1f KB"
|
||||
msgstr "%.1f ك.ب"
|
||||
|
||||
#: template/defaultfilters.py:800
|
||||
#: template/defaultfilters.py:802
|
||||
#, python-format
|
||||
msgid "%.1f MB"
|
||||
msgstr "%.1f م.ب"
|
||||
|
||||
#: template/defaultfilters.py:801
|
||||
#: template/defaultfilters.py:803
|
||||
#, python-format
|
||||
msgid "%.1f GB"
|
||||
msgstr "%.1f ج.ب"
|
||||
|
||||
#: utils/dateformat.py:41
|
||||
#: utils/dateformat.py:42
|
||||
msgid "p.m."
|
||||
msgstr "م"
|
||||
|
||||
#: utils/dateformat.py:42
|
||||
#: utils/dateformat.py:43
|
||||
msgid "a.m."
|
||||
msgstr "ص"
|
||||
|
||||
#: utils/dateformat.py:47
|
||||
#: utils/dateformat.py:48
|
||||
msgid "PM"
|
||||
msgstr "م"
|
||||
|
||||
#: utils/dateformat.py:48
|
||||
#: utils/dateformat.py:49
|
||||
msgid "AM"
|
||||
msgstr "ص"
|
||||
|
||||
#: utils/dateformat.py:97
|
||||
#: utils/dateformat.py:98
|
||||
msgid "midnight"
|
||||
msgstr "منتصف الليل"
|
||||
|
||||
#: utils/dateformat.py:99
|
||||
#: utils/dateformat.py:100
|
||||
msgid "noon"
|
||||
msgstr "ظهراً"
|
||||
|
||||
|
||||
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
@ -1,17 +1,13 @@
|
||||
# SOME DESCRIPTIVE TITLE.
|
||||
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
|
||||
# This file is distributed under the same license as the PACKAGE package.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
# This file is distributed under the same license as the Django package.
|
||||
#
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Django\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2007-06-28 17:36+1000\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"POT-Creation-Date: 2008-09-02 22:36-0700\n"
|
||||
"PO-Revision-Date: 2009-07-19 22:49+0000\n"
|
||||
"Last-Translator: Nasimul Haque <nasim.haque@gmail.com>\n"
|
||||
"Language-Team: Nasimul Haque <nasim.haque@gmail.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
@ -19,100 +15,100 @@ msgstr ""
|
||||
#: contrib/admin/media/js/SelectFilter2.js:33
|
||||
#, perl-format
|
||||
msgid "Available %s"
|
||||
msgstr ""
|
||||
msgstr "%s বিদ্যমান"
|
||||
|
||||
#: contrib/admin/media/js/SelectFilter2.js:41
|
||||
msgid "Choose all"
|
||||
msgstr ""
|
||||
msgstr "সব বাছাই করুন"
|
||||
|
||||
#: contrib/admin/media/js/SelectFilter2.js:46
|
||||
msgid "Add"
|
||||
msgstr ""
|
||||
msgstr "যোগ করুন"
|
||||
|
||||
#: contrib/admin/media/js/SelectFilter2.js:48
|
||||
msgid "Remove"
|
||||
msgstr ""
|
||||
msgstr "মুছে ফেলুন"
|
||||
|
||||
#: contrib/admin/media/js/SelectFilter2.js:53
|
||||
#, perl-format
|
||||
msgid "Chosen %s"
|
||||
msgstr ""
|
||||
msgstr "%s বাছাই করা হয়েছে"
|
||||
|
||||
#: contrib/admin/media/js/SelectFilter2.js:54
|
||||
msgid "Select your choice(s) and click "
|
||||
msgstr ""
|
||||
msgstr "আপনার পছন্দ বাছাই এবং ক্লিক করুন"
|
||||
|
||||
#: contrib/admin/media/js/SelectFilter2.js:59
|
||||
msgid "Clear all"
|
||||
msgstr ""
|
||||
msgstr "সব পরিষ্কার করুন"
|
||||
|
||||
#: contrib/admin/media/js/dateparse.js:32
|
||||
#: contrib/admin/media/js/calendar.js:24
|
||||
#: contrib/admin/media/js/dateparse.js:32
|
||||
msgid ""
|
||||
"January February March April May June July August September October November "
|
||||
"December"
|
||||
msgstr ""
|
||||
|
||||
#: contrib/admin/media/js/dateparse.js:33
|
||||
msgid "Sunday Monday Tuesday Wednesday Thursday Friday Saturday"
|
||||
msgstr ""
|
||||
msgstr "জানুয়ারি ফেব্রুয়ারি মার্চ এপ্রিল মে জুন জুলাই অাগস্ট সেপ্টেম্বর অক্টোবর নভেম্বর ডিসেম্বর"
|
||||
|
||||
#: contrib/admin/media/js/calendar.js:25
|
||||
msgid "S M T W T F S"
|
||||
msgstr ""
|
||||
msgstr "র স ম ব ব শ শ"
|
||||
|
||||
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:47
|
||||
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:81
|
||||
msgid "Now"
|
||||
msgstr ""
|
||||
|
||||
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:51
|
||||
msgid "Clock"
|
||||
msgstr ""
|
||||
|
||||
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:78
|
||||
msgid "Choose a time"
|
||||
msgstr ""
|
||||
|
||||
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:82
|
||||
msgid "Midnight"
|
||||
msgstr ""
|
||||
|
||||
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:83
|
||||
msgid "6 a.m."
|
||||
msgstr ""
|
||||
|
||||
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:84
|
||||
msgid "Noon"
|
||||
msgstr ""
|
||||
|
||||
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:88
|
||||
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:183
|
||||
msgid "Cancel"
|
||||
msgstr ""
|
||||
|
||||
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:128
|
||||
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:177
|
||||
msgid "Today"
|
||||
msgstr ""
|
||||
|
||||
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:132
|
||||
msgid "Calendar"
|
||||
msgstr ""
|
||||
|
||||
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:175
|
||||
msgid "Yesterday"
|
||||
msgstr ""
|
||||
|
||||
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:179
|
||||
msgid "Tomorrow"
|
||||
msgstr ""
|
||||
#: contrib/admin/media/js/dateparse.js:33
|
||||
msgid "Sunday Monday Tuesday Wednesday Thursday Friday Saturday"
|
||||
msgstr "রবিবার সোমবার মঙ্গলবার বুধবার বৃহস্পতিবার শুক্রবার শনিবার"
|
||||
|
||||
#: contrib/admin/media/js/admin/CollapsedFieldsets.js:34
|
||||
#: contrib/admin/media/js/admin/CollapsedFieldsets.js:72
|
||||
msgid "Show"
|
||||
msgstr ""
|
||||
msgstr "দেখান"
|
||||
|
||||
#: contrib/admin/media/js/admin/CollapsedFieldsets.js:63
|
||||
msgid "Hide"
|
||||
msgstr ""
|
||||
msgstr "লুকান"
|
||||
|
||||
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:47
|
||||
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:81
|
||||
msgid "Now"
|
||||
msgstr "এখন"
|
||||
|
||||
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:51
|
||||
msgid "Clock"
|
||||
msgstr "ঘড়ি"
|
||||
|
||||
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:78
|
||||
msgid "Choose a time"
|
||||
msgstr "সময় নির্বাচন করুন"
|
||||
|
||||
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:82
|
||||
msgid "Midnight"
|
||||
msgstr "মধ্যরাত"
|
||||
|
||||
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:83
|
||||
msgid "6 a.m."
|
||||
msgstr "৬ পূর্বাহ্ন"
|
||||
|
||||
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:84
|
||||
msgid "Noon"
|
||||
msgstr "দুপুর"
|
||||
|
||||
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:88
|
||||
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:183
|
||||
msgid "Cancel"
|
||||
msgstr "বাতিল"
|
||||
|
||||
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:128
|
||||
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:177
|
||||
msgid "Today"
|
||||
msgstr "আজ"
|
||||
|
||||
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:132
|
||||
msgid "Calendar"
|
||||
msgstr "দিনপঞ্জিকা"
|
||||
|
||||
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:175
|
||||
msgid "Yesterday"
|
||||
msgstr "গতকাল"
|
||||
|
||||
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:179
|
||||
msgid "Tomorrow"
|
||||
msgstr "আগামীকাল"
|
||||
|
||||
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
@ -1,13 +1,13 @@
|
||||
# Translation of django.po to German
|
||||
#
|
||||
# Copyright (C) 2005-2008,
|
||||
# Copyright (C) 2005-2009,
|
||||
# This file is distributed under the same license as the django package.
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Django\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2009-04-28 09:32+0200\n"
|
||||
"POT-Creation-Date: 2009-07-23 18:58+0200\n"
|
||||
"PO-Revision-Date: 2008-08-28 22:58+0100\n"
|
||||
"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
|
||||
"Language-Team: \n"
|
||||
@ -223,16 +223,16 @@ msgstr "Vereinfachtes Chinesisch"
|
||||
msgid "Traditional Chinese"
|
||||
msgstr "Traditionelles Chinesisch"
|
||||
|
||||
#: contrib/admin/actions.py:56
|
||||
#: contrib/admin/actions.py:60
|
||||
#, python-format
|
||||
msgid "Successfully deleted %(count)d %(items)s."
|
||||
msgstr "Erfolgreich %(count)d %(items)s gelöscht."
|
||||
|
||||
#: contrib/admin/actions.py:63 contrib/admin/options.py:1025
|
||||
#: contrib/admin/actions.py:67 contrib/admin/options.py:1027
|
||||
msgid "Are you sure?"
|
||||
msgstr "Sind Sie sicher?"
|
||||
|
||||
#: contrib/admin/actions.py:81
|
||||
#: contrib/admin/actions.py:85
|
||||
#, python-format
|
||||
msgid "Delete selected %(verbose_name_plural)s"
|
||||
msgstr "Ausgewählte %(verbose_name_plural)s löschen"
|
||||
@ -271,15 +271,15 @@ msgstr "Diesen Monat"
|
||||
msgid "This year"
|
||||
msgstr "Dieses Jahr"
|
||||
|
||||
#: contrib/admin/filterspecs.py:147 forms/widgets.py:413
|
||||
#: contrib/admin/filterspecs.py:147 forms/widgets.py:434
|
||||
msgid "Yes"
|
||||
msgstr "Ja"
|
||||
|
||||
#: contrib/admin/filterspecs.py:147 forms/widgets.py:413
|
||||
#: contrib/admin/filterspecs.py:147 forms/widgets.py:434
|
||||
msgid "No"
|
||||
msgstr "Nein"
|
||||
|
||||
#: contrib/admin/filterspecs.py:154 forms/widgets.py:413
|
||||
#: contrib/admin/filterspecs.py:154 forms/widgets.py:434
|
||||
msgid "Unknown"
|
||||
msgstr "Unbekannt"
|
||||
|
||||
@ -325,7 +325,8 @@ msgid "Changed %s."
|
||||
msgstr "%s geändert."
|
||||
|
||||
#: contrib/admin/options.py:519 contrib/admin/options.py:529
|
||||
#: contrib/comments/templates/comments/preview.html:16 forms/models.py:306
|
||||
#: contrib/comments/templates/comments/preview.html:16 forms/models.py:388
|
||||
#: forms/models.py:600
|
||||
msgid "and"
|
||||
msgstr "und"
|
||||
|
||||
@ -348,27 +349,27 @@ msgstr "%(name)s \"%(object)s\" gelöscht."
|
||||
msgid "No fields changed."
|
||||
msgstr "Keine Felder geändert."
|
||||
|
||||
#: contrib/admin/options.py:598 contrib/auth/admin.py:67
|
||||
#: contrib/admin/options.py:599 contrib/auth/admin.py:67
|
||||
#, python-format
|
||||
msgid "The %(name)s \"%(obj)s\" was added successfully."
|
||||
msgstr "%(name)s \"%(obj)s\" wurde erfolgreich hinzugefügt."
|
||||
|
||||
#: contrib/admin/options.py:602 contrib/admin/options.py:635
|
||||
#: contrib/admin/options.py:603 contrib/admin/options.py:636
|
||||
#: contrib/auth/admin.py:75
|
||||
msgid "You may edit it again below."
|
||||
msgstr "Das Element kann jetzt erneut bearbeitet werden."
|
||||
|
||||
#: contrib/admin/options.py:612 contrib/admin/options.py:645
|
||||
#: contrib/admin/options.py:613 contrib/admin/options.py:646
|
||||
#, python-format
|
||||
msgid "You may add another %s below."
|
||||
msgstr "Es kann ein weiteres Element des Typs %s angelegt werden."
|
||||
|
||||
#: contrib/admin/options.py:633
|
||||
#: contrib/admin/options.py:634
|
||||
#, python-format
|
||||
msgid "The %(name)s \"%(obj)s\" was changed successfully."
|
||||
msgstr "%(name)s \"%(obj)s\" wurde erfolgreich geändert."
|
||||
|
||||
#: contrib/admin/options.py:641
|
||||
#: contrib/admin/options.py:642
|
||||
#, python-format
|
||||
msgid ""
|
||||
"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
|
||||
@ -376,44 +377,44 @@ msgstr ""
|
||||
"%(name)s \"%(obj)s\" wurde erfolgreich hinzugefügt. Das Element kann jetzt "
|
||||
"geändert werden."
|
||||
|
||||
#: contrib/admin/options.py:772
|
||||
#: contrib/admin/options.py:773
|
||||
#, python-format
|
||||
msgid "Add %s"
|
||||
msgstr "%s hinzufügen"
|
||||
|
||||
#: contrib/admin/options.py:803 contrib/admin/options.py:1003
|
||||
#: contrib/admin/options.py:804 contrib/admin/options.py:1005
|
||||
#, python-format
|
||||
msgid "%(name)s object with primary key %(key)r does not exist."
|
||||
msgstr ""
|
||||
"Das %(name)s-Objekt mit dem Primärschlüssel %(key)r ist nicht vorhanden."
|
||||
|
||||
#: contrib/admin/options.py:860
|
||||
#: contrib/admin/options.py:861
|
||||
#, python-format
|
||||
msgid "Change %s"
|
||||
msgstr "%s ändern"
|
||||
|
||||
#: contrib/admin/options.py:904
|
||||
#: contrib/admin/options.py:905
|
||||
msgid "Database error"
|
||||
msgstr "Datenbankfehler"
|
||||
|
||||
#: contrib/admin/options.py:940
|
||||
#: contrib/admin/options.py:941
|
||||
#, python-format
|
||||
msgid "%(count)s %(name)s was changed successfully."
|
||||
msgid_plural "%(count)s %(name)s were changed successfully."
|
||||
msgstr[0] "%(count)s \"%(name)s\" wurde erfolgreich geändert."
|
||||
msgstr[1] "%(count)s \"%(name)s\" wurden erfolgreich geändert."
|
||||
|
||||
#: contrib/admin/options.py:1018
|
||||
#: contrib/admin/options.py:1020
|
||||
#, python-format
|
||||
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
|
||||
msgstr "%(name)s \"%(obj)s\" wurde erfolgreich gelöscht."
|
||||
|
||||
#: contrib/admin/options.py:1054
|
||||
#: contrib/admin/options.py:1057
|
||||
#, python-format
|
||||
msgid "Change history: %s"
|
||||
msgstr "Änderungsgeschichte: %s"
|
||||
|
||||
#: contrib/admin/sites.py:20 contrib/admin/views/decorators.py:14
|
||||
#: contrib/admin/sites.py:21 contrib/admin/views/decorators.py:14
|
||||
#: contrib/auth/forms.py:80
|
||||
msgid ""
|
||||
"Please enter a correct username and password. Note that both fields are case-"
|
||||
@ -422,11 +423,11 @@ msgstr ""
|
||||
"Bitte einen gültigen Benutzernamen und ein Passwort eingeben. Beide Felder "
|
||||
"berücksichtigen die Groß-/Kleinschreibung."
|
||||
|
||||
#: contrib/admin/sites.py:278 contrib/admin/views/decorators.py:40
|
||||
#: contrib/admin/sites.py:285 contrib/admin/views/decorators.py:40
|
||||
msgid "Please log in again, because your session has expired."
|
||||
msgstr "Bitte melden Sie sich erneut an, da Ihre Sitzung abgelaufen ist."
|
||||
|
||||
#: contrib/admin/sites.py:285 contrib/admin/views/decorators.py:47
|
||||
#: contrib/admin/sites.py:292 contrib/admin/views/decorators.py:47
|
||||
msgid ""
|
||||
"Looks like your browser isn't configured to accept cookies. Please enable "
|
||||
"cookies, reload this page, and try again."
|
||||
@ -434,29 +435,29 @@ msgstr ""
|
||||
"Ihr Browser scheint keine Cookies zu akzeptieren. Bitte aktivieren Sie diese "
|
||||
"und laden Sie die Seite neu."
|
||||
|
||||
#: contrib/admin/sites.py:301 contrib/admin/sites.py:307
|
||||
#: contrib/admin/sites.py:308 contrib/admin/sites.py:314
|
||||
#: contrib/admin/views/decorators.py:66
|
||||
msgid "Usernames cannot contain the '@' character."
|
||||
msgstr "Benutzernamen dürfen das Zeichen '@' nicht enthalten."
|
||||
|
||||
#: contrib/admin/sites.py:304 contrib/admin/views/decorators.py:62
|
||||
#: contrib/admin/sites.py:311 contrib/admin/views/decorators.py:62
|
||||
#, python-format
|
||||
msgid "Your e-mail address is not your username. Try '%s' instead."
|
||||
msgstr ""
|
||||
"Die E-Mail-Adresse entspricht nicht Ihrem Benutzernamen. Bitte stattdessen '%"
|
||||
"s' versuchen."
|
||||
|
||||
#: contrib/admin/sites.py:360
|
||||
#: contrib/admin/sites.py:367
|
||||
msgid "Site administration"
|
||||
msgstr "Website-Verwaltung"
|
||||
|
||||
#: contrib/admin/sites.py:373 contrib/admin/templates/admin/login.html:26
|
||||
#: contrib/admin/sites.py:381 contrib/admin/templates/admin/login.html:26
|
||||
#: contrib/admin/templates/registration/password_reset_complete.html:14
|
||||
#: contrib/admin/views/decorators.py:20
|
||||
msgid "Log in"
|
||||
msgstr "Anmelden"
|
||||
|
||||
#: contrib/admin/sites.py:417
|
||||
#: contrib/admin/sites.py:426
|
||||
#, python-format
|
||||
msgid "%s administration"
|
||||
msgstr "%s-Verwaltung"
|
||||
@ -507,7 +508,7 @@ msgstr ""
|
||||
|
||||
#: contrib/admin/templates/admin/500.html:4
|
||||
#: contrib/admin/templates/admin/app_index.html:8
|
||||
#: contrib/admin/templates/admin/base.html:31
|
||||
#: contrib/admin/templates/admin/base.html:54
|
||||
#: contrib/admin/templates/admin/change_form.html:17
|
||||
#: contrib/admin/templates/admin/change_list.html:25
|
||||
#: contrib/admin/templates/admin/delete_confirmation.html:6
|
||||
@ -552,7 +553,6 @@ msgid "Run the selected action"
|
||||
msgstr "Ausgewählte Aktion ausführen"
|
||||
|
||||
#: contrib/admin/templates/admin/actions.html:4
|
||||
#: contrib/admin/templates/admin/search_form.html:8
|
||||
msgid "Go"
|
||||
msgstr "Los"
|
||||
|
||||
@ -562,18 +562,18 @@ msgstr "Los"
|
||||
msgid "%(name)s"
|
||||
msgstr "%(name)s"
|
||||
|
||||
#: contrib/admin/templates/admin/base.html:26
|
||||
#: contrib/admin/templates/admin/base.html:27
|
||||
msgid "Welcome,"
|
||||
msgstr "Willkommen,"
|
||||
|
||||
#: contrib/admin/templates/admin/base.html:26
|
||||
#: contrib/admin/templates/admin/base.html:32
|
||||
#: contrib/admin/templates/registration/password_change_done.html:3
|
||||
#: contrib/admin/templates/registration/password_change_form.html:3
|
||||
#: contrib/admindocs/templates/admin_doc/bookmarklets.html:3
|
||||
msgid "Documentation"
|
||||
msgstr "Dokumentation"
|
||||
|
||||
#: contrib/admin/templates/admin/base.html:26
|
||||
#: contrib/admin/templates/admin/base.html:40
|
||||
#: contrib/admin/templates/admin/auth/user/change_password.html:14
|
||||
#: contrib/admin/templates/admin/auth/user/change_password.html:47
|
||||
#: contrib/admin/templates/registration/password_change_done.html:3
|
||||
@ -581,7 +581,7 @@ msgstr "Dokumentation"
|
||||
msgid "Change password"
|
||||
msgstr "Passwort ändern"
|
||||
|
||||
#: contrib/admin/templates/admin/base.html:26
|
||||
#: contrib/admin/templates/admin/base.html:47
|
||||
#: contrib/admin/templates/registration/password_change_done.html:3
|
||||
#: contrib/admin/templates/registration/password_change_form.html:3
|
||||
msgid "Log out"
|
||||
@ -712,6 +712,10 @@ msgstr "Meine Aktionen"
|
||||
msgid "None available"
|
||||
msgstr "Keine vorhanden"
|
||||
|
||||
#: contrib/admin/templates/admin/index.html:72
|
||||
msgid "Unknown content"
|
||||
msgstr "Unbekannter Inhalt"
|
||||
|
||||
#: contrib/admin/templates/admin/invalid_setup.html:7
|
||||
msgid ""
|
||||
"Something's wrong with your database installation. Make sure the appropriate "
|
||||
@ -760,6 +764,15 @@ msgstr ""
|
||||
msgid "Show all"
|
||||
msgstr "Zeige alle"
|
||||
|
||||
#: contrib/admin/templates/admin/pagination.html:11
|
||||
#: contrib/admin/templates/admin/submit_line.html:3
|
||||
msgid "Save"
|
||||
msgstr "Sichern"
|
||||
|
||||
#: contrib/admin/templates/admin/search_form.html:8
|
||||
msgid "Search"
|
||||
msgstr "Suchen"
|
||||
|
||||
#: contrib/admin/templates/admin/search_form.html:10
|
||||
#, python-format
|
||||
msgid "1 result"
|
||||
@ -772,10 +785,6 @@ msgstr[1] "%(counter)s Ergebnisse"
|
||||
msgid "%(full_result_count)s total"
|
||||
msgstr "%(full_result_count)s gesamt"
|
||||
|
||||
#: contrib/admin/templates/admin/submit_line.html:3
|
||||
msgid "Save"
|
||||
msgstr "Sichern"
|
||||
|
||||
#: contrib/admin/templates/admin/submit_line.html:5
|
||||
msgid "Save as new"
|
||||
msgstr "Als neu sichern"
|
||||
@ -1005,144 +1014,145 @@ msgstr "Site"
|
||||
msgid "template"
|
||||
msgstr "Template"
|
||||
|
||||
#: contrib/admindocs/views.py:58 contrib/admindocs/views.py:60
|
||||
#: contrib/admindocs/views.py:62
|
||||
#: contrib/admindocs/views.py:61 contrib/admindocs/views.py:63
|
||||
#: contrib/admindocs/views.py:65
|
||||
msgid "tag:"
|
||||
msgstr "Schlagwort:"
|
||||
|
||||
#: contrib/admindocs/views.py:91 contrib/admindocs/views.py:93
|
||||
#: contrib/admindocs/views.py:95
|
||||
#: contrib/admindocs/views.py:94 contrib/admindocs/views.py:96
|
||||
#: contrib/admindocs/views.py:98
|
||||
msgid "filter:"
|
||||
msgstr "Filter:"
|
||||
|
||||
#: contrib/admindocs/views.py:155 contrib/admindocs/views.py:157
|
||||
#: contrib/admindocs/views.py:159
|
||||
#: contrib/admindocs/views.py:158 contrib/admindocs/views.py:160
|
||||
#: contrib/admindocs/views.py:162
|
||||
msgid "view:"
|
||||
msgstr "Ansicht:"
|
||||
|
||||
#: contrib/admindocs/views.py:187
|
||||
#: contrib/admindocs/views.py:190
|
||||
#, python-format
|
||||
msgid "App %r not found"
|
||||
msgstr "Anwendung %r nicht gefunden"
|
||||
|
||||
#: contrib/admindocs/views.py:194
|
||||
#: contrib/admindocs/views.py:197
|
||||
#, python-format
|
||||
msgid "Model %(model_name)r not found in app %(app_label)r"
|
||||
msgstr "Modell %(model_name)r wurde nicht in Anwendung %(app_label)r gefunden"
|
||||
|
||||
#: contrib/admindocs/views.py:206
|
||||
#: contrib/admindocs/views.py:209
|
||||
#, python-format
|
||||
msgid "the related `%(app_label)s.%(data_type)s` object"
|
||||
msgstr "Das verknüpfte `%(app_label)s.%(data_type)s` Objekt"
|
||||
|
||||
#: contrib/admindocs/views.py:206 contrib/admindocs/views.py:228
|
||||
#: contrib/admindocs/views.py:242 contrib/admindocs/views.py:247
|
||||
#: contrib/admindocs/views.py:209 contrib/admindocs/views.py:228
|
||||
#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:247
|
||||
#: contrib/admindocs/views.py:261 contrib/admindocs/views.py:266
|
||||
msgid "model:"
|
||||
msgstr "Modell:"
|
||||
|
||||
#: contrib/admindocs/views.py:237
|
||||
#: contrib/admindocs/views.py:224 contrib/admindocs/views.py:256
|
||||
#, python-format
|
||||
msgid "related `%(app_label)s.%(object_name)s` objects"
|
||||
msgstr "verknüpftes `%(app_label)s.%(object_name)s` Objekt"
|
||||
|
||||
#: contrib/admindocs/views.py:242
|
||||
#: contrib/admindocs/views.py:228 contrib/admindocs/views.py:261
|
||||
#, python-format
|
||||
msgid "all %s"
|
||||
msgstr "Alle %s"
|
||||
|
||||
#: contrib/admindocs/views.py:247
|
||||
#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:266
|
||||
#, python-format
|
||||
msgid "number of %s"
|
||||
msgstr "Anzahl von %s"
|
||||
|
||||
#: contrib/admindocs/views.py:252
|
||||
#: contrib/admindocs/views.py:271
|
||||
#, python-format
|
||||
msgid "Fields on %s objects"
|
||||
msgstr "Felder am %s Objekt"
|
||||
|
||||
#: contrib/admindocs/views.py:315 contrib/admindocs/views.py:326
|
||||
#: contrib/admindocs/views.py:328 contrib/admindocs/views.py:334
|
||||
#: contrib/admindocs/views.py:335 contrib/admindocs/views.py:337
|
||||
#: contrib/admindocs/views.py:334 contrib/admindocs/views.py:345
|
||||
#: contrib/admindocs/views.py:347 contrib/admindocs/views.py:353
|
||||
#: contrib/admindocs/views.py:354 contrib/admindocs/views.py:356
|
||||
msgid "Integer"
|
||||
msgstr "Ganzzahl"
|
||||
|
||||
#: contrib/admindocs/views.py:316
|
||||
#: contrib/admindocs/views.py:335
|
||||
msgid "Boolean (Either True or False)"
|
||||
msgstr "Boolescher Wert (True oder False)"
|
||||
|
||||
#: contrib/admindocs/views.py:317 contrib/admindocs/views.py:336
|
||||
#: contrib/admindocs/views.py:336 contrib/admindocs/views.py:355
|
||||
#, python-format
|
||||
msgid "String (up to %(max_length)s)"
|
||||
msgstr "Zeichenkette (bis zu %(max_length)s Zeichen)"
|
||||
|
||||
#: contrib/admindocs/views.py:318
|
||||
#: contrib/admindocs/views.py:337
|
||||
msgid "Comma-separated integers"
|
||||
msgstr "Kommaseparierte Liste von Ganzzahlen"
|
||||
|
||||
#: contrib/admindocs/views.py:319
|
||||
#: contrib/admindocs/views.py:338
|
||||
msgid "Date (without time)"
|
||||
msgstr "Datum (ohne Uhrzeit)"
|
||||
|
||||
#: contrib/admindocs/views.py:320
|
||||
#: contrib/admindocs/views.py:339
|
||||
msgid "Date (with time)"
|
||||
msgstr "Datum (mit Uhrzeit)"
|
||||
|
||||
#: contrib/admindocs/views.py:321
|
||||
#: contrib/admindocs/views.py:340
|
||||
msgid "Decimal number"
|
||||
msgstr "Dezimalzahl"
|
||||
|
||||
#: contrib/admindocs/views.py:322
|
||||
#: contrib/admindocs/views.py:341
|
||||
msgid "E-mail address"
|
||||
msgstr "E-Mail-Adresse"
|
||||
|
||||
#: contrib/admindocs/views.py:323 contrib/admindocs/views.py:324
|
||||
#: contrib/admindocs/views.py:327
|
||||
#: contrib/admindocs/views.py:342 contrib/admindocs/views.py:343
|
||||
#: contrib/admindocs/views.py:346
|
||||
msgid "File path"
|
||||
msgstr "Dateipfad"
|
||||
|
||||
#: contrib/admindocs/views.py:325
|
||||
#: contrib/admindocs/views.py:344
|
||||
msgid "Floating point number"
|
||||
msgstr "Gleitkommazahl"
|
||||
|
||||
#: contrib/admindocs/views.py:329 contrib/comments/models.py:60
|
||||
#: contrib/admindocs/views.py:348 contrib/comments/models.py:60
|
||||
msgid "IP address"
|
||||
msgstr "IP-Adresse"
|
||||
|
||||
#: contrib/admindocs/views.py:331
|
||||
#: contrib/admindocs/views.py:350
|
||||
msgid "Boolean (Either True, False or None)"
|
||||
msgstr "Boolescher Wert (True, False oder None)"
|
||||
|
||||
#: contrib/admindocs/views.py:332
|
||||
#: contrib/admindocs/views.py:351
|
||||
msgid "Relation to parent model"
|
||||
msgstr "Beziehung zum Eltern-Modell"
|
||||
|
||||
#: contrib/admindocs/views.py:333
|
||||
#: contrib/admindocs/views.py:352
|
||||
msgid "Phone number"
|
||||
msgstr "Telefonnummer"
|
||||
|
||||
#: contrib/admindocs/views.py:338
|
||||
#: contrib/admindocs/views.py:357
|
||||
msgid "Text"
|
||||
msgstr "Text"
|
||||
|
||||
#: contrib/admindocs/views.py:339
|
||||
#: contrib/admindocs/views.py:358
|
||||
msgid "Time"
|
||||
msgstr "Zeit"
|
||||
|
||||
#: contrib/admindocs/views.py:340 contrib/comments/forms.py:95
|
||||
#: contrib/admindocs/views.py:359 contrib/comments/forms.py:95
|
||||
#: contrib/comments/templates/comments/moderation_queue.html:37
|
||||
#: contrib/flatpages/admin.py:8 contrib/flatpages/models.py:7
|
||||
msgid "URL"
|
||||
msgstr "Adresse (URL)"
|
||||
|
||||
#: contrib/admindocs/views.py:341
|
||||
#: contrib/admindocs/views.py:360
|
||||
msgid "U.S. state (two uppercase letters)"
|
||||
msgstr "U.S.-Bundesstaat (zwei Großbuchstaben)"
|
||||
|
||||
#: contrib/admindocs/views.py:342
|
||||
#: contrib/admindocs/views.py:361
|
||||
msgid "XML text"
|
||||
msgstr "XML-Text"
|
||||
|
||||
#: contrib/admindocs/views.py:368
|
||||
#: contrib/admindocs/views.py:387
|
||||
#, python-format
|
||||
msgid "%s does not appear to be a urlpattern object"
|
||||
msgstr "%s ist scheinbar kein urlpattern-Objekt"
|
||||
@ -1815,7 +1825,7 @@ msgstr "Ungültiger geometrischer Typ."
|
||||
|
||||
#: contrib/gis/forms/fields.py:20
|
||||
msgid ""
|
||||
"An error occurred when transforming the geometryto the SRID of the geometry "
|
||||
"An error occurred when transforming the geometry to the SRID of the geometry "
|
||||
"form field."
|
||||
msgstr ""
|
||||
"Ein Fehler ist beim Umwandeln der Geometrie-Werte in die SRID des Geometrie-"
|
||||
@ -3948,14 +3958,14 @@ msgstr "Dieser Wert muss None, True oder False sein."
|
||||
msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
|
||||
msgstr "Bitte eine gültige Zeit im Format HH:MM[:ss[.uuuuuu]] eingeben."
|
||||
|
||||
#: db/models/fields/related.py:792
|
||||
#: db/models/fields/related.py:816
|
||||
msgid ""
|
||||
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
|
||||
msgstr ""
|
||||
"Halten Sie die Strg-Taste (⌘ für Mac) während des Klickens gedrückt, um "
|
||||
"mehrere Einträge auszuwählen."
|
||||
|
||||
#: db/models/fields/related.py:870
|
||||
#: db/models/fields/related.py:894
|
||||
#, python-format
|
||||
msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
|
||||
msgid_plural ""
|
||||
@ -4020,11 +4030,11 @@ msgstr "Bitte geben Sie nicht mehr als %s Dezimalstellen ein."
|
||||
msgid "Ensure that there are no more than %s digits before the decimal point."
|
||||
msgstr "Bitte geben Sie nicht mehr als %s Ziffern vor dem Komma ein."
|
||||
|
||||
#: forms/fields.py:288 forms/fields.py:862
|
||||
#: forms/fields.py:288 forms/fields.py:863
|
||||
msgid "Enter a valid date."
|
||||
msgstr "Bitte ein gültiges Datum eingeben."
|
||||
|
||||
#: forms/fields.py:322 forms/fields.py:863
|
||||
#: forms/fields.py:322 forms/fields.py:864
|
||||
msgid "Enter a valid time."
|
||||
msgstr "Bitte eine gültige Uhrzeit eingeben."
|
||||
|
||||
@ -4069,21 +4079,21 @@ msgstr "Bitte eine gültige Adresse eingeben."
|
||||
msgid "This URL appears to be a broken link."
|
||||
msgstr "Diese Adresse scheint nicht gültig zu sein."
|
||||
|
||||
#: forms/fields.py:624 forms/fields.py:702
|
||||
#: forms/fields.py:625 forms/fields.py:703
|
||||
#, python-format
|
||||
msgid "Select a valid choice. %(value)s is not one of the available choices."
|
||||
msgstr ""
|
||||
"Bitte eine gültige Auswahl treffen. %(value)s ist keine gültige Auswahl."
|
||||
|
||||
#: forms/fields.py:703 forms/fields.py:764 forms/models.py:798
|
||||
#: forms/fields.py:704 forms/fields.py:765 forms/models.py:1003
|
||||
msgid "Enter a list of values."
|
||||
msgstr "Bitte eine Liste mit Werten eingeben."
|
||||
|
||||
#: forms/fields.py:891
|
||||
#: forms/fields.py:892
|
||||
msgid "Enter a valid IPv4 address."
|
||||
msgstr "Bitte eine gültige IPv4-Adresse eingeben."
|
||||
|
||||
#: forms/fields.py:901
|
||||
#: forms/fields.py:902
|
||||
msgid ""
|
||||
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
|
||||
msgstr ""
|
||||
@ -4094,27 +4104,55 @@ msgstr ""
|
||||
msgid "Order"
|
||||
msgstr "Reihenfolge"
|
||||
|
||||
#: forms/models.py:299 forms/models.py:308
|
||||
#: forms/models.py:367
|
||||
#, python-format
|
||||
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
|
||||
msgstr "%(field_name)s muss für %(date_field)s %(lookup)s eindeutig sein."
|
||||
|
||||
#: forms/models.py:381 forms/models.py:389
|
||||
#, python-format
|
||||
msgid "%(model_name)s with this %(field_label)s already exists."
|
||||
msgstr "%(model_name)s mit diesem %(field_label)s existiert bereits."
|
||||
|
||||
#: forms/models.py:673
|
||||
#: forms/models.py:594
|
||||
#, python-format
|
||||
msgid "Please correct the duplicate data for %(field)s."
|
||||
msgstr "Bitte die doppelten Daten für %(field)s korrigieren."
|
||||
|
||||
#: forms/models.py:598
|
||||
#, python-format
|
||||
msgid "Please correct the duplicate data for %(field)s, which must be unique."
|
||||
msgstr "Bitte die doppelten Daten für %(field)s korrigieren, das eindeutig sein muss."
|
||||
|
||||
#: forms/models.py:604
|
||||
#, 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 ""
|
||||
"Bitte die doppelten Daten für %(field_name)s korrigieren, da es für "
|
||||
"%(lookup)s in %(date_field)s eindeutig sein muss."
|
||||
|
||||
#: forms/models.py:612
|
||||
msgid "Please correct the duplicate values below."
|
||||
msgstr "Bitte die unten aufgeführten doppelten Werte korrigieren."
|
||||
|
||||
#: forms/models.py:867
|
||||
msgid "The inline foreign key did not match the parent instance primary key."
|
||||
msgstr ""
|
||||
"Der Inline-Fremdschlüssel passt nicht zum Primärschlüssel der übergeordneten "
|
||||
"Instanz."
|
||||
|
||||
#: forms/models.py:728
|
||||
#: forms/models.py:930
|
||||
msgid "Select a valid choice. That choice is not one of the available choices."
|
||||
msgstr "Bitte eine gültige Auswahl treffen. Dies ist keine gültige Auswahl."
|
||||
|
||||
#: forms/models.py:799
|
||||
#: forms/models.py:1004
|
||||
#, python-format
|
||||
msgid "Select a valid choice. %s is not one of the available choices."
|
||||
msgstr "Bitte eine gültige Auswahl treffen. %s ist keine gültige Auswahl."
|
||||
|
||||
#: forms/models.py:801
|
||||
#: forms/models.py:1006
|
||||
#, python-format
|
||||
msgid "\"%s\" is not a valid value for a primary key."
|
||||
msgstr "\"%s\" ist kein gültiger Wert für einen Primärschlüssel."
|
||||
@ -4145,27 +4183,27 @@ msgstr "%.1f MB"
|
||||
msgid "%.1f GB"
|
||||
msgstr "%.1f GB"
|
||||
|
||||
#: utils/dateformat.py:41
|
||||
#: utils/dateformat.py:42
|
||||
msgid "p.m."
|
||||
msgstr "nachm."
|
||||
|
||||
#: utils/dateformat.py:42
|
||||
#: utils/dateformat.py:43
|
||||
msgid "a.m."
|
||||
msgstr "vorm."
|
||||
|
||||
#: utils/dateformat.py:47
|
||||
#: utils/dateformat.py:48
|
||||
msgid "PM"
|
||||
msgstr "nachm."
|
||||
|
||||
#: utils/dateformat.py:48
|
||||
#: utils/dateformat.py:49
|
||||
msgid "AM"
|
||||
msgstr "vorm."
|
||||
|
||||
#: utils/dateformat.py:97
|
||||
#: utils/dateformat.py:98
|
||||
msgid "midnight"
|
||||
msgstr "Mitternacht"
|
||||
|
||||
#: utils/dateformat.py:99
|
||||
#: utils/dateformat.py:100
|
||||
msgid "noon"
|
||||
msgstr "Mittag"
|
||||
|
||||
|
||||
Binary file not shown.
@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Django\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2009-05-28 12:30-0300\n"
|
||||
"PO-Revision-Date: 2009-05-05 20:35-0300\n"
|
||||
"POT-Creation-Date: 2009-07-21 23:56-0300\n"
|
||||
"PO-Revision-Date: 2009-07-22 00:13-0300\n"
|
||||
"Last-Translator: Ramiro Morales <rm0@gmx.net>\n"
|
||||
"Language-Team: Django-I18N <django-i18n@googlegroups.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
@ -224,7 +224,7 @@ msgstr "chino tradicional"
|
||||
msgid "Successfully deleted %(count)d %(items)s."
|
||||
msgstr "Se eliminaron con éxito %(count)d %(items)s."
|
||||
|
||||
#: contrib/admin/actions.py:67 contrib/admin/options.py:1025
|
||||
#: contrib/admin/actions.py:67 contrib/admin/options.py:1027
|
||||
msgid "Are you sure?"
|
||||
msgstr "¿Está seguro?"
|
||||
|
||||
@ -322,7 +322,7 @@ msgstr "Modifica %s."
|
||||
|
||||
#: contrib/admin/options.py:519 contrib/admin/options.py:529
|
||||
#: contrib/comments/templates/comments/preview.html:16 forms/models.py:388
|
||||
#: forms/models.py:587
|
||||
#: forms/models.py:600
|
||||
msgid "and"
|
||||
msgstr "y"
|
||||
|
||||
@ -345,27 +345,27 @@ msgstr "Se eliminó %(name)s \"%(object)s\"."
|
||||
msgid "No fields changed."
|
||||
msgstr "No ha modificado ningún campo."
|
||||
|
||||
#: contrib/admin/options.py:598 contrib/auth/admin.py:67
|
||||
#: contrib/admin/options.py:599 contrib/auth/admin.py:67
|
||||
#, python-format
|
||||
msgid "The %(name)s \"%(obj)s\" was added successfully."
|
||||
msgstr "Se agregó con éxito %(name)s \"%(obj)s\"."
|
||||
|
||||
#: contrib/admin/options.py:602 contrib/admin/options.py:635
|
||||
#: contrib/admin/options.py:603 contrib/admin/options.py:636
|
||||
#: contrib/auth/admin.py:75
|
||||
msgid "You may edit it again below."
|
||||
msgstr "Puede modificarlo/a nuevamente abajo."
|
||||
|
||||
#: contrib/admin/options.py:612 contrib/admin/options.py:645
|
||||
#: contrib/admin/options.py:613 contrib/admin/options.py:646
|
||||
#, python-format
|
||||
msgid "You may add another %s below."
|
||||
msgstr "Puede agregar otro/a %s abajo."
|
||||
|
||||
#: contrib/admin/options.py:633
|
||||
#: contrib/admin/options.py:634
|
||||
#, python-format
|
||||
msgid "The %(name)s \"%(obj)s\" was changed successfully."
|
||||
msgstr "Se modificó con éxito %(name)s \"%(obj)s\"."
|
||||
|
||||
#: contrib/admin/options.py:641
|
||||
#: contrib/admin/options.py:642
|
||||
#, python-format
|
||||
msgid ""
|
||||
"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
|
||||
@ -373,43 +373,43 @@ msgstr ""
|
||||
"Se agregó con éxito %(name)s \"%(obj)s\". Puede modificarlo/a nuevamente "
|
||||
"abajo."
|
||||
|
||||
#: contrib/admin/options.py:772
|
||||
#: contrib/admin/options.py:773
|
||||
#, python-format
|
||||
msgid "Add %s"
|
||||
msgstr "Agregar %s"
|
||||
|
||||
#: contrib/admin/options.py:803 contrib/admin/options.py:1003
|
||||
#: contrib/admin/options.py:804 contrib/admin/options.py:1005
|
||||
#, python-format
|
||||
msgid "%(name)s object with primary key %(key)r does not exist."
|
||||
msgstr "No existe un objeto %(name)s con una clave primaria %(key)r."
|
||||
|
||||
#: contrib/admin/options.py:860
|
||||
#: contrib/admin/options.py:861
|
||||
#, python-format
|
||||
msgid "Change %s"
|
||||
msgstr "Modificar %s"
|
||||
|
||||
#: contrib/admin/options.py:904
|
||||
#: contrib/admin/options.py:905
|
||||
msgid "Database error"
|
||||
msgstr "Error de base de datos"
|
||||
|
||||
#: contrib/admin/options.py:940
|
||||
#: contrib/admin/options.py:941
|
||||
#, python-format
|
||||
msgid "%(count)s %(name)s was changed successfully."
|
||||
msgid_plural "%(count)s %(name)s were changed successfully."
|
||||
msgstr[0] "Se ha modificado con éxito %(count)s %(name)s."
|
||||
msgstr[1] "Se han modificado con éxito %(count)s %(name)s."
|
||||
|
||||
#: contrib/admin/options.py:1018
|
||||
#: contrib/admin/options.py:1020
|
||||
#, python-format
|
||||
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
|
||||
msgstr "Se eliminó con éxito %(name)s \"%(obj)s\"."
|
||||
|
||||
#: contrib/admin/options.py:1054
|
||||
#: contrib/admin/options.py:1057
|
||||
#, python-format
|
||||
msgid "Change history: %s"
|
||||
msgstr "Historia de modificaciones: %s"
|
||||
|
||||
#: contrib/admin/sites.py:20 contrib/admin/views/decorators.py:14
|
||||
#: contrib/admin/sites.py:21 contrib/admin/views/decorators.py:14
|
||||
#: contrib/auth/forms.py:80
|
||||
msgid ""
|
||||
"Please enter a correct username and password. Note that both fields are case-"
|
||||
@ -418,11 +418,11 @@ msgstr ""
|
||||
"Por favor introduzca un nombre de usuario y una contraseña correctos. Note "
|
||||
"que ambos campos son sensibles a mayúsculas/minúsculas."
|
||||
|
||||
#: contrib/admin/sites.py:278 contrib/admin/views/decorators.py:40
|
||||
#: contrib/admin/sites.py:285 contrib/admin/views/decorators.py:40
|
||||
msgid "Please log in again, because your session has expired."
|
||||
msgstr "Por favor, identifíquese de nuevo porque su sesión ha caducado."
|
||||
|
||||
#: contrib/admin/sites.py:285 contrib/admin/views/decorators.py:47
|
||||
#: contrib/admin/sites.py:292 contrib/admin/views/decorators.py:47
|
||||
msgid ""
|
||||
"Looks like your browser isn't configured to accept cookies. Please enable "
|
||||
"cookies, reload this page, and try again."
|
||||
@ -430,29 +430,29 @@ msgstr ""
|
||||
"Parece que su navegador no está configurado para aceptar cookies. Por favor "
|
||||
"actívelas, recargue esta página, e inténtelo de nuevo."
|
||||
|
||||
#: contrib/admin/sites.py:301 contrib/admin/sites.py:307
|
||||
#: contrib/admin/sites.py:308 contrib/admin/sites.py:314
|
||||
#: contrib/admin/views/decorators.py:66
|
||||
msgid "Usernames cannot contain the '@' character."
|
||||
msgstr "Los nombres de usuario no pueden contener el carácter '@'."
|
||||
|
||||
#: contrib/admin/sites.py:304 contrib/admin/views/decorators.py:62
|
||||
#: contrib/admin/sites.py:311 contrib/admin/views/decorators.py:62
|
||||
#, python-format
|
||||
msgid "Your e-mail address is not your username. Try '%s' instead."
|
||||
msgstr ""
|
||||
"Su dirección de correo electrónico no es su nombre de usuario. Intente "
|
||||
"nuevamente usando '%s'."
|
||||
|
||||
#: contrib/admin/sites.py:360
|
||||
#: contrib/admin/sites.py:367
|
||||
msgid "Site administration"
|
||||
msgstr "Administración de sitio"
|
||||
|
||||
#: contrib/admin/sites.py:373 contrib/admin/templates/admin/login.html:26
|
||||
#: contrib/admin/sites.py:381 contrib/admin/templates/admin/login.html:26
|
||||
#: contrib/admin/templates/registration/password_reset_complete.html:14
|
||||
#: contrib/admin/views/decorators.py:20
|
||||
msgid "Log in"
|
||||
msgstr "Identificarse"
|
||||
|
||||
#: contrib/admin/sites.py:417
|
||||
#: contrib/admin/sites.py:426
|
||||
#, python-format
|
||||
msgid "%s administration"
|
||||
msgstr "Administración de %s"
|
||||
@ -487,7 +487,7 @@ msgstr "Modificar:"
|
||||
msgid "Lookup"
|
||||
msgstr "Buscar"
|
||||
|
||||
#: contrib/admin/widgets.py:236
|
||||
#: contrib/admin/widgets.py:235
|
||||
msgid "Add Another"
|
||||
msgstr "Agregar otro/a"
|
||||
|
||||
@ -502,7 +502,7 @@ msgstr "Lo sentimos, pero no se encuentra la página solicitada."
|
||||
|
||||
#: contrib/admin/templates/admin/500.html:4
|
||||
#: contrib/admin/templates/admin/app_index.html:8
|
||||
#: contrib/admin/templates/admin/base.html:31
|
||||
#: contrib/admin/templates/admin/base.html:54
|
||||
#: contrib/admin/templates/admin/change_form.html:17
|
||||
#: contrib/admin/templates/admin/change_list.html:25
|
||||
#: contrib/admin/templates/admin/delete_confirmation.html:6
|
||||
@ -556,18 +556,18 @@ msgstr "Ejecutar"
|
||||
msgid "%(name)s"
|
||||
msgstr "%(name)s"
|
||||
|
||||
#: contrib/admin/templates/admin/base.html:26
|
||||
#: contrib/admin/templates/admin/base.html:27
|
||||
msgid "Welcome,"
|
||||
msgstr "Bienvenido,"
|
||||
|
||||
#: contrib/admin/templates/admin/base.html:26
|
||||
#: contrib/admin/templates/admin/base.html:32
|
||||
#: contrib/admin/templates/registration/password_change_done.html:3
|
||||
#: contrib/admin/templates/registration/password_change_form.html:3
|
||||
#: contrib/admindocs/templates/admin_doc/bookmarklets.html:3
|
||||
msgid "Documentation"
|
||||
msgstr "Documentación"
|
||||
|
||||
#: contrib/admin/templates/admin/base.html:26
|
||||
#: contrib/admin/templates/admin/base.html:40
|
||||
#: contrib/admin/templates/admin/auth/user/change_password.html:14
|
||||
#: contrib/admin/templates/admin/auth/user/change_password.html:47
|
||||
#: contrib/admin/templates/registration/password_change_done.html:3
|
||||
@ -575,7 +575,7 @@ msgstr "Documentación"
|
||||
msgid "Change password"
|
||||
msgstr "Cambiar contraseña"
|
||||
|
||||
#: contrib/admin/templates/admin/base.html:26
|
||||
#: contrib/admin/templates/admin/base.html:47
|
||||
#: contrib/admin/templates/registration/password_change_done.html:3
|
||||
#: contrib/admin/templates/registration/password_change_form.html:3
|
||||
msgid "Log out"
|
||||
@ -673,8 +673,9 @@ msgid ""
|
||||
"Are you sure you want to delete the selected %(object_name)s objects? All of "
|
||||
"the following objects and it's related items will be deleted:"
|
||||
msgstr ""
|
||||
"¿Está seguro de que quiere eliminar los objetos %(object_name)s? Se "
|
||||
"eliminarán todos los siguientes objetos relacionados:"
|
||||
"¿Está seguro de que quiere eliminar los objetos %(object_name)s "
|
||||
"seleccionados? Se eliminarán todos los siguientes objetos "
|
||||
"relacionados:"
|
||||
|
||||
#: contrib/admin/templates/admin/filter.html:2
|
||||
#, python-format
|
||||
@ -708,7 +709,7 @@ msgstr "Ninguna disponible"
|
||||
|
||||
#: contrib/admin/templates/admin/index.html:72
|
||||
msgid "Unknown content"
|
||||
msgstr "COntenido desconocido"
|
||||
msgstr "Contenido desconocido"
|
||||
|
||||
#: contrib/admin/templates/admin/invalid_setup.html:7
|
||||
msgid ""
|
||||
@ -758,6 +759,11 @@ msgstr ""
|
||||
msgid "Show all"
|
||||
msgstr "Mostrar todos/as"
|
||||
|
||||
#: contrib/admin/templates/admin/pagination.html:11
|
||||
#: contrib/admin/templates/admin/submit_line.html:3
|
||||
msgid "Save"
|
||||
msgstr "Grabar"
|
||||
|
||||
#: contrib/admin/templates/admin/search_form.html:8
|
||||
msgid "Search"
|
||||
msgstr "Buscar"
|
||||
@ -774,10 +780,6 @@ msgstr[1] "%(counter)s resultados"
|
||||
msgid "%(full_result_count)s total"
|
||||
msgstr "total: %(full_result_count)s"
|
||||
|
||||
#: contrib/admin/templates/admin/submit_line.html:3
|
||||
msgid "Save"
|
||||
msgstr "Grabar"
|
||||
|
||||
#: contrib/admin/templates/admin/submit_line.html:5
|
||||
msgid "Save as new"
|
||||
msgstr "Grabar como nuevo"
|
||||
@ -861,9 +863,9 @@ msgid ""
|
||||
"Please enter your old password, for security's sake, and then enter your new "
|
||||
"password twice so we can verify you typed it in correctly."
|
||||
msgstr ""
|
||||
"Por favor, por razones de seguridad, introduzca su contraseña antigua, y "
|
||||
"luego introduzca la nueva contraseña dos veces para verificar que la ha "
|
||||
"escrito correctamente."
|
||||
"Por favor, por razones de seguridad, introduzca primero su contraseña "
|
||||
"antigua y luego introduzca la nueva contraseña dos veces para verificar que "
|
||||
"la ha escrito correctamente."
|
||||
|
||||
#: contrib/admin/templates/registration/password_change_form.html:17
|
||||
msgid "Old password:"
|
||||
@ -948,7 +950,7 @@ msgstr ""
|
||||
#: contrib/admin/templates/registration/password_reset_email.html:2
|
||||
msgid "You're receiving this e-mail because you requested a password reset"
|
||||
msgstr ""
|
||||
"Está recibiendo este mensaje debido a que solicitó recuperar la contraseña"
|
||||
"Recibe este mensaje debido a que solicitó recuperar la contraseña"
|
||||
|
||||
#: contrib/admin/templates/registration/password_reset_email.html:3
|
||||
#, python-format
|
||||
@ -1012,144 +1014,145 @@ msgstr "sitio"
|
||||
msgid "template"
|
||||
msgstr "plantilla"
|
||||
|
||||
#: contrib/admindocs/views.py:58 contrib/admindocs/views.py:60
|
||||
#: contrib/admindocs/views.py:62
|
||||
#: contrib/admindocs/views.py:61 contrib/admindocs/views.py:63
|
||||
#: contrib/admindocs/views.py:65
|
||||
msgid "tag:"
|
||||
msgstr "etiqueta:"
|
||||
|
||||
#: contrib/admindocs/views.py:91 contrib/admindocs/views.py:93
|
||||
#: contrib/admindocs/views.py:95
|
||||
#: contrib/admindocs/views.py:94 contrib/admindocs/views.py:96
|
||||
#: contrib/admindocs/views.py:98
|
||||
msgid "filter:"
|
||||
msgstr "filtrar:"
|
||||
|
||||
#: contrib/admindocs/views.py:155 contrib/admindocs/views.py:157
|
||||
#: contrib/admindocs/views.py:159
|
||||
#: contrib/admindocs/views.py:158 contrib/admindocs/views.py:160
|
||||
#: contrib/admindocs/views.py:162
|
||||
msgid "view:"
|
||||
msgstr "ver:"
|
||||
|
||||
#: contrib/admindocs/views.py:187
|
||||
#: contrib/admindocs/views.py:190
|
||||
#, python-format
|
||||
msgid "App %r not found"
|
||||
msgstr "Aplicación %r no encontrada"
|
||||
|
||||
#: contrib/admindocs/views.py:194
|
||||
#: contrib/admindocs/views.py:197
|
||||
#, python-format
|
||||
msgid "Model %(model_name)r not found in app %(app_label)r"
|
||||
msgstr "Modelo %(model_name)r no encontrado en aplicación %(app_label)r"
|
||||
|
||||
#: contrib/admindocs/views.py:206
|
||||
#: contrib/admindocs/views.py:209
|
||||
#, python-format
|
||||
msgid "the related `%(app_label)s.%(data_type)s` object"
|
||||
msgstr "el objeto `%(app_label)s.%(data_type)s` relacionado"
|
||||
|
||||
#: contrib/admindocs/views.py:206 contrib/admindocs/views.py:228
|
||||
#: contrib/admindocs/views.py:242 contrib/admindocs/views.py:247
|
||||
#: contrib/admindocs/views.py:209 contrib/admindocs/views.py:228
|
||||
#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:247
|
||||
#: contrib/admindocs/views.py:261 contrib/admindocs/views.py:266
|
||||
msgid "model:"
|
||||
msgstr "modelo:"
|
||||
|
||||
#: contrib/admindocs/views.py:237
|
||||
#: contrib/admindocs/views.py:224 contrib/admindocs/views.py:256
|
||||
#, python-format
|
||||
msgid "related `%(app_label)s.%(object_name)s` objects"
|
||||
msgstr "objetos `%(app_label)s.%(object_name)s` relacionados"
|
||||
|
||||
#: contrib/admindocs/views.py:242
|
||||
#: contrib/admindocs/views.py:228 contrib/admindocs/views.py:261
|
||||
#, python-format
|
||||
msgid "all %s"
|
||||
msgstr "todos los %s"
|
||||
|
||||
#: contrib/admindocs/views.py:247
|
||||
#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:266
|
||||
#, python-format
|
||||
msgid "number of %s"
|
||||
msgstr "número de %s"
|
||||
|
||||
#: contrib/admindocs/views.py:252
|
||||
#: contrib/admindocs/views.py:271
|
||||
#, python-format
|
||||
msgid "Fields on %s objects"
|
||||
msgstr "Campos en objetos %s"
|
||||
|
||||
#: contrib/admindocs/views.py:315 contrib/admindocs/views.py:326
|
||||
#: contrib/admindocs/views.py:328 contrib/admindocs/views.py:334
|
||||
#: contrib/admindocs/views.py:335 contrib/admindocs/views.py:337
|
||||
#: contrib/admindocs/views.py:334 contrib/admindocs/views.py:345
|
||||
#: contrib/admindocs/views.py:347 contrib/admindocs/views.py:353
|
||||
#: contrib/admindocs/views.py:354 contrib/admindocs/views.py:356
|
||||
msgid "Integer"
|
||||
msgstr "Entero"
|
||||
|
||||
#: contrib/admindocs/views.py:316
|
||||
#: contrib/admindocs/views.py:335
|
||||
msgid "Boolean (Either True or False)"
|
||||
msgstr "Booleano (Verdadero o Falso)"
|
||||
|
||||
#: contrib/admindocs/views.py:317 contrib/admindocs/views.py:336
|
||||
#: contrib/admindocs/views.py:336 contrib/admindocs/views.py:355
|
||||
#, python-format
|
||||
msgid "String (up to %(max_length)s)"
|
||||
msgstr "Cadena (máximo %(max_length)s)"
|
||||
|
||||
#: contrib/admindocs/views.py:318
|
||||
#: contrib/admindocs/views.py:337
|
||||
msgid "Comma-separated integers"
|
||||
msgstr "Enteros separados por comas"
|
||||
|
||||
#: contrib/admindocs/views.py:319
|
||||
#: contrib/admindocs/views.py:338
|
||||
msgid "Date (without time)"
|
||||
msgstr "Fecha (sin hora)"
|
||||
|
||||
#: contrib/admindocs/views.py:320
|
||||
#: contrib/admindocs/views.py:339
|
||||
msgid "Date (with time)"
|
||||
msgstr "Fecha (con hora)"
|
||||
|
||||
#: contrib/admindocs/views.py:321
|
||||
#: contrib/admindocs/views.py:340
|
||||
msgid "Decimal number"
|
||||
msgstr "Número decimal"
|
||||
|
||||
#: contrib/admindocs/views.py:322
|
||||
#: contrib/admindocs/views.py:341
|
||||
msgid "E-mail address"
|
||||
msgstr "Dirección de correo electrónico"
|
||||
|
||||
#: contrib/admindocs/views.py:323 contrib/admindocs/views.py:324
|
||||
#: contrib/admindocs/views.py:327
|
||||
#: contrib/admindocs/views.py:342 contrib/admindocs/views.py:343
|
||||
#: contrib/admindocs/views.py:346
|
||||
msgid "File path"
|
||||
msgstr "Ruta de archivo"
|
||||
|
||||
#: contrib/admindocs/views.py:325
|
||||
#: contrib/admindocs/views.py:344
|
||||
msgid "Floating point number"
|
||||
msgstr "Número de punto flotante"
|
||||
|
||||
#: contrib/admindocs/views.py:329 contrib/comments/models.py:60
|
||||
#: contrib/admindocs/views.py:348 contrib/comments/models.py:60
|
||||
msgid "IP address"
|
||||
msgstr "Dirección IP"
|
||||
|
||||
#: contrib/admindocs/views.py:331
|
||||
#: contrib/admindocs/views.py:350
|
||||
msgid "Boolean (Either True, False or None)"
|
||||
msgstr "Booleano (Verdadero, Falso o Nulo)"
|
||||
|
||||
#: contrib/admindocs/views.py:332
|
||||
#: contrib/admindocs/views.py:351
|
||||
msgid "Relation to parent model"
|
||||
msgstr "Relación con el modelo padre"
|
||||
|
||||
#: contrib/admindocs/views.py:333
|
||||
#: contrib/admindocs/views.py:352
|
||||
msgid "Phone number"
|
||||
msgstr "Número de teléfono"
|
||||
|
||||
#: contrib/admindocs/views.py:338
|
||||
#: contrib/admindocs/views.py:357
|
||||
msgid "Text"
|
||||
msgstr "Texto"
|
||||
|
||||
#: contrib/admindocs/views.py:339
|
||||
#: contrib/admindocs/views.py:358
|
||||
msgid "Time"
|
||||
msgstr "Hora"
|
||||
|
||||
#: contrib/admindocs/views.py:340 contrib/comments/forms.py:95
|
||||
#: contrib/admindocs/views.py:359 contrib/comments/forms.py:95
|
||||
#: contrib/comments/templates/comments/moderation_queue.html:37
|
||||
#: contrib/flatpages/admin.py:8 contrib/flatpages/models.py:7
|
||||
msgid "URL"
|
||||
msgstr "URL"
|
||||
|
||||
#: contrib/admindocs/views.py:341
|
||||
#: contrib/admindocs/views.py:360
|
||||
msgid "U.S. state (two uppercase letters)"
|
||||
msgstr "Estado de los EE.UU. (dos letras mayúsculas)"
|
||||
|
||||
#: contrib/admindocs/views.py:342
|
||||
#: contrib/admindocs/views.py:361
|
||||
msgid "XML text"
|
||||
msgstr "Texto XML"
|
||||
|
||||
#: contrib/admindocs/views.py:368
|
||||
#: contrib/admindocs/views.py:387
|
||||
#, python-format
|
||||
msgid "%s does not appear to be a urlpattern object"
|
||||
msgstr "%s no parece ser un objeto urlpattern"
|
||||
@ -1555,7 +1558,7 @@ msgid ""
|
||||
"only."
|
||||
msgstr ""
|
||||
"Este comentario ha sido enviado por un usuario identificado, por lo tanto el "
|
||||
"nombre no puede modificarse.%(text)s"
|
||||
"nombre no puede modificarse."
|
||||
|
||||
#: contrib/comments/models.py:128
|
||||
msgid ""
|
||||
@ -1563,7 +1566,7 @@ msgid ""
|
||||
"only."
|
||||
msgstr ""
|
||||
"Este comentario ha sido enviado por un usuario identificado, por lo tanto la "
|
||||
"dirección de correo electrónico no puede modificarse.%(text)s"
|
||||
"dirección de correo electrónico no puede modificarse."
|
||||
|
||||
#: contrib/comments/models.py:153
|
||||
#, python-format
|
||||
@ -3048,7 +3051,7 @@ msgstr ""
|
||||
|
||||
#: contrib/localflavor/pl/forms.py:72
|
||||
msgid "Wrong checksum for the Tax Number (NIP)."
|
||||
msgstr "Código de verificación de Número Impostitivo (NIP) inválido."
|
||||
msgstr "Código de verificación de Número Impositivo (NIP) inválido."
|
||||
|
||||
#: contrib/localflavor/pl/forms.py:109
|
||||
msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
|
||||
@ -3945,14 +3948,14 @@ msgstr "Este valor debe ser None, True o False."
|
||||
msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
|
||||
msgstr "Introduzca un valor de hora válido en formato HH:MM[:ss[.uuuuuu]]."
|
||||
|
||||
#: db/models/fields/related.py:792
|
||||
#: db/models/fields/related.py:816
|
||||
msgid ""
|
||||
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
|
||||
msgstr ""
|
||||
"Mantenga presionada \"Control\" (\"Command\" en una Mac) para seleccionar "
|
||||
"más de uno."
|
||||
|
||||
#: db/models/fields/related.py:870
|
||||
#: db/models/fields/related.py:894
|
||||
#, python-format
|
||||
msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
|
||||
msgid_plural ""
|
||||
@ -4075,7 +4078,7 @@ msgstr ""
|
||||
"Seleccione una opción válida. %(value)s no es una de las opciones "
|
||||
"disponibles."
|
||||
|
||||
#: forms/fields.py:704 forms/fields.py:765 forms/models.py:991
|
||||
#: forms/fields.py:704 forms/fields.py:765 forms/models.py:1003
|
||||
msgid "Enter a list of values."
|
||||
msgstr "Introduzca una lista de valores."
|
||||
|
||||
@ -4086,7 +4089,7 @@ msgstr "Introduzca una dirección IPv4 válida"
|
||||
#: forms/fields.py:902
|
||||
msgid ""
|
||||
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
|
||||
msgstr "Introduzca un 'slug' válido consistente en letras, números o guiones."
|
||||
msgstr "Introduzca un 'slug' válido consistente de letras, números o guiones."
|
||||
|
||||
#: forms/formsets.py:271 forms/formsets.py:273
|
||||
msgid "Order"
|
||||
@ -4104,46 +4107,48 @@ msgstr ""
|
||||
msgid "%(model_name)s with this %(field_label)s already exists."
|
||||
msgstr "Ya existe un/a %(model_name)s con este/a %(field_label)s."
|
||||
|
||||
#: forms/models.py:581
|
||||
#, fuzzy, python-format
|
||||
#: forms/models.py:594
|
||||
#, python-format
|
||||
msgid "Please correct the duplicate data for %(field)s."
|
||||
msgstr "Por favor, corrija el siguiente error."
|
||||
msgstr "Por favor, corrija la información duplicada en %(field)s."
|
||||
|
||||
#: forms/models.py:585
|
||||
#: forms/models.py:598
|
||||
#, python-format
|
||||
msgid "Please correct the duplicate data for %(field)s, which must be unique."
|
||||
msgstr ""
|
||||
"Por favor corrija la información duplicada en %(field)s, que debe ser única."
|
||||
|
||||
#: forms/models.py:591
|
||||
#: forms/models.py:604
|
||||
#, 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 la información duplicada en %(field_name)s que debe ser "
|
||||
"única para el %(lookup)s en %(date_field)s."
|
||||
|
||||
#: forms/models.py:599
|
||||
#, fuzzy
|
||||
#: forms/models.py:612
|
||||
msgid "Please correct the duplicate values below."
|
||||
msgstr "Por favor, corrija el siguiente error."
|
||||
msgstr "Por favor, corrija los valores duplicados detallados mas abajo."
|
||||
|
||||
#: forms/models.py:855
|
||||
#: forms/models.py:867
|
||||
msgid "The inline foreign key did not match the parent instance primary key."
|
||||
msgstr ""
|
||||
"La clave foránea del modelo inline no coincide con la de la instancia padre."
|
||||
|
||||
#: forms/models.py:918
|
||||
#: forms/models.py:930
|
||||
msgid "Select a valid choice. That choice is not one of the available choices."
|
||||
msgstr ""
|
||||
"Seleccione una opción válida. Esa opción no es una de las opciones "
|
||||
"disponibles."
|
||||
|
||||
#: forms/models.py:992
|
||||
#: forms/models.py:1004
|
||||
#, python-format
|
||||
msgid "Select a valid choice. %s is not one of the available choices."
|
||||
msgstr ""
|
||||
"Seleccione una opción válida. %s no es una de las opciones disponibles."
|
||||
|
||||
#: forms/models.py:994
|
||||
#: forms/models.py:1006
|
||||
#, python-format
|
||||
msgid "\"%s\" is not a valid value for a primary key."
|
||||
msgstr "\"%s\" no es un valor válido para una clave primaria."
|
||||
|
||||
Binary file not shown.
@ -5,7 +5,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Django\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2009-04-11 07:53+0300\n"
|
||||
"POT-Creation-Date: 2009-07-24 22:06+0300\n"
|
||||
"PO-Revision-Date: 2008-09-03 00:35+0200\n"
|
||||
"Last-Translator: Erik Allik <removethis-eallik_at_gmail-com>\n"
|
||||
"Language-Team: Django-i18n <django-i18n@googlegroups.com>\n"
|
||||
@ -217,19 +217,19 @@ msgstr "lihtsustatud hiina"
|
||||
msgid "Traditional Chinese"
|
||||
msgstr "traditsiooniline hiina"
|
||||
|
||||
#: contrib/admin/actions.py:56
|
||||
#: contrib/admin/actions.py:60
|
||||
#, python-format
|
||||
msgid "Successfully deleted %(count)d %(items)s."
|
||||
msgstr ""
|
||||
msgstr "%(count)d %(items)s kustutamine õnnestus"
|
||||
|
||||
#: contrib/admin/actions.py:63 contrib/admin/options.py:1023
|
||||
#: contrib/admin/actions.py:67 contrib/admin/options.py:1027
|
||||
msgid "Are you sure?"
|
||||
msgstr "Kas olete kindel?"
|
||||
|
||||
#: contrib/admin/actions.py:81
|
||||
#: contrib/admin/actions.py:85
|
||||
#, python-format
|
||||
msgid "Delete selected %(verbose_name_plural)s"
|
||||
msgstr ""
|
||||
msgstr "Kustuta valitud %(verbose_name_plural)s"
|
||||
|
||||
#: contrib/admin/filterspecs.py:44
|
||||
#, python-format
|
||||
@ -265,15 +265,15 @@ msgstr "Käesolev kuu"
|
||||
msgid "This year"
|
||||
msgstr "Käesolev aasta"
|
||||
|
||||
#: contrib/admin/filterspecs.py:147 forms/widgets.py:413
|
||||
#: contrib/admin/filterspecs.py:147 forms/widgets.py:434
|
||||
msgid "Yes"
|
||||
msgstr "Jah"
|
||||
|
||||
#: contrib/admin/filterspecs.py:147 forms/widgets.py:413
|
||||
#: contrib/admin/filterspecs.py:147 forms/widgets.py:434
|
||||
msgid "No"
|
||||
msgstr "Ei"
|
||||
|
||||
#: contrib/admin/filterspecs.py:154 forms/widgets.py:413
|
||||
#: contrib/admin/filterspecs.py:154 forms/widgets.py:434
|
||||
msgid "Unknown"
|
||||
msgstr "Tundmatu"
|
||||
|
||||
@ -311,100 +311,101 @@ msgstr "logisissekanded"
|
||||
|
||||
#: contrib/admin/options.py:133 contrib/admin/options.py:147
|
||||
msgid "None"
|
||||
msgstr "puudub"
|
||||
msgstr "Puudub"
|
||||
|
||||
#: contrib/admin/options.py:517
|
||||
#: contrib/admin/options.py:519
|
||||
#, python-format
|
||||
msgid "Changed %s."
|
||||
msgstr "Muutsin %s."
|
||||
|
||||
#: contrib/admin/options.py:517 contrib/admin/options.py:527
|
||||
#: contrib/comments/templates/comments/preview.html:16 forms/models.py:306
|
||||
#: contrib/admin/options.py:519 contrib/admin/options.py:529
|
||||
#: contrib/comments/templates/comments/preview.html:16 forms/models.py:388
|
||||
#: forms/models.py:600
|
||||
msgid "and"
|
||||
msgstr "ja"
|
||||
|
||||
#: contrib/admin/options.py:522
|
||||
#: contrib/admin/options.py:524
|
||||
#, python-format
|
||||
msgid "Added %(name)s \"%(object)s\"."
|
||||
msgstr "Lisatud %(name)s \"%(object)s\"."
|
||||
|
||||
#: contrib/admin/options.py:526
|
||||
#: contrib/admin/options.py:528
|
||||
#, python-format
|
||||
msgid "Changed %(list)s for %(name)s \"%(object)s\"."
|
||||
msgstr "Muudetud %(list)s objektil %(name)s \"%(object)s\"."
|
||||
|
||||
#: contrib/admin/options.py:531
|
||||
#: contrib/admin/options.py:533
|
||||
#, python-format
|
||||
msgid "Deleted %(name)s \"%(object)s\"."
|
||||
msgstr "Kustutatud %(name)s \"%(object)s\"."
|
||||
|
||||
#: contrib/admin/options.py:535
|
||||
#: contrib/admin/options.py:537
|
||||
msgid "No fields changed."
|
||||
msgstr "Ühtegi välja ei muudetud."
|
||||
|
||||
#: contrib/admin/options.py:596 contrib/auth/admin.py:67
|
||||
#: contrib/admin/options.py:599 contrib/auth/admin.py:67
|
||||
#, python-format
|
||||
msgid "The %(name)s \"%(obj)s\" was added successfully."
|
||||
msgstr "%(name)s \"%(obj)s\" lisamine õnnestus."
|
||||
|
||||
#: contrib/admin/options.py:600 contrib/admin/options.py:633
|
||||
#: contrib/admin/options.py:603 contrib/admin/options.py:636
|
||||
#: contrib/auth/admin.py:75
|
||||
msgid "You may edit it again below."
|
||||
msgstr "Võite jätkata redigeerimist."
|
||||
|
||||
#: contrib/admin/options.py:610 contrib/admin/options.py:643
|
||||
#: contrib/admin/options.py:613 contrib/admin/options.py:646
|
||||
#, python-format
|
||||
msgid "You may add another %s below."
|
||||
msgstr "Võite jätkata uue %s lisamisega."
|
||||
|
||||
#: contrib/admin/options.py:631
|
||||
#: contrib/admin/options.py:634
|
||||
#, python-format
|
||||
msgid "The %(name)s \"%(obj)s\" was changed successfully."
|
||||
msgstr "%(name)s \"%(obj)s\" muutmine õnnestus."
|
||||
|
||||
#: contrib/admin/options.py:639
|
||||
#: contrib/admin/options.py:642
|
||||
#, python-format
|
||||
msgid ""
|
||||
"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
|
||||
msgstr "%(name)s \"%(obj)s\" lisamine õnnestus. Te võite seda muuta."
|
||||
|
||||
#: contrib/admin/options.py:770
|
||||
#: contrib/admin/options.py:773
|
||||
#, python-format
|
||||
msgid "Add %s"
|
||||
msgstr "Lisa %s"
|
||||
|
||||
#: contrib/admin/options.py:801 contrib/admin/options.py:1001
|
||||
#: contrib/admin/options.py:804 contrib/admin/options.py:1005
|
||||
#, python-format
|
||||
msgid "%(name)s object with primary key %(key)r does not exist."
|
||||
msgstr "%(name)s primaarvõtmega %(key)r ei eksisteeri."
|
||||
|
||||
#: contrib/admin/options.py:858
|
||||
#: contrib/admin/options.py:861
|
||||
#, python-format
|
||||
msgid "Change %s"
|
||||
msgstr "Muuda %s"
|
||||
|
||||
#: contrib/admin/options.py:902
|
||||
#: contrib/admin/options.py:905
|
||||
msgid "Database error"
|
||||
msgstr "Andmebaasi viga"
|
||||
|
||||
#: contrib/admin/options.py:938
|
||||
#: contrib/admin/options.py:941
|
||||
#, python-format
|
||||
msgid "%(count)s %(name)s was changed successfully."
|
||||
msgid_plural "%(count)s %(name)s were changed successfully."
|
||||
msgstr[0] "%(count)s %(name)s muutmine õnnestus."
|
||||
msgstr[1] "%(count)s %(name)s muutmine õnnestus."
|
||||
|
||||
#: contrib/admin/options.py:1016
|
||||
#: contrib/admin/options.py:1020
|
||||
#, python-format
|
||||
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
|
||||
msgstr "%(name)s \"%(obj)s\" kustutati."
|
||||
|
||||
#: contrib/admin/options.py:1052
|
||||
#: contrib/admin/options.py:1057
|
||||
#, python-format
|
||||
msgid "Change history: %s"
|
||||
msgstr "Muudatuste ajalugu: %s"
|
||||
|
||||
#: contrib/admin/sites.py:20 contrib/admin/views/decorators.py:14
|
||||
#: contrib/admin/sites.py:21 contrib/admin/views/decorators.py:14
|
||||
#: contrib/auth/forms.py:80
|
||||
msgid ""
|
||||
"Please enter a correct username and password. Note that both fields are case-"
|
||||
@ -413,11 +414,11 @@ msgstr ""
|
||||
"Palun sisestage korrektne kasutajatunnus ja salasõna. Mõlemad väljad on "
|
||||
"tõstutundlikud."
|
||||
|
||||
#: contrib/admin/sites.py:278 contrib/admin/views/decorators.py:40
|
||||
#: contrib/admin/sites.py:285 contrib/admin/views/decorators.py:40
|
||||
msgid "Please log in again, because your session has expired."
|
||||
msgstr "Teie sessioon on aegunud. Palun logige uuesti sisse."
|
||||
|
||||
#: contrib/admin/sites.py:285 contrib/admin/views/decorators.py:47
|
||||
#: contrib/admin/sites.py:292 contrib/admin/views/decorators.py:47
|
||||
msgid ""
|
||||
"Looks like your browser isn't configured to accept cookies. Please enable "
|
||||
"cookies, reload this page, and try again."
|
||||
@ -425,28 +426,27 @@ msgstr ""
|
||||
"Paistab, et Teie brauser ei aktsepteeri küpsiseid. Palun võimaldage küpsised "
|
||||
"ning seejärel laadige see leht uuesti."
|
||||
|
||||
#: contrib/admin/sites.py:301 contrib/admin/sites.py:307
|
||||
#: contrib/admin/sites.py:308 contrib/admin/sites.py:314
|
||||
#: contrib/admin/views/decorators.py:66
|
||||
msgid "Usernames cannot contain the '@' character."
|
||||
msgstr "Kasutajatunnused ei tohi sisaldada '@' märki."
|
||||
|
||||
#: contrib/admin/sites.py:304 contrib/admin/views/decorators.py:62
|
||||
#: contrib/admin/sites.py:311 contrib/admin/views/decorators.py:62
|
||||
#, python-format
|
||||
msgid "Your e-mail address is not your username. Try '%s' instead."
|
||||
msgstr ""
|
||||
"Teie e-posti aadress ei ole Teie kasutajatunnus. Proovige '%s'."
|
||||
msgstr "Teie e-posti aadress ei ole Teie kasutajatunnus. Proovige '%s'."
|
||||
|
||||
#: contrib/admin/sites.py:360
|
||||
#: contrib/admin/sites.py:367
|
||||
msgid "Site administration"
|
||||
msgstr "Saidi administreerimine"
|
||||
|
||||
#: contrib/admin/sites.py:373 contrib/admin/templates/admin/login.html:26
|
||||
#: contrib/admin/sites.py:381 contrib/admin/templates/admin/login.html:26
|
||||
#: contrib/admin/templates/registration/password_reset_complete.html:14
|
||||
#: contrib/admin/views/decorators.py:20
|
||||
msgid "Log in"
|
||||
msgstr "Sisene"
|
||||
|
||||
#: contrib/admin/sites.py:417
|
||||
#: contrib/admin/sites.py:426
|
||||
#, python-format
|
||||
msgid "%s administration"
|
||||
msgstr "%s - administreerimine"
|
||||
@ -496,7 +496,7 @@ msgstr "Vabandame, kuid soovitud lehte ei leitud."
|
||||
|
||||
#: contrib/admin/templates/admin/500.html:4
|
||||
#: contrib/admin/templates/admin/app_index.html:8
|
||||
#: contrib/admin/templates/admin/base.html:33
|
||||
#: contrib/admin/templates/admin/base.html:54
|
||||
#: contrib/admin/templates/admin/change_form.html:17
|
||||
#: contrib/admin/templates/admin/change_list.html:25
|
||||
#: contrib/admin/templates/admin/delete_confirmation.html:6
|
||||
@ -541,7 +541,6 @@ msgid "Run the selected action"
|
||||
msgstr "Käivita valitud toiming"
|
||||
|
||||
#: contrib/admin/templates/admin/actions.html:4
|
||||
#: contrib/admin/templates/admin/search_form.html:8
|
||||
msgid "Go"
|
||||
msgstr "Mine"
|
||||
|
||||
@ -551,18 +550,18 @@ msgstr "Mine"
|
||||
msgid "%(name)s"
|
||||
msgstr "%(name)s"
|
||||
|
||||
#: contrib/admin/templates/admin/base.html:28
|
||||
#: contrib/admin/templates/admin/base.html:27
|
||||
msgid "Welcome,"
|
||||
msgstr "Tere tulemast,"
|
||||
|
||||
#: contrib/admin/templates/admin/base.html:28
|
||||
#: contrib/admin/templates/admin/base.html:32
|
||||
#: contrib/admin/templates/registration/password_change_done.html:3
|
||||
#: contrib/admin/templates/registration/password_change_form.html:3
|
||||
#: contrib/admindocs/templates/admin_doc/bookmarklets.html:3
|
||||
msgid "Documentation"
|
||||
msgstr "Dokumentatsioon"
|
||||
|
||||
#: contrib/admin/templates/admin/base.html:28
|
||||
#: contrib/admin/templates/admin/base.html:40
|
||||
#: contrib/admin/templates/admin/auth/user/change_password.html:14
|
||||
#: contrib/admin/templates/admin/auth/user/change_password.html:47
|
||||
#: contrib/admin/templates/registration/password_change_done.html:3
|
||||
@ -570,7 +569,7 @@ msgstr "Dokumentatsioon"
|
||||
msgid "Change password"
|
||||
msgstr "Muuda salasõna"
|
||||
|
||||
#: contrib/admin/templates/admin/base.html:28
|
||||
#: contrib/admin/templates/admin/base.html:47
|
||||
#: contrib/admin/templates/registration/password_change_done.html:3
|
||||
#: contrib/admin/templates/registration/password_change_form.html:3
|
||||
msgid "Log out"
|
||||
@ -659,9 +658,8 @@ msgid ""
|
||||
"your account doesn't have permission to delete the following types of "
|
||||
"objects:"
|
||||
msgstr ""
|
||||
"%(object_name)s kustutamiseks on vaja "
|
||||
"kustutada ka seotud objektid, aga teil puudub õigus järgnevat "
|
||||
"tüüpi objektide kustutamiseks:"
|
||||
"%(object_name)s kustutamiseks on vaja kustutada ka seotud objektid, aga teil "
|
||||
"puudub õigus järgnevat tüüpi objektide kustutamiseks:"
|
||||
|
||||
#: contrib/admin/templates/admin/delete_selected_confirmation.html:22
|
||||
#, python-format
|
||||
@ -702,6 +700,10 @@ msgstr "Minu Toimingud"
|
||||
msgid "None available"
|
||||
msgstr "Ei leitud ühtegi"
|
||||
|
||||
#: contrib/admin/templates/admin/index.html:72
|
||||
msgid "Unknown content"
|
||||
msgstr "Tundmatu sisu"
|
||||
|
||||
#: contrib/admin/templates/admin/invalid_setup.html:7
|
||||
msgid ""
|
||||
"Something's wrong with your database installation. Make sure the appropriate "
|
||||
@ -750,6 +752,15 @@ msgstr ""
|
||||
msgid "Show all"
|
||||
msgstr "Näita kõiki"
|
||||
|
||||
#: contrib/admin/templates/admin/pagination.html:11
|
||||
#: contrib/admin/templates/admin/submit_line.html:3
|
||||
msgid "Save"
|
||||
msgstr "Salvesta"
|
||||
|
||||
#: contrib/admin/templates/admin/search_form.html:8
|
||||
msgid "Search"
|
||||
msgstr "Otsing"
|
||||
|
||||
#: contrib/admin/templates/admin/search_form.html:10
|
||||
#, python-format
|
||||
msgid "1 result"
|
||||
@ -762,10 +773,6 @@ msgstr[1] "%(counter)s tulemust"
|
||||
msgid "%(full_result_count)s total"
|
||||
msgstr "Kokku %(full_result_count)s"
|
||||
|
||||
#: contrib/admin/templates/admin/submit_line.html:3
|
||||
msgid "Save"
|
||||
msgstr "Salvesta"
|
||||
|
||||
#: contrib/admin/templates/admin/submit_line.html:5
|
||||
msgid "Save as new"
|
||||
msgstr "Salvesta uuena"
|
||||
@ -993,144 +1000,145 @@ msgstr "sait"
|
||||
msgid "template"
|
||||
msgstr "mall"
|
||||
|
||||
#: contrib/admindocs/views.py:58 contrib/admindocs/views.py:60
|
||||
#: contrib/admindocs/views.py:62
|
||||
#: contrib/admindocs/views.py:61 contrib/admindocs/views.py:63
|
||||
#: contrib/admindocs/views.py:65
|
||||
msgid "tag:"
|
||||
msgstr "lipik:"
|
||||
|
||||
#: contrib/admindocs/views.py:91 contrib/admindocs/views.py:93
|
||||
#: contrib/admindocs/views.py:95
|
||||
#: contrib/admindocs/views.py:94 contrib/admindocs/views.py:96
|
||||
#: contrib/admindocs/views.py:98
|
||||
msgid "filter:"
|
||||
msgstr "filtreeri:"
|
||||
|
||||
#: contrib/admindocs/views.py:155 contrib/admindocs/views.py:157
|
||||
#: contrib/admindocs/views.py:159
|
||||
#: contrib/admindocs/views.py:158 contrib/admindocs/views.py:160
|
||||
#: contrib/admindocs/views.py:162
|
||||
msgid "view:"
|
||||
msgstr "vaade:"
|
||||
|
||||
#: contrib/admindocs/views.py:187
|
||||
#: contrib/admindocs/views.py:190
|
||||
#, python-format
|
||||
msgid "App %r not found"
|
||||
msgstr "Rakendust %r ei leitud"
|
||||
|
||||
#: contrib/admindocs/views.py:194
|
||||
#: contrib/admindocs/views.py:197
|
||||
#, python-format
|
||||
msgid "Model %(model_name)r not found in app %(app_label)r"
|
||||
msgstr "Mudelit %(model_name)r ei leitud rakendusest %(app_label)r"
|
||||
|
||||
#: contrib/admindocs/views.py:206
|
||||
#: contrib/admindocs/views.py:209
|
||||
#, python-format
|
||||
msgid "the related `%(app_label)s.%(data_type)s` object"
|
||||
msgstr "seotud `%(app_label)s.%(data_type)s` objekt"
|
||||
|
||||
#: contrib/admindocs/views.py:206 contrib/admindocs/views.py:228
|
||||
#: contrib/admindocs/views.py:242 contrib/admindocs/views.py:247
|
||||
#: contrib/admindocs/views.py:209 contrib/admindocs/views.py:228
|
||||
#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:247
|
||||
#: contrib/admindocs/views.py:261 contrib/admindocs/views.py:266
|
||||
msgid "model:"
|
||||
msgstr "mudel:"
|
||||
|
||||
#: contrib/admindocs/views.py:237
|
||||
#: contrib/admindocs/views.py:224 contrib/admindocs/views.py:256
|
||||
#, python-format
|
||||
msgid "related `%(app_label)s.%(object_name)s` objects"
|
||||
msgstr "seotud `%(app_label)s.%(object_name)s` objektid"
|
||||
|
||||
#: contrib/admindocs/views.py:242
|
||||
#: contrib/admindocs/views.py:228 contrib/admindocs/views.py:261
|
||||
#, python-format
|
||||
msgid "all %s"
|
||||
msgstr "kõik %s"
|
||||
|
||||
#: contrib/admindocs/views.py:247
|
||||
#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:266
|
||||
#, python-format
|
||||
msgid "number of %s"
|
||||
msgstr "%s arv"
|
||||
|
||||
#: contrib/admindocs/views.py:252
|
||||
#: contrib/admindocs/views.py:271
|
||||
#, python-format
|
||||
msgid "Fields on %s objects"
|
||||
msgstr "Objekti %s väljad"
|
||||
|
||||
#: contrib/admindocs/views.py:315 contrib/admindocs/views.py:326
|
||||
#: contrib/admindocs/views.py:328 contrib/admindocs/views.py:334
|
||||
#: contrib/admindocs/views.py:335 contrib/admindocs/views.py:337
|
||||
#: contrib/admindocs/views.py:334 contrib/admindocs/views.py:345
|
||||
#: contrib/admindocs/views.py:347 contrib/admindocs/views.py:353
|
||||
#: contrib/admindocs/views.py:354 contrib/admindocs/views.py:356
|
||||
msgid "Integer"
|
||||
msgstr "Täisarv"
|
||||
|
||||
#: contrib/admindocs/views.py:316
|
||||
#: contrib/admindocs/views.py:335
|
||||
msgid "Boolean (Either True or False)"
|
||||
msgstr "Tõeväärtus (Kas tõene või väär)"
|
||||
|
||||
#: contrib/admindocs/views.py:317 contrib/admindocs/views.py:336
|
||||
#: contrib/admindocs/views.py:336 contrib/admindocs/views.py:355
|
||||
#, python-format
|
||||
msgid "String (up to %(max_length)s)"
|
||||
msgstr "String (kuni %(max_length)s märki)"
|
||||
|
||||
#: contrib/admindocs/views.py:318
|
||||
#: contrib/admindocs/views.py:337
|
||||
msgid "Comma-separated integers"
|
||||
msgstr "Komaga eraldatud täisarvud"
|
||||
|
||||
#: contrib/admindocs/views.py:319
|
||||
#: contrib/admindocs/views.py:338
|
||||
msgid "Date (without time)"
|
||||
msgstr "Kuupäev (kellaajata)"
|
||||
|
||||
#: contrib/admindocs/views.py:320
|
||||
#: contrib/admindocs/views.py:339
|
||||
msgid "Date (with time)"
|
||||
msgstr "Kuupäev (kellaajaga)"
|
||||
|
||||
#: contrib/admindocs/views.py:321
|
||||
#: contrib/admindocs/views.py:340
|
||||
msgid "Decimal number"
|
||||
msgstr "Kümnendmurd"
|
||||
|
||||
#: contrib/admindocs/views.py:322
|
||||
#: contrib/admindocs/views.py:341
|
||||
msgid "E-mail address"
|
||||
msgstr "E-posti aadress"
|
||||
|
||||
#: contrib/admindocs/views.py:323 contrib/admindocs/views.py:324
|
||||
#: contrib/admindocs/views.py:327
|
||||
#: contrib/admindocs/views.py:342 contrib/admindocs/views.py:343
|
||||
#: contrib/admindocs/views.py:346
|
||||
msgid "File path"
|
||||
msgstr "Faili asukoht"
|
||||
|
||||
#: contrib/admindocs/views.py:325
|
||||
#: contrib/admindocs/views.py:344
|
||||
msgid "Floating point number"
|
||||
msgstr "Ujukomaarv"
|
||||
|
||||
#: contrib/admindocs/views.py:329 contrib/comments/models.py:60
|
||||
#: contrib/admindocs/views.py:348 contrib/comments/models.py:60
|
||||
msgid "IP address"
|
||||
msgstr "IP aadress"
|
||||
|
||||
#: contrib/admindocs/views.py:331
|
||||
#: contrib/admindocs/views.py:350
|
||||
msgid "Boolean (Either True, False or None)"
|
||||
msgstr "Tõeväärtus (Kas tõene, väär või tühi)"
|
||||
|
||||
#: contrib/admindocs/views.py:332
|
||||
#: contrib/admindocs/views.py:351
|
||||
msgid "Relation to parent model"
|
||||
msgstr "Seos ülem-mudeliga"
|
||||
|
||||
#: contrib/admindocs/views.py:333
|
||||
#: contrib/admindocs/views.py:352
|
||||
msgid "Phone number"
|
||||
msgstr "Telefoninumber"
|
||||
|
||||
#: contrib/admindocs/views.py:338
|
||||
#: contrib/admindocs/views.py:357
|
||||
msgid "Text"
|
||||
msgstr "Tekst"
|
||||
|
||||
#: contrib/admindocs/views.py:339
|
||||
#: contrib/admindocs/views.py:358
|
||||
msgid "Time"
|
||||
msgstr "Aeg"
|
||||
|
||||
#: contrib/admindocs/views.py:340 contrib/comments/forms.py:95
|
||||
#: contrib/admindocs/views.py:359 contrib/comments/forms.py:95
|
||||
#: contrib/comments/templates/comments/moderation_queue.html:37
|
||||
#: contrib/flatpages/admin.py:8 contrib/flatpages/models.py:7
|
||||
msgid "URL"
|
||||
msgstr "URL"
|
||||
|
||||
#: contrib/admindocs/views.py:341
|
||||
#: contrib/admindocs/views.py:360
|
||||
msgid "U.S. state (two uppercase letters)"
|
||||
msgstr "U.S.A. osariik (kaks suurt tähte)"
|
||||
|
||||
#: contrib/admindocs/views.py:342
|
||||
#: contrib/admindocs/views.py:361
|
||||
msgid "XML text"
|
||||
msgstr "XML tekst"
|
||||
|
||||
#: contrib/admindocs/views.py:368
|
||||
#: contrib/admindocs/views.py:387
|
||||
#, python-format
|
||||
msgid "%s does not appear to be a urlpattern object"
|
||||
msgstr "%s ei tundu olevat urlpattern objekt"
|
||||
@ -1470,7 +1478,7 @@ msgid ""
|
||||
"If you enter anything in this field your comment will be treated as spam"
|
||||
msgstr "Kui sisestate sellesse lahtrisse midagi, loetakse kommentaar rämpsuks"
|
||||
|
||||
#: contrib/comments/models.py:22 contrib/contenttypes/models.py:71
|
||||
#: contrib/comments/models.py:22 contrib/contenttypes/models.py:74
|
||||
msgid "content type"
|
||||
msgstr "sisutüüp"
|
||||
|
||||
@ -1698,11 +1706,11 @@ msgstr "Postita kommentaar"
|
||||
msgid "or make changes"
|
||||
msgstr "või tee muudatused"
|
||||
|
||||
#: contrib/contenttypes/models.py:67
|
||||
#: contrib/contenttypes/models.py:70
|
||||
msgid "python model class name"
|
||||
msgstr "pythoni mudeli klassinimi"
|
||||
|
||||
#: contrib/contenttypes/models.py:72
|
||||
#: contrib/contenttypes/models.py:75
|
||||
msgid "content types"
|
||||
msgstr "sisutüübid"
|
||||
|
||||
@ -1772,18 +1780,25 @@ msgstr ""
|
||||
"Vabandame, kuid vorm on aegunud. Palun jätkake vormi täitmist käesolevalt "
|
||||
"lehelt."
|
||||
|
||||
#: contrib/gis/forms/fields.py:14
|
||||
#: contrib/gis/forms/fields.py:17
|
||||
msgid "No geometry value provided."
|
||||
msgstr "Geomeetriline väärtus puudub."
|
||||
|
||||
#: contrib/gis/forms/fields.py:15
|
||||
#: contrib/gis/forms/fields.py:18
|
||||
msgid "Invalid geometry value."
|
||||
msgstr "Vigane geomeetriline väärtus."
|
||||
|
||||
#: contrib/gis/forms/fields.py:16
|
||||
#: contrib/gis/forms/fields.py:19
|
||||
msgid "Invalid geometry type."
|
||||
msgstr "Vigane geomeetriline tüüp."
|
||||
|
||||
#: contrib/gis/forms/fields.py:20
|
||||
msgid ""
|
||||
"An error occurred when transforming the geometry to the SRID of the geometry "
|
||||
"form field."
|
||||
msgstr ""
|
||||
"Geomeetria teisendamisel geomeetria vormivälja SRID-ks tekkis viga."
|
||||
|
||||
#: contrib/humanize/templatetags/humanize.py:19
|
||||
msgid "th"
|
||||
msgstr "."
|
||||
@ -2104,59 +2119,59 @@ msgstr "Tšiili RUT on ebakorrektne."
|
||||
|
||||
#: contrib/localflavor/cz/cz_regions.py:8
|
||||
msgid "Prague"
|
||||
msgstr ""
|
||||
msgstr "Praha"
|
||||
|
||||
#: contrib/localflavor/cz/cz_regions.py:9
|
||||
msgid "Central Bohemian Region"
|
||||
msgstr ""
|
||||
msgstr "Kesk-Boheemia regioon"
|
||||
|
||||
#: contrib/localflavor/cz/cz_regions.py:10
|
||||
msgid "South Bohemian Region"
|
||||
msgstr ""
|
||||
msgstr "Lõuna-Boheemia regioon"
|
||||
|
||||
#: contrib/localflavor/cz/cz_regions.py:11
|
||||
msgid "Pilsen Region"
|
||||
msgstr ""
|
||||
msgstr "Pilseni regioon"
|
||||
|
||||
#: contrib/localflavor/cz/cz_regions.py:12
|
||||
msgid "Carlsbad Region"
|
||||
msgstr ""
|
||||
msgstr "Carlsbadi regioon"
|
||||
|
||||
#: contrib/localflavor/cz/cz_regions.py:13
|
||||
msgid "Usti Region"
|
||||
msgstr ""
|
||||
msgstr "Usti regioon"
|
||||
|
||||
#: contrib/localflavor/cz/cz_regions.py:14
|
||||
msgid "Liberec Region"
|
||||
msgstr ""
|
||||
msgstr "Libereci regioon"
|
||||
|
||||
#: contrib/localflavor/cz/cz_regions.py:15
|
||||
msgid "Hradec Region"
|
||||
msgstr ""
|
||||
msgstr "Hradeci regioon"
|
||||
|
||||
#: contrib/localflavor/cz/cz_regions.py:16
|
||||
msgid "Pardubice Region"
|
||||
msgstr ""
|
||||
msgstr "Pardubice regioon"
|
||||
|
||||
#: contrib/localflavor/cz/cz_regions.py:17
|
||||
msgid "Vysocina Region"
|
||||
msgstr ""
|
||||
msgstr "Vysocina regioon"
|
||||
|
||||
#: contrib/localflavor/cz/cz_regions.py:18
|
||||
msgid "South Moravian Region"
|
||||
msgstr ""
|
||||
msgstr "Lõuna-Moraavia regioon"
|
||||
|
||||
#: contrib/localflavor/cz/cz_regions.py:19
|
||||
msgid "Olomouc Region"
|
||||
msgstr ""
|
||||
msgstr "Olomouci regioon"
|
||||
|
||||
#: contrib/localflavor/cz/cz_regions.py:20
|
||||
msgid "Zlin Region"
|
||||
msgstr ""
|
||||
msgstr "Zlini regioon"
|
||||
|
||||
#: contrib/localflavor/cz/cz_regions.py:21
|
||||
msgid "Moravian-Silesian Region"
|
||||
msgstr ""
|
||||
msgstr "Moraavia-Sileesia regioon"
|
||||
|
||||
#: contrib/localflavor/cz/forms.py:27 contrib/localflavor/sk/forms.py:30
|
||||
msgid "Enter a postal code in the format XXXXX or XXX XX."
|
||||
@ -2164,12 +2179,13 @@ msgstr "Sisesta postiindeks kujul XXXXX või XXX XX."
|
||||
|
||||
#: contrib/localflavor/cz/forms.py:47
|
||||
msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
|
||||
msgstr ""
|
||||
"Sisesta sünninumber formaadis XXXXXX/XXXX või XXXXXXXXXX"
|
||||
msgstr "Sisesta sünninumber formaadis XXXXXX/XXXX või XXXXXXXXXX"
|
||||
|
||||
#: contrib/localflavor/cz/forms.py:48
|
||||
msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
|
||||
msgstr "Ebasobiv valikuline parameeter Sugu, sobivad väärtused on 'f' (naine) ja 'm' (mees)"
|
||||
msgstr ""
|
||||
"Ebasobiv valikuline parameeter Sugu, sobivad väärtused on 'f' (naine) ja "
|
||||
"'m' (mees)"
|
||||
|
||||
#: contrib/localflavor/cz/forms.py:49
|
||||
msgid "Enter a valid birth number."
|
||||
@ -3846,7 +3862,7 @@ msgstr "hüüdnimi"
|
||||
msgid "sites"
|
||||
msgstr "saidid"
|
||||
|
||||
#: db/models/fields/__init__.py:356 db/models/fields/__init__.py:707
|
||||
#: db/models/fields/__init__.py:356 db/models/fields/__init__.py:710
|
||||
msgid "This value must be an integer."
|
||||
msgstr "See väärtus peab olema täisarv."
|
||||
|
||||
@ -3880,24 +3896,24 @@ msgstr ""
|
||||
msgid "This value must be a decimal number."
|
||||
msgstr "See väärtus peab olema kümnendarv."
|
||||
|
||||
#: db/models/fields/__init__.py:683
|
||||
#: db/models/fields/__init__.py:686
|
||||
msgid "This value must be a float."
|
||||
msgstr "See väärtus peab olema murdarv."
|
||||
|
||||
#: db/models/fields/__init__.py:743
|
||||
#: db/models/fields/__init__.py:746
|
||||
msgid "This value must be either None, True or False."
|
||||
msgstr "See väärtus peab olema kas tühi, tõene või väär."
|
||||
|
||||
#: db/models/fields/__init__.py:846 db/models/fields/__init__.py:860
|
||||
#: db/models/fields/__init__.py:849 db/models/fields/__init__.py:863
|
||||
msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
|
||||
msgstr "Sisestage korrektne kellaaeg formaadis TT:MM[:ss[.uuuuuu]]"
|
||||
|
||||
#: db/models/fields/related.py:792
|
||||
#: db/models/fields/related.py:816
|
||||
msgid ""
|
||||
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
|
||||
msgstr "Et valida mitu, hoidke all \"Control\"-nuppu (Maci puhul \"Command\")."
|
||||
|
||||
#: db/models/fields/related.py:870
|
||||
#: db/models/fields/related.py:894
|
||||
#, python-format
|
||||
msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
|
||||
msgid_plural ""
|
||||
@ -3961,11 +3977,11 @@ msgstr "Veenduge, et komakohtade arv ei ületaks %s."
|
||||
msgid "Ensure that there are no more than %s digits before the decimal point."
|
||||
msgstr "Veenduge, et komast vasakul olevaid numbreid ei oleks rohkem kui %s."
|
||||
|
||||
#: forms/fields.py:288 forms/fields.py:862
|
||||
#: forms/fields.py:288 forms/fields.py:863
|
||||
msgid "Enter a valid date."
|
||||
msgstr "Sisestage korrektne kuupäev."
|
||||
|
||||
#: forms/fields.py:322 forms/fields.py:863
|
||||
#: forms/fields.py:322 forms/fields.py:864
|
||||
msgid "Enter a valid time."
|
||||
msgstr "Sisestage korrektne kellaaeg."
|
||||
|
||||
@ -4009,20 +4025,20 @@ msgstr "Sisestage korrektne URL."
|
||||
msgid "This URL appears to be a broken link."
|
||||
msgstr "See URL näib olevat katkine."
|
||||
|
||||
#: forms/fields.py:624 forms/fields.py:702
|
||||
#: forms/fields.py:625 forms/fields.py:703
|
||||
#, python-format
|
||||
msgid "Select a valid choice. %(value)s is not one of the available choices."
|
||||
msgstr "Valige korrektne väärtus. %(value)s ei ole valitav."
|
||||
|
||||
#: forms/fields.py:703 forms/fields.py:764 forms/models.py:776
|
||||
#: forms/fields.py:704 forms/fields.py:765 forms/models.py:1003
|
||||
msgid "Enter a list of values."
|
||||
msgstr "Sisestage väärtuste nimekiri."
|
||||
|
||||
#: forms/fields.py:891
|
||||
#: forms/fields.py:892
|
||||
msgid "Enter a valid IPv4 address."
|
||||
msgstr "Sisestage korrektne IPv4 aadress."
|
||||
|
||||
#: forms/fields.py:901
|
||||
#: forms/fields.py:902
|
||||
msgid ""
|
||||
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
|
||||
msgstr ""
|
||||
@ -4032,76 +4048,103 @@ msgstr ""
|
||||
msgid "Order"
|
||||
msgstr "Järjestus"
|
||||
|
||||
#: forms/models.py:299 forms/models.py:308
|
||||
#: forms/models.py:367
|
||||
#, python-format
|
||||
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
|
||||
msgstr "%(field_name)s peab olema unikaalne %(date_field)s %(lookup)s suhtes."
|
||||
|
||||
#: forms/models.py:381 forms/models.py:389
|
||||
#, python-format
|
||||
msgid "%(model_name)s with this %(field_label)s already exists."
|
||||
msgstr "Sellise %(field_label)s-väljaga %(model_name)s on juba olemas."
|
||||
|
||||
#: forms/models.py:651
|
||||
msgid "The inline foreign key did not match the parent instance primary key."
|
||||
msgstr ""
|
||||
#: forms/models.py:594
|
||||
#, python-format
|
||||
msgid "Please correct the duplicate data for %(field)s."
|
||||
msgstr "Palun parandage duplikaat-andmed lahtris %(field)s."
|
||||
|
||||
#: forms/models.py:706
|
||||
#: forms/models.py:598
|
||||
#, python-format
|
||||
msgid "Please correct the duplicate data for %(field)s, which must be unique."
|
||||
msgstr "Palun parandage duplikaat-andmed lahtris %(field)s, mis peab olema unikaalne."
|
||||
|
||||
#: forms/models.py:604
|
||||
#, 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 ""
|
||||
""
|
||||
|
||||
#: forms/models.py:612
|
||||
msgid "Please correct the duplicate values below."
|
||||
msgstr "Palun parandage allolevad duplikaat-väärtused"
|
||||
|
||||
#: forms/models.py:867
|
||||
msgid "The inline foreign key did not match the parent instance primary key."
|
||||
msgstr "Pesastatud välisvõti ei sobi ülemobjekti primaarvõtmega."
|
||||
|
||||
#: forms/models.py:930
|
||||
msgid "Select a valid choice. That choice is not one of the available choices."
|
||||
msgstr "Valige korrektne väärtus. Valitud väärtus ei ole valitav."
|
||||
|
||||
#: forms/models.py:777
|
||||
#: forms/models.py:1004
|
||||
#, python-format
|
||||
msgid "Select a valid choice. %s is not one of the available choices."
|
||||
msgstr "Valige korrektne väärtus. %s ei ole valitav."
|
||||
|
||||
#: forms/models.py:779
|
||||
#: forms/models.py:1006
|
||||
#, python-format
|
||||
msgid "\"%s\" is not a valid value for a primary key."
|
||||
msgstr ""
|
||||
msgstr "\"%s\" ei ole sobiv väärtust primaarvõtmeks."
|
||||
|
||||
#: template/defaultfilters.py:765
|
||||
#: template/defaultfilters.py:767
|
||||
msgid "yes,no,maybe"
|
||||
msgstr "jah,ei,võib-olla"
|
||||
|
||||
#: template/defaultfilters.py:796
|
||||
#: template/defaultfilters.py:798
|
||||
#, python-format
|
||||
msgid "%(size)d byte"
|
||||
msgid_plural "%(size)d bytes"
|
||||
msgstr[0] "%(size)d bait"
|
||||
msgstr[1] "%(size)d baiti"
|
||||
|
||||
#: template/defaultfilters.py:798
|
||||
#: template/defaultfilters.py:800
|
||||
#, python-format
|
||||
msgid "%.1f KB"
|
||||
msgstr "%.1f KB"
|
||||
|
||||
#: template/defaultfilters.py:800
|
||||
#: template/defaultfilters.py:802
|
||||
#, python-format
|
||||
msgid "%.1f MB"
|
||||
msgstr "%.1f MB"
|
||||
|
||||
#: template/defaultfilters.py:801
|
||||
#: template/defaultfilters.py:803
|
||||
#, python-format
|
||||
msgid "%.1f GB"
|
||||
msgstr "%.1f GB"
|
||||
|
||||
#: utils/dateformat.py:41
|
||||
#: utils/dateformat.py:42
|
||||
msgid "p.m."
|
||||
msgstr "p.l."
|
||||
|
||||
#: utils/dateformat.py:42
|
||||
#: utils/dateformat.py:43
|
||||
msgid "a.m."
|
||||
msgstr "e.l."
|
||||
|
||||
#: utils/dateformat.py:47
|
||||
#: utils/dateformat.py:48
|
||||
msgid "PM"
|
||||
msgstr "PL"
|
||||
|
||||
#: utils/dateformat.py:48
|
||||
#: utils/dateformat.py:49
|
||||
msgid "AM"
|
||||
msgstr "EL"
|
||||
|
||||
#: utils/dateformat.py:97
|
||||
#: utils/dateformat.py:98
|
||||
msgid "midnight"
|
||||
msgstr "südaöö"
|
||||
|
||||
#: utils/dateformat.py:99
|
||||
#: utils/dateformat.py:100
|
||||
msgid "noon"
|
||||
msgstr "keskpäev"
|
||||
|
||||
|
||||
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
@ -6,15 +6,15 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: django\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2009-04-10 08:26+0200\n"
|
||||
"PO-Revision-Date: 2009-04-10 08:29+0200\n"
|
||||
"POT-Creation-Date: 2009-07-27 11:12+0200\n"
|
||||
"PO-Revision-Date: 2009-07-27 11:10+0200\n"
|
||||
"Last-Translator: Nicola Larosa <nico@tekNico.net>\n"
|
||||
"Language-Team: Italian\n"
|
||||
"Language-Team: Italian <django-it@googlegroups.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
|
||||
"X-Generator: KBabel 1.11.4\n"
|
||||
"X-Generator: Lokalize 0.3\n"
|
||||
|
||||
#: conf/global_settings.py:44
|
||||
msgid "Arabic"
|
||||
@ -202,7 +202,7 @@ msgstr "telugu"
|
||||
|
||||
#: conf/global_settings.py:90
|
||||
msgid "Thai"
|
||||
msgstr "thai"
|
||||
msgstr "tailandese"
|
||||
|
||||
#: conf/global_settings.py:91
|
||||
msgid "Turkish"
|
||||
@ -220,19 +220,19 @@ msgstr "cinese semplificato"
|
||||
msgid "Traditional Chinese"
|
||||
msgstr "cinese tradizionale"
|
||||
|
||||
#: contrib/admin/actions.py:56
|
||||
#: contrib/admin/actions.py:60
|
||||
#, python-format
|
||||
msgid "Successfully deleted %(count)d %(items)s."
|
||||
msgstr "Cancellati con successo %(count)d %(items)s."
|
||||
msgstr "Cancellati/e con successo %(count)d %(items)s."
|
||||
|
||||
#: contrib/admin/actions.py:63 contrib/admin/options.py:1023
|
||||
#: contrib/admin/actions.py:67 contrib/admin/options.py:1027
|
||||
msgid "Are you sure?"
|
||||
msgstr "Sei sicuro?"
|
||||
|
||||
#: contrib/admin/actions.py:81
|
||||
#: contrib/admin/actions.py:85
|
||||
#, python-format
|
||||
msgid "Delete selected %(verbose_name_plural)s"
|
||||
msgstr "Cancellati i %(verbose_name_plural)s selezionati"
|
||||
msgstr "Cancella %(verbose_name_plural)s selezionati/e"
|
||||
|
||||
#: contrib/admin/filterspecs.py:44
|
||||
#, python-format
|
||||
@ -268,15 +268,15 @@ msgstr "Questo mese"
|
||||
msgid "This year"
|
||||
msgstr "Quest'anno"
|
||||
|
||||
#: contrib/admin/filterspecs.py:147 forms/widgets.py:413
|
||||
#: contrib/admin/filterspecs.py:147 forms/widgets.py:434
|
||||
msgid "Yes"
|
||||
msgstr "Sì"
|
||||
|
||||
#: contrib/admin/filterspecs.py:147 forms/widgets.py:413
|
||||
#: contrib/admin/filterspecs.py:147 forms/widgets.py:434
|
||||
msgid "No"
|
||||
msgstr "No"
|
||||
|
||||
#: contrib/admin/filterspecs.py:154 forms/widgets.py:413
|
||||
#: contrib/admin/filterspecs.py:154 forms/widgets.py:434
|
||||
msgid "Unknown"
|
||||
msgstr "Sconosciuto"
|
||||
|
||||
@ -316,99 +316,100 @@ msgstr "voci di log"
|
||||
msgid "None"
|
||||
msgstr "Nessuno"
|
||||
|
||||
#: contrib/admin/options.py:517
|
||||
#: contrib/admin/options.py:519
|
||||
#, python-format
|
||||
msgid "Changed %s."
|
||||
msgstr "%s modificato."
|
||||
msgstr "%s modificato/a."
|
||||
|
||||
#: contrib/admin/options.py:517 contrib/admin/options.py:527
|
||||
#: contrib/comments/templates/comments/preview.html:16 forms/models.py:306
|
||||
#: contrib/admin/options.py:519 contrib/admin/options.py:529
|
||||
#: contrib/comments/templates/comments/preview.html:16 forms/models.py:388
|
||||
#: forms/models.py:600
|
||||
msgid "and"
|
||||
msgstr "e"
|
||||
|
||||
#: contrib/admin/options.py:522
|
||||
#: contrib/admin/options.py:524
|
||||
#, python-format
|
||||
msgid "Added %(name)s \"%(object)s\"."
|
||||
msgstr "Aggiunti %(name)s \"%(object)s\"."
|
||||
msgstr "Aggiunto/a %(name)s \"%(object)s\"."
|
||||
|
||||
#: contrib/admin/options.py:526
|
||||
#: contrib/admin/options.py:528
|
||||
#, python-format
|
||||
msgid "Changed %(list)s for %(name)s \"%(object)s\"."
|
||||
msgstr "Cambiati %(list)s per %(name)s \"%(object)s\"."
|
||||
msgstr "Cambiato/i %(list)s per %(name)s \"%(object)s\"."
|
||||
|
||||
#: contrib/admin/options.py:531
|
||||
#: contrib/admin/options.py:533
|
||||
#, python-format
|
||||
msgid "Deleted %(name)s \"%(object)s\"."
|
||||
msgstr "Cancellati %(name)s \"%(object)s\"."
|
||||
msgstr "Cancellato/a %(name)s \"%(object)s\"."
|
||||
|
||||
#: contrib/admin/options.py:535
|
||||
#: contrib/admin/options.py:537
|
||||
msgid "No fields changed."
|
||||
msgstr "Nessun campo modificato."
|
||||
|
||||
#: contrib/admin/options.py:596 contrib/auth/admin.py:67
|
||||
#: contrib/admin/options.py:599 contrib/auth/admin.py:67
|
||||
#, python-format
|
||||
msgid "The %(name)s \"%(obj)s\" was added successfully."
|
||||
msgstr "%(name)s \"%(obj)s\" è stato aggiunto correttamente."
|
||||
msgstr "%(name)s \"%(obj)s\" aggiunto/a correttamente."
|
||||
|
||||
#: contrib/admin/options.py:600 contrib/admin/options.py:633
|
||||
#: contrib/admin/options.py:603 contrib/admin/options.py:636
|
||||
#: contrib/auth/admin.py:75
|
||||
msgid "You may edit it again below."
|
||||
msgstr "È possibile modificarlo nuovamente qui sotto."
|
||||
msgstr "È possibile modificare nuovamente qui sotto."
|
||||
|
||||
#: contrib/admin/options.py:610 contrib/admin/options.py:643
|
||||
#: contrib/admin/options.py:613 contrib/admin/options.py:646
|
||||
#, python-format
|
||||
msgid "You may add another %s below."
|
||||
msgstr "Puoi aggiungere un altro %s qui sotto."
|
||||
msgstr "Puoi aggiungere un altro/a %s qui sotto."
|
||||
|
||||
#: contrib/admin/options.py:631
|
||||
#: contrib/admin/options.py:634
|
||||
#, python-format
|
||||
msgid "The %(name)s \"%(obj)s\" was changed successfully."
|
||||
msgstr "%(name)s \"%(obj)s\" modificato correttamente."
|
||||
msgstr "%(name)s \"%(obj)s\" modificato/a correttamente."
|
||||
|
||||
#: contrib/admin/options.py:639
|
||||
#: contrib/admin/options.py:642
|
||||
#, python-format
|
||||
msgid "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
|
||||
msgstr ""
|
||||
"%(name)s \"%(obj)s\" aggiunto correttamente. Puoi modificarlo ancora qui "
|
||||
"%(name)s \"%(obj)s\" aggiunto/a correttamente. Puoi modificare ancora qui "
|
||||
"sotto."
|
||||
|
||||
#: contrib/admin/options.py:770
|
||||
#: contrib/admin/options.py:773
|
||||
#, python-format
|
||||
msgid "Add %s"
|
||||
msgstr "Aggiungi %s"
|
||||
|
||||
#: contrib/admin/options.py:801 contrib/admin/options.py:1001
|
||||
#: contrib/admin/options.py:804 contrib/admin/options.py:1005
|
||||
#, python-format
|
||||
msgid "%(name)s object with primary key %(key)r does not exist."
|
||||
msgstr "L'oggetto %(name)s con chiave primaria %(key)r non esiste."
|
||||
|
||||
#: contrib/admin/options.py:858
|
||||
#: contrib/admin/options.py:861
|
||||
#, python-format
|
||||
msgid "Change %s"
|
||||
msgstr "Modifica %s"
|
||||
|
||||
#: contrib/admin/options.py:902
|
||||
#: contrib/admin/options.py:905
|
||||
msgid "Database error"
|
||||
msgstr "Errore nel database"
|
||||
|
||||
#: contrib/admin/options.py:938
|
||||
#: contrib/admin/options.py:941
|
||||
#, python-format
|
||||
msgid "%(count)s %(name)s was changed successfully."
|
||||
msgid_plural "%(count)s %(name)s were changed successfully."
|
||||
msgstr[0] "%(count)s %(name)s è stato modificato correttamente."
|
||||
msgstr[1] "%(count)s %(name)s sono stati modificati correttamente."
|
||||
msgstr[0] "%(count)s %(name)s modificato/a correttamente."
|
||||
msgstr[1] "%(count)s %(name)s modificati/e correttamente."
|
||||
|
||||
#: contrib/admin/options.py:1016
|
||||
#: contrib/admin/options.py:1020
|
||||
#, python-format
|
||||
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
|
||||
msgstr "%(name)s \"%(obj)s\" cancellato correttamente."
|
||||
msgstr "%(name)s \"%(obj)s\" cancellato/a correttamente."
|
||||
|
||||
#: contrib/admin/options.py:1052
|
||||
#: contrib/admin/options.py:1057
|
||||
#, python-format
|
||||
msgid "Change history: %s"
|
||||
msgstr "Tracciato delle modifiche: %s"
|
||||
|
||||
#: contrib/admin/sites.py:20 contrib/admin/views/decorators.py:14
|
||||
#: contrib/admin/sites.py:21 contrib/admin/views/decorators.py:14
|
||||
#: contrib/auth/forms.py:80
|
||||
msgid ""
|
||||
"Please enter a correct username and password. Note that both fields are case-"
|
||||
@ -417,11 +418,11 @@ msgstr ""
|
||||
"Inserisci nome utente e password corretti. In entrambi i campi le maiuscole "
|
||||
"sono significative."
|
||||
|
||||
#: contrib/admin/sites.py:278 contrib/admin/views/decorators.py:40
|
||||
#: contrib/admin/sites.py:285 contrib/admin/views/decorators.py:40
|
||||
msgid "Please log in again, because your session has expired."
|
||||
msgstr "Effettua di nuovo l'accesso, perché la tua sessione è scaduta."
|
||||
|
||||
#: contrib/admin/sites.py:285 contrib/admin/views/decorators.py:47
|
||||
#: contrib/admin/sites.py:292 contrib/admin/views/decorators.py:47
|
||||
msgid ""
|
||||
"Looks like your browser isn't configured to accept cookies. Please enable "
|
||||
"cookies, reload this page, and try again."
|
||||
@ -429,27 +430,27 @@ msgstr ""
|
||||
"Il browser non sembra configurato per accettare i cookie. Una volta "
|
||||
"abilitati, ricarica la pagina e riprova."
|
||||
|
||||
#: contrib/admin/sites.py:301 contrib/admin/sites.py:307
|
||||
#: contrib/admin/sites.py:308 contrib/admin/sites.py:314
|
||||
#: contrib/admin/views/decorators.py:66
|
||||
msgid "Usernames cannot contain the '@' character."
|
||||
msgstr "I nomi utente non possono contenere il carattere '@'."
|
||||
|
||||
#: contrib/admin/sites.py:304 contrib/admin/views/decorators.py:62
|
||||
#: contrib/admin/sites.py:311 contrib/admin/views/decorators.py:62
|
||||
#, python-format
|
||||
msgid "Your e-mail address is not your username. Try '%s' instead."
|
||||
msgstr "Il nome utente non è costituito dall'indirizzo e-mail. Prova con '%s'."
|
||||
|
||||
#: contrib/admin/sites.py:360
|
||||
#: contrib/admin/sites.py:367
|
||||
msgid "Site administration"
|
||||
msgstr "Amministrazione sito"
|
||||
|
||||
#: contrib/admin/sites.py:373 contrib/admin/templates/admin/login.html:26
|
||||
#: contrib/admin/sites.py:381 contrib/admin/templates/admin/login.html:26
|
||||
#: contrib/admin/templates/registration/password_reset_complete.html:14
|
||||
#: contrib/admin/views/decorators.py:20
|
||||
msgid "Log in"
|
||||
msgstr "Accedi"
|
||||
|
||||
#: contrib/admin/sites.py:417
|
||||
#: contrib/admin/sites.py:426
|
||||
#, python-format
|
||||
msgid "%s administration"
|
||||
msgstr "Amministrazione %s"
|
||||
@ -499,7 +500,7 @@ msgstr "Spiacenti, ma la pagina richiesta non è stata trovata."
|
||||
|
||||
#: contrib/admin/templates/admin/500.html:4
|
||||
#: contrib/admin/templates/admin/app_index.html:8
|
||||
#: contrib/admin/templates/admin/base.html:33
|
||||
#: contrib/admin/templates/admin/base.html:54
|
||||
#: contrib/admin/templates/admin/change_form.html:17
|
||||
#: contrib/admin/templates/admin/change_list.html:25
|
||||
#: contrib/admin/templates/admin/delete_confirmation.html:6
|
||||
@ -535,7 +536,8 @@ msgid ""
|
||||
"There's been an error. It's been reported to the site administrators via e-"
|
||||
"mail and should be fixed shortly. Thanks for your patience."
|
||||
msgstr ""
|
||||
"Si è verificato un errore. È stato riportato agli amministratori del sito "
|
||||
"Si è verificato un errore. Gli amministratori del sito ne sono stati "
|
||||
"informati"
|
||||
"via e-mail e verrà corretto a breve. Grazie per la tua pazienza."
|
||||
|
||||
#: contrib/admin/templates/admin/actions.html:4
|
||||
@ -543,7 +545,6 @@ msgid "Run the selected action"
|
||||
msgstr "Esegui l'azione selezionata"
|
||||
|
||||
#: contrib/admin/templates/admin/actions.html:4
|
||||
#: contrib/admin/templates/admin/search_form.html:8
|
||||
msgid "Go"
|
||||
msgstr "Vai"
|
||||
|
||||
@ -553,18 +554,18 @@ msgstr "Vai"
|
||||
msgid "%(name)s"
|
||||
msgstr "%(name)s"
|
||||
|
||||
#: contrib/admin/templates/admin/base.html:28
|
||||
#: contrib/admin/templates/admin/base.html:27
|
||||
msgid "Welcome,"
|
||||
msgstr "Benvenuto,"
|
||||
msgstr "Benvenuto/a,"
|
||||
|
||||
#: contrib/admin/templates/admin/base.html:28
|
||||
#: contrib/admin/templates/admin/base.html:32
|
||||
#: contrib/admin/templates/registration/password_change_done.html:3
|
||||
#: contrib/admin/templates/registration/password_change_form.html:3
|
||||
#: contrib/admindocs/templates/admin_doc/bookmarklets.html:3
|
||||
msgid "Documentation"
|
||||
msgstr "Documentazione"
|
||||
|
||||
#: contrib/admin/templates/admin/base.html:28
|
||||
#: contrib/admin/templates/admin/base.html:40
|
||||
#: contrib/admin/templates/admin/auth/user/change_password.html:14
|
||||
#: contrib/admin/templates/admin/auth/user/change_password.html:47
|
||||
#: contrib/admin/templates/registration/password_change_done.html:3
|
||||
@ -572,7 +573,7 @@ msgstr "Documentazione"
|
||||
msgid "Change password"
|
||||
msgstr "Cambia la password"
|
||||
|
||||
#: contrib/admin/templates/admin/base.html:28
|
||||
#: contrib/admin/templates/admin/base.html:47
|
||||
#: contrib/admin/templates/registration/password_change_done.html:3
|
||||
#: contrib/admin/templates/registration/password_change_form.html:3
|
||||
msgid "Log out"
|
||||
@ -607,7 +608,7 @@ msgstr "Vedi sul sito"
|
||||
#: contrib/admin/templates/admin/auth/user/change_password.html:23
|
||||
msgid "Please correct the error below."
|
||||
msgid_plural "Please correct the errors below."
|
||||
msgstr[0] "Correggi gli errori qui sotto."
|
||||
msgstr[0] "Correggi l'errore qui sotto."
|
||||
msgstr[1] "Correggi gli errori qui sotto."
|
||||
|
||||
#: contrib/admin/templates/admin/change_list.html:46
|
||||
@ -703,6 +704,10 @@ msgstr "Azioni Proprie"
|
||||
msgid "None available"
|
||||
msgstr "Nessuna disponibile"
|
||||
|
||||
#: contrib/admin/templates/admin/index.html:72
|
||||
msgid "Unknown content"
|
||||
msgstr "Contenuto sconosciuto"
|
||||
|
||||
#: contrib/admin/templates/admin/invalid_setup.html:7
|
||||
msgid ""
|
||||
"Something's wrong with your database installation. Make sure the appropriate "
|
||||
@ -751,6 +756,15 @@ msgstr ""
|
||||
msgid "Show all"
|
||||
msgstr "Mostra tutto"
|
||||
|
||||
#: contrib/admin/templates/admin/pagination.html:11
|
||||
#: contrib/admin/templates/admin/submit_line.html:3
|
||||
msgid "Save"
|
||||
msgstr "Salva"
|
||||
|
||||
#: contrib/admin/templates/admin/search_form.html:8
|
||||
msgid "Search"
|
||||
msgstr "Cerca"
|
||||
|
||||
#: contrib/admin/templates/admin/search_form.html:10
|
||||
#, python-format
|
||||
msgid "1 result"
|
||||
@ -763,10 +777,6 @@ msgstr[1] "%(counter)s risultati"
|
||||
msgid "%(full_result_count)s total"
|
||||
msgstr "%(full_result_count)s totali"
|
||||
|
||||
#: contrib/admin/templates/admin/submit_line.html:3
|
||||
msgid "Save"
|
||||
msgstr "Salva"
|
||||
|
||||
#: contrib/admin/templates/admin/submit_line.html:5
|
||||
msgid "Save as new"
|
||||
msgstr "Salva come nuovo"
|
||||
@ -836,7 +846,7 @@ msgstr "Cambio password"
|
||||
#: contrib/admin/templates/registration/password_change_done.html:6
|
||||
#: contrib/admin/templates/registration/password_change_done.html:10
|
||||
msgid "Password change successful"
|
||||
msgstr "Cambio di password avvenuto correttamente"
|
||||
msgstr "Cambio password avvenuto correttamente"
|
||||
|
||||
#: contrib/admin/templates/registration/password_change_done.html:12
|
||||
msgid "Your password was changed."
|
||||
@ -905,7 +915,7 @@ msgstr ""
|
||||
|
||||
#: contrib/admin/templates/registration/password_reset_confirm.html:26
|
||||
msgid "Password reset unsuccessful"
|
||||
msgstr "Password NON reimpostata"
|
||||
msgstr "Password non reimpostata"
|
||||
|
||||
#: contrib/admin/templates/registration/password_reset_confirm.html:28
|
||||
msgid ""
|
||||
@ -943,7 +953,7 @@ msgstr "Vai alla pagina seguente e scegli una nuova password:"
|
||||
|
||||
#: contrib/admin/templates/registration/password_reset_email.html:9
|
||||
msgid "Your username, in case you've forgotten:"
|
||||
msgstr "Il tuo nome utente, in caso l'abbia dimenticato:"
|
||||
msgstr "Il tuo nome utente, in caso tu l'abbia dimenticato:"
|
||||
|
||||
#: contrib/admin/templates/registration/password_reset_email.html:11
|
||||
msgid "Thanks for using our site!"
|
||||
@ -959,7 +969,7 @@ msgid ""
|
||||
"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
|
||||
"instructions for setting a new one."
|
||||
msgstr ""
|
||||
"Dimenticata la password? Inserisci il tuo indirizzo email qui sotto, e ti "
|
||||
"Password dimenticata? Inserisci il tuo indirizzo email qui sotto, e ti "
|
||||
"invieremo per email le istruzioni per impostarne una nuova."
|
||||
|
||||
#: contrib/admin/templates/registration/password_reset_form.html:16
|
||||
@ -992,144 +1002,145 @@ msgstr "sito"
|
||||
msgid "template"
|
||||
msgstr "modello"
|
||||
|
||||
#: contrib/admindocs/views.py:58 contrib/admindocs/views.py:60
|
||||
#: contrib/admindocs/views.py:62
|
||||
#: contrib/admindocs/views.py:61 contrib/admindocs/views.py:63
|
||||
#: contrib/admindocs/views.py:65
|
||||
msgid "tag:"
|
||||
msgstr "tag:"
|
||||
|
||||
#: contrib/admindocs/views.py:91 contrib/admindocs/views.py:93
|
||||
#: contrib/admindocs/views.py:95
|
||||
#: contrib/admindocs/views.py:94 contrib/admindocs/views.py:96
|
||||
#: contrib/admindocs/views.py:98
|
||||
msgid "filter:"
|
||||
msgstr "filtro:"
|
||||
|
||||
#: contrib/admindocs/views.py:155 contrib/admindocs/views.py:157
|
||||
#: contrib/admindocs/views.py:159
|
||||
#: contrib/admindocs/views.py:158 contrib/admindocs/views.py:160
|
||||
#: contrib/admindocs/views.py:162
|
||||
msgid "view:"
|
||||
msgstr "view:"
|
||||
|
||||
#: contrib/admindocs/views.py:187
|
||||
#: contrib/admindocs/views.py:190
|
||||
#, python-format
|
||||
msgid "App %r not found"
|
||||
msgstr "Appl. %r non trovata"
|
||||
|
||||
#: contrib/admindocs/views.py:194
|
||||
#: contrib/admindocs/views.py:197
|
||||
#, python-format
|
||||
msgid "Model %(model_name)r not found in app %(app_label)r"
|
||||
msgstr "Modello %(model_name)r non trovato nell'appl. %(app_label)r"
|
||||
|
||||
#: contrib/admindocs/views.py:206
|
||||
#: contrib/admindocs/views.py:209
|
||||
#, python-format
|
||||
msgid "the related `%(app_label)s.%(data_type)s` object"
|
||||
msgstr "l'oggetto `%(app_label)s.%(data_type)s` collegato"
|
||||
|
||||
#: contrib/admindocs/views.py:206 contrib/admindocs/views.py:228
|
||||
#: contrib/admindocs/views.py:242 contrib/admindocs/views.py:247
|
||||
#: contrib/admindocs/views.py:209 contrib/admindocs/views.py:228
|
||||
#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:247
|
||||
#: contrib/admindocs/views.py:261 contrib/admindocs/views.py:266
|
||||
msgid "model:"
|
||||
msgstr "modello:"
|
||||
|
||||
#: contrib/admindocs/views.py:237
|
||||
#: contrib/admindocs/views.py:224 contrib/admindocs/views.py:256
|
||||
#, python-format
|
||||
msgid "related `%(app_label)s.%(object_name)s` objects"
|
||||
msgstr "oggetti `%(app_label)s.%(object_name)s` collegati"
|
||||
|
||||
#: contrib/admindocs/views.py:242
|
||||
#: contrib/admindocs/views.py:228 contrib/admindocs/views.py:261
|
||||
#, python-format
|
||||
msgid "all %s"
|
||||
msgstr "tutti %s"
|
||||
|
||||
#: contrib/admindocs/views.py:247
|
||||
#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:266
|
||||
#, python-format
|
||||
msgid "number of %s"
|
||||
msgstr "numero di %s"
|
||||
|
||||
#: contrib/admindocs/views.py:252
|
||||
#: contrib/admindocs/views.py:271
|
||||
#, python-format
|
||||
msgid "Fields on %s objects"
|
||||
msgstr "Campi sugli oggetti %s"
|
||||
|
||||
#: contrib/admindocs/views.py:315 contrib/admindocs/views.py:326
|
||||
#: contrib/admindocs/views.py:328 contrib/admindocs/views.py:334
|
||||
#: contrib/admindocs/views.py:335 contrib/admindocs/views.py:337
|
||||
#: contrib/admindocs/views.py:334 contrib/admindocs/views.py:345
|
||||
#: contrib/admindocs/views.py:347 contrib/admindocs/views.py:353
|
||||
#: contrib/admindocs/views.py:354 contrib/admindocs/views.py:356
|
||||
msgid "Integer"
|
||||
msgstr "Intero"
|
||||
|
||||
#: contrib/admindocs/views.py:316
|
||||
#: contrib/admindocs/views.py:335
|
||||
msgid "Boolean (Either True or False)"
|
||||
msgstr "Booleano (True o False)"
|
||||
|
||||
#: contrib/admindocs/views.py:317 contrib/admindocs/views.py:336
|
||||
#: contrib/admindocs/views.py:336 contrib/admindocs/views.py:355
|
||||
#, python-format
|
||||
msgid "String (up to %(max_length)s)"
|
||||
msgstr "Stringa (fino a %(max_length)s)"
|
||||
|
||||
#: contrib/admindocs/views.py:318
|
||||
#: contrib/admindocs/views.py:337
|
||||
msgid "Comma-separated integers"
|
||||
msgstr "Interi separati da virgola"
|
||||
|
||||
#: contrib/admindocs/views.py:319
|
||||
#: contrib/admindocs/views.py:338
|
||||
msgid "Date (without time)"
|
||||
msgstr "Data (senza ora)"
|
||||
|
||||
#: contrib/admindocs/views.py:320
|
||||
#: contrib/admindocs/views.py:339
|
||||
msgid "Date (with time)"
|
||||
msgstr "Data (con ora)"
|
||||
|
||||
#: contrib/admindocs/views.py:321
|
||||
#: contrib/admindocs/views.py:340
|
||||
msgid "Decimal number"
|
||||
msgstr "Numero decimale"
|
||||
|
||||
#: contrib/admindocs/views.py:322
|
||||
#: contrib/admindocs/views.py:341
|
||||
msgid "E-mail address"
|
||||
msgstr "Indirizzo e-mail"
|
||||
|
||||
#: contrib/admindocs/views.py:323 contrib/admindocs/views.py:324
|
||||
#: contrib/admindocs/views.py:327
|
||||
#: contrib/admindocs/views.py:342 contrib/admindocs/views.py:343
|
||||
#: contrib/admindocs/views.py:346
|
||||
msgid "File path"
|
||||
msgstr "Percorso di file"
|
||||
|
||||
#: contrib/admindocs/views.py:325
|
||||
#: contrib/admindocs/views.py:344
|
||||
msgid "Floating point number"
|
||||
msgstr "Numero decimale"
|
||||
|
||||
#: contrib/admindocs/views.py:329 contrib/comments/models.py:60
|
||||
#: contrib/admindocs/views.py:348 contrib/comments/models.py:60
|
||||
msgid "IP address"
|
||||
msgstr "indirizzo IP"
|
||||
|
||||
#: contrib/admindocs/views.py:331
|
||||
#: contrib/admindocs/views.py:350
|
||||
msgid "Boolean (Either True, False or None)"
|
||||
msgstr "Booleano (True, False o None)"
|
||||
|
||||
#: contrib/admindocs/views.py:332
|
||||
#: contrib/admindocs/views.py:351
|
||||
msgid "Relation to parent model"
|
||||
msgstr "Collegamento a modello padre"
|
||||
|
||||
#: contrib/admindocs/views.py:333
|
||||
#: contrib/admindocs/views.py:352
|
||||
msgid "Phone number"
|
||||
msgstr "Numero di telefono"
|
||||
|
||||
#: contrib/admindocs/views.py:338
|
||||
#: contrib/admindocs/views.py:357
|
||||
msgid "Text"
|
||||
msgstr "Testo"
|
||||
|
||||
#: contrib/admindocs/views.py:339
|
||||
#: contrib/admindocs/views.py:358
|
||||
msgid "Time"
|
||||
msgstr "Ora"
|
||||
|
||||
#: contrib/admindocs/views.py:340 contrib/comments/forms.py:95
|
||||
#: contrib/admindocs/views.py:359 contrib/comments/forms.py:95
|
||||
#: contrib/comments/templates/comments/moderation_queue.html:37
|
||||
#: contrib/flatpages/admin.py:8 contrib/flatpages/models.py:7
|
||||
msgid "URL"
|
||||
msgstr "URL"
|
||||
|
||||
#: contrib/admindocs/views.py:341
|
||||
#: contrib/admindocs/views.py:360
|
||||
msgid "U.S. state (two uppercase letters)"
|
||||
msgstr "Stato USA (due lettere maiuscole)"
|
||||
|
||||
#: contrib/admindocs/views.py:342
|
||||
#: contrib/admindocs/views.py:361
|
||||
msgid "XML text"
|
||||
msgstr "Testo XML"
|
||||
|
||||
#: contrib/admindocs/views.py:368
|
||||
#: contrib/admindocs/views.py:387
|
||||
#, python-format
|
||||
msgid "%s does not appear to be a urlpattern object"
|
||||
msgstr "%s non sembra essere un oggetto urlpattern"
|
||||
@ -1153,10 +1164,10 @@ msgid ""
|
||||
"your computer is \"internal\").</p>\n"
|
||||
msgstr ""
|
||||
"\n"
|
||||
"<p class=\"help\">Per installare i bookmarklet, trascina il link sulla "
|
||||
"barra \n"
|
||||
"dei bookmark, o clicca il link con il tasto destro e aggiungilo ai "
|
||||
"bookmark.\n"
|
||||
"<p class=\"help\">Per installare i bookmarklet, trascina il link sulla barra "
|
||||
"\n"
|
||||
"dei bookmark, o clicca il link con il tasto destro e aggiungilo ai bookmark."
|
||||
"\n"
|
||||
"Potrai poi scegliere un bookmarklet in qualsiasi pagina del sito.\n"
|
||||
"Nota che alcuni di questi bookmarklet richiedono l'accesso al sito tramite "
|
||||
"un\n"
|
||||
@ -1253,7 +1264,7 @@ msgstr "Conferma password"
|
||||
|
||||
#: contrib/auth/forms.py:30
|
||||
msgid "A user with that username already exists."
|
||||
msgstr "Un utente con questo nome·è già presente."
|
||||
msgstr "Un utente con questo nome è già presente."
|
||||
|
||||
#: contrib/auth/forms.py:36 contrib/auth/forms.py:155
|
||||
#: contrib/auth/forms.py:197
|
||||
@ -1303,7 +1314,8 @@ msgstr "Password attuale"
|
||||
|
||||
#: contrib/auth/forms.py:177
|
||||
msgid "Your old password was entered incorrectly. Please enter it again."
|
||||
msgstr "La password attuale non è stata inserita correttamente: va inserita di nuovo."
|
||||
msgstr ""
|
||||
"La password attuale non è stata inserita correttamente: va inserita di nuovo."
|
||||
|
||||
#: contrib/auth/models.py:63 contrib/auth/models.py:86
|
||||
msgid "name"
|
||||
@ -1466,14 +1478,14 @@ msgstr "Commento"
|
||||
#, python-format
|
||||
msgid "Watch your mouth! The word %s is not allowed here."
|
||||
msgid_plural "Watch your mouth! The words %s are not allowed here."
|
||||
msgstr[0] "Modera i termini: la parola %s non è ammessa."
|
||||
msgstr[1] "Modera i termini: le parole %s non sono ammesse."
|
||||
msgstr[0] "Modera i termini: la parola %s non è ammessa qui."
|
||||
msgstr[1] "Modera i termini: le parole %s non sono ammesse qui."
|
||||
|
||||
#: contrib/comments/forms.py:180
|
||||
msgid "If you enter anything in this field your comment will be treated as spam"
|
||||
msgstr "Se inserisci qualcosa in questo campo il tuo commento verrà considerato spam"
|
||||
|
||||
#: contrib/comments/models.py:22 contrib/contenttypes/models.py:71
|
||||
#: contrib/comments/models.py:22 contrib/contenttypes/models.py:74
|
||||
msgid "content type"
|
||||
msgstr "content type"
|
||||
|
||||
@ -1701,11 +1713,11 @@ msgstr "Pubblica il tuo commento"
|
||||
msgid "or make changes"
|
||||
msgstr "o fai dei cambiamenti"
|
||||
|
||||
#: contrib/contenttypes/models.py:67
|
||||
#: contrib/contenttypes/models.py:70
|
||||
msgid "python model class name"
|
||||
msgstr "nome della classe del modello Python"
|
||||
|
||||
#: contrib/contenttypes/models.py:72
|
||||
#: contrib/contenttypes/models.py:75
|
||||
msgid "content types"
|
||||
msgstr "content type"
|
||||
|
||||
@ -1777,18 +1789,26 @@ msgstr ""
|
||||
"Spiacenti, ma la tua form è scaduta. Puoi continuare a compilare la form da "
|
||||
"questa pagina."
|
||||
|
||||
#: contrib/gis/forms/fields.py:14
|
||||
#: contrib/gis/forms/fields.py:17
|
||||
msgid "No geometry value provided."
|
||||
msgstr "Nessun valore geometrico fornito."
|
||||
|
||||
#: contrib/gis/forms/fields.py:15
|
||||
#: contrib/gis/forms/fields.py:18
|
||||
msgid "Invalid geometry value."
|
||||
msgstr "Valore geometrico non valido."
|
||||
|
||||
#: contrib/gis/forms/fields.py:16
|
||||
#: contrib/gis/forms/fields.py:19
|
||||
msgid "Invalid geometry type."
|
||||
msgstr "Tipo geometrico non valido."
|
||||
|
||||
#: contrib/gis/forms/fields.py:20
|
||||
msgid ""
|
||||
"An error occurred when transforming the geometry to the SRID of the geometry "
|
||||
"form field."
|
||||
msgstr ""
|
||||
"Si è verificato un errore durante la trasformazione della geometria nello "
|
||||
"SRID del campo geometria della form."
|
||||
|
||||
#: contrib/humanize/templatetags/humanize.py:19
|
||||
msgid "th"
|
||||
msgstr "º"
|
||||
@ -2251,7 +2271,7 @@ msgstr "Schleswig-Holstein"
|
||||
|
||||
#: contrib/localflavor/de/de_states.py:20
|
||||
msgid "Thuringia"
|
||||
msgstr "Thuringia"
|
||||
msgstr "Turingia"
|
||||
|
||||
#: contrib/localflavor/de/forms.py:14 contrib/localflavor/fi/forms.py:12
|
||||
#: contrib/localflavor/fr/forms.py:15
|
||||
@ -3017,7 +3037,9 @@ msgstr "Checksum errato per il Numero d'Imposta (NIP)."
|
||||
|
||||
#: contrib/localflavor/pl/forms.py:109
|
||||
msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
|
||||
msgstr "Il Numero di Registro Nazionale d'Impresa (REGON) è costituito da 9 o 14 cifre."
|
||||
msgstr ""
|
||||
"Il Numero di Registro Nazionale d'Impresa (REGON) è costituito da 9 o 14 "
|
||||
"cifre."
|
||||
|
||||
#: contrib/localflavor/pl/forms.py:110
|
||||
msgid "Wrong checksum for the National Business Register Number (REGON)."
|
||||
@ -3625,27 +3647,27 @@ msgstr "Worcestershire"
|
||||
|
||||
#: contrib/localflavor/uk/uk_regions.py:55
|
||||
msgid "County Antrim"
|
||||
msgstr "County Antrim"
|
||||
msgstr "Contea di Antrim"
|
||||
|
||||
#: contrib/localflavor/uk/uk_regions.py:56
|
||||
msgid "County Armagh"
|
||||
msgstr "County Armagh"
|
||||
msgstr "Contea di Armagh"
|
||||
|
||||
#: contrib/localflavor/uk/uk_regions.py:57
|
||||
msgid "County Down"
|
||||
msgstr "County Down"
|
||||
msgstr "Contea di Down"
|
||||
|
||||
#: contrib/localflavor/uk/uk_regions.py:58
|
||||
msgid "County Fermanagh"
|
||||
msgstr "County Fermanagh"
|
||||
msgstr "Contea di Fermanagh"
|
||||
|
||||
#: contrib/localflavor/uk/uk_regions.py:59
|
||||
msgid "County Londonderry"
|
||||
msgstr "County Londonderry"
|
||||
msgstr "Contea di Londonderry"
|
||||
|
||||
#: contrib/localflavor/uk/uk_regions.py:60
|
||||
msgid "County Tyrone"
|
||||
msgstr "County Tyrone"
|
||||
msgstr "Contea di Tyrone"
|
||||
|
||||
#: contrib/localflavor/uk/uk_regions.py:64
|
||||
msgid "Clwyd"
|
||||
@ -3750,7 +3772,7 @@ msgstr "Inserisci un codice postale nel formato XXXXX o XXXXX-XXXX ."
|
||||
#: contrib/localflavor/us/forms.py:54
|
||||
msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
|
||||
msgstr ""
|
||||
"Inserisci un numero di assistenza sociale statunitense valido, nel formato "
|
||||
"Inserisci un numero di assistenza sociale USA valido, nel formato "
|
||||
"XXX-XX-XXXX ."
|
||||
|
||||
#: contrib/localflavor/za/forms.py:20
|
||||
@ -3861,56 +3883,57 @@ msgstr "nome visualizzato"
|
||||
msgid "sites"
|
||||
msgstr "siti"
|
||||
|
||||
#: db/models/fields/__init__.py:356 db/models/fields/__init__.py:700
|
||||
#: db/models/fields/__init__.py:356 db/models/fields/__init__.py:710
|
||||
msgid "This value must be an integer."
|
||||
msgstr "Questo valore deve essere un intero."
|
||||
|
||||
#: db/models/fields/__init__.py:387
|
||||
#: db/models/fields/__init__.py:388
|
||||
msgid "This value must be either True or False."
|
||||
msgstr "Questo valore deve essere True o False."
|
||||
|
||||
#: db/models/fields/__init__.py:420
|
||||
#: db/models/fields/__init__.py:427
|
||||
msgid "This field cannot be null."
|
||||
msgstr "Questo campo non può essere nullo."
|
||||
|
||||
#: db/models/fields/__init__.py:436
|
||||
#: db/models/fields/__init__.py:443
|
||||
msgid "Enter only digits separated by commas."
|
||||
msgstr "Inserisci solo cifre separate da virgole."
|
||||
|
||||
#: db/models/fields/__init__.py:467
|
||||
#: db/models/fields/__init__.py:474
|
||||
msgid "Enter a valid date in YYYY-MM-DD format."
|
||||
msgstr "Inserisci una data valida in formato AAAA-MM-GG."
|
||||
|
||||
#: db/models/fields/__init__.py:476
|
||||
#: db/models/fields/__init__.py:483
|
||||
#, python-format
|
||||
msgid "Invalid date: %s"
|
||||
msgstr "Data non valida: %s"
|
||||
|
||||
#: db/models/fields/__init__.py:540 db/models/fields/__init__.py:558
|
||||
#: db/models/fields/__init__.py:547 db/models/fields/__init__.py:565
|
||||
msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
|
||||
msgstr "Inserisci una data/ora valida nel formato AAAA-MM-GG OO:MM[ss[.uuuuuu]]."
|
||||
|
||||
#: db/models/fields/__init__.py:594
|
||||
#: db/models/fields/__init__.py:601
|
||||
msgid "This value must be a decimal number."
|
||||
msgstr "Questo valore deve essere un numero decimale."
|
||||
|
||||
#: db/models/fields/__init__.py:676
|
||||
#: db/models/fields/__init__.py:686
|
||||
msgid "This value must be a float."
|
||||
msgstr "Questo valore deve essere un numero a virgola mobile."
|
||||
|
||||
#: db/models/fields/__init__.py:736
|
||||
#: db/models/fields/__init__.py:746
|
||||
msgid "This value must be either None, True or False."
|
||||
msgstr "Questo valore deve essere None, True o False."
|
||||
|
||||
#: db/models/fields/__init__.py:839 db/models/fields/__init__.py:853
|
||||
#: db/models/fields/__init__.py:849 db/models/fields/__init__.py:863
|
||||
msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
|
||||
msgstr "Inserisci un'ora valida nel formato OO:MM[ss[.uuuuuu]]."
|
||||
|
||||
#: db/models/fields/related.py:792
|
||||
#: db/models/fields/related.py:816
|
||||
msgid "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
|
||||
msgstr "Tieni premuto \"Control\", o \"Command\" su Mac, per selezionarne più di uno."
|
||||
msgstr ""
|
||||
"Tieni premuto \"Control\", o \"Command\" su Mac, per selezionarne più di uno."
|
||||
|
||||
#: db/models/fields/related.py:870
|
||||
#: db/models/fields/related.py:894
|
||||
#, python-format
|
||||
msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
|
||||
msgid_plural "Please enter valid %(self)s IDs. The values %(value)r are invalid."
|
||||
@ -3972,11 +3995,11 @@ msgstr "Assicurarsi che non vi siano più di %s cifre decimali."
|
||||
msgid "Ensure that there are no more than %s digits before the decimal point."
|
||||
msgstr "Assicurarsi che non vi siano più di %s cifre prima della virgola."
|
||||
|
||||
#: forms/fields.py:288 forms/fields.py:862
|
||||
#: forms/fields.py:288 forms/fields.py:863
|
||||
msgid "Enter a valid date."
|
||||
msgstr "Inserisci una data valida."
|
||||
|
||||
#: forms/fields.py:322 forms/fields.py:863
|
||||
#: forms/fields.py:322 forms/fields.py:864
|
||||
msgid "Enter a valid time."
|
||||
msgstr "Inserisci un'ora valida."
|
||||
|
||||
@ -3999,7 +4022,9 @@ msgstr "Il file inviato è vuoto."
|
||||
#: forms/fields.py:450
|
||||
#, python-format
|
||||
msgid "Ensure this filename has at most %(max)d characters (it has %(length)d)."
|
||||
msgstr "Assicurarsi che questo nome di file non contenga più di %(max)d caratteri (ne ha %(length)d)."
|
||||
msgstr ""
|
||||
"Assicurarsi che questo nome di file non contenga più di %(max)d caratteri "
|
||||
"(ne ha %(length)d)."
|
||||
|
||||
#: forms/fields.py:483
|
||||
msgid ""
|
||||
@ -4015,20 +4040,20 @@ msgstr "Inserisci una URL valida."
|
||||
msgid "This URL appears to be a broken link."
|
||||
msgstr "Questa URL non sembra funzionare."
|
||||
|
||||
#: forms/fields.py:624 forms/fields.py:702
|
||||
#: forms/fields.py:625 forms/fields.py:703
|
||||
#, python-format
|
||||
msgid "Select a valid choice. %(value)s is not one of the available choices."
|
||||
msgstr "Scegli un'opzione valida. '%(value)s non compare tra quelle disponibili."
|
||||
|
||||
#: forms/fields.py:703 forms/fields.py:764 forms/models.py:776
|
||||
#: forms/fields.py:704 forms/fields.py:765 forms/models.py:1003
|
||||
msgid "Enter a list of values."
|
||||
msgstr "Inserisci una lista di valori."
|
||||
|
||||
#: forms/fields.py:891
|
||||
#: forms/fields.py:892
|
||||
msgid "Enter a valid IPv4 address."
|
||||
msgstr "Inserisci un indirizzo IPv4 valido."
|
||||
|
||||
#: forms/fields.py:901
|
||||
#: forms/fields.py:902
|
||||
msgid "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
|
||||
msgstr ""
|
||||
"Inserisci uno 'slug' valido contenente lettere, cifre, sottolineati o "
|
||||
@ -4038,80 +4063,107 @@ msgstr ""
|
||||
msgid "Order"
|
||||
msgstr "Ordine"
|
||||
|
||||
#: forms/models.py:299 forms/models.py:308
|
||||
#: forms/models.py:367
|
||||
#, python-format
|
||||
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
|
||||
msgstr "%(field_name)s deve essere unico per %(lookup)s %(date_field)s."
|
||||
|
||||
#: forms/models.py:381 forms/models.py:389
|
||||
#, python-format
|
||||
msgid "%(model_name)s with this %(field_label)s already exists."
|
||||
msgstr "%(model_name)s con questo %(field_label)s esiste già."
|
||||
|
||||
#: forms/models.py:651
|
||||
#: forms/models.py:594, python-format
|
||||
msgid "Please correct the duplicate data for %(field)s."
|
||||
msgstr "Correggi i dati duplicati di %(field)s."
|
||||
|
||||
#: forms/models.py:598
|
||||
#, python-format
|
||||
msgid "Please correct the duplicate data for %(field)s, which must be unique."
|
||||
msgstr "Correggi i dati duplicati di %(field)s, che deve essere unico."
|
||||
|
||||
#: forms/models.py:604
|
||||
#, 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 ""
|
||||
"Correggi i dati duplicati di %(field_name)s che deve essere unico/a per %(lookup)s "
|
||||
"in %(date_field)s."
|
||||
|
||||
#: forms/models.py:612
|
||||
msgid "Please correct the duplicate values below."
|
||||
msgstr "Correggi i dati duplicati qui sotto."
|
||||
|
||||
#: forms/models.py:867
|
||||
msgid "The inline foreign key did not match the parent instance primary key."
|
||||
msgstr ""
|
||||
"La foreign key inline non concorda con la chiave primaria dell'istanza "
|
||||
"principale."
|
||||
"padre."
|
||||
|
||||
#: forms/models.py:706
|
||||
#: forms/models.py:930
|
||||
msgid "Select a valid choice. That choice is not one of the available choices."
|
||||
msgstr ""
|
||||
"Scegli un'opzione valida. La scelta effettuata non compare tra quelle "
|
||||
"disponibili."
|
||||
|
||||
#: forms/models.py:777
|
||||
#: forms/models.py:1004
|
||||
#, python-format
|
||||
msgid "Select a valid choice. %s is not one of the available choices."
|
||||
msgstr "Scegli un'opzione valida. %s non compare tra quelle disponibili."
|
||||
|
||||
#: forms/models.py:779
|
||||
#: forms/models.py:1006
|
||||
#, python-format
|
||||
msgid "\"%s\" is not a valid value for a primary key."
|
||||
msgstr "\"%s\" non è un valore valido per una chiave primaria."
|
||||
|
||||
#: template/defaultfilters.py:765
|
||||
#: template/defaultfilters.py:767
|
||||
msgid "yes,no,maybe"
|
||||
msgstr "sì,no,forse"
|
||||
|
||||
#: template/defaultfilters.py:796
|
||||
#: template/defaultfilters.py:798
|
||||
#, python-format
|
||||
msgid "%(size)d byte"
|
||||
msgid_plural "%(size)d bytes"
|
||||
msgstr[0] "%(size)d byte"
|
||||
msgstr[1] "%(size)d byte"
|
||||
|
||||
#: template/defaultfilters.py:798
|
||||
#: template/defaultfilters.py:800
|
||||
#, python-format
|
||||
msgid "%.1f KB"
|
||||
msgstr "%.1f KB"
|
||||
|
||||
#: template/defaultfilters.py:800
|
||||
#: template/defaultfilters.py:802
|
||||
#, python-format
|
||||
msgid "%.1f MB"
|
||||
msgstr "%.1f MB"
|
||||
|
||||
#: template/defaultfilters.py:801
|
||||
#: template/defaultfilters.py:803
|
||||
#, python-format
|
||||
msgid "%.1f GB"
|
||||
msgstr "%.1f GB"
|
||||
|
||||
#: utils/dateformat.py:41
|
||||
#: utils/dateformat.py:42
|
||||
msgid "p.m."
|
||||
msgstr "p.m."
|
||||
|
||||
#: utils/dateformat.py:42
|
||||
#: utils/dateformat.py:43
|
||||
msgid "a.m."
|
||||
msgstr "a.m."
|
||||
|
||||
#: utils/dateformat.py:47
|
||||
#: utils/dateformat.py:48
|
||||
msgid "PM"
|
||||
msgstr "PM"
|
||||
|
||||
#: utils/dateformat.py:48
|
||||
#: utils/dateformat.py:49
|
||||
msgid "AM"
|
||||
msgstr "AM"
|
||||
|
||||
#: utils/dateformat.py:97
|
||||
#: utils/dateformat.py:98
|
||||
msgid "midnight"
|
||||
msgstr "mezzanotte"
|
||||
|
||||
#: utils/dateformat.py:99
|
||||
#: utils/dateformat.py:100
|
||||
msgid "noon"
|
||||
msgstr "mezzogiorno"
|
||||
|
||||
@ -4368,15 +4420,15 @@ msgstr "F j"
|
||||
#: views/generic/create_update.py:114
|
||||
#, python-format
|
||||
msgid "The %(verbose_name)s was created successfully."
|
||||
msgstr "%(verbose_name)s creato correttamente."
|
||||
msgstr "%(verbose_name)s creato/a correttamente."
|
||||
|
||||
#: views/generic/create_update.py:156
|
||||
#, python-format
|
||||
msgid "The %(verbose_name)s was updated successfully."
|
||||
msgstr "%(verbose_name)s aggiornato correttamente."
|
||||
msgstr "%(verbose_name)s aggiornato/a correttamente."
|
||||
|
||||
#: views/generic/create_update.py:198
|
||||
#, python-format
|
||||
msgid "The %(verbose_name)s was deleted."
|
||||
msgstr "%(verbose_name)s è stato cancellato."
|
||||
msgstr "%(verbose_name)s cancellato/a."
|
||||
|
||||
|
||||
Binary file not shown.
@ -7,14 +7,14 @@ msgstr ""
|
||||
"Project-Id-Version: django\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2009-04-10 08:26+0200\n"
|
||||
"PO-Revision-Date: 2008-08-14 18:36+0200\n"
|
||||
"PO-Revision-Date: 2009-07-26 17:51+0200\n"
|
||||
"Last-Translator: Nicola Larosa <nico@tekNico.net>\n"
|
||||
"Language-Team: Italian\n"
|
||||
"Language-Team: Italian <django-it@googlegroups.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
|
||||
"X-Generator: KBabel 1.11.4\n"
|
||||
"X-Generator: Lokalize 0.3\n"
|
||||
|
||||
#: contrib/admin/media/js/SelectFilter2.js:33
|
||||
#, perl-format
|
||||
@ -40,7 +40,7 @@ msgstr "%s scelti"
|
||||
|
||||
#: contrib/admin/media/js/SelectFilter2.js:54
|
||||
msgid "Select your choice(s) and click "
|
||||
msgstr "Fai le tue scelte e clicca "
|
||||
msgstr "Seleziona le tue scelte e clicca "
|
||||
|
||||
#: contrib/admin/media/js/SelectFilter2.js:59
|
||||
msgid "Clear all"
|
||||
@ -118,3 +118,4 @@ msgstr "Ieri"
|
||||
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:179
|
||||
msgid "Tomorrow"
|
||||
msgstr "Domani"
|
||||
|
||||
|
||||
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
@ -3,7 +3,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Django\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2008-12-19 12:04+0900\n"
|
||||
"POT-Creation-Date: 2009-07-22 23:23+0900\n"
|
||||
"PO-Revision-Date: 2006-05-08 13:39+0900\n"
|
||||
"Last-Translator: makoto tsuyuki <mtsuyuki@gmail.com>\n"
|
||||
"Language-Team: Japanese <django-ja@googlegroups.com>\n"
|
||||
|
||||
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
@ -1,14 +1,13 @@
|
||||
# SOME DESCRIPTIVE TITLE.
|
||||
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
|
||||
# This file is distributed under the same license as the PACKAGE package.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
# Django Korean Translation (Javascripts)
|
||||
# Copyright (C) 2009
|
||||
# This file is distributed under the same license as the django package.
|
||||
# Hyun Mi Ae, Joongi Kim (me@daybreaker.info), Sung-Jin Hong (serialx.net@gmail.com)
|
||||
#
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Django\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2007-04-06 11:10+0900\n"
|
||||
"POT-Creation-Date: 2009-07-20 00:51+0900\n"
|
||||
"PO-Revision-Date: 2007-04-06 11:15+0900\n"
|
||||
"Last-Translator: Hyun Mi Ae <happyhyun@gmail.com>\n"
|
||||
"Language-Team: Korean\n"
|
||||
@ -16,21 +15,6 @@ msgstr ""
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
||||
#: contrib/admin/media/js/calendar.js:24
|
||||
#: contrib/admin/media/js/dateparse.js:32
|
||||
msgid ""
|
||||
"January February March April May June July August September October November "
|
||||
"December"
|
||||
msgstr "1월 2월 3월 4월 5월 6월 7월 8월 9월 10월 11월 12월"
|
||||
|
||||
#: contrib/admin/media/js/calendar.js:25
|
||||
msgid "S M T W T F S"
|
||||
msgstr "일 월 화 수 목 금 토"
|
||||
|
||||
#: contrib/admin/media/js/dateparse.js:33
|
||||
msgid "Sunday Monday Tuesday Wednesday Thursday Friday Saturday"
|
||||
msgstr "일요일 월요일 화요일 수요일 목요일 금요일 토요일"
|
||||
|
||||
#: contrib/admin/media/js/SelectFilter2.js:33
|
||||
#, perl-format
|
||||
msgid "Available %s"
|
||||
@ -61,6 +45,21 @@ msgstr "선택한 후 클릭하세요"
|
||||
msgid "Clear all"
|
||||
msgstr "모두 삭제"
|
||||
|
||||
#: contrib/admin/media/js/calendar.js:24
|
||||
#: contrib/admin/media/js/dateparse.js:32
|
||||
msgid ""
|
||||
"January February March April May June July August September October November "
|
||||
"December"
|
||||
msgstr "1월 2월 3월 4월 5월 6월 7월 8월 9월 10월 11월 12월"
|
||||
|
||||
#: contrib/admin/media/js/calendar.js:25
|
||||
msgid "S M T W T F S"
|
||||
msgstr "일 월 화 수 목 금 토"
|
||||
|
||||
#: contrib/admin/media/js/dateparse.js:33
|
||||
msgid "Sunday Monday Tuesday Wednesday Thursday Friday Saturday"
|
||||
msgstr "일요일 월요일 화요일 수요일 목요일 금요일 토요일"
|
||||
|
||||
#: contrib/admin/media/js/admin/CollapsedFieldsets.js:34
|
||||
#: contrib/admin/media/js/admin/CollapsedFieldsets.js:72
|
||||
msgid "Show"
|
||||
|
||||
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
@ -7,7 +7,7 @@ msgstr ""
|
||||
"Project-Id-Version: Django\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2006-05-16 10:12+0200\n"
|
||||
"PO-Revision-Date: 2009-04-12 15:27+0200\n"
|
||||
"PO-Revision-Date: 2009-07-24 15:44+0200\n"
|
||||
"Last-Translator: Christian Mikalsen and Jon Lønne\n"
|
||||
"Language-Team: Norsk <no@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
@ -218,16 +218,16 @@ msgstr "Simplifisert kinesisk"
|
||||
msgid "Traditional Chinese"
|
||||
msgstr "Tradisjonell kinesisk"
|
||||
|
||||
#: contrib/admin/actions.py:56
|
||||
#: contrib/admin/actions.py:60
|
||||
#, python-format
|
||||
msgid "Successfully deleted %(count)d %(items)s."
|
||||
msgstr "Slettet %(count)d %(items)s."
|
||||
|
||||
#: contrib/admin/actions.py:63 contrib/admin/options.py:1023
|
||||
#: contrib/admin/actions.py:67 contrib/admin/options.py:1027
|
||||
msgid "Are you sure?"
|
||||
msgstr "Er du sikker?"
|
||||
|
||||
#: contrib/admin/actions.py:81
|
||||
#: contrib/admin/actions.py:85
|
||||
#, python-format
|
||||
msgid "Delete selected %(verbose_name_plural)s"
|
||||
msgstr "Slett valgte %(verbose_name_plural)s"
|
||||
@ -266,15 +266,15 @@ msgstr "Denne måneden"
|
||||
msgid "This year"
|
||||
msgstr "I år"
|
||||
|
||||
#: contrib/admin/filterspecs.py:147 forms/widgets.py:413
|
||||
#: contrib/admin/filterspecs.py:147 forms/widgets.py:434
|
||||
msgid "Yes"
|
||||
msgstr "Ja"
|
||||
|
||||
#: contrib/admin/filterspecs.py:147 forms/widgets.py:413
|
||||
#: contrib/admin/filterspecs.py:147 forms/widgets.py:434
|
||||
msgid "No"
|
||||
msgstr "Nei"
|
||||
|
||||
#: contrib/admin/filterspecs.py:154 forms/widgets.py:413
|
||||
#: contrib/admin/filterspecs.py:154 forms/widgets.py:434
|
||||
msgid "Unknown"
|
||||
msgstr "Ukjent"
|
||||
|
||||
@ -314,98 +314,99 @@ msgstr "logginnlegg"
|
||||
msgid "None"
|
||||
msgstr "Ingen"
|
||||
|
||||
#: contrib/admin/options.py:517
|
||||
#: contrib/admin/options.py:519
|
||||
#, python-format
|
||||
msgid "Changed %s."
|
||||
msgstr "Endret %s."
|
||||
|
||||
#: contrib/admin/options.py:517 contrib/admin/options.py:527
|
||||
#: contrib/comments/templates/comments/preview.html:16 forms/models.py:306
|
||||
#: contrib/admin/options.py:519 contrib/admin/options.py:529
|
||||
#: contrib/comments/templates/comments/preview.html:16 forms/models.py:388
|
||||
#: forms/models.py:600
|
||||
msgid "and"
|
||||
msgstr "og"
|
||||
|
||||
#: contrib/admin/options.py:522
|
||||
#: contrib/admin/options.py:524
|
||||
#, python-format
|
||||
msgid "Added %(name)s \"%(object)s\"."
|
||||
msgstr "Opprettet %(name)s \"%(object)s\"."
|
||||
|
||||
#: contrib/admin/options.py:526
|
||||
#: contrib/admin/options.py:528
|
||||
#, python-format
|
||||
msgid "Changed %(list)s for %(name)s \"%(object)s\"."
|
||||
msgstr "Endret %(list)s for %(name)s \"%(object)s\"."
|
||||
|
||||
#: contrib/admin/options.py:531
|
||||
#: contrib/admin/options.py:533
|
||||
#, python-format
|
||||
msgid "Deleted %(name)s \"%(object)s\"."
|
||||
msgstr "Slettet %(name)s \"%(object)s\"."
|
||||
|
||||
#: contrib/admin/options.py:535
|
||||
#: contrib/admin/options.py:537
|
||||
msgid "No fields changed."
|
||||
msgstr "Ingen felt endret."
|
||||
|
||||
#: contrib/admin/options.py:596 contrib/auth/admin.py:67
|
||||
#: contrib/admin/options.py:599 contrib/auth/admin.py:67
|
||||
#, python-format
|
||||
msgid "The %(name)s \"%(obj)s\" was added successfully."
|
||||
msgstr "%(name)s \"%(obj)s\" ble opprettet."
|
||||
|
||||
#: contrib/admin/options.py:600 contrib/admin/options.py:633
|
||||
#: contrib/admin/options.py:603 contrib/admin/options.py:636
|
||||
#: contrib/auth/admin.py:75
|
||||
msgid "You may edit it again below."
|
||||
msgstr "Du kan redigere videre nedenfor."
|
||||
|
||||
#: contrib/admin/options.py:610 contrib/admin/options.py:643
|
||||
#: contrib/admin/options.py:613 contrib/admin/options.py:646
|
||||
#, python-format
|
||||
msgid "You may add another %s below."
|
||||
msgstr "Du kan opprette ny %s nedenfor."
|
||||
|
||||
#: contrib/admin/options.py:631
|
||||
#: contrib/admin/options.py:634
|
||||
#, python-format
|
||||
msgid "The %(name)s \"%(obj)s\" was changed successfully."
|
||||
msgstr "%(name)s \"%(obj)s\" ble endret."
|
||||
|
||||
#: contrib/admin/options.py:639
|
||||
#: contrib/admin/options.py:642
|
||||
#, python-format
|
||||
msgid ""
|
||||
"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
|
||||
msgstr "%(name)s \"%(obj)s\" ble endret. Du kan redigere videre nedenfor."
|
||||
|
||||
#: contrib/admin/options.py:770
|
||||
#: contrib/admin/options.py:773
|
||||
#, python-format
|
||||
msgid "Add %s"
|
||||
msgstr "Opprett %s"
|
||||
|
||||
#: contrib/admin/options.py:801 contrib/admin/options.py:1001
|
||||
#: contrib/admin/options.py:804 contrib/admin/options.py:1005
|
||||
#, python-format
|
||||
msgid "%(name)s object with primary key %(key)r does not exist."
|
||||
msgstr "%(name)s-objekt med primærnøkkelen %(key)r finnes ikke."
|
||||
|
||||
#: contrib/admin/options.py:858
|
||||
#: contrib/admin/options.py:861
|
||||
#, python-format
|
||||
msgid "Change %s"
|
||||
msgstr "Rediger %s"
|
||||
|
||||
#: contrib/admin/options.py:902
|
||||
#: contrib/admin/options.py:905
|
||||
msgid "Database error"
|
||||
msgstr "Databasefeil"
|
||||
|
||||
#: contrib/admin/options.py:938
|
||||
#: contrib/admin/options.py:941
|
||||
#, python-format
|
||||
msgid "%(count)s %(name)s was changed successfully."
|
||||
msgid_plural "%(count)s %(name)s were changed successfully."
|
||||
msgstr[0] "%(count)s %(name)s ble endret."
|
||||
msgstr[1] "%(count)s %(name)s ble endret."
|
||||
|
||||
#: contrib/admin/options.py:1016
|
||||
#: contrib/admin/options.py:1020
|
||||
#, python-format
|
||||
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
|
||||
msgstr "%(name)s \"%(obj)s\" ble slettet."
|
||||
|
||||
#: contrib/admin/options.py:1052
|
||||
#: contrib/admin/options.py:1057
|
||||
#, python-format
|
||||
msgid "Change history: %s"
|
||||
msgstr "Endringshistorikk: %s"
|
||||
|
||||
#: contrib/admin/sites.py:20 contrib/admin/views/decorators.py:14
|
||||
#: contrib/admin/sites.py:21 contrib/admin/views/decorators.py:14
|
||||
#: contrib/auth/forms.py:80
|
||||
msgid ""
|
||||
"Please enter a correct username and password. Note that both fields are case-"
|
||||
@ -414,11 +415,11 @@ msgstr ""
|
||||
"Vennligst angi korrekt brukernavn og passord. Merk at det er forskjell på "
|
||||
"små og store bokstaver."
|
||||
|
||||
#: contrib/admin/sites.py:278 contrib/admin/views/decorators.py:40
|
||||
#: contrib/admin/sites.py:285 contrib/admin/views/decorators.py:40
|
||||
msgid "Please log in again, because your session has expired."
|
||||
msgstr "Økten din har tidsavbrutt, vennligst logg inn igjen."
|
||||
|
||||
#: contrib/admin/sites.py:285 contrib/admin/views/decorators.py:47
|
||||
#: contrib/admin/sites.py:292 contrib/admin/views/decorators.py:47
|
||||
msgid ""
|
||||
"Looks like your browser isn't configured to accept cookies. Please enable "
|
||||
"cookies, reload this page, and try again."
|
||||
@ -426,27 +427,27 @@ msgstr ""
|
||||
"Det ser ut som om nettleseren din ikke støtter informasjonskapsler "
|
||||
"(cookies). Vennligst konfigurer nettleseren din og prøv igjen."
|
||||
|
||||
#: contrib/admin/sites.py:301 contrib/admin/sites.py:307
|
||||
#: contrib/admin/sites.py:308 contrib/admin/sites.py:314
|
||||
#: contrib/admin/views/decorators.py:66
|
||||
msgid "Usernames cannot contain the '@' character."
|
||||
msgstr "Brukernavnet kan ikke inneholde tegnet '@'."
|
||||
|
||||
#: contrib/admin/sites.py:304 contrib/admin/views/decorators.py:62
|
||||
#: contrib/admin/sites.py:311 contrib/admin/views/decorators.py:62
|
||||
#, python-format
|
||||
msgid "Your e-mail address is not your username. Try '%s' instead."
|
||||
msgstr "E-postadressen er ikke brukernavnet ditt, prøv '%s' isteden."
|
||||
|
||||
#: contrib/admin/sites.py:360
|
||||
#: contrib/admin/sites.py:367
|
||||
msgid "Site administration"
|
||||
msgstr "Nettstedsadministrasjon"
|
||||
|
||||
#: contrib/admin/sites.py:373 contrib/admin/templates/admin/login.html:26
|
||||
#: contrib/admin/sites.py:381 contrib/admin/templates/admin/login.html:26
|
||||
#: contrib/admin/templates/registration/password_reset_complete.html:14
|
||||
#: contrib/admin/views/decorators.py:20
|
||||
msgid "Log in"
|
||||
msgstr "Logg inn"
|
||||
|
||||
#: contrib/admin/sites.py:417
|
||||
#: contrib/admin/sites.py:426
|
||||
#, python-format
|
||||
msgid "%s administration"
|
||||
msgstr "%s-administrasjon"
|
||||
@ -496,7 +497,7 @@ msgstr "Beklager, men siden du spør etter finnes ikke."
|
||||
|
||||
#: contrib/admin/templates/admin/500.html:4
|
||||
#: contrib/admin/templates/admin/app_index.html:8
|
||||
#: contrib/admin/templates/admin/base.html:33
|
||||
#: contrib/admin/templates/admin/base.html:54
|
||||
#: contrib/admin/templates/admin/change_form.html:17
|
||||
#: contrib/admin/templates/admin/change_list.html:25
|
||||
#: contrib/admin/templates/admin/delete_confirmation.html:6
|
||||
@ -540,7 +541,6 @@ msgid "Run the selected action"
|
||||
msgstr "Utfør den valgte handlingen"
|
||||
|
||||
#: contrib/admin/templates/admin/actions.html:4
|
||||
#: contrib/admin/templates/admin/search_form.html:8
|
||||
msgid "Go"
|
||||
msgstr "Gå"
|
||||
|
||||
@ -550,18 +550,18 @@ msgstr "Gå"
|
||||
msgid "%(name)s"
|
||||
msgstr "%(name)s"
|
||||
|
||||
#: contrib/admin/templates/admin/base.html:28
|
||||
#: contrib/admin/templates/admin/base.html:27
|
||||
msgid "Welcome,"
|
||||
msgstr "Velkommen,"
|
||||
|
||||
#: contrib/admin/templates/admin/base.html:28
|
||||
#: contrib/admin/templates/admin/base.html:32
|
||||
#: contrib/admin/templates/registration/password_change_done.html:3
|
||||
#: contrib/admin/templates/registration/password_change_form.html:3
|
||||
#: contrib/admindocs/templates/admin_doc/bookmarklets.html:3
|
||||
msgid "Documentation"
|
||||
msgstr "Dokumentasjon"
|
||||
|
||||
#: contrib/admin/templates/admin/base.html:28
|
||||
#: contrib/admin/templates/admin/base.html:40
|
||||
#: contrib/admin/templates/admin/auth/user/change_password.html:14
|
||||
#: contrib/admin/templates/admin/auth/user/change_password.html:47
|
||||
#: contrib/admin/templates/registration/password_change_done.html:3
|
||||
@ -569,7 +569,7 @@ msgstr "Dokumentasjon"
|
||||
msgid "Change password"
|
||||
msgstr "Endre passord"
|
||||
|
||||
#: contrib/admin/templates/admin/base.html:28
|
||||
#: contrib/admin/templates/admin/base.html:47
|
||||
#: contrib/admin/templates/registration/password_change_done.html:3
|
||||
#: contrib/admin/templates/registration/password_change_form.html:3
|
||||
msgid "Log out"
|
||||
@ -699,6 +699,10 @@ msgstr "Mine handlinger"
|
||||
msgid "None available"
|
||||
msgstr "Ingen tilgjengelige"
|
||||
|
||||
#: contrib/admin/templates/admin/index.html:72
|
||||
msgid "Unknown content"
|
||||
msgstr "Ukjent innhold"
|
||||
|
||||
#: contrib/admin/templates/admin/invalid_setup.html:7
|
||||
msgid ""
|
||||
"Something's wrong with your database installation. Make sure the appropriate "
|
||||
@ -746,6 +750,15 @@ msgstr ""
|
||||
msgid "Show all"
|
||||
msgstr "Vis alle"
|
||||
|
||||
#: contrib/admin/templates/admin/pagination.html:11
|
||||
#: contrib/admin/templates/admin/submit_line.html:3
|
||||
msgid "Save"
|
||||
msgstr "Lagre"
|
||||
|
||||
#: contrib/admin/templates/admin/search_form.html:8
|
||||
msgid "Search"
|
||||
msgstr "Søk"
|
||||
|
||||
#: contrib/admin/templates/admin/search_form.html:10
|
||||
#, python-format
|
||||
msgid "1 result"
|
||||
@ -758,10 +771,6 @@ msgstr[1] "%(counter)s resultater"
|
||||
msgid "%(full_result_count)s total"
|
||||
msgstr "%(full_result_count)s totalt"
|
||||
|
||||
#: contrib/admin/templates/admin/submit_line.html:3
|
||||
msgid "Save"
|
||||
msgstr "Lagre"
|
||||
|
||||
#: contrib/admin/templates/admin/submit_line.html:5
|
||||
msgid "Save as new"
|
||||
msgstr "Lagre som ny"
|
||||
@ -989,144 +998,145 @@ msgstr "nettside"
|
||||
msgid "template"
|
||||
msgstr "mal"
|
||||
|
||||
#: contrib/admindocs/views.py:58 contrib/admindocs/views.py:60
|
||||
#: contrib/admindocs/views.py:62
|
||||
#: contrib/admindocs/views.py:61 contrib/admindocs/views.py:63
|
||||
#: contrib/admindocs/views.py:65
|
||||
msgid "tag:"
|
||||
msgstr "tag:"
|
||||
|
||||
#: contrib/admindocs/views.py:91 contrib/admindocs/views.py:93
|
||||
#: contrib/admindocs/views.py:95
|
||||
#: contrib/admindocs/views.py:94 contrib/admindocs/views.py:96
|
||||
#: contrib/admindocs/views.py:98
|
||||
msgid "filter:"
|
||||
msgstr "filter:"
|
||||
|
||||
#: contrib/admindocs/views.py:155 contrib/admindocs/views.py:157
|
||||
#: contrib/admindocs/views.py:159
|
||||
#: contrib/admindocs/views.py:158 contrib/admindocs/views.py:160
|
||||
#: contrib/admindocs/views.py:162
|
||||
msgid "view:"
|
||||
msgstr "view:"
|
||||
|
||||
#: contrib/admindocs/views.py:187
|
||||
#: contrib/admindocs/views.py:190
|
||||
#, python-format
|
||||
msgid "App %r not found"
|
||||
msgstr "Fant ikke applikasjonen %r"
|
||||
|
||||
#: contrib/admindocs/views.py:194
|
||||
#: contrib/admindocs/views.py:197
|
||||
#, python-format
|
||||
msgid "Model %(model_name)r not found in app %(app_label)r"
|
||||
msgstr "Fant ikke modellen %(model_name)r i applikasjonen %(app_label)r"
|
||||
|
||||
#: contrib/admindocs/views.py:206
|
||||
#: contrib/admindocs/views.py:209
|
||||
#, python-format
|
||||
msgid "the related `%(app_label)s.%(data_type)s` object"
|
||||
msgstr "det relaterte `%(app_label)s.%(data_type)s`-objektet"
|
||||
|
||||
#: contrib/admindocs/views.py:206 contrib/admindocs/views.py:228
|
||||
#: contrib/admindocs/views.py:242 contrib/admindocs/views.py:247
|
||||
#: contrib/admindocs/views.py:209 contrib/admindocs/views.py:228
|
||||
#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:247
|
||||
#: contrib/admindocs/views.py:261 contrib/admindocs/views.py:266
|
||||
msgid "model:"
|
||||
msgstr "modell:"
|
||||
|
||||
#: contrib/admindocs/views.py:237
|
||||
#: contrib/admindocs/views.py:224 contrib/admindocs/views.py:256
|
||||
#, python-format
|
||||
msgid "related `%(app_label)s.%(object_name)s` objects"
|
||||
msgstr "relaterte `%(app_label)s.%(object_name)s`-objekter"
|
||||
|
||||
#: contrib/admindocs/views.py:242
|
||||
#: contrib/admindocs/views.py:228 contrib/admindocs/views.py:261
|
||||
#, python-format
|
||||
msgid "all %s"
|
||||
msgstr "alle %s"
|
||||
|
||||
#: contrib/admindocs/views.py:247
|
||||
#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:266
|
||||
#, python-format
|
||||
msgid "number of %s"
|
||||
msgstr "antall %s"
|
||||
|
||||
#: contrib/admindocs/views.py:252
|
||||
#: contrib/admindocs/views.py:271
|
||||
#, python-format
|
||||
msgid "Fields on %s objects"
|
||||
msgstr "Felter på %s-objekter"
|
||||
|
||||
#: contrib/admindocs/views.py:315 contrib/admindocs/views.py:326
|
||||
#: contrib/admindocs/views.py:328 contrib/admindocs/views.py:334
|
||||
#: contrib/admindocs/views.py:335 contrib/admindocs/views.py:337
|
||||
#: contrib/admindocs/views.py:334 contrib/admindocs/views.py:345
|
||||
#: contrib/admindocs/views.py:347 contrib/admindocs/views.py:353
|
||||
#: contrib/admindocs/views.py:354 contrib/admindocs/views.py:356
|
||||
msgid "Integer"
|
||||
msgstr "Heltall"
|
||||
|
||||
#: contrib/admindocs/views.py:316
|
||||
#: contrib/admindocs/views.py:335
|
||||
msgid "Boolean (Either True or False)"
|
||||
msgstr "Boolsk (True eller False)"
|
||||
|
||||
#: contrib/admindocs/views.py:317 contrib/admindocs/views.py:336
|
||||
#: contrib/admindocs/views.py:336 contrib/admindocs/views.py:355
|
||||
#, python-format
|
||||
msgid "String (up to %(max_length)s)"
|
||||
msgstr "Tekst (opp til %(max_length)s tegn)"
|
||||
|
||||
#: contrib/admindocs/views.py:318
|
||||
#: contrib/admindocs/views.py:337
|
||||
msgid "Comma-separated integers"
|
||||
msgstr "Heltall adskilt med komma"
|
||||
|
||||
#: contrib/admindocs/views.py:319
|
||||
#: contrib/admindocs/views.py:338
|
||||
msgid "Date (without time)"
|
||||
msgstr "Dato (uten tid)"
|
||||
|
||||
#: contrib/admindocs/views.py:320
|
||||
#: contrib/admindocs/views.py:339
|
||||
msgid "Date (with time)"
|
||||
msgstr "Dato (med tid)"
|
||||
|
||||
#: contrib/admindocs/views.py:321
|
||||
#: contrib/admindocs/views.py:340
|
||||
msgid "Decimal number"
|
||||
msgstr "Desimaltall"
|
||||
|
||||
#: contrib/admindocs/views.py:322
|
||||
#: contrib/admindocs/views.py:341
|
||||
msgid "E-mail address"
|
||||
msgstr "E-postadresse"
|
||||
|
||||
#: contrib/admindocs/views.py:323 contrib/admindocs/views.py:324
|
||||
#: contrib/admindocs/views.py:327
|
||||
#: contrib/admindocs/views.py:342 contrib/admindocs/views.py:343
|
||||
#: contrib/admindocs/views.py:346
|
||||
msgid "File path"
|
||||
msgstr "Filsti"
|
||||
|
||||
#: contrib/admindocs/views.py:325
|
||||
#: contrib/admindocs/views.py:344
|
||||
msgid "Floating point number"
|
||||
msgstr "Flyttall"
|
||||
|
||||
#: contrib/admindocs/views.py:329 contrib/comments/models.py:60
|
||||
#: contrib/admindocs/views.py:348 contrib/comments/models.py:60
|
||||
msgid "IP address"
|
||||
msgstr "IP-adresse"
|
||||
|
||||
#: contrib/admindocs/views.py:331
|
||||
#: contrib/admindocs/views.py:350
|
||||
msgid "Boolean (Either True, False or None)"
|
||||
msgstr "Boolsk (True, False eller None)"
|
||||
|
||||
#: contrib/admindocs/views.py:332
|
||||
#: contrib/admindocs/views.py:351
|
||||
msgid "Relation to parent model"
|
||||
msgstr "Relasjon til foreldermodell"
|
||||
|
||||
#: contrib/admindocs/views.py:333
|
||||
#: contrib/admindocs/views.py:352
|
||||
msgid "Phone number"
|
||||
msgstr "Telefonnummer"
|
||||
|
||||
#: contrib/admindocs/views.py:338
|
||||
#: contrib/admindocs/views.py:357
|
||||
msgid "Text"
|
||||
msgstr "Tekst"
|
||||
|
||||
#: contrib/admindocs/views.py:339
|
||||
#: contrib/admindocs/views.py:358
|
||||
msgid "Time"
|
||||
msgstr "Tid"
|
||||
|
||||
#: contrib/admindocs/views.py:340 contrib/comments/forms.py:95
|
||||
#: contrib/admindocs/views.py:359 contrib/comments/forms.py:95
|
||||
#: contrib/comments/templates/comments/moderation_queue.html:37
|
||||
#: contrib/flatpages/admin.py:8 contrib/flatpages/models.py:7
|
||||
msgid "URL"
|
||||
msgstr "Nettadresse"
|
||||
|
||||
#: contrib/admindocs/views.py:341
|
||||
#: contrib/admindocs/views.py:360
|
||||
msgid "U.S. state (two uppercase letters)"
|
||||
msgstr "Stat (i USA, to store bokstaver)"
|
||||
|
||||
#: contrib/admindocs/views.py:342
|
||||
#: contrib/admindocs/views.py:361
|
||||
msgid "XML text"
|
||||
msgstr "XML-tekst"
|
||||
|
||||
#: contrib/admindocs/views.py:368
|
||||
#: contrib/admindocs/views.py:387
|
||||
#, python-format
|
||||
msgid "%s does not appear to be a urlpattern object"
|
||||
msgstr "%s ser ikke ut til å være et urlpattern-objekt"
|
||||
@ -1770,18 +1780,25 @@ msgstr ""
|
||||
"Vi beklager, men dette skjemaet har tidsavbrutt. Vennligst fyll ut skjemaet "
|
||||
"fra denne siden."
|
||||
|
||||
#: contrib/gis/forms/fields.py:14
|
||||
#: contrib/gis/forms/fields.py:17
|
||||
msgid "No geometry value provided."
|
||||
msgstr "Ingen geometriverdi oppgitt."
|
||||
|
||||
#: contrib/gis/forms/fields.py:15
|
||||
#: contrib/gis/forms/fields.py:18
|
||||
msgid "Invalid geometry value."
|
||||
msgstr "Ugyldig geometriverdi"
|
||||
|
||||
#: contrib/gis/forms/fields.py:16
|
||||
#: contrib/gis/forms/fields.py:19
|
||||
msgid "Invalid geometry type."
|
||||
msgstr "Ugyldig geometritype"
|
||||
|
||||
#: contrib/gis/forms/fields.py:20
|
||||
msgid ""
|
||||
"An error occurred when transforming the geometry to the SRID of the geometry "
|
||||
"form field."
|
||||
msgstr ""
|
||||
"En feil oppstod ved transformering av geometrien til SRID fra geometrifeltet."
|
||||
|
||||
#: contrib/humanize/templatetags/humanize.py:19
|
||||
msgid "th"
|
||||
msgstr "."
|
||||
@ -3891,13 +3908,13 @@ msgstr "Verdien må være None, True eller False."
|
||||
msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
|
||||
msgstr "Oppgi tiden på formen TT:MM[:ss[.uuuuuu]]."
|
||||
|
||||
#: db/models/fields/related.py:792
|
||||
#: db/models/fields/related.py:816
|
||||
msgid ""
|
||||
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
|
||||
msgstr ""
|
||||
"Hold nede \"Control\", eller \"Command\" på en Mac, for å velge mer enn en."
|
||||
|
||||
#: db/models/fields/related.py:870
|
||||
#: db/models/fields/related.py:894
|
||||
#, python-format
|
||||
msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
|
||||
msgid_plural ""
|
||||
@ -3956,11 +3973,11 @@ msgstr "Verdien kan ikke ha mer enn %s desimaler."
|
||||
msgid "Ensure that there are no more than %s digits before the decimal point."
|
||||
msgstr "Verdien kan ikke ha mer enn %s siffer foran komma."
|
||||
|
||||
#: forms/fields.py:288 forms/fields.py:862
|
||||
#: forms/fields.py:288 forms/fields.py:863
|
||||
msgid "Enter a valid date."
|
||||
msgstr "Oppgi en gyldig dato."
|
||||
|
||||
#: forms/fields.py:322 forms/fields.py:863
|
||||
#: forms/fields.py:322 forms/fields.py:864
|
||||
msgid "Enter a valid time."
|
||||
msgstr "Oppgi et gyldig tidspunkt."
|
||||
|
||||
@ -4002,20 +4019,20 @@ msgstr "Oppgi en gyldig nettadresse."
|
||||
msgid "This URL appears to be a broken link."
|
||||
msgstr "Nettadressen fører til en side som ikke eksisterer."
|
||||
|
||||
#: forms/fields.py:624 forms/fields.py:702
|
||||
#: forms/fields.py:625 forms/fields.py:703
|
||||
#, python-format
|
||||
msgid "Select a valid choice. %(value)s is not one of the available choices."
|
||||
msgstr "Velg et gyldig valg. %(value)s er ikke et av de tilgjengelige valgene."
|
||||
|
||||
#: forms/fields.py:703 forms/fields.py:764 forms/models.py:776
|
||||
#: forms/fields.py:704 forms/fields.py:765 forms/models.py:1003
|
||||
msgid "Enter a list of values."
|
||||
msgstr "Oppgi en liste med verdier."
|
||||
|
||||
#: forms/fields.py:891
|
||||
#: forms/fields.py:892
|
||||
msgid "Enter a valid IPv4 address."
|
||||
msgstr "Oppgi en gyldig IPv4-adresse."
|
||||
|
||||
#: forms/fields.py:901
|
||||
#: forms/fields.py:902
|
||||
msgid ""
|
||||
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
|
||||
msgstr ""
|
||||
@ -4026,25 +4043,53 @@ msgstr ""
|
||||
msgid "Order"
|
||||
msgstr "Rekkefølge"
|
||||
|
||||
#: forms/models.py:299 forms/models.py:308
|
||||
#: forms/models.py:367
|
||||
#, python-format
|
||||
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
|
||||
msgstr "%(field_name)s må være unik for %(date_field)s %(lookup)s."
|
||||
|
||||
#: forms/models.py:381 forms/models.py:389
|
||||
#, python-format
|
||||
msgid "%(model_name)s with this %(field_label)s already exists."
|
||||
msgstr "%(model_name)s med %(field_label)s finnes allerede."
|
||||
|
||||
#: forms/models.py:651
|
||||
#: forms/models.py:594
|
||||
#, python-format
|
||||
msgid "Please correct the duplicate data for %(field)s."
|
||||
msgstr "Vennligst korriger duplisert data for %(field)s."
|
||||
|
||||
#: forms/models.py:598
|
||||
#, python-format
|
||||
msgid "Please correct the duplicate data for %(field)s, which must be unique."
|
||||
msgstr "Vennligst korriger duplisert data for %(field)s, som må være unik."
|
||||
|
||||
#: forms/models.py:604
|
||||
#, 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 ""
|
||||
"Vennligst korriger duplisert data for %(field_name)s, som må være unik for "
|
||||
"%(lookup)s i %(date_field)s."
|
||||
|
||||
#: forms/models.py:612
|
||||
msgid "Please correct the duplicate values below."
|
||||
msgstr "Vennligst korriger de dupliserte verdiene nedenfor."
|
||||
|
||||
#: forms/models.py:867
|
||||
msgid "The inline foreign key did not match the parent instance primary key."
|
||||
msgstr "Primærnøkkelen er ikke den samme som foreldreinstansens primærnøkkel."
|
||||
|
||||
#: forms/models.py:706
|
||||
#: forms/models.py:930
|
||||
msgid "Select a valid choice. That choice is not one of the available choices."
|
||||
msgstr "Velg et gyldig valg. Valget er ikke et av de tilgjengelige valgene."
|
||||
|
||||
#: forms/models.py:777
|
||||
#: forms/models.py:1004
|
||||
#, python-format
|
||||
msgid "Select a valid choice. %s is not one of the available choices."
|
||||
msgstr "Velg et gyldig valg. %s er ikke et av de tilgjengelige valgene."
|
||||
|
||||
#: forms/models.py:779
|
||||
#: forms/models.py:1006
|
||||
#, python-format
|
||||
msgid "\"%s\" is not a valid value for a primary key."
|
||||
msgstr "\"%s\" er ikke en gyldig verdi for en primærnøkkel."
|
||||
@ -4075,27 +4120,27 @@ msgstr "%.1f MB"
|
||||
msgid "%.1f GB"
|
||||
msgstr "%.1f GB"
|
||||
|
||||
#: utils/dateformat.py:41
|
||||
#: utils/dateformat.py:42
|
||||
msgid "p.m."
|
||||
msgstr "p.m."
|
||||
|
||||
#: utils/dateformat.py:42
|
||||
#: utils/dateformat.py:43
|
||||
msgid "a.m."
|
||||
msgstr "a.m."
|
||||
|
||||
#: utils/dateformat.py:47
|
||||
#: utils/dateformat.py:48
|
||||
msgid "PM"
|
||||
msgstr "PM"
|
||||
|
||||
#: utils/dateformat.py:48
|
||||
#: utils/dateformat.py:49
|
||||
msgid "AM"
|
||||
msgstr "AM"
|
||||
|
||||
#: utils/dateformat.py:97
|
||||
#: utils/dateformat.py:98
|
||||
msgid "midnight"
|
||||
msgstr "midnatt"
|
||||
|
||||
#: utils/dateformat.py:99
|
||||
#: utils/dateformat.py:100
|
||||
msgid "noon"
|
||||
msgstr "12:00"
|
||||
|
||||
|
||||
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
@ -5,8 +5,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Django\n"
|
||||
"Report-Msgid-Bugs-To: Grupo de Localização para o Português <django-l10n-portuguese@googlegroups.com>\n"
|
||||
"POT-Creation-Date: 2009-04-13 22:52-0300\n"
|
||||
"PO-Revision-Date: 2009-04-13 23:07-0300\n"
|
||||
"POT-Creation-Date: 2009-07-23 10:00-0300\n"
|
||||
"PO-Revision-Date: 2009-07-23 10:03-0300\n"
|
||||
"Last-Translator: Guilherme Gondim <semente@taurinus.org>\n"
|
||||
"Language-Team: Grupo de Localização para o Português <django-l10n-portuguese@googlegroups.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
@ -218,16 +218,16 @@ msgstr "Chinês Simplificado"
|
||||
msgid "Traditional Chinese"
|
||||
msgstr "Chinês Tradicional"
|
||||
|
||||
#: contrib/admin/actions.py:56
|
||||
#: contrib/admin/actions.py:60
|
||||
#, python-format
|
||||
msgid "Successfully deleted %(count)d %(items)s."
|
||||
msgstr "Removido %(count)d %(items)s com sucesso."
|
||||
|
||||
#: contrib/admin/actions.py:63 contrib/admin/options.py:1023
|
||||
#: contrib/admin/actions.py:67 contrib/admin/options.py:1027
|
||||
msgid "Are you sure?"
|
||||
msgstr "Tem certeza?"
|
||||
|
||||
#: contrib/admin/actions.py:81
|
||||
#: contrib/admin/actions.py:85
|
||||
#, python-format
|
||||
msgid "Delete selected %(verbose_name_plural)s"
|
||||
msgstr "Remover %(verbose_name_plural)s selecionado"
|
||||
@ -266,15 +266,15 @@ msgstr "Este mês"
|
||||
msgid "This year"
|
||||
msgstr "Este ano"
|
||||
|
||||
#: contrib/admin/filterspecs.py:147 forms/widgets.py:413
|
||||
#: contrib/admin/filterspecs.py:147 forms/widgets.py:434
|
||||
msgid "Yes"
|
||||
msgstr "Sim"
|
||||
|
||||
#: contrib/admin/filterspecs.py:147 forms/widgets.py:413
|
||||
#: contrib/admin/filterspecs.py:147 forms/widgets.py:434
|
||||
msgid "No"
|
||||
msgstr "Não"
|
||||
|
||||
#: contrib/admin/filterspecs.py:154 forms/widgets.py:413
|
||||
#: contrib/admin/filterspecs.py:154 forms/widgets.py:434
|
||||
msgid "Unknown"
|
||||
msgstr "Desconhecido"
|
||||
|
||||
@ -314,56 +314,57 @@ msgstr "entradas de log"
|
||||
msgid "None"
|
||||
msgstr "Nenhum"
|
||||
|
||||
#: contrib/admin/options.py:517
|
||||
#: contrib/admin/options.py:519
|
||||
#, python-format
|
||||
msgid "Changed %s."
|
||||
msgstr "Modificado %s."
|
||||
|
||||
#: contrib/admin/options.py:517 contrib/admin/options.py:527
|
||||
#: contrib/comments/templates/comments/preview.html:16 forms/models.py:306
|
||||
#: contrib/admin/options.py:519 contrib/admin/options.py:529
|
||||
#: contrib/comments/templates/comments/preview.html:16 forms/models.py:388
|
||||
#: forms/models.py:600 forms/models_flymake.py:388 forms/models_flymake.py:600
|
||||
msgid "and"
|
||||
msgstr "e"
|
||||
|
||||
#: contrib/admin/options.py:522
|
||||
#: contrib/admin/options.py:524
|
||||
#, python-format
|
||||
msgid "Added %(name)s \"%(object)s\"."
|
||||
msgstr "Adicionado %(name)s \"%(object)s\""
|
||||
|
||||
#: contrib/admin/options.py:526
|
||||
#: contrib/admin/options.py:528
|
||||
#, python-format
|
||||
msgid "Changed %(list)s for %(name)s \"%(object)s\"."
|
||||
msgstr "Modificado %(list)s para %(name)s \"%(object)s\"."
|
||||
|
||||
#: contrib/admin/options.py:531
|
||||
#: contrib/admin/options.py:533
|
||||
#, python-format
|
||||
msgid "Deleted %(name)s \"%(object)s\"."
|
||||
msgstr "Deletado %(name)s \"%(object)s\"."
|
||||
|
||||
#: contrib/admin/options.py:535
|
||||
#: contrib/admin/options.py:537
|
||||
msgid "No fields changed."
|
||||
msgstr "Nenhum campo modificado."
|
||||
|
||||
#: contrib/admin/options.py:596 contrib/auth/admin.py:67
|
||||
#: contrib/admin/options.py:599 contrib/auth/admin.py:67
|
||||
#, python-format
|
||||
msgid "The %(name)s \"%(obj)s\" was added successfully."
|
||||
msgstr "%(name)s \"%(obj)s\": adicionado com sucesso."
|
||||
|
||||
#: contrib/admin/options.py:600 contrib/admin/options.py:633
|
||||
#: contrib/admin/options.py:603 contrib/admin/options.py:636
|
||||
#: contrib/auth/admin.py:75
|
||||
msgid "You may edit it again below."
|
||||
msgstr "Você pode editar novamente abaixo."
|
||||
|
||||
#: contrib/admin/options.py:610 contrib/admin/options.py:643
|
||||
#: contrib/admin/options.py:613 contrib/admin/options.py:646
|
||||
#, python-format
|
||||
msgid "You may add another %s below."
|
||||
msgstr "Você pode adicionar outro %s abaixo."
|
||||
|
||||
#: contrib/admin/options.py:631
|
||||
#: contrib/admin/options.py:634
|
||||
#, python-format
|
||||
msgid "The %(name)s \"%(obj)s\" was changed successfully."
|
||||
msgstr "%(name)s \"%(obj)s\": modificado com sucesso."
|
||||
|
||||
#: contrib/admin/options.py:639
|
||||
#: contrib/admin/options.py:642
|
||||
#, python-format
|
||||
msgid ""
|
||||
"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
|
||||
@ -371,43 +372,43 @@ msgstr ""
|
||||
"%(name)s \"%(obj)s\": adicionado com sucesso. Você pode editar novamente "
|
||||
"abaixo."
|
||||
|
||||
#: contrib/admin/options.py:770
|
||||
#: contrib/admin/options.py:773
|
||||
#, python-format
|
||||
msgid "Add %s"
|
||||
msgstr "Adicionar %s"
|
||||
|
||||
#: contrib/admin/options.py:801 contrib/admin/options.py:1001
|
||||
#: contrib/admin/options.py:804 contrib/admin/options.py:1005
|
||||
#, python-format
|
||||
msgid "%(name)s object with primary key %(key)r does not exist."
|
||||
msgstr "Objeto %(name)s com chave primária %(key)r não existe."
|
||||
|
||||
#: contrib/admin/options.py:858
|
||||
#: contrib/admin/options.py:861
|
||||
#, python-format
|
||||
msgid "Change %s"
|
||||
msgstr "Modificar %s"
|
||||
|
||||
#: contrib/admin/options.py:902
|
||||
#: contrib/admin/options.py:905
|
||||
msgid "Database error"
|
||||
msgstr "Erro no banco de dados"
|
||||
|
||||
#: contrib/admin/options.py:938
|
||||
#: contrib/admin/options.py:941
|
||||
#, python-format
|
||||
msgid "%(count)s %(name)s was changed successfully."
|
||||
msgid_plural "%(count)s %(name)s were changed successfully."
|
||||
msgstr[0] "%(count)s %(name)s modificado com sucesso."
|
||||
msgstr[1] "%(count)s %(name)s modificados com sucesso."
|
||||
|
||||
#: contrib/admin/options.py:1016
|
||||
#: contrib/admin/options.py:1020
|
||||
#, python-format
|
||||
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
|
||||
msgstr "%(name)s \"%(obj)s\": excluído com sucesso."
|
||||
|
||||
#: contrib/admin/options.py:1052
|
||||
#: contrib/admin/options.py:1057
|
||||
#, python-format
|
||||
msgid "Change history: %s"
|
||||
msgstr "Histórico de modificações: %s"
|
||||
|
||||
#: contrib/admin/sites.py:20 contrib/admin/views/decorators.py:14
|
||||
#: contrib/admin/sites.py:21 contrib/admin/views/decorators.py:14
|
||||
#: contrib/auth/forms.py:80
|
||||
msgid ""
|
||||
"Please enter a correct username and password. Note that both fields are case-"
|
||||
@ -416,11 +417,11 @@ msgstr ""
|
||||
"Por favor, entre com um usuário e senha corretos. Note que ambos os campos "
|
||||
"diferenciam maiúsculas e minúsculas."
|
||||
|
||||
#: contrib/admin/sites.py:278 contrib/admin/views/decorators.py:40
|
||||
#: contrib/admin/sites.py:285 contrib/admin/views/decorators.py:40
|
||||
msgid "Please log in again, because your session has expired."
|
||||
msgstr "Por favor acesse novamente, pois sua sessão expirou."
|
||||
|
||||
#: contrib/admin/sites.py:285 contrib/admin/views/decorators.py:47
|
||||
#: contrib/admin/sites.py:292 contrib/admin/views/decorators.py:47
|
||||
msgid ""
|
||||
"Looks like your browser isn't configured to accept cookies. Please enable "
|
||||
"cookies, reload this page, and try again."
|
||||
@ -428,27 +429,27 @@ msgstr ""
|
||||
"Parece que seu navegador não está configurado para aceitar cookies. Por "
|
||||
"favor habilite os cookies, recarregue esta página, e tente novamente."
|
||||
|
||||
#: contrib/admin/sites.py:301 contrib/admin/sites.py:307
|
||||
#: contrib/admin/sites.py:308 contrib/admin/sites.py:314
|
||||
#: contrib/admin/views/decorators.py:66
|
||||
msgid "Usernames cannot contain the '@' character."
|
||||
msgstr "Nomes de usuário não podem conter o caractere '@'."
|
||||
|
||||
#: contrib/admin/sites.py:304 contrib/admin/views/decorators.py:62
|
||||
#: contrib/admin/sites.py:311 contrib/admin/views/decorators.py:62
|
||||
#, python-format
|
||||
msgid "Your e-mail address is not your username. Try '%s' instead."
|
||||
msgstr "Seu endereço de e-mail não é seu nome de usuário. Tente usar '%s'"
|
||||
|
||||
#: contrib/admin/sites.py:360
|
||||
#: contrib/admin/sites.py:367
|
||||
msgid "Site administration"
|
||||
msgstr "Administração do Site"
|
||||
|
||||
#: contrib/admin/sites.py:373 contrib/admin/templates/admin/login.html:26
|
||||
#: contrib/admin/sites.py:381 contrib/admin/templates/admin/login.html:26
|
||||
#: contrib/admin/templates/registration/password_reset_complete.html:14
|
||||
#: contrib/admin/views/decorators.py:20
|
||||
msgid "Log in"
|
||||
msgstr "Acessar"
|
||||
|
||||
#: contrib/admin/sites.py:417
|
||||
#: contrib/admin/sites.py:426
|
||||
#, python-format
|
||||
msgid "%s administration"
|
||||
msgstr "Administração de %s"
|
||||
@ -483,7 +484,7 @@ msgstr "Modificar:"
|
||||
msgid "Lookup"
|
||||
msgstr "Olhar"
|
||||
|
||||
#: contrib/admin/widgets.py:236
|
||||
#: contrib/admin/widgets.py:235
|
||||
msgid "Add Another"
|
||||
msgstr "Adicionar outro"
|
||||
|
||||
@ -498,7 +499,7 @@ msgstr "Desculpe, mas a página requisitada não pode ser encontrada."
|
||||
|
||||
#: contrib/admin/templates/admin/500.html:4
|
||||
#: contrib/admin/templates/admin/app_index.html:8
|
||||
#: contrib/admin/templates/admin/base.html:33
|
||||
#: contrib/admin/templates/admin/base.html:54
|
||||
#: contrib/admin/templates/admin/change_form.html:17
|
||||
#: contrib/admin/templates/admin/change_list.html:25
|
||||
#: contrib/admin/templates/admin/delete_confirmation.html:6
|
||||
@ -542,7 +543,6 @@ msgid "Run the selected action"
|
||||
msgstr "Executar ação selecionada"
|
||||
|
||||
#: contrib/admin/templates/admin/actions.html:4
|
||||
#: contrib/admin/templates/admin/search_form.html:8
|
||||
msgid "Go"
|
||||
msgstr "Ir"
|
||||
|
||||
@ -552,18 +552,18 @@ msgstr "Ir"
|
||||
msgid "%(name)s"
|
||||
msgstr "%(name)s"
|
||||
|
||||
#: contrib/admin/templates/admin/base.html:28
|
||||
#: contrib/admin/templates/admin/base.html:27
|
||||
msgid "Welcome,"
|
||||
msgstr "Bem vindo,"
|
||||
|
||||
#: contrib/admin/templates/admin/base.html:28
|
||||
#: contrib/admin/templates/admin/base.html:32
|
||||
#: contrib/admin/templates/registration/password_change_done.html:3
|
||||
#: contrib/admin/templates/registration/password_change_form.html:3
|
||||
#: contrib/admindocs/templates/admin_doc/bookmarklets.html:3
|
||||
msgid "Documentation"
|
||||
msgstr "Documentação"
|
||||
|
||||
#: contrib/admin/templates/admin/base.html:28
|
||||
#: contrib/admin/templates/admin/base.html:40
|
||||
#: contrib/admin/templates/admin/auth/user/change_password.html:14
|
||||
#: contrib/admin/templates/admin/auth/user/change_password.html:47
|
||||
#: contrib/admin/templates/registration/password_change_done.html:3
|
||||
@ -571,7 +571,7 @@ msgstr "Documentação"
|
||||
msgid "Change password"
|
||||
msgstr "Alterar senha"
|
||||
|
||||
#: contrib/admin/templates/admin/base.html:28
|
||||
#: contrib/admin/templates/admin/base.html:47
|
||||
#: contrib/admin/templates/registration/password_change_done.html:3
|
||||
#: contrib/admin/templates/registration/password_change_form.html:3
|
||||
msgid "Log out"
|
||||
@ -702,6 +702,10 @@ msgstr "Minhas Ações"
|
||||
msgid "None available"
|
||||
msgstr "Nenhuma disponível"
|
||||
|
||||
#: contrib/admin/templates/admin/index.html:72
|
||||
msgid "Unknown content"
|
||||
msgstr "Conteúdo desconhecido"
|
||||
|
||||
#: contrib/admin/templates/admin/invalid_setup.html:7
|
||||
msgid ""
|
||||
"Something's wrong with your database installation. Make sure the appropriate "
|
||||
@ -750,6 +754,15 @@ msgstr ""
|
||||
msgid "Show all"
|
||||
msgstr "Mostrar tudo"
|
||||
|
||||
#: contrib/admin/templates/admin/pagination.html:11
|
||||
#: contrib/admin/templates/admin/submit_line.html:3
|
||||
msgid "Save"
|
||||
msgstr "Salvar"
|
||||
|
||||
#: contrib/admin/templates/admin/search_form.html:8
|
||||
msgid "Search"
|
||||
msgstr "Pesquisar"
|
||||
|
||||
#: contrib/admin/templates/admin/search_form.html:10
|
||||
#, python-format
|
||||
msgid "1 result"
|
||||
@ -762,10 +775,6 @@ msgstr[1] "%(counter)s resultados"
|
||||
msgid "%(full_result_count)s total"
|
||||
msgstr "%(full_result_count)s total"
|
||||
|
||||
#: contrib/admin/templates/admin/submit_line.html:3
|
||||
msgid "Save"
|
||||
msgstr "Salvar"
|
||||
|
||||
#: contrib/admin/templates/admin/submit_line.html:5
|
||||
msgid "Save as new"
|
||||
msgstr "Salvar como novo"
|
||||
@ -991,144 +1000,145 @@ msgstr "site"
|
||||
msgid "template"
|
||||
msgstr "template"
|
||||
|
||||
#: contrib/admindocs/views.py:58 contrib/admindocs/views.py:60
|
||||
#: contrib/admindocs/views.py:62
|
||||
#: contrib/admindocs/views.py:61 contrib/admindocs/views.py:63
|
||||
#: contrib/admindocs/views.py:65
|
||||
msgid "tag:"
|
||||
msgstr "tag:"
|
||||
|
||||
#: contrib/admindocs/views.py:91 contrib/admindocs/views.py:93
|
||||
#: contrib/admindocs/views.py:95
|
||||
#: contrib/admindocs/views.py:94 contrib/admindocs/views.py:96
|
||||
#: contrib/admindocs/views.py:98
|
||||
msgid "filter:"
|
||||
msgstr "filtro:"
|
||||
|
||||
#: contrib/admindocs/views.py:155 contrib/admindocs/views.py:157
|
||||
#: contrib/admindocs/views.py:159
|
||||
#: contrib/admindocs/views.py:158 contrib/admindocs/views.py:160
|
||||
#: contrib/admindocs/views.py:162
|
||||
msgid "view:"
|
||||
msgstr "view:"
|
||||
|
||||
#: contrib/admindocs/views.py:187
|
||||
#: contrib/admindocs/views.py:190
|
||||
#, python-format
|
||||
msgid "App %r not found"
|
||||
msgstr "Aplicação %r não encontrada"
|
||||
|
||||
#: contrib/admindocs/views.py:194
|
||||
#: contrib/admindocs/views.py:197
|
||||
#, python-format
|
||||
msgid "Model %(model_name)r not found in app %(app_label)r"
|
||||
msgstr "Model %(model_name)r não encontrado na aplicação %(app_label)r"
|
||||
|
||||
#: contrib/admindocs/views.py:206
|
||||
#: contrib/admindocs/views.py:209
|
||||
#, python-format
|
||||
msgid "the related `%(app_label)s.%(data_type)s` object"
|
||||
msgstr "o objeto `%(app_label)s.%(data_type)s` relacionado"
|
||||
|
||||
#: contrib/admindocs/views.py:206 contrib/admindocs/views.py:228
|
||||
#: contrib/admindocs/views.py:242 contrib/admindocs/views.py:247
|
||||
#: contrib/admindocs/views.py:209 contrib/admindocs/views.py:228
|
||||
#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:247
|
||||
#: contrib/admindocs/views.py:261 contrib/admindocs/views.py:266
|
||||
msgid "model:"
|
||||
msgstr "model:"
|
||||
|
||||
#: contrib/admindocs/views.py:237
|
||||
#: contrib/admindocs/views.py:224 contrib/admindocs/views.py:256
|
||||
#, python-format
|
||||
msgid "related `%(app_label)s.%(object_name)s` objects"
|
||||
msgstr "objetos `%(app_label)s.%(object_name)s` relacionados"
|
||||
|
||||
#: contrib/admindocs/views.py:242
|
||||
#: contrib/admindocs/views.py:228 contrib/admindocs/views.py:261
|
||||
#, python-format
|
||||
msgid "all %s"
|
||||
msgstr "todos %s"
|
||||
|
||||
#: contrib/admindocs/views.py:247
|
||||
#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:266
|
||||
#, python-format
|
||||
msgid "number of %s"
|
||||
msgstr "número de %s"
|
||||
|
||||
#: contrib/admindocs/views.py:252
|
||||
#: contrib/admindocs/views.py:271
|
||||
#, python-format
|
||||
msgid "Fields on %s objects"
|
||||
msgstr "Campos nos objetos %s"
|
||||
|
||||
#: contrib/admindocs/views.py:315 contrib/admindocs/views.py:326
|
||||
#: contrib/admindocs/views.py:328 contrib/admindocs/views.py:334
|
||||
#: contrib/admindocs/views.py:335 contrib/admindocs/views.py:337
|
||||
#: contrib/admindocs/views.py:334 contrib/admindocs/views.py:345
|
||||
#: contrib/admindocs/views.py:347 contrib/admindocs/views.py:353
|
||||
#: contrib/admindocs/views.py:354 contrib/admindocs/views.py:356
|
||||
msgid "Integer"
|
||||
msgstr "Inteiro"
|
||||
|
||||
#: contrib/admindocs/views.py:316
|
||||
#: contrib/admindocs/views.py:335
|
||||
msgid "Boolean (Either True or False)"
|
||||
msgstr "Booleano (Verdadeiro ou Falso)"
|
||||
|
||||
#: contrib/admindocs/views.py:317 contrib/admindocs/views.py:336
|
||||
#: contrib/admindocs/views.py:336 contrib/admindocs/views.py:355
|
||||
#, python-format
|
||||
msgid "String (up to %(max_length)s)"
|
||||
msgstr "String (até %(max_length)s)"
|
||||
|
||||
#: contrib/admindocs/views.py:318
|
||||
#: contrib/admindocs/views.py:337
|
||||
msgid "Comma-separated integers"
|
||||
msgstr "Inteiros separados por vírgula"
|
||||
|
||||
#: contrib/admindocs/views.py:319
|
||||
#: contrib/admindocs/views.py:338
|
||||
msgid "Date (without time)"
|
||||
msgstr "Data (sem hora)"
|
||||
|
||||
#: contrib/admindocs/views.py:320
|
||||
#: contrib/admindocs/views.py:339
|
||||
msgid "Date (with time)"
|
||||
msgstr "Data e hora"
|
||||
|
||||
#: contrib/admindocs/views.py:321
|
||||
#: contrib/admindocs/views.py:340
|
||||
msgid "Decimal number"
|
||||
msgstr "Número decimal"
|
||||
|
||||
#: contrib/admindocs/views.py:322
|
||||
#: contrib/admindocs/views.py:341
|
||||
msgid "E-mail address"
|
||||
msgstr "Endereço de e-mail"
|
||||
|
||||
#: contrib/admindocs/views.py:323 contrib/admindocs/views.py:324
|
||||
#: contrib/admindocs/views.py:327
|
||||
#: contrib/admindocs/views.py:342 contrib/admindocs/views.py:343
|
||||
#: contrib/admindocs/views.py:346
|
||||
msgid "File path"
|
||||
msgstr "Caminho de arquivo"
|
||||
|
||||
#: contrib/admindocs/views.py:325
|
||||
#: contrib/admindocs/views.py:344
|
||||
msgid "Floating point number"
|
||||
msgstr "Número de ponto flutuante"
|
||||
|
||||
#: contrib/admindocs/views.py:329 contrib/comments/models.py:60
|
||||
#: contrib/admindocs/views.py:348 contrib/comments/models.py:60
|
||||
msgid "IP address"
|
||||
msgstr "Endereço IP"
|
||||
|
||||
#: contrib/admindocs/views.py:331
|
||||
#: contrib/admindocs/views.py:350
|
||||
msgid "Boolean (Either True, False or None)"
|
||||
msgstr "Booleano (Verdadeiro, Falso ou Nada)"
|
||||
|
||||
#: contrib/admindocs/views.py:332
|
||||
#: contrib/admindocs/views.py:351
|
||||
msgid "Relation to parent model"
|
||||
msgstr "Relação com o modelo pai"
|
||||
|
||||
#: contrib/admindocs/views.py:333
|
||||
#: contrib/admindocs/views.py:352
|
||||
msgid "Phone number"
|
||||
msgstr "Número de telefone"
|
||||
|
||||
#: contrib/admindocs/views.py:338
|
||||
#: contrib/admindocs/views.py:357
|
||||
msgid "Text"
|
||||
msgstr "Texto"
|
||||
|
||||
#: contrib/admindocs/views.py:339
|
||||
#: contrib/admindocs/views.py:358
|
||||
msgid "Time"
|
||||
msgstr "Hora"
|
||||
|
||||
#: contrib/admindocs/views.py:340 contrib/comments/forms.py:95
|
||||
#: contrib/admindocs/views.py:359 contrib/comments/forms.py:95
|
||||
#: contrib/comments/templates/comments/moderation_queue.html:37
|
||||
#: contrib/flatpages/admin.py:8 contrib/flatpages/models.py:7
|
||||
msgid "URL"
|
||||
msgstr "URL"
|
||||
|
||||
#: contrib/admindocs/views.py:341
|
||||
#: contrib/admindocs/views.py:360
|
||||
msgid "U.S. state (two uppercase letters)"
|
||||
msgstr "Estado dos EUA (duas letras maiúsculas)"
|
||||
|
||||
#: contrib/admindocs/views.py:342
|
||||
#: contrib/admindocs/views.py:361
|
||||
msgid "XML text"
|
||||
msgstr "Texto XML"
|
||||
|
||||
#: contrib/admindocs/views.py:368
|
||||
#: contrib/admindocs/views.py:387
|
||||
#, python-format
|
||||
msgid "%s does not appear to be a urlpattern object"
|
||||
msgstr "%s não aparenta ser um objeto urlpattern"
|
||||
@ -1776,18 +1786,26 @@ msgstr ""
|
||||
"Desculpe, mas seu formulário expirou. Por favor, continue preenchendo o "
|
||||
"formulário desta página."
|
||||
|
||||
#: contrib/gis/forms/fields.py:14
|
||||
#: contrib/gis/forms/fields.py:17
|
||||
msgid "No geometry value provided."
|
||||
msgstr "Nenhum valor geométrico fornecido."
|
||||
|
||||
#: contrib/gis/forms/fields.py:15
|
||||
#: contrib/gis/forms/fields.py:18
|
||||
msgid "Invalid geometry value."
|
||||
msgstr "Valor geométrico inválido."
|
||||
|
||||
#: contrib/gis/forms/fields.py:16
|
||||
#: contrib/gis/forms/fields.py:19
|
||||
msgid "Invalid geometry type."
|
||||
msgstr "Tipo geométrico inválido."
|
||||
|
||||
#: contrib/gis/forms/fields.py:20
|
||||
msgid ""
|
||||
"An error occurred when transforming the geometry to the SRID of the geometry "
|
||||
"form field."
|
||||
msgstr ""
|
||||
"Ocorreu um erro ao transformar a geometria para o SRID do campo de "
|
||||
"formulário de geometria."
|
||||
|
||||
#: contrib/humanize/templatetags/humanize.py:19
|
||||
msgid "th"
|
||||
msgstr "º"
|
||||
@ -3014,7 +3032,9 @@ msgstr "O Número de Identificação Tributária (NIP) é incorreto."
|
||||
|
||||
#: contrib/localflavor/pl/forms.py:109
|
||||
msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
|
||||
msgstr "O Número Nacional de Registro de Negócios (REGON) consiste em 9 ou 14 dígitos."
|
||||
msgstr ""
|
||||
"O Número Nacional de Registro de Negócios (REGON) consiste em 9 ou 14 "
|
||||
"dígitos."
|
||||
|
||||
#: contrib/localflavor/pl/forms.py:110
|
||||
msgid "Wrong checksum for the National Business Register Number (REGON)."
|
||||
@ -3903,14 +3923,14 @@ msgstr "Este valor deve ser None, True ou False."
|
||||
msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
|
||||
msgstr "Informe uma hora válida no formato HH:MM[:ss[.uuuuuu]]."
|
||||
|
||||
#: db/models/fields/related.py:792
|
||||
#: db/models/fields/related.py:816
|
||||
msgid ""
|
||||
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
|
||||
msgstr ""
|
||||
"Mantenha pressionado \"Control\" (ou \"Command\" no Mac) para selecionar "
|
||||
"mais de uma opção."
|
||||
|
||||
#: db/models/fields/related.py:870
|
||||
#: db/models/fields/related.py:894
|
||||
#, python-format
|
||||
msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
|
||||
msgid_plural ""
|
||||
@ -3977,11 +3997,11 @@ msgid "Ensure that there are no more than %s digits before the decimal point."
|
||||
msgstr ""
|
||||
"Certifique-se de que não tenha mais de %s dígitos antes do ponto decimal."
|
||||
|
||||
#: forms/fields.py:288 forms/fields.py:862
|
||||
#: forms/fields.py:288 forms/fields.py:863
|
||||
msgid "Enter a valid date."
|
||||
msgstr "Informe uma data válida."
|
||||
|
||||
#: forms/fields.py:322 forms/fields.py:863
|
||||
#: forms/fields.py:322 forms/fields.py:864
|
||||
msgid "Enter a valid time."
|
||||
msgstr "Informe uma hora válida."
|
||||
|
||||
@ -4025,20 +4045,21 @@ msgstr "Informe uma URL válida."
|
||||
msgid "This URL appears to be a broken link."
|
||||
msgstr "A URL %s aparenta ser um link quebrado."
|
||||
|
||||
#: forms/fields.py:624 forms/fields.py:702
|
||||
#: forms/fields.py:625 forms/fields.py:703
|
||||
#, python-format
|
||||
msgid "Select a valid choice. %(value)s is not one of the available choices."
|
||||
msgstr "Faça uma escolha válida. %(value)s não está disponível."
|
||||
|
||||
#: forms/fields.py:703 forms/fields.py:764 forms/models.py:776
|
||||
#: forms/fields.py:704 forms/fields.py:765 forms/models.py:1003
|
||||
#: forms/models_flymake.py:1003
|
||||
msgid "Enter a list of values."
|
||||
msgstr "Informe uma lista de valores."
|
||||
|
||||
#: forms/fields.py:891
|
||||
#: forms/fields.py:892
|
||||
msgid "Enter a valid IPv4 address."
|
||||
msgstr "Informe um endereço IPv4 válido."
|
||||
|
||||
#: forms/fields.py:901
|
||||
#: forms/fields.py:902
|
||||
msgid ""
|
||||
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
|
||||
msgstr ""
|
||||
@ -4049,25 +4070,57 @@ msgstr ""
|
||||
msgid "Order"
|
||||
msgstr "Ordem"
|
||||
|
||||
#: forms/models.py:299 forms/models.py:308
|
||||
#: forms/models.py:367 forms/models_flymake.py:367
|
||||
#, python-format
|
||||
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
|
||||
msgstr "%(field_name)s deverá ser único para %(date_field)s %(lookup)s."
|
||||
|
||||
#: forms/models.py:381 forms/models.py:389 forms/models_flymake.py:381
|
||||
#: forms/models_flymake.py:389
|
||||
#, python-format
|
||||
msgid "%(model_name)s with this %(field_label)s already exists."
|
||||
msgstr "%(model_name)s com este %(field_label)s já existe."
|
||||
|
||||
#: forms/models.py:651
|
||||
#: forms/models.py:594 forms/models_flymake.py:594
|
||||
#, python-format
|
||||
msgid "Please correct the duplicate data for %(field)s."
|
||||
msgstr "Por favor, corrija o valor duplicado para %(field)s."
|
||||
|
||||
#: forms/models.py:598 forms/models_flymake.py:598
|
||||
#, python-format
|
||||
msgid "Please correct the duplicate data for %(field)s, which must be unique."
|
||||
msgstr ""
|
||||
"Por favor, corrija o valor duplicado para %(field)s, o qual deve ser único"
|
||||
|
||||
#: forms/models.py:604 forms/models_flymake.py:604
|
||||
#, 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 os dados duplicados em %(field_name)s que deverá ser único "
|
||||
"para o %(lookup)s em %(date_field)s."
|
||||
|
||||
#: forms/models.py:612 forms/models_flymake.py:612
|
||||
msgid "Please correct the duplicate values below."
|
||||
msgstr "Por favor, corrija os valores duplicados abaixo."
|
||||
|
||||
#: forms/models.py:867 forms/models_flymake.py:867
|
||||
msgid "The inline foreign key did not match the parent instance primary key."
|
||||
msgstr ""
|
||||
"A chave estrangeira no inline não coincide com a chave primária na instância "
|
||||
"pai."
|
||||
|
||||
#: forms/models.py:706
|
||||
#: forms/models.py:930 forms/models_flymake.py:930
|
||||
msgid "Select a valid choice. That choice is not one of the available choices."
|
||||
msgstr "Faça uma escolha válida. Sua escolha não é uma das disponíveis."
|
||||
|
||||
#: forms/models.py:777
|
||||
#: forms/models.py:1004 forms/models_flymake.py:1004
|
||||
#, python-format
|
||||
msgid "Select a valid choice. %s is not one of the available choices."
|
||||
msgstr "Faça uma escolha válida. %s não está disponível."
|
||||
|
||||
#: forms/models.py:779
|
||||
#: forms/models.py:1006 forms/models_flymake.py:1006
|
||||
#, python-format
|
||||
msgid "\"%s\" is not a valid value for a primary key."
|
||||
msgstr "\"%s\" não é um valor válido para uma chave primária."
|
||||
@ -4098,27 +4151,27 @@ msgstr "%.1f MB"
|
||||
msgid "%.1f GB"
|
||||
msgstr "%.1f GB"
|
||||
|
||||
#: utils/dateformat.py:41
|
||||
#: utils/dateformat.py:42
|
||||
msgid "p.m."
|
||||
msgstr "p.m."
|
||||
|
||||
#: utils/dateformat.py:42
|
||||
#: utils/dateformat.py:43
|
||||
msgid "a.m."
|
||||
msgstr "a.m."
|
||||
|
||||
#: utils/dateformat.py:47
|
||||
#: utils/dateformat.py:48
|
||||
msgid "PM"
|
||||
msgstr "PM"
|
||||
|
||||
#: utils/dateformat.py:48
|
||||
#: utils/dateformat.py:49
|
||||
msgid "AM"
|
||||
msgstr "AM"
|
||||
|
||||
#: utils/dateformat.py:97
|
||||
#: utils/dateformat.py:98
|
||||
msgid "midnight"
|
||||
msgstr "meia noite"
|
||||
|
||||
#: utils/dateformat.py:99
|
||||
#: utils/dateformat.py:100
|
||||
msgid "noon"
|
||||
msgstr "meio dia"
|
||||
|
||||
|
||||
Binary file not shown.
@ -5,7 +5,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Django\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2009-04-10 17:08+0400\n"
|
||||
"POT-Creation-Date: 2009-07-23 00:31+0400\n"
|
||||
"PO-Revision-Date: 2009-04-10 18:37+0400\n"
|
||||
"Last-Translator: Andrew Fedorov <dmmdrs@gmail.com>\n"
|
||||
"Language-Team: Russian\n"
|
||||
@ -218,16 +218,16 @@ msgstr "Упрощенный китайский"
|
||||
msgid "Traditional Chinese"
|
||||
msgstr "Традиционный китайский"
|
||||
|
||||
#: contrib/admin/actions.py:56
|
||||
#: contrib/admin/actions.py:60
|
||||
#, python-format
|
||||
msgid "Successfully deleted %(count)d %(items)s."
|
||||
msgstr "Успешно удалено %(count)d %(items)s."
|
||||
msgstr "Успешно удалены %(count)d %(items)s."
|
||||
|
||||
#: contrib/admin/actions.py:63 contrib/admin/options.py:1023
|
||||
#: contrib/admin/actions.py:67 contrib/admin/options.py:1027
|
||||
msgid "Are you sure?"
|
||||
msgstr "Вы уверены?"
|
||||
|
||||
#: contrib/admin/actions.py:81
|
||||
#: contrib/admin/actions.py:85
|
||||
#, python-format
|
||||
msgid "Delete selected %(verbose_name_plural)s"
|
||||
msgstr "Удалить выбранные %(verbose_name_plural)s"
|
||||
@ -266,15 +266,15 @@ msgstr "Этот месяц"
|
||||
msgid "This year"
|
||||
msgstr "Этот год"
|
||||
|
||||
#: contrib/admin/filterspecs.py:147 forms/widgets.py:413
|
||||
#: contrib/admin/filterspecs.py:147 forms/widgets.py:434
|
||||
msgid "Yes"
|
||||
msgstr "Да"
|
||||
|
||||
#: contrib/admin/filterspecs.py:147 forms/widgets.py:413
|
||||
#: contrib/admin/filterspecs.py:147 forms/widgets.py:434
|
||||
msgid "No"
|
||||
msgstr "Нет"
|
||||
|
||||
#: contrib/admin/filterspecs.py:154 forms/widgets.py:413
|
||||
#: contrib/admin/filterspecs.py:154 forms/widgets.py:434
|
||||
msgid "Unknown"
|
||||
msgstr "Неизвестно"
|
||||
|
||||
@ -314,56 +314,57 @@ msgstr "записи в журнале"
|
||||
msgid "None"
|
||||
msgstr "Нет"
|
||||
|
||||
#: contrib/admin/options.py:517
|
||||
#: contrib/admin/options.py:519
|
||||
#, python-format
|
||||
msgid "Changed %s."
|
||||
msgstr "Изменён %s."
|
||||
|
||||
#: contrib/admin/options.py:517 contrib/admin/options.py:527
|
||||
#: contrib/comments/templates/comments/preview.html:16 forms/models.py:306
|
||||
#: contrib/admin/options.py:519 contrib/admin/options.py:529
|
||||
#: contrib/comments/templates/comments/preview.html:16 forms/models.py:388
|
||||
#: forms/models.py:600
|
||||
msgid "and"
|
||||
msgstr "и"
|
||||
|
||||
#: contrib/admin/options.py:522
|
||||
#: contrib/admin/options.py:524
|
||||
#, python-format
|
||||
msgid "Added %(name)s \"%(object)s\"."
|
||||
msgstr "Добавлен %(name)s \"%(object)s\"."
|
||||
|
||||
#: contrib/admin/options.py:526
|
||||
#: contrib/admin/options.py:528
|
||||
#, python-format
|
||||
msgid "Changed %(list)s for %(name)s \"%(object)s\"."
|
||||
msgstr "Изменены %(list)s для %(name)s \"%(object)s\"."
|
||||
|
||||
#: contrib/admin/options.py:531
|
||||
#: contrib/admin/options.py:533
|
||||
#, python-format
|
||||
msgid "Deleted %(name)s \"%(object)s\"."
|
||||
msgstr "Удалён %(name)s \"%(object)s\"."
|
||||
|
||||
#: contrib/admin/options.py:535
|
||||
#: contrib/admin/options.py:537
|
||||
msgid "No fields changed."
|
||||
msgstr "Ни одно поле не изменено."
|
||||
|
||||
#: contrib/admin/options.py:596 contrib/auth/admin.py:67
|
||||
#: contrib/admin/options.py:599 contrib/auth/admin.py:67
|
||||
#, python-format
|
||||
msgid "The %(name)s \"%(obj)s\" was added successfully."
|
||||
msgstr "%(name)s \"%(obj)s\" был успешно добавлен."
|
||||
|
||||
#: contrib/admin/options.py:600 contrib/admin/options.py:633
|
||||
#: contrib/admin/options.py:603 contrib/admin/options.py:636
|
||||
#: contrib/auth/admin.py:75
|
||||
msgid "You may edit it again below."
|
||||
msgstr "Ниже вы можете снова его отредактировать."
|
||||
|
||||
#: contrib/admin/options.py:610 contrib/admin/options.py:643
|
||||
#: contrib/admin/options.py:613 contrib/admin/options.py:646
|
||||
#, python-format
|
||||
msgid "You may add another %s below."
|
||||
msgstr "Ниже вы можете добавить еще один %s."
|
||||
|
||||
#: contrib/admin/options.py:631
|
||||
#: contrib/admin/options.py:634
|
||||
#, python-format
|
||||
msgid "The %(name)s \"%(obj)s\" was changed successfully."
|
||||
msgstr "%(name)s \"%(obj)s\" был успешно изменён."
|
||||
|
||||
#: contrib/admin/options.py:639
|
||||
#: contrib/admin/options.py:642
|
||||
#, python-format
|
||||
msgid ""
|
||||
"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
|
||||
@ -371,26 +372,26 @@ msgstr ""
|
||||
"%(name)s \"%(obj)s\" был успешно добавлен. Ниже вы можете снова его "
|
||||
"отредактировать."
|
||||
|
||||
#: contrib/admin/options.py:770
|
||||
#: contrib/admin/options.py:773
|
||||
#, python-format
|
||||
msgid "Add %s"
|
||||
msgstr "Добавить %s"
|
||||
|
||||
#: contrib/admin/options.py:801 contrib/admin/options.py:1001
|
||||
#: contrib/admin/options.py:804 contrib/admin/options.py:1005
|
||||
#, python-format
|
||||
msgid "%(name)s object with primary key %(key)r does not exist."
|
||||
msgstr "%(name)s с первичным ключом %(key)r не существует."
|
||||
|
||||
#: contrib/admin/options.py:858
|
||||
#: contrib/admin/options.py:861
|
||||
#, python-format
|
||||
msgid "Change %s"
|
||||
msgstr "Изменить %s"
|
||||
|
||||
#: contrib/admin/options.py:902
|
||||
#: contrib/admin/options.py:905
|
||||
msgid "Database error"
|
||||
msgstr "Ошибка базы данных"
|
||||
|
||||
#: contrib/admin/options.py:938
|
||||
#: contrib/admin/options.py:941
|
||||
#, python-format
|
||||
msgid "%(count)s %(name)s was changed successfully."
|
||||
msgid_plural "%(count)s %(name)s were changed successfully."
|
||||
@ -398,17 +399,17 @@ msgstr[0] "%(count)s %(name)s был успешно изменён."
|
||||
msgstr[1] "%(count)s %(name)s были успешно изменены."
|
||||
msgstr[2] "%(count)s %(name)s были успешно изменены."
|
||||
|
||||
#: contrib/admin/options.py:1016
|
||||
#: contrib/admin/options.py:1020
|
||||
#, python-format
|
||||
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
|
||||
msgstr "%(name)s \"%(obj)s\" был успешно удалён."
|
||||
|
||||
#: contrib/admin/options.py:1052
|
||||
#: contrib/admin/options.py:1057
|
||||
#, python-format
|
||||
msgid "Change history: %s"
|
||||
msgstr "История изменений: %s"
|
||||
|
||||
#: contrib/admin/sites.py:20 contrib/admin/views/decorators.py:14
|
||||
#: contrib/admin/sites.py:21 contrib/admin/views/decorators.py:14
|
||||
#: contrib/auth/forms.py:80
|
||||
msgid ""
|
||||
"Please enter a correct username and password. Note that both fields are case-"
|
||||
@ -417,11 +418,11 @@ msgstr ""
|
||||
"Пожалуйста, введите верные имя пользователя и пароль. Помните, оба поля "
|
||||
"чувствительны к регистру."
|
||||
|
||||
#: contrib/admin/sites.py:278 contrib/admin/views/decorators.py:40
|
||||
#: contrib/admin/sites.py:285 contrib/admin/views/decorators.py:40
|
||||
msgid "Please log in again, because your session has expired."
|
||||
msgstr "Пожалуйста, войдите снова, поскольку ваша сессия устарела."
|
||||
|
||||
#: contrib/admin/sites.py:285 contrib/admin/views/decorators.py:47
|
||||
#: contrib/admin/sites.py:292 contrib/admin/views/decorators.py:47
|
||||
msgid ""
|
||||
"Looks like your browser isn't configured to accept cookies. Please enable "
|
||||
"cookies, reload this page, and try again."
|
||||
@ -429,29 +430,29 @@ msgstr ""
|
||||
"Похоже, ваш браузер не настроен на прием cookies. Пожалуйста, включите "
|
||||
"cookies, перезагрузите страницу и попытайтесь снова."
|
||||
|
||||
#: contrib/admin/sites.py:301 contrib/admin/sites.py:307
|
||||
#: contrib/admin/sites.py:308 contrib/admin/sites.py:314
|
||||
#: contrib/admin/views/decorators.py:66
|
||||
msgid "Usernames cannot contain the '@' character."
|
||||
msgstr "Имя пользователя не может содержать символ '@'."
|
||||
|
||||
#: contrib/admin/sites.py:304 contrib/admin/views/decorators.py:62
|
||||
#: contrib/admin/sites.py:311 contrib/admin/views/decorators.py:62
|
||||
#, python-format
|
||||
msgid "Your e-mail address is not your username. Try '%s' instead."
|
||||
msgstr ""
|
||||
"Ваш адрес электронной почты не является вашим именем пользователя. "
|
||||
"Попробуйте '%s' взамен."
|
||||
|
||||
#: contrib/admin/sites.py:360
|
||||
#: contrib/admin/sites.py:367
|
||||
msgid "Site administration"
|
||||
msgstr "Администрирование сайта"
|
||||
|
||||
#: contrib/admin/sites.py:373 contrib/admin/templates/admin/login.html:26
|
||||
#: contrib/admin/sites.py:381 contrib/admin/templates/admin/login.html:26
|
||||
#: contrib/admin/templates/registration/password_reset_complete.html:14
|
||||
#: contrib/admin/views/decorators.py:20
|
||||
msgid "Log in"
|
||||
msgstr "Войти"
|
||||
|
||||
#: contrib/admin/sites.py:417
|
||||
#: contrib/admin/sites.py:426
|
||||
#, python-format
|
||||
msgid "%s administration"
|
||||
msgstr "%s администрирование"
|
||||
@ -486,7 +487,7 @@ msgstr "Изменить:"
|
||||
msgid "Lookup"
|
||||
msgstr "Поиск"
|
||||
|
||||
#: contrib/admin/widgets.py:236
|
||||
#: contrib/admin/widgets.py:235
|
||||
msgid "Add Another"
|
||||
msgstr "Добавить еще"
|
||||
|
||||
@ -501,7 +502,7 @@ msgstr "К сожалению, запрашиваемая вами страни
|
||||
|
||||
#: contrib/admin/templates/admin/500.html:4
|
||||
#: contrib/admin/templates/admin/app_index.html:8
|
||||
#: contrib/admin/templates/admin/base.html:33
|
||||
#: contrib/admin/templates/admin/base.html:54
|
||||
#: contrib/admin/templates/admin/change_form.html:17
|
||||
#: contrib/admin/templates/admin/change_list.html:25
|
||||
#: contrib/admin/templates/admin/delete_confirmation.html:6
|
||||
@ -545,9 +546,8 @@ msgid "Run the selected action"
|
||||
msgstr "Выполнить выбранное действие"
|
||||
|
||||
#: contrib/admin/templates/admin/actions.html:4
|
||||
#: contrib/admin/templates/admin/search_form.html:8
|
||||
msgid "Go"
|
||||
msgstr "Вперёд"
|
||||
msgstr "Выполнить"
|
||||
|
||||
#: contrib/admin/templates/admin/app_index.html:10
|
||||
#: contrib/admin/templates/admin/index.html:19
|
||||
@ -555,18 +555,18 @@ msgstr "Вперёд"
|
||||
msgid "%(name)s"
|
||||
msgstr "%(name)s"
|
||||
|
||||
#: contrib/admin/templates/admin/base.html:28
|
||||
#: contrib/admin/templates/admin/base.html:27
|
||||
msgid "Welcome,"
|
||||
msgstr "Добро пожаловать,"
|
||||
|
||||
#: contrib/admin/templates/admin/base.html:28
|
||||
#: contrib/admin/templates/admin/base.html:32
|
||||
#: contrib/admin/templates/registration/password_change_done.html:3
|
||||
#: contrib/admin/templates/registration/password_change_form.html:3
|
||||
#: contrib/admindocs/templates/admin_doc/bookmarklets.html:3
|
||||
msgid "Documentation"
|
||||
msgstr "Документация"
|
||||
|
||||
#: contrib/admin/templates/admin/base.html:28
|
||||
#: contrib/admin/templates/admin/base.html:40
|
||||
#: contrib/admin/templates/admin/auth/user/change_password.html:14
|
||||
#: contrib/admin/templates/admin/auth/user/change_password.html:47
|
||||
#: contrib/admin/templates/registration/password_change_done.html:3
|
||||
@ -574,7 +574,7 @@ msgstr "Документация"
|
||||
msgid "Change password"
|
||||
msgstr "Изменить пароль"
|
||||
|
||||
#: contrib/admin/templates/admin/base.html:28
|
||||
#: contrib/admin/templates/admin/base.html:47
|
||||
#: contrib/admin/templates/registration/password_change_done.html:3
|
||||
#: contrib/admin/templates/registration/password_change_form.html:3
|
||||
msgid "Log out"
|
||||
@ -705,6 +705,10 @@ msgstr "Мои действия"
|
||||
msgid "None available"
|
||||
msgstr "Недоступно"
|
||||
|
||||
#: contrib/admin/templates/admin/index.html:72
|
||||
msgid "Unknown content"
|
||||
msgstr "Неизвестный тип"
|
||||
|
||||
#: contrib/admin/templates/admin/invalid_setup.html:7
|
||||
msgid ""
|
||||
"Something's wrong with your database installation. Make sure the appropriate "
|
||||
@ -753,6 +757,15 @@ msgstr ""
|
||||
msgid "Show all"
|
||||
msgstr "Показать все"
|
||||
|
||||
#: contrib/admin/templates/admin/pagination.html:11
|
||||
#: contrib/admin/templates/admin/submit_line.html:3
|
||||
msgid "Save"
|
||||
msgstr "Сохранить"
|
||||
|
||||
#: contrib/admin/templates/admin/search_form.html:8
|
||||
msgid "Search"
|
||||
msgstr "Найти"
|
||||
|
||||
#: contrib/admin/templates/admin/search_form.html:10
|
||||
#, python-format
|
||||
msgid "1 result"
|
||||
@ -766,10 +779,6 @@ msgstr[2] "%(counter)s результатов"
|
||||
msgid "%(full_result_count)s total"
|
||||
msgstr "%(full_result_count)s всего"
|
||||
|
||||
#: contrib/admin/templates/admin/submit_line.html:3
|
||||
msgid "Save"
|
||||
msgstr "Сохранить"
|
||||
|
||||
#: contrib/admin/templates/admin/submit_line.html:5
|
||||
msgid "Save as new"
|
||||
msgstr "Сохранить как новый объект"
|
||||
@ -996,144 +1005,145 @@ msgstr "сайт"
|
||||
msgid "template"
|
||||
msgstr "шаблон"
|
||||
|
||||
#: contrib/admindocs/views.py:58 contrib/admindocs/views.py:60
|
||||
#: contrib/admindocs/views.py:62
|
||||
#: contrib/admindocs/views.py:61 contrib/admindocs/views.py:63
|
||||
#: contrib/admindocs/views.py:65
|
||||
msgid "tag:"
|
||||
msgstr "метка:"
|
||||
|
||||
#: contrib/admindocs/views.py:91 contrib/admindocs/views.py:93
|
||||
#: contrib/admindocs/views.py:95
|
||||
#: contrib/admindocs/views.py:94 contrib/admindocs/views.py:96
|
||||
#: contrib/admindocs/views.py:98
|
||||
msgid "filter:"
|
||||
msgstr "фильтр:"
|
||||
|
||||
#: contrib/admindocs/views.py:155 contrib/admindocs/views.py:157
|
||||
#: contrib/admindocs/views.py:159
|
||||
#: contrib/admindocs/views.py:158 contrib/admindocs/views.py:160
|
||||
#: contrib/admindocs/views.py:162
|
||||
msgid "view:"
|
||||
msgstr "view:"
|
||||
|
||||
#: contrib/admindocs/views.py:187
|
||||
#: contrib/admindocs/views.py:190
|
||||
#, python-format
|
||||
msgid "App %r not found"
|
||||
msgstr "Приложение %r не найдено"
|
||||
|
||||
#: contrib/admindocs/views.py:194
|
||||
#: contrib/admindocs/views.py:197
|
||||
#, python-format
|
||||
msgid "Model %(model_name)r not found in app %(app_label)r"
|
||||
msgstr "Модель %(model_name)r не найдена в приложении %(app_label)r"
|
||||
|
||||
#: contrib/admindocs/views.py:206
|
||||
#: contrib/admindocs/views.py:209
|
||||
#, python-format
|
||||
msgid "the related `%(app_label)s.%(data_type)s` object"
|
||||
msgstr "зависимый `%(app_label)s.%(data_type)s` объект"
|
||||
|
||||
#: contrib/admindocs/views.py:206 contrib/admindocs/views.py:228
|
||||
#: contrib/admindocs/views.py:242 contrib/admindocs/views.py:247
|
||||
#: contrib/admindocs/views.py:209 contrib/admindocs/views.py:228
|
||||
#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:247
|
||||
#: contrib/admindocs/views.py:261 contrib/admindocs/views.py:266
|
||||
msgid "model:"
|
||||
msgstr "модель:"
|
||||
|
||||
#: contrib/admindocs/views.py:237
|
||||
#: contrib/admindocs/views.py:224 contrib/admindocs/views.py:256
|
||||
#, python-format
|
||||
msgid "related `%(app_label)s.%(object_name)s` objects"
|
||||
msgstr "зависимые `%(app_label)s.%(object_name)s` объекты"
|
||||
|
||||
#: contrib/admindocs/views.py:242
|
||||
#: contrib/admindocs/views.py:228 contrib/admindocs/views.py:261
|
||||
#, python-format
|
||||
msgid "all %s"
|
||||
msgstr "все %s"
|
||||
|
||||
#: contrib/admindocs/views.py:247
|
||||
#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:266
|
||||
#, python-format
|
||||
msgid "number of %s"
|
||||
msgstr "количество %s"
|
||||
|
||||
#: contrib/admindocs/views.py:252
|
||||
#: contrib/admindocs/views.py:271
|
||||
#, python-format
|
||||
msgid "Fields on %s objects"
|
||||
msgstr "Поля для %s объектов"
|
||||
|
||||
#: contrib/admindocs/views.py:315 contrib/admindocs/views.py:326
|
||||
#: contrib/admindocs/views.py:328 contrib/admindocs/views.py:334
|
||||
#: contrib/admindocs/views.py:335 contrib/admindocs/views.py:337
|
||||
#: contrib/admindocs/views.py:334 contrib/admindocs/views.py:345
|
||||
#: contrib/admindocs/views.py:347 contrib/admindocs/views.py:353
|
||||
#: contrib/admindocs/views.py:354 contrib/admindocs/views.py:356
|
||||
msgid "Integer"
|
||||
msgstr "Целое"
|
||||
|
||||
#: contrib/admindocs/views.py:316
|
||||
#: contrib/admindocs/views.py:335
|
||||
msgid "Boolean (Either True or False)"
|
||||
msgstr "Логическое (True или False)"
|
||||
|
||||
#: contrib/admindocs/views.py:317 contrib/admindocs/views.py:336
|
||||
#: contrib/admindocs/views.py:336 contrib/admindocs/views.py:355
|
||||
#, python-format
|
||||
msgid "String (up to %(max_length)s)"
|
||||
msgstr "Строка (до %(max_length)s)"
|
||||
|
||||
#: contrib/admindocs/views.py:318
|
||||
#: contrib/admindocs/views.py:337
|
||||
msgid "Comma-separated integers"
|
||||
msgstr "Целые, разделенные запятыми"
|
||||
|
||||
#: contrib/admindocs/views.py:319
|
||||
#: contrib/admindocs/views.py:338
|
||||
msgid "Date (without time)"
|
||||
msgstr "Дата (без указания времени)"
|
||||
|
||||
#: contrib/admindocs/views.py:320
|
||||
#: contrib/admindocs/views.py:339
|
||||
msgid "Date (with time)"
|
||||
msgstr "Дата (с указанием времени)"
|
||||
|
||||
#: contrib/admindocs/views.py:321
|
||||
#: contrib/admindocs/views.py:340
|
||||
msgid "Decimal number"
|
||||
msgstr "Десятичное число"
|
||||
|
||||
#: contrib/admindocs/views.py:322
|
||||
#: contrib/admindocs/views.py:341
|
||||
msgid "E-mail address"
|
||||
msgstr "Адрес электронной почты"
|
||||
|
||||
#: contrib/admindocs/views.py:323 contrib/admindocs/views.py:324
|
||||
#: contrib/admindocs/views.py:327
|
||||
#: contrib/admindocs/views.py:342 contrib/admindocs/views.py:343
|
||||
#: contrib/admindocs/views.py:346
|
||||
msgid "File path"
|
||||
msgstr "Путь к файлу"
|
||||
|
||||
#: contrib/admindocs/views.py:325
|
||||
#: contrib/admindocs/views.py:344
|
||||
msgid "Floating point number"
|
||||
msgstr "Число с плавающей точкой"
|
||||
msgstr "Число с плавающей запятой"
|
||||
|
||||
#: contrib/admindocs/views.py:329 contrib/comments/models.py:60
|
||||
#: contrib/admindocs/views.py:348 contrib/comments/models.py:60
|
||||
msgid "IP address"
|
||||
msgstr "IP-адрес"
|
||||
|
||||
#: contrib/admindocs/views.py:331
|
||||
#: contrib/admindocs/views.py:350
|
||||
msgid "Boolean (Either True, False or None)"
|
||||
msgstr "Логическое (True, False или None)"
|
||||
|
||||
#: contrib/admindocs/views.py:332
|
||||
#: contrib/admindocs/views.py:351
|
||||
msgid "Relation to parent model"
|
||||
msgstr "Связь с родительской моделью"
|
||||
|
||||
#: contrib/admindocs/views.py:333
|
||||
#: contrib/admindocs/views.py:352
|
||||
msgid "Phone number"
|
||||
msgstr "Номер телефона"
|
||||
|
||||
#: contrib/admindocs/views.py:338
|
||||
#: contrib/admindocs/views.py:357
|
||||
msgid "Text"
|
||||
msgstr "Текст"
|
||||
|
||||
#: contrib/admindocs/views.py:339
|
||||
#: contrib/admindocs/views.py:358
|
||||
msgid "Time"
|
||||
msgstr "Время"
|
||||
|
||||
#: contrib/admindocs/views.py:340 contrib/comments/forms.py:95
|
||||
#: contrib/admindocs/views.py:359 contrib/comments/forms.py:95
|
||||
#: contrib/comments/templates/comments/moderation_queue.html:37
|
||||
#: contrib/flatpages/admin.py:8 contrib/flatpages/models.py:7
|
||||
msgid "URL"
|
||||
msgstr "URL"
|
||||
|
||||
#: contrib/admindocs/views.py:341
|
||||
#: contrib/admindocs/views.py:360
|
||||
msgid "U.S. state (two uppercase letters)"
|
||||
msgstr "Штат США (две заглавные буквы)"
|
||||
|
||||
#: contrib/admindocs/views.py:342
|
||||
#: contrib/admindocs/views.py:361
|
||||
msgid "XML text"
|
||||
msgstr "XML текст"
|
||||
|
||||
#: contrib/admindocs/views.py:368
|
||||
#: contrib/admindocs/views.py:387
|
||||
#, python-format
|
||||
msgid "%s does not appear to be a urlpattern object"
|
||||
msgstr "%s не похож на объект urlpattern"
|
||||
@ -1475,7 +1485,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Если что-нибудь введете в это поле, то ваш комментарий будет признан спамом"
|
||||
|
||||
#: contrib/comments/models.py:22 contrib/contenttypes/models.py:71
|
||||
#: contrib/comments/models.py:22 contrib/contenttypes/models.py:74
|
||||
msgid "content type"
|
||||
msgstr "тип содержимого"
|
||||
|
||||
@ -1598,8 +1608,7 @@ msgstr "Спасибо за подтверждение"
|
||||
#: contrib/comments/templates/comments/flagged.html:7
|
||||
msgid ""
|
||||
"Thanks for taking the time to improve the quality of discussion on our site"
|
||||
msgstr ""
|
||||
"Спасибо, что заботитесь о качестве обсуждений на нашем сайте"
|
||||
msgstr "Спасибо, что заботитесь о качестве общения на нашем сайте"
|
||||
|
||||
#: contrib/comments/templates/comments/delete.html:4
|
||||
msgid "Remove a comment"
|
||||
@ -1647,7 +1656,7 @@ msgstr "Предпросмотр"
|
||||
#: contrib/comments/templates/comments/moderation_queue.html:4
|
||||
#: contrib/comments/templates/comments/moderation_queue.html:19
|
||||
msgid "Comment moderation queue"
|
||||
msgstr "Очередь модерирования комментариев"
|
||||
msgstr "Очередь модерации комментариев"
|
||||
|
||||
#: contrib/comments/templates/comments/moderation_queue.html:26
|
||||
msgid "No comments to moderate"
|
||||
@ -1705,11 +1714,11 @@ msgstr "Опубликуйте ваш комментарий"
|
||||
msgid "or make changes"
|
||||
msgstr "или внесите изменения"
|
||||
|
||||
#: contrib/contenttypes/models.py:67
|
||||
#: contrib/contenttypes/models.py:70
|
||||
msgid "python model class name"
|
||||
msgstr "имя класса модели"
|
||||
|
||||
#: contrib/contenttypes/models.py:72
|
||||
#: contrib/contenttypes/models.py:75
|
||||
msgid "content types"
|
||||
msgstr "типы содержимого"
|
||||
|
||||
@ -1725,7 +1734,7 @@ msgid ""
|
||||
"This value must contain only letters, numbers, underscores, dashes or "
|
||||
"slashes."
|
||||
msgstr ""
|
||||
"Значение должно состоять только из букв, цифр, знаков подчеркивания, тире "
|
||||
"Значение должно состоять только из букв, цифр, знаков подчеркивания, дефиса "
|
||||
"или наклонной черты вправо."
|
||||
|
||||
#: contrib/flatpages/admin.py:22
|
||||
@ -1780,18 +1789,24 @@ msgstr ""
|
||||
"Мы сожалеем, но ваша форма устарела. Пожалуйста, продолжите заполнять форму "
|
||||
"на этой странице."
|
||||
|
||||
#: contrib/gis/forms/fields.py:14
|
||||
#: contrib/gis/forms/fields.py:17
|
||||
msgid "No geometry value provided."
|
||||
msgstr "Не указано значение геометрии."
|
||||
|
||||
#: contrib/gis/forms/fields.py:15
|
||||
#: contrib/gis/forms/fields.py:18
|
||||
msgid "Invalid geometry value."
|
||||
msgstr "Неверное значение геометрии."
|
||||
|
||||
#: contrib/gis/forms/fields.py:16
|
||||
#: contrib/gis/forms/fields.py:19
|
||||
msgid "Invalid geometry type."
|
||||
msgstr "Неверный тип геометрии."
|
||||
|
||||
#: contrib/gis/forms/fields.py:20
|
||||
msgid ""
|
||||
"An error occurred when transforming the geometry to the SRID of the geometry "
|
||||
"form field."
|
||||
msgstr "Произошла ошибка во время преобразования геометрии в SRID."
|
||||
|
||||
#: contrib/humanize/templatetags/humanize.py:19
|
||||
msgid "th"
|
||||
msgstr ""
|
||||
@ -1888,7 +1903,7 @@ msgstr "Введите почтовый индекс в формате NNNN ил
|
||||
#: contrib/localflavor/br/forms.py:135 contrib/localflavor/pe/forms.py:23
|
||||
#: contrib/localflavor/pe/forms.py:51
|
||||
msgid "This field requires only numbers."
|
||||
msgstr "Это поле требует только числа."
|
||||
msgstr "Это поле принимает только числа."
|
||||
|
||||
#: contrib/localflavor/ar/forms.py:50
|
||||
msgid "This field requires 7 or 8 digits."
|
||||
@ -1941,7 +1956,7 @@ msgstr "Вена"
|
||||
#: contrib/localflavor/at/forms.py:20 contrib/localflavor/ch/forms.py:16
|
||||
#: contrib/localflavor/no/forms.py:12
|
||||
msgid "Enter a zip code in the format XXXX."
|
||||
msgstr "Введите правильный индекс в формате XXXX.."
|
||||
msgstr "Введите правильный индекс в формате XXXX."
|
||||
|
||||
#: contrib/localflavor/at/forms.py:48
|
||||
msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
|
||||
@ -2157,7 +2172,7 @@ msgstr "Пардубицкий край"
|
||||
|
||||
#: contrib/localflavor/cz/cz_regions.py:17
|
||||
msgid "Vysocina Region"
|
||||
msgstr "Высочинский край"
|
||||
msgstr "Край Высочина"
|
||||
|
||||
#: contrib/localflavor/cz/cz_regions.py:18
|
||||
msgid "South Moravian Region"
|
||||
@ -2182,7 +2197,7 @@ msgstr "Введите почтовый индекс в формате XXXXX и
|
||||
#: contrib/localflavor/cz/forms.py:47
|
||||
msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
|
||||
msgstr ""
|
||||
"Введите номер свидетельства о рождении в формате XXXXXX/XXXX or XXXXXXXXXX."
|
||||
"Введите номер свидетельства о рождении в формате XXXXXX/XXXX или XXXXXXXXXX."
|
||||
|
||||
#: contrib/localflavor/cz/forms.py:48
|
||||
msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
|
||||
@ -3080,7 +3095,7 @@ msgstr "Подляское"
|
||||
|
||||
#: contrib/localflavor/pl/pl_voivodeships.py:18
|
||||
msgid "Pomerania"
|
||||
msgstr "Померания"
|
||||
msgstr "Поморское"
|
||||
|
||||
#: contrib/localflavor/pl/pl_voivodeships.py:19
|
||||
msgid "Silesia"
|
||||
@ -3871,60 +3886,60 @@ msgstr "выводимое имя"
|
||||
msgid "sites"
|
||||
msgstr "сайты"
|
||||
|
||||
#: db/models/fields/__init__.py:356 db/models/fields/__init__.py:700
|
||||
#: db/models/fields/__init__.py:356 db/models/fields/__init__.py:710
|
||||
msgid "This value must be an integer."
|
||||
msgstr "Это значение должно быть целым числом."
|
||||
|
||||
#: db/models/fields/__init__.py:387
|
||||
#: db/models/fields/__init__.py:388
|
||||
msgid "This value must be either True or False."
|
||||
msgstr "Значение должно либо True, либо False."
|
||||
msgstr "Значение должно быть либо True, либо False."
|
||||
|
||||
#: db/models/fields/__init__.py:420
|
||||
#: db/models/fields/__init__.py:427
|
||||
msgid "This field cannot be null."
|
||||
msgstr "Это поле не может быть нулевым."
|
||||
|
||||
#: db/models/fields/__init__.py:436
|
||||
#: db/models/fields/__init__.py:443
|
||||
msgid "Enter only digits separated by commas."
|
||||
msgstr "Введите цифры, разделенные запятыми."
|
||||
|
||||
#: db/models/fields/__init__.py:467
|
||||
#: db/models/fields/__init__.py:474
|
||||
msgid "Enter a valid date in YYYY-MM-DD format."
|
||||
msgstr "Введите правильную дату в формате YYYY-MM-DD."
|
||||
|
||||
#: db/models/fields/__init__.py:476
|
||||
#: db/models/fields/__init__.py:483
|
||||
#, python-format
|
||||
msgid "Invalid date: %s"
|
||||
msgstr "Неправильная дата: %s"
|
||||
|
||||
#: db/models/fields/__init__.py:540 db/models/fields/__init__.py:558
|
||||
#: db/models/fields/__init__.py:547 db/models/fields/__init__.py:565
|
||||
msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
|
||||
msgstr ""
|
||||
"Введите правильные дату и время в формате YYYY-MM-DD HH:MM[:ss[.uuuuuu]."
|
||||
|
||||
#: db/models/fields/__init__.py:594
|
||||
#: db/models/fields/__init__.py:601
|
||||
msgid "This value must be a decimal number."
|
||||
msgstr "Это значение должно быть целым числом."
|
||||
|
||||
#: db/models/fields/__init__.py:676
|
||||
#: db/models/fields/__init__.py:686
|
||||
msgid "This value must be a float."
|
||||
msgstr "Это значение должно быть числом с плавающей запятой."
|
||||
|
||||
#: db/models/fields/__init__.py:736
|
||||
#: db/models/fields/__init__.py:746
|
||||
msgid "This value must be either None, True or False."
|
||||
msgstr "Значение должно либо True, либо False."
|
||||
msgstr "Значение должно быть None, True или False."
|
||||
|
||||
#: db/models/fields/__init__.py:839 db/models/fields/__init__.py:853
|
||||
#: db/models/fields/__init__.py:849 db/models/fields/__init__.py:863
|
||||
msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
|
||||
msgstr "Введите правильное время в формате HH:MM[:ss[.uuuuuu]]."
|
||||
|
||||
#: db/models/fields/related.py:792
|
||||
#: db/models/fields/related.py:816
|
||||
msgid ""
|
||||
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
|
||||
msgstr ""
|
||||
"Удерживайте \"Control\" (или \"Command\" на Mac) для выбора нескольких "
|
||||
"значений."
|
||||
|
||||
#: db/models/fields/related.py:870
|
||||
#: db/models/fields/related.py:894
|
||||
#, python-format
|
||||
msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
|
||||
msgid_plural ""
|
||||
@ -3994,11 +4009,11 @@ msgstr "Убедитесь, что ввели не больше %s цифр по
|
||||
msgid "Ensure that there are no more than %s digits before the decimal point."
|
||||
msgstr "Убедитесь, что ввели не больше %s цифр до запятой."
|
||||
|
||||
#: forms/fields.py:288 forms/fields.py:862
|
||||
#: forms/fields.py:288 forms/fields.py:863
|
||||
msgid "Enter a valid date."
|
||||
msgstr "Введите правильную дату."
|
||||
|
||||
#: forms/fields.py:322 forms/fields.py:863
|
||||
#: forms/fields.py:322 forms/fields.py:864
|
||||
msgid "Enter a valid time."
|
||||
msgstr "Введите правильное время."
|
||||
|
||||
@ -4042,58 +4057,90 @@ msgstr "Введите правильный URL."
|
||||
msgid "This URL appears to be a broken link."
|
||||
msgstr "Похоже, что это нерабочая ссылка."
|
||||
|
||||
#: forms/fields.py:624 forms/fields.py:702
|
||||
#: forms/fields.py:625 forms/fields.py:703
|
||||
#, python-format
|
||||
msgid "Select a valid choice. %(value)s is not one of the available choices."
|
||||
msgstr "Выберите корректный вариант. %(value)s нет среди допустимых значений."
|
||||
|
||||
#: forms/fields.py:703 forms/fields.py:764 forms/models.py:776
|
||||
#: forms/fields.py:704 forms/fields.py:765 forms/models.py:1003
|
||||
msgid "Enter a list of values."
|
||||
msgstr "Введите список значений."
|
||||
|
||||
#: forms/fields.py:891
|
||||
#: forms/fields.py:892
|
||||
msgid "Enter a valid IPv4 address."
|
||||
msgstr "Введите правильный IPv4 адрес."
|
||||
|
||||
#: forms/fields.py:901
|
||||
#: forms/fields.py:902
|
||||
msgid ""
|
||||
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
|
||||
msgstr ""
|
||||
"Значение должно состоять только из букв, цифр, знаков подчеркивания или тире."
|
||||
"Значение должно состоять только из букв, цифр, знаков подчеркивания или "
|
||||
"дефиса."
|
||||
|
||||
#: forms/formsets.py:271 forms/formsets.py:273
|
||||
msgid "Order"
|
||||
msgstr "Порядок"
|
||||
|
||||
#: forms/models.py:299 forms/models.py:308
|
||||
#: forms/models.py:367
|
||||
#, python-format
|
||||
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
|
||||
msgstr ""
|
||||
"Значение в поле %(field_name)s должно быть уникальным для %(lookup)s в поле %"
|
||||
"(date_field)s."
|
||||
|
||||
#: forms/models.py:381 forms/models.py:389
|
||||
#, python-format
|
||||
msgid "%(model_name)s with this %(field_label)s already exists."
|
||||
msgstr "%(model_name)s с таким %(field_label)s уже существует."
|
||||
|
||||
#: forms/models.py:651
|
||||
msgid "The inline foreign key did not match the parent instance primary key."
|
||||
msgstr "Вторичный ключ не совпадает с первичным ключом родителя."
|
||||
#: forms/models.py:594
|
||||
#, python-format
|
||||
msgid "Please correct the duplicate data for %(field)s."
|
||||
msgstr "Пожалуйста, измените повторяющееся значение в поле %(field)s."
|
||||
|
||||
#: forms/models.py:706
|
||||
#: forms/models.py:598
|
||||
#, python-format
|
||||
msgid "Please correct the duplicate data for %(field)s, which must be unique."
|
||||
msgstr ""
|
||||
"Пожалуйста, измените значение в поле %(field)s, оно должно быть уникальным."
|
||||
|
||||
#: forms/models.py:604
|
||||
#, 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 ""
|
||||
"Пожалуйста, измените значение в поле %(field_name)s, оно должно быть "
|
||||
"уникальным для %(lookup)s в поле %(date_field)s."
|
||||
|
||||
#: forms/models.py:612
|
||||
msgid "Please correct the duplicate values below."
|
||||
msgstr "Пожалуйста, измените повторяющиеся значения ниже."
|
||||
|
||||
#: forms/models.py:867
|
||||
msgid "The inline foreign key did not match the parent instance primary key."
|
||||
msgstr "Внешний ключ не совпадает с первичным ключом родителя."
|
||||
|
||||
#: forms/models.py:930
|
||||
msgid "Select a valid choice. That choice is not one of the available choices."
|
||||
msgstr ""
|
||||
"Выберите корректный вариант. Вашего варианта нет среди допустимых значений."
|
||||
|
||||
#: forms/models.py:777
|
||||
#: forms/models.py:1004
|
||||
#, python-format
|
||||
msgid "Select a valid choice. %s is not one of the available choices."
|
||||
msgstr "Выберите корректный вариант. %s нет среди допустимых значений."
|
||||
|
||||
#: forms/models.py:779
|
||||
#: forms/models.py:1006
|
||||
#, python-format
|
||||
msgid "\"%s\" is not a valid value for a primary key."
|
||||
msgstr "\"%s\" не является верным значением для первичного ключа."
|
||||
|
||||
#: template/defaultfilters.py:765
|
||||
#: template/defaultfilters.py:767
|
||||
msgid "yes,no,maybe"
|
||||
msgstr "да,нет,может быть"
|
||||
|
||||
#: template/defaultfilters.py:796
|
||||
#: template/defaultfilters.py:798
|
||||
#, python-format
|
||||
msgid "%(size)d byte"
|
||||
msgid_plural "%(size)d bytes"
|
||||
@ -4101,42 +4148,42 @@ msgstr[0] "%(size)d байт"
|
||||
msgstr[1] "%(size)d байта"
|
||||
msgstr[2] "%(size)d байт"
|
||||
|
||||
#: template/defaultfilters.py:798
|
||||
#: template/defaultfilters.py:800
|
||||
#, python-format
|
||||
msgid "%.1f KB"
|
||||
msgstr "%.1f КБ"
|
||||
|
||||
#: template/defaultfilters.py:800
|
||||
#: template/defaultfilters.py:802
|
||||
#, python-format
|
||||
msgid "%.1f MB"
|
||||
msgstr "%.1f МБ"
|
||||
|
||||
#: template/defaultfilters.py:801
|
||||
#: template/defaultfilters.py:803
|
||||
#, python-format
|
||||
msgid "%.1f GB"
|
||||
msgstr "%.1f ГБ"
|
||||
|
||||
#: utils/dateformat.py:41
|
||||
#: utils/dateformat.py:42
|
||||
msgid "p.m."
|
||||
msgstr "п.п."
|
||||
|
||||
#: utils/dateformat.py:42
|
||||
#: utils/dateformat.py:43
|
||||
msgid "a.m."
|
||||
msgstr "д.п."
|
||||
|
||||
#: utils/dateformat.py:47
|
||||
#: utils/dateformat.py:48
|
||||
msgid "PM"
|
||||
msgstr "ПП"
|
||||
|
||||
#: utils/dateformat.py:48
|
||||
#: utils/dateformat.py:49
|
||||
msgid "AM"
|
||||
msgstr "ДП"
|
||||
|
||||
#: utils/dateformat.py:97
|
||||
#: utils/dateformat.py:98
|
||||
msgid "midnight"
|
||||
msgstr "полночь"
|
||||
|
||||
#: utils/dateformat.py:99
|
||||
#: utils/dateformat.py:100
|
||||
msgid "noon"
|
||||
msgstr "полдень"
|
||||
|
||||
|
||||
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
@ -1,51 +1,50 @@
|
||||
# This file is distributed under the same license as the PACKAGE package.
|
||||
# This file is distributed under the same license as the Django package.
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Django\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2009-01-23 23:46+0100\n"
|
||||
"PO-Revision-Date: 2008-07-29 12:53+0100\n"
|
||||
"Last-Translator: Nebojsa Djordjevic <djnesh@gmail.com>\n"
|
||||
"Language-Team: Nesh <djnesh@gmail.com> & Petar <petar.maric@gmail.com> & Janos Guljas <janos@janos.in.rs>"
|
||||
"POT-Creation-Date: 2009-03-30 14:00+0200\n"
|
||||
"PO-Revision-Date: 2009-03-30 14:04+0200\n"
|
||||
"Last-Translator: Janos Guljas <janos@janos.in.rs>\n"
|
||||
"Language-Team: Branko Vukelic <bg.branko@gmail.com> & Janos Guljas "
|
||||
"<janos@janos.in.rs> & Nesh <djnesh@gmail.com> & Petar <petar.maric@gmail."
|
||||
"com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Poedit-Country: YUGOSLAVIA\n"
|
||||
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
|
||||
"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
|
||||
"X-Poedit-Language: Serbian\n"
|
||||
"X-Poedit-SourceCharset: utf-8\n"
|
||||
|
||||
#: contrib/admin/media/js/SelectFilter2.js:33
|
||||
#, perl-format
|
||||
msgid "Available %s"
|
||||
msgstr "Доступно %s"
|
||||
msgstr "Доступни %s"
|
||||
|
||||
#: contrib/admin/media/js/SelectFilter2.js:41
|
||||
msgid "Choose all"
|
||||
msgstr "Изаберите све"
|
||||
msgstr "Додај све"
|
||||
|
||||
#: contrib/admin/media/js/SelectFilter2.js:46
|
||||
msgid "Add"
|
||||
msgstr "Додајте"
|
||||
msgstr "Додај"
|
||||
|
||||
#: contrib/admin/media/js/SelectFilter2.js:48
|
||||
msgid "Remove"
|
||||
msgstr "Избаците"
|
||||
msgstr "Уклони"
|
||||
|
||||
#: contrib/admin/media/js/SelectFilter2.js:53
|
||||
#, perl-format
|
||||
msgid "Chosen %s"
|
||||
msgstr "Изабрано %s"
|
||||
msgstr "Одабрани %s"
|
||||
|
||||
#: contrib/admin/media/js/SelectFilter2.js:54
|
||||
msgid "Select your choice(s) and click "
|
||||
msgstr "Изаберите потребно и кликните"
|
||||
msgstr "Направите избор и кликните "
|
||||
|
||||
#: contrib/admin/media/js/SelectFilter2.js:59
|
||||
msgid "Clear all"
|
||||
msgstr "Обришите све"
|
||||
msgstr "Врати све"
|
||||
|
||||
#: contrib/admin/media/js/calendar.js:24
|
||||
#: contrib/admin/media/js/dateparse.js:32
|
||||
@ -67,7 +66,7 @@ msgstr "недеља понедељак уторак среда четвртак
|
||||
#: contrib/admin/media/js/admin/CollapsedFieldsets.js:34
|
||||
#: contrib/admin/media/js/admin/CollapsedFieldsets.js:72
|
||||
msgid "Show"
|
||||
msgstr "Прикажи"
|
||||
msgstr "Покажи"
|
||||
|
||||
#: contrib/admin/media/js/admin/CollapsedFieldsets.js:63
|
||||
msgid "Hide"
|
||||
@ -76,7 +75,7 @@ msgstr "Сакриј"
|
||||
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:47
|
||||
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:81
|
||||
msgid "Now"
|
||||
msgstr "Сада"
|
||||
msgstr "Тренутно време"
|
||||
|
||||
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:51
|
||||
msgid "Clock"
|
||||
@ -84,7 +83,7 @@ msgstr "Сат"
|
||||
|
||||
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:78
|
||||
msgid "Choose a time"
|
||||
msgstr "Изаберите време"
|
||||
msgstr "Одабир времена"
|
||||
|
||||
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:82
|
||||
msgid "Midnight"
|
||||
@ -92,7 +91,7 @@ msgstr "Поноћ"
|
||||
|
||||
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:83
|
||||
msgid "6 a.m."
|
||||
msgstr "6 сати"
|
||||
msgstr "18ч"
|
||||
|
||||
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:84
|
||||
msgid "Noon"
|
||||
|
||||
BIN
django/conf/locale/sr_Latn/LC_MESSAGES/django.mo
Normal file
BIN
django/conf/locale/sr_Latn/LC_MESSAGES/django.mo
Normal file
Binary file not shown.
4436
django/conf/locale/sr_Latn/LC_MESSAGES/django.po
Normal file
4436
django/conf/locale/sr_Latn/LC_MESSAGES/django.po
Normal file
File diff suppressed because it is too large
Load Diff
BIN
django/conf/locale/sr_Latn/LC_MESSAGES/djangojs.mo
Normal file
BIN
django/conf/locale/sr_Latn/LC_MESSAGES/djangojs.mo
Normal file
Binary file not shown.
120
django/conf/locale/sr_Latn/LC_MESSAGES/djangojs.po
Normal file
120
django/conf/locale/sr_Latn/LC_MESSAGES/djangojs.po
Normal file
@ -0,0 +1,120 @@
|
||||
# This file is distributed under the same license as the Django package.
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Django\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2009-03-30 14:00+0200\n"
|
||||
"PO-Revision-Date: 2009-03-30 14:04+0200\n"
|
||||
"Last-Translator: Janos Guljas <janos@janos.in.rs>\n"
|
||||
"Language-Team: Branko Vukelic <bg.branko@gmail.com> & Janos Guljas "
|
||||
"<janos@janos.in.rs> & Nesh <djnesh@gmail.com> & Petar <petar.maric@gmail."
|
||||
"com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
|
||||
"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
|
||||
|
||||
#: contrib/admin/media/js/SelectFilter2.js:33
|
||||
#, perl-format
|
||||
msgid "Available %s"
|
||||
msgstr "Dostupni %s"
|
||||
|
||||
#: contrib/admin/media/js/SelectFilter2.js:41
|
||||
msgid "Choose all"
|
||||
msgstr "Dodaj sve"
|
||||
|
||||
#: contrib/admin/media/js/SelectFilter2.js:46
|
||||
msgid "Add"
|
||||
msgstr "Dodaj"
|
||||
|
||||
#: contrib/admin/media/js/SelectFilter2.js:48
|
||||
msgid "Remove"
|
||||
msgstr "Ukloni"
|
||||
|
||||
#: contrib/admin/media/js/SelectFilter2.js:53
|
||||
#, perl-format
|
||||
msgid "Chosen %s"
|
||||
msgstr "Odabrani %s"
|
||||
|
||||
#: contrib/admin/media/js/SelectFilter2.js:54
|
||||
msgid "Select your choice(s) and click "
|
||||
msgstr "Napravite izbor i kliknite "
|
||||
|
||||
#: contrib/admin/media/js/SelectFilter2.js:59
|
||||
msgid "Clear all"
|
||||
msgstr "Vrati sve"
|
||||
|
||||
#: contrib/admin/media/js/calendar.js:24
|
||||
#: contrib/admin/media/js/dateparse.js:32
|
||||
msgid ""
|
||||
"January February March April May June July August September October November "
|
||||
"December"
|
||||
msgstr ""
|
||||
"januar februar mart april maj jun jul avgust septembar oktobar novembar "
|
||||
"decembar"
|
||||
|
||||
#: contrib/admin/media/js/calendar.js:25
|
||||
msgid "S M T W T F S"
|
||||
msgstr "N P U S Č P S"
|
||||
|
||||
#: contrib/admin/media/js/dateparse.js:33
|
||||
msgid "Sunday Monday Tuesday Wednesday Thursday Friday Saturday"
|
||||
msgstr "nedelja ponedeljak utorak sreda četvrtak petak subota"
|
||||
|
||||
#: contrib/admin/media/js/admin/CollapsedFieldsets.js:34
|
||||
#: contrib/admin/media/js/admin/CollapsedFieldsets.js:72
|
||||
msgid "Show"
|
||||
msgstr "Pokaži"
|
||||
|
||||
#: contrib/admin/media/js/admin/CollapsedFieldsets.js:63
|
||||
msgid "Hide"
|
||||
msgstr "Sakrij"
|
||||
|
||||
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:47
|
||||
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:81
|
||||
msgid "Now"
|
||||
msgstr "Trenutno vreme"
|
||||
|
||||
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:51
|
||||
msgid "Clock"
|
||||
msgstr "Sat"
|
||||
|
||||
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:78
|
||||
msgid "Choose a time"
|
||||
msgstr "Odabir vremena"
|
||||
|
||||
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:82
|
||||
msgid "Midnight"
|
||||
msgstr "Ponoć"
|
||||
|
||||
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:83
|
||||
msgid "6 a.m."
|
||||
msgstr "18č"
|
||||
|
||||
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:84
|
||||
msgid "Noon"
|
||||
msgstr "Podne"
|
||||
|
||||
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:88
|
||||
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:183
|
||||
msgid "Cancel"
|
||||
msgstr "Poništi"
|
||||
|
||||
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:128
|
||||
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:177
|
||||
msgid "Today"
|
||||
msgstr "Danas"
|
||||
|
||||
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:132
|
||||
msgid "Calendar"
|
||||
msgstr "Kalendar"
|
||||
|
||||
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:175
|
||||
msgid "Yesterday"
|
||||
msgstr "Juče"
|
||||
|
||||
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:179
|
||||
msgid "Tomorrow"
|
||||
msgstr "Sutra"
|
||||
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
@ -2,23 +2,24 @@
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Django\n"
|
||||
"Report-Msgid-Bugs-To: kowito@felspar.com\n"
|
||||
"Project-Id-Version: Django-1.1-rc-1\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2008-09-02 22:36-0700\n"
|
||||
"PO-Revision-Date: 2008-11-04 00:35+0700\n"
|
||||
"PO-Revision-Date: 2009-07-27 21:47+0700\n"
|
||||
"Last-Translator: Kowit Charoenratchatabhan <kowito@felspar.com>\n"
|
||||
"Language-Team: Kowit Charoenratchatabhan,Kadsarin Sanjek, Felspar <kowito@felspar.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Poedit-Language: Thai\n"
|
||||
"X-Poedit-Country: Thailand\n"
|
||||
"X-Poedit-Country: THAILAND\n"
|
||||
"X-Poedit-SourceCharset: utf-8\n"
|
||||
"Plural-Forms: nplurals=1; plural=0;\n"
|
||||
|
||||
#: contrib/admin/media/js/SelectFilter2.js:33
|
||||
#, perl-format
|
||||
msgid "Available %s"
|
||||
msgstr "ที่มีอยู่ %s"
|
||||
msgstr "%sที่มีอยู่"
|
||||
|
||||
#: contrib/admin/media/js/SelectFilter2.js:41
|
||||
msgid "Choose all"
|
||||
@ -35,7 +36,7 @@ msgstr "ลบออก"
|
||||
#: contrib/admin/media/js/SelectFilter2.js:53
|
||||
#, perl-format
|
||||
msgid "Chosen %s"
|
||||
msgstr "ได้เลือก %s"
|
||||
msgstr "%sที่ถูกเลือก"
|
||||
|
||||
#: contrib/admin/media/js/SelectFilter2.js:54
|
||||
msgid "Select your choice(s) and click "
|
||||
@ -43,7 +44,7 @@ msgstr "เลือกและคลิก"
|
||||
|
||||
#: contrib/admin/media/js/SelectFilter2.js:59
|
||||
msgid "Clear all"
|
||||
msgstr "ล้างทั้งหมด"
|
||||
msgstr "ลบทั้งหมด"
|
||||
|
||||
#: contrib/admin/media/js/calendar.js:24
|
||||
#: contrib/admin/media/js/dateparse.js:32
|
||||
@ -52,11 +53,11 @@ msgstr "มกราคม กุมภาพันธ์ มีนาคม เ
|
||||
|
||||
#: contrib/admin/media/js/calendar.js:25
|
||||
msgid "S M T W T F S"
|
||||
msgstr "อา จ. อ. พ. พฤ. ศ. ส."
|
||||
msgstr "อา. จ. อ. พ. พฤ. ศ. ส."
|
||||
|
||||
#: contrib/admin/media/js/dateparse.js:33
|
||||
msgid "Sunday Monday Tuesday Wednesday Thursday Friday Saturday"
|
||||
msgstr "อาทิตย์ จันทร์ อังคาร พุธ พฤหัส ศุกร์ เสาร์"
|
||||
msgstr "อาทิตย์ จันทร์ อังคาร พุธ พฤหัสบดี ศุกร์ เสาร์"
|
||||
|
||||
#: contrib/admin/media/js/admin/CollapsedFieldsets.js:34
|
||||
#: contrib/admin/media/js/admin/CollapsedFieldsets.js:72
|
||||
@ -70,7 +71,7 @@ msgstr "ซ่อน"
|
||||
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:47
|
||||
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:81
|
||||
msgid "Now"
|
||||
msgstr "เดี๋ยวนี้"
|
||||
msgstr "ขณะนี้"
|
||||
|
||||
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:51
|
||||
msgid "Clock"
|
||||
@ -86,11 +87,11 @@ msgstr "เที่ยงคืน"
|
||||
|
||||
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:83
|
||||
msgid "6 a.m."
|
||||
msgstr "6 นาฬิกา"
|
||||
msgstr "หกโมงเช้า"
|
||||
|
||||
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:84
|
||||
msgid "Noon"
|
||||
msgstr "เที่ยง"
|
||||
msgstr "เที่ยงวัน"
|
||||
|
||||
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:88
|
||||
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:183
|
||||
@ -108,7 +109,7 @@ msgstr "ปฏิทิน"
|
||||
|
||||
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:175
|
||||
msgid "Yesterday"
|
||||
msgstr "เมื่อวานนี้"
|
||||
msgstr "เมื่อวาน"
|
||||
|
||||
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:179
|
||||
msgid "Tomorrow"
|
||||
|
||||
Binary file not shown.
@ -5,9 +5,9 @@ msgstr ""
|
||||
"Project-Id-Version: Django\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2008-12-02 22:52+0800\n"
|
||||
"PO-Revision-Date: 2008-11-19 17:38+0800\n"
|
||||
"Last-Translator: Liang Feng <hutuworm@gmail.com>\n"
|
||||
"Language-Team: Simplified Chinese <hutuworm@gmail.com>\n"
|
||||
"PO-Revision-Date: 2009-07-23 11:47+0800\n"
|
||||
"Last-Translator: Qing Feng <paradise.qingfeng@gmail.com>\n"
|
||||
"Language-Team: Simplified Chinese <paradise.qingfeng@gmail.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
@ -220,6 +220,20 @@ msgstr "简体中文"
|
||||
msgid "Traditional Chinese"
|
||||
msgstr "繁体中文"
|
||||
|
||||
#: contrib/admin/actions.py:60
|
||||
#, python-format
|
||||
msgid "Successfully deleted %(count)d %(items)s."
|
||||
msgstr "删除了%(count)d的%(items)s"
|
||||
|
||||
#: contrib/admin/actions.py:67 contrib/admin/options.py:1027
|
||||
msgid "Are you sure?"
|
||||
msgstr "你确认吗？"
|
||||
|
||||
#: contrib/admin/actions.py:85
|
||||
#, python-format
|
||||
msgid "Delete selected %(verbose_name_plural)s"
|
||||
msgstr "删除了选择的%(verbose_name_plural)s"
|
||||
|
||||
#: contrib/admin/filterspecs.py:44
|
||||
#, python-format
|
||||
msgid ""
|
||||
@ -377,10 +391,6 @@ msgstr "数据库错误"
|
||||
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
|
||||
msgstr "%(name)s \"%(obj)s\" 删除成功。"
|
||||
|
||||
#: contrib/admin/options.py:695
|
||||
msgid "Are you sure?"
|
||||
msgstr "你确认吗？"
|
||||
|
||||
#: contrib/admin/options.py:724
|
||||
#, python-format
|
||||
msgid "Change history: %s"
|
||||
@ -640,6 +650,10 @@ msgstr "我的动作"
|
||||
msgid "None available"
|
||||
msgstr "无可用的"
|
||||
|
||||
#: contrib/admin/templates/admin/index.html:72
|
||||
msgid "Unknown content"
|
||||
msgstr "未知内容"
|
||||
|
||||
#: contrib/admin/templates/admin/invalid_setup.html:7
|
||||
msgid ""
|
||||
"Something's wrong with your database installation. Make sure the appropriate "
|
||||
@ -685,6 +699,15 @@ msgstr "该对象没有变更历史记录。可能从未通过这个管理站点
|
||||
msgid "Show all"
|
||||
msgstr "显示全部"
|
||||
|
||||
#: contrib/admin/templates/admin/pagination.html:11
|
||||
#: contrib/admin/templates/admin/submit_line.html:3
|
||||
msgid "Save"
|
||||
msgstr "保存"
|
||||
|
||||
#: contrib/admin/templates/admin/search_form.html:8
|
||||
msgid "Search"
|
||||
msgstr "搜索"
|
||||
|
||||
#: contrib/admin/templates/admin/search_form.html:8
|
||||
msgid "Go"
|
||||
msgstr "执行"
|
||||
@ -701,10 +724,6 @@ msgstr[1] "%(counter)s 条结果"
|
||||
msgid "%(full_result_count)s total"
|
||||
msgstr "总共 %(full_result_count)s"
|
||||
|
||||
#: contrib/admin/templates/admin/submit_line.html:3
|
||||
msgid "Save"
|
||||
msgstr "保存"
|
||||
|
||||
#: contrib/admin/templates/admin/submit_line.html:5
|
||||
msgid "Save as new"
|
||||
msgstr "保存为新的"
|
||||
@ -1347,6 +1366,16 @@ msgstr "内容"
|
||||
msgid "Metadata"
|
||||
msgstr "元数据"
|
||||
|
||||
#: contrib/comments/feeds.py:13
|
||||
#, python-format
|
||||
msgid "%(site_name)s comments"
|
||||
msgstr "%(site_name)s的评论"
|
||||
|
||||
#: contrib/comments/feeds.py:23
|
||||
#, python-format
|
||||
msgid "Latest comments on %(site_name)s"
|
||||
msgstr "%(site_name)s的最新评论"
|
||||
|
||||
#: contrib/comments/forms.py:19
|
||||
#: contrib/comments/templates/comments/moderation_queue.html:34
|
||||
msgid "Name"
|
||||
@ -1423,6 +1452,12 @@ msgid ""
|
||||
"only."
|
||||
msgstr "此评论由一位验证用户发表，因此该用户名是只读的。"
|
||||
|
||||
#: contrib/comments/models.py:77
|
||||
msgid "comments"
|
||||
msgstr "评论"
|
||||
|
||||
#: contrib/comments/models.py:119
|
||||
|
||||
#: contrib/comments/models.py:124
|
||||
msgid ""
|
||||
"This comment was posted by an authenticated user and thus the email is read-"
|
||||
@ -1444,6 +1479,22 @@ msgstr ""
|
||||
"\n"
|
||||
"http://%(domain)s%(url)s"
|
||||
|
||||
#: contrib/comments/models.py:170
|
||||
msgid "flag"
|
||||
msgstr "标记"
|
||||
|
||||
#: contrib/comments/models.py:171
|
||||
msgid "date"
|
||||
msgstr "标记时间"
|
||||
|
||||
#: contrib/comments/models.py:181
|
||||
msgid "comment flag"
|
||||
msgstr "评论标记"
|
||||
|
||||
#: contrib/comments/models.py:182
|
||||
msgid "comment flags"
|
||||
msgstr "评论标记"
|
||||
|
||||
#: contrib/comments/templates/comments/approve.html:4
|
||||
msgid "Approve a comment"
|
||||
msgstr "批准评论"
|
||||
@ -1574,10 +1625,6 @@ msgstr "或进行修改"
|
||||
msgid "python model class name"
|
||||
msgstr "python 模型类名"
|
||||
|
||||
#: contrib/contenttypes/models.py:71
|
||||
msgid "content type"
|
||||
msgstr "内容类型"
|
||||
|
||||
#: contrib/contenttypes/models.py:72
|
||||
msgid "content types"
|
||||
msgstr "内容类型"
|
||||
@ -1655,6 +1702,14 @@ msgstr "无效几何信息。"
|
||||
msgid "Invalid geometry type."
|
||||
msgstr "无效几何类型。"
|
||||
|
||||
#: contrib/gis/forms/fields.py:20
|
||||
msgid ""
|
||||
"An error occurred when transforming the geometry to the SRID of the geometry "
|
||||
"form field."
|
||||
msgstr ""
|
||||
"几何形状的SRID字段发生试图转换错误"
|
||||
"ました。"
|
||||
|
||||
#: contrib/humanize/templatetags/humanize.py:19
|
||||
msgid "th"
|
||||
msgstr "th"
|
||||
@ -2789,8 +2844,8 @@ msgid "Wrong checksum for the Tax Number (NIP)."
|
||||
msgstr "税号（NIP）校验和错误。"
|
||||
|
||||
#: contrib/localflavor/pl/forms.py:111
|
||||
msgid "National Business Register Number (REGON) consists of 7 or 9 digits."
|
||||
msgstr "国家商业注册号码（REGON）由 7 位或 9 位数字组成。"
|
||||
msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
|
||||
msgstr "国家商业注册号码（REGON）由 9 位或 14 位数字组成。"
|
||||
|
||||
#: contrib/localflavor/pl/forms.py:112
|
||||
msgid "Wrong checksum for the National Business Register Number (REGON)."
|
||||
@ -3796,6 +3851,36 @@ msgstr "输入一个有效的 'slug'，由字母、数字、下划线或横线
|
||||
msgid "Order"
|
||||
msgstr "排序"
|
||||
|
||||
#: forms/models.py:367
|
||||
#, python-format
|
||||
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
|
||||
msgstr ""
|
||||
"在%(date_field)s %(lookup)s 需要唯一的 %(field_name)s"
|
||||
|
||||
#: forms/models.py:594
|
||||
#, python-format
|
||||
msgid "Please correct the duplicate data for %(field)s."
|
||||
msgstr "请修改%(field)s的重复数据"
|
||||
|
||||
#: forms/models.py:598
|
||||
#, python-format
|
||||
msgid "Please correct the duplicate data for %(field)s, which must be unique."
|
||||
msgstr "请修改%(field)s的重复数据.这个字段必须唯一"
|
||||
|
||||
#: forms/models.py:604
|
||||
#, 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 "请修正%(field_name)s的重复数据。%(date_field)s %(lookup)s 在 %(field_name)s 必须保证唯一."
|
||||
|
||||
#: forms/models.py:612
|
||||
msgid "Please correct the duplicate values below."
|
||||
msgstr "请修正重复的数据."
|
||||
|
||||
#: forms/models.py:381 forms/models.py:389
|
||||
#, python-format
|
||||
|
||||
#: forms/models.py:281 forms/models.py:290
|
||||
#, python-format
|
||||
msgid "%(model_name)s with this %(field_label)s already exists."
|
||||
|
||||
Binary file not shown.
@ -9,8 +9,8 @@ msgstr ""
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2006-03-21 18:43+0800\n"
|
||||
"PO-Revision-Date: 2006-09-25 08:35+0800\n"
|
||||
"Last-Translator: limodou <limodou@gmail.com>\n"
|
||||
"Language-Team: limodou <limodou@gmail.com>\n"
|
||||
"Last-Translator: Qing Feng <paradise.qingfeng@gmail.com>\n"
|
||||
"Language-Team: Qing Feng <paradise.qingfeng@gmail.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=utf-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
||||
@ -224,7 +224,8 @@ class RelatedFieldWidgetWrapper(forms.Widget):
|
||||
try:
|
||||
related_url = reverse('admin:%s_%s_add' % info, current_app=self.admin_site.name)
|
||||
except NoReverseMatch:
|
||||
related_url = '../../../%s/%s/add/' % info
|
||||
info = (self.admin_site.root_path, rel_to._meta.app_label, rel_to._meta.object_name.lower())
|
||||
related_url = '%s%s/%s/add/' % info
|
||||
self.widget.choices = self.choices
|
||||
output = [self.widget.render(name, value, *args, **kwargs)]
|
||||
if rel_to in self.admin_site._registry: # If the related object has an admin interface:
|
||||
|
||||
@ -125,7 +125,15 @@ class GeoQuerySet(QuerySet):
|
||||
if not isinstance(precision, (int, long)):
|
||||
raise TypeError('Precision keyword must be set with an integer.')
|
||||
|
||||
# Setting the options flag
|
||||
# Setting the options flag -- which depends on which version of
|
||||
# PostGIS we're using.
|
||||
major, minor1, minor2 = SpatialBackend.version
|
||||
if major >=1 and (minor1 >= 4):
|
||||
options = 0
|
||||
if crs and bbox: options = 3
|
||||
elif bbox: options = 1
|
||||
elif crs: options = 2
|
||||
else:
|
||||
options = 0
|
||||
if crs and bbox: options = 3
|
||||
elif crs: options = 1
|
||||
|
||||
@ -148,15 +148,16 @@ class GeoModelTest(unittest.TestCase):
|
||||
ptown1 = City.objects.gml(field_name='point', precision=9).get(name='Pueblo')
|
||||
ptown2 = City.objects.gml(precision=9).get(name='Pueblo')
|
||||
|
||||
import re
|
||||
if SpatialBackend.oracle:
|
||||
# No precision parameter for Oracle :-/
|
||||
import re
|
||||
gml_regex = re.compile(r'<gml:Point srsName="SDO:4326" xmlns:gml="http://www.opengis.net/gml"><gml:coordinates decimal="\." cs="," ts=" ">-104.60925\d+,38.25500\d+ </gml:coordinates></gml:Point>')
|
||||
gml_regex = re.compile(r'^<gml:Point srsName="SDO:4326" xmlns:gml="http://www.opengis.net/gml"><gml:coordinates decimal="\." cs="," ts=" ">-104.60925\d+,38.25500\d+ </gml:coordinates></gml:Point>')
|
||||
for ptown in [ptown1, ptown2]:
|
||||
self.assertEqual(True, bool(gml_regex.match(ptown.gml)))
|
||||
self.failUnless(gml_regex.match(ptown.gml))
|
||||
else:
|
||||
gml_regex = re.compile(r'^<gml:Point srsName="EPSG:4326"><gml:coordinates>-104\.60925\d+,38\.255001</gml:coordinates></gml:Point>')
|
||||
for ptown in [ptown1, ptown2]:
|
||||
self.assertEqual('<gml:Point srsName="EPSG:4326"><gml:coordinates>-104.609252,38.255001</gml:coordinates></gml:Point>', ptown.gml)
|
||||
self.failUnless(gml_regex.match(ptown.gml))
|
||||
|
||||
@no_spatialite
|
||||
@no_oracle
|
||||
@ -167,28 +168,38 @@ class GeoModelTest(unittest.TestCase):
|
||||
if not SpatialBackend.geojson:
|
||||
return
|
||||
|
||||
major, minor1, minor2 = SpatialBackend.version
|
||||
if major >=1 and minor1 >= 4:
|
||||
pueblo_json = '{"type":"Point","coordinates":[-104.609252,38.255001]}'
|
||||
houston_json = '{"type":"Point","crs":{"type":"name","properties":{"name":"EPSG:4326"}},"coordinates":[-95.363151,29.763374]}'
|
||||
victoria_json = '{"type":"Point","bbox":[-123.30519600,48.46261100,-123.30519600,48.46261100],"coordinates":[-123.305196,48.462611]}'
|
||||
chicago_json = '{"type":"Point","crs":{"type":"name","properties":{"name":"EPSG:4326"}},"bbox":[-87.65018,41.85039,-87.65018,41.85039],"coordinates":[-87.65018,41.85039]}'
|
||||
else:
|
||||
pueblo_json = '{"type":"Point","coordinates":[-104.60925200,38.25500100]}'
|
||||
houston_json = '{"type":"Point","crs":{"type":"EPSG","properties":{"EPSG":4326}},"coordinates":[-95.36315100,29.76337400]}'
|
||||
victoria_json = '{"type":"Point","bbox":[-123.30519600,48.46261100,-123.30519600,48.46261100],"coordinates":[-123.30519600,48.46261100]}'
|
||||
chicago_json = '{"type":"Point","crs":{"type":"EPSG","properties":{"EPSG":4326}},"bbox":[-87.65018,41.85039,-87.65018,41.85039],"coordinates":[-87.65018,41.85039]}'
|
||||
|
||||
# Precision argument should only be an integer
|
||||
self.assertRaises(TypeError, City.objects.geojson, precision='foo')
|
||||
|
||||
# Reference queries and values.
|
||||
# SELECT ST_AsGeoJson("geoapp_city"."point", 8, 0) FROM "geoapp_city" WHERE "geoapp_city"."name" = 'Pueblo';
|
||||
json = '{"type":"Point","coordinates":[-104.60925200,38.25500100]}'
|
||||
self.assertEqual(City.objects.geojson().get(name='Pueblo').geojson, json)
|
||||
self.assertEqual(pueblo_json, City.objects.geojson().get(name='Pueblo').geojson)
|
||||
|
||||
# SELECT ST_AsGeoJson("geoapp_city"."point", 8, 1) FROM "geoapp_city" WHERE "geoapp_city"."name" = 'Houston';
|
||||
json = '{"type":"Point","crs":{"type":"EPSG","properties":{"EPSG":4326}},"coordinates":[-95.36315100,29.76337400]}'
|
||||
# 1.3.x: SELECT ST_AsGeoJson("geoapp_city"."point", 8, 1) FROM "geoapp_city" WHERE "geoapp_city"."name" = 'Houston';
|
||||
# 1.4.x: SELECT ST_AsGeoJson("geoapp_city"."point", 8, 2) FROM "geoapp_city" WHERE "geoapp_city"."name" = 'Houston';
|
||||
# This time we want to include the CRS by using the `crs` keyword.
|
||||
self.assertEqual(City.objects.geojson(crs=True, model_att='json').get(name='Houston').json, json)
|
||||
self.assertEqual(houston_json, City.objects.geojson(crs=True, model_att='json').get(name='Houston').json)
|
||||
|
||||
# SELECT ST_AsGeoJson("geoapp_city"."point", 8, 2) FROM "geoapp_city" WHERE "geoapp_city"."name" = 'Victoria';
|
||||
json = '{"type":"Point","bbox":[-123.30519600,48.46261100,-123.30519600,48.46261100],"coordinates":[-123.30519600,48.46261100]}'
|
||||
# 1.3.x: SELECT ST_AsGeoJson("geoapp_city"."point", 8, 2) FROM "geoapp_city" WHERE "geoapp_city"."name" = 'Victoria';
|
||||
# 1.4.x: SELECT ST_AsGeoJson("geoapp_city"."point", 8, 1) FROM "geoapp_city" WHERE "geoapp_city"."name" = 'Houston';
|
||||
# This time we include the bounding box by using the `bbox` keyword.
|
||||
self.assertEqual(City.objects.geojson(bbox=True).get(name='Victoria').geojson, json)
|
||||
self.assertEqual(victoria_json, City.objects.geojson(bbox=True).get(name='Victoria').geojson)
|
||||
|
||||
# SELECT ST_AsGeoJson("geoapp_city"."point", 5, 3) FROM "geoapp_city" WHERE "geoapp_city"."name" = 'Chicago';
|
||||
json = '{"type":"Point","crs":{"type":"EPSG","properties":{"EPSG":4326}},"bbox":[-87.65018,41.85039,-87.65018,41.85039],"coordinates":[-87.65018,41.85039]}'
|
||||
# 1.(3|4).x: SELECT ST_AsGeoJson("geoapp_city"."point", 5, 3) FROM "geoapp_city" WHERE "geoapp_city"."name" = 'Chicago';
|
||||
# Finally, we set every available keyword.
|
||||
self.assertEqual(City.objects.geojson(bbox=True, crs=True, precision=5).get(name='Chicago').geojson, json)
|
||||
self.assertEqual(chicago_json, City.objects.geojson(bbox=True, crs=True, precision=5).get(name='Chicago').geojson)
|
||||
|
||||
@no_oracle
|
||||
def test03d_svg(self):
|
||||
|
||||
@ -39,9 +39,6 @@ class RelatedGeoModelTest(unittest.TestCase):
|
||||
"Testing the `transform` GeoQuerySet method on related geographic models."
|
||||
# All the transformations are to state plane coordinate systems using
|
||||
# US Survey Feet (thus a tolerance of 0 implies error w/in 1 survey foot).
|
||||
if SpatialBackend.postgis:
|
||||
tol = 3
|
||||
else:
|
||||
tol = 0
|
||||
|
||||
def check_pnt(ref, pnt):
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
import unittest
|
||||
from django.contrib.gis.db.backend import SpatialBackend
|
||||
from django.contrib.gis.tests.utils import mysql, no_mysql, oracle, postgis, spatialite
|
||||
if not mysql:
|
||||
from django.contrib.gis.models import SpatialRefSys
|
||||
@ -7,6 +8,7 @@ test_srs = ({'srid' : 4326,
|
||||
'auth_name' : ('EPSG', True),
|
||||
'auth_srid' : 4326,
|
||||
'srtext' : 'GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],TOWGS84[0,0,0,0,0,0,0],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.01745329251994328,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]]',
|
||||
'srtext14' : 'GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.01745329251994328,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]]',
|
||||
'proj4' : '+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs ',
|
||||
'spheroid' : 'WGS 84', 'name' : 'WGS 84',
|
||||
'geographic' : True, 'projected' : False, 'spatialite' : True,
|
||||
@ -17,6 +19,7 @@ test_srs = ({'srid' : 4326,
|
||||
'auth_name' : ('EPSG', False),
|
||||
'auth_srid' : 32140,
|
||||
'srtext' : 'PROJCS["NAD83 / Texas South Central",GEOGCS["NAD83",DATUM["North_American_Datum_1983",SPHEROID["GRS 1980",6378137,298.257222101,AUTHORITY["EPSG","7019"]],AUTHORITY["EPSG","6269"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.01745329251994328,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4269"]],PROJECTION["Lambert_Conformal_Conic_2SP"],PARAMETER["standard_parallel_1",30.28333333333333],PARAMETER["standard_parallel_2",28.38333333333333],PARAMETER["latitude_of_origin",27.83333333333333],PARAMETER["central_meridian",-99],PARAMETER["false_easting",600000],PARAMETER["false_northing",4000000],UNIT["metre",1,AUTHORITY["EPSG","9001"]],AUTHORITY["EPSG","32140"]]',
|
||||
'srtext14': 'PROJCS["NAD83 / Texas South Central",GEOGCS["NAD83",DATUM["North_American_Datum_1983",SPHEROID["GRS 1980",6378137,298.257222101,AUTHORITY["EPSG","7019"]],AUTHORITY["EPSG","6269"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.01745329251994328,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4269"]],UNIT["metre",1,AUTHORITY["EPSG","9001"]],PROJECTION["Lambert_Conformal_Conic_2SP"],PARAMETER["standard_parallel_1",30.28333333333333],PARAMETER["standard_parallel_2",28.38333333333333],PARAMETER["latitude_of_origin",27.83333333333333],PARAMETER["central_meridian",-99],PARAMETER["false_easting",600000],PARAMETER["false_northing",4000000],AUTHORITY["EPSG","32140"],AXIS["X",EAST],AXIS["Y",NORTH]]',
|
||||
'proj4' : '+proj=lcc +lat_1=30.28333333333333 +lat_2=28.38333333333333 +lat_0=27.83333333333333 +lon_0=-99 +x_0=600000 +y_0=4000000 +ellps=GRS80 +datum=NAD83 +units=m +no_defs ',
|
||||
'spheroid' : 'GRS 1980', 'name' : 'NAD83 / Texas South Central',
|
||||
'geographic' : False, 'projected' : True, 'spatialite' : False,
|
||||
@ -25,6 +28,10 @@ test_srs = ({'srid' : 4326,
|
||||
},
|
||||
)
|
||||
|
||||
if SpatialBackend.postgis:
|
||||
major, minor1, minor2 = SpatialBackend.version
|
||||
POSTGIS_14 = major >=1 and minor1 >= 4
|
||||
|
||||
class SpatialRefSysTest(unittest.TestCase):
|
||||
|
||||
@no_mysql
|
||||
@ -45,7 +52,11 @@ class SpatialRefSysTest(unittest.TestCase):
|
||||
|
||||
# No proj.4 and different srtext on oracle backends :(
|
||||
if postgis:
|
||||
self.assertEqual(sd['srtext'], srs.wkt)
|
||||
if POSTGIS_14:
|
||||
srtext = sd['srtext14']
|
||||
else:
|
||||
srtext = sd['srtext']
|
||||
self.assertEqual(srtext, srs.wkt)
|
||||
self.assertEqual(sd['proj4'], srs.proj4text)
|
||||
|
||||
@no_mysql
|
||||
@ -68,7 +79,11 @@ class SpatialRefSysTest(unittest.TestCase):
|
||||
self.assertEqual(sd['proj4'], srs.proj4)
|
||||
# No `srtext` field in the `spatial_ref_sys` table in SpatiaLite
|
||||
if not spatialite:
|
||||
self.assertEqual(sd['srtext'], srs.wkt)
|
||||
if POSTGIS_14:
|
||||
srtext = sd['srtext14']
|
||||
else:
|
||||
srtext = sd['srtext']
|
||||
self.assertEqual(srtext, srs.wkt)
|
||||
|
||||
@no_mysql
|
||||
def test03_ellipsoid(self):
|
||||
|
||||
@ -73,6 +73,7 @@ class Command(BaseCommand):
|
||||
model_list = get_models(app)
|
||||
|
||||
for model in model_list:
|
||||
if not model._meta.proxy:
|
||||
objects.extend(model._default_manager.all())
|
||||
|
||||
try:
|
||||
|
||||
@ -56,8 +56,7 @@ class Command(BaseCommand):
|
||||
translation.activate(settings.LANGUAGE_CODE)
|
||||
|
||||
try:
|
||||
path = admin_media_path or django.__path__[0] + '/contrib/admin/media'
|
||||
handler = AdminMediaHandler(WSGIHandler(), path)
|
||||
handler = AdminMediaHandler(WSGIHandler(), admin_media_path)
|
||||
run(addr, int(port), handler)
|
||||
except WSGIServerException, e:
|
||||
# Use helpful error messages instead of ugly tracebacks.
|
||||
|
||||
@ -16,6 +16,7 @@ import sys
|
||||
import urllib
|
||||
|
||||
from django.utils.http import http_date
|
||||
from django.utils._os import safe_join
|
||||
|
||||
__version__ = "0.1"
|
||||
__all__ = ['WSGIServer','WSGIRequestHandler']
|
||||
@ -621,11 +622,25 @@ class AdminMediaHandler(object):
|
||||
self.application = application
|
||||
if not media_dir:
|
||||
import django
|
||||
self.media_dir = django.__path__[0] + '/contrib/admin/media'
|
||||
self.media_dir = \
|
||||
os.path.join(django.__path__[0], 'contrib', 'admin', 'media')
|
||||
else:
|
||||
self.media_dir = media_dir
|
||||
self.media_url = settings.ADMIN_MEDIA_PREFIX
|
||||
|
||||
def file_path(self, url):
|
||||
"""
|
||||
Returns the path to the media file on disk for the given URL.
|
||||
|
||||
The passed URL is assumed to begin with ADMIN_MEDIA_PREFIX. If the
|
||||
resultant file path is outside the media directory, then a ValueError
|
||||
is raised.
|
||||
"""
|
||||
# Remove ADMIN_MEDIA_PREFIX.
|
||||
relative_url = url[len(self.media_url):]
|
||||
relative_path = urllib.url2pathname(relative_url)
|
||||
return safe_join(self.media_dir, relative_path)
|
||||
|
||||
def __call__(self, environ, start_response):
|
||||
import os.path
|
||||
|
||||
@ -636,19 +651,25 @@ class AdminMediaHandler(object):
|
||||
return self.application(environ, start_response)
|
||||
|
||||
# Find the admin file and serve it up, if it exists and is readable.
|
||||
relative_url = environ['PATH_INFO'][len(self.media_url):]
|
||||
file_path = os.path.join(self.media_dir, relative_url)
|
||||
try:
|
||||
file_path = self.file_path(environ['PATH_INFO'])
|
||||
except ValueError: # Resulting file path was not valid.
|
||||
status = '404 NOT FOUND'
|
||||
headers = {'Content-type': 'text/plain'}
|
||||
output = ['Page not found: %s' % environ['PATH_INFO']]
|
||||
start_response(status, headers.items())
|
||||
return output
|
||||
if not os.path.exists(file_path):
|
||||
status = '404 NOT FOUND'
|
||||
headers = {'Content-type': 'text/plain'}
|
||||
output = ['Page not found: %s' % file_path]
|
||||
output = ['Page not found: %s' % environ['PATH_INFO']]
|
||||
else:
|
||||
try:
|
||||
fp = open(file_path, 'rb')
|
||||
except IOError:
|
||||
status = '401 UNAUTHORIZED'
|
||||
headers = {'Content-type': 'text/plain'}
|
||||
output = ['Permission denied: %s' % file_path]
|
||||
output = ['Permission denied: %s' % environ['PATH_INFO']]
|
||||
else:
|
||||
# This is a very simple implementation of conditional GET with
|
||||
# the Last-Modified header. It makes media files a bit speedier
|
||||
|
||||
@ -41,7 +41,7 @@ class BaseDatabaseCreation(object):
|
||||
from django.db import models
|
||||
|
||||
opts = model._meta
|
||||
if not opts.managed:
|
||||
if not opts.managed or opts.proxy:
|
||||
return [], {}
|
||||
final_output = []
|
||||
table_output = []
|
||||
@ -122,7 +122,7 @@ class BaseDatabaseCreation(object):
|
||||
"Returns any ALTER TABLE statements to add constraints after the fact."
|
||||
from django.db.backends.util import truncate_name
|
||||
|
||||
if not model._meta.managed:
|
||||
if not model._meta.managed or model._meta.proxy:
|
||||
return []
|
||||
qn = self.connection.ops.quote_name
|
||||
final_output = []
|
||||
@ -237,7 +237,7 @@ class BaseDatabaseCreation(object):
|
||||
|
||||
def sql_indexes_for_model(self, model, style):
|
||||
"Returns the CREATE INDEX SQL statements for a single model"
|
||||
if not model._meta.managed:
|
||||
if not model._meta.managed or model._meta.proxy:
|
||||
return []
|
||||
output = []
|
||||
for f in model._meta.local_fields:
|
||||
@ -269,7 +269,7 @@ class BaseDatabaseCreation(object):
|
||||
|
||||
def sql_destroy_model(self, model, references_to_delete, style):
|
||||
"Return the DROP TABLE and restraint dropping statements for a single model"
|
||||
if not model._meta.managed:
|
||||
if not model._meta.managed or model._meta.proxy:
|
||||
return []
|
||||
# Drop the table now
|
||||
qn = self.connection.ops.quote_name
|
||||
@ -287,7 +287,7 @@ class BaseDatabaseCreation(object):
|
||||
def sql_remove_table_constraints(self, model, references_to_delete, style):
|
||||
from django.db.backends.util import truncate_name
|
||||
|
||||
if not model._meta.managed:
|
||||
if not model._meta.managed or model._meta.proxy:
|
||||
return []
|
||||
output = []
|
||||
qn = self.connection.ops.quote_name
|
||||
|
||||
@ -345,7 +345,7 @@ class OracleParam(object):
|
||||
"""
|
||||
Wrapper object for formatting parameters for Oracle. If the string
|
||||
representation of the value is large enough (greater than 4000 characters)
|
||||
the input size needs to be set as NCLOB. Alternatively, if the parameter
|
||||
the input size needs to be set as CLOB. Alternatively, if the parameter
|
||||
has an `input_size` attribute, then the value of the `input_size` attribute
|
||||
will be used instead. Otherwise, no input size will be set for the
|
||||
parameter when executing the query.
|
||||
@ -360,8 +360,8 @@ class OracleParam(object):
|
||||
# If parameter has `input_size` attribute, use that.
|
||||
self.input_size = param.input_size
|
||||
elif isinstance(param, basestring) and len(param) > 4000:
|
||||
# Mark any string param greater than 4000 characters as an NCLOB.
|
||||
self.input_size = Database.NCLOB
|
||||
# Mark any string param greater than 4000 characters as a CLOB.
|
||||
self.input_size = Database.CLOB
|
||||
else:
|
||||
self.input_size = None
|
||||
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
from django.core.exceptions import MiddlewareNotUsed
|
||||
from django.utils.http import http_date
|
||||
|
||||
class ConditionalGetMiddleware(object):
|
||||
@ -32,24 +33,19 @@ class ConditionalGetMiddleware(object):
|
||||
|
||||
class SetRemoteAddrFromForwardedFor(object):
|
||||
"""
|
||||
Middleware that sets REMOTE_ADDR based on HTTP_X_FORWARDED_FOR, if the
|
||||
latter is set. This is useful if you're sitting behind a reverse proxy that
|
||||
causes each request's REMOTE_ADDR to be set to 127.0.0.1.
|
||||
This middleware has been removed; see the Django 1.1 release notes for
|
||||
details.
|
||||
|
||||
It previously set REMOTE_ADDR based on HTTP_X_FORWARDED_FOR. However, after
|
||||
investiagtion, it turns out this is impossible to do in a general manner:
|
||||
different proxies treat the X-Forwarded-For header differently. Thus, a
|
||||
built-in middleware can lead to application-level security problems, and so
|
||||
this was removed in Django 1.1
|
||||
|
||||
Note that this does NOT validate HTTP_X_FORWARDED_FOR. If you're not behind
|
||||
a reverse proxy that sets HTTP_X_FORWARDED_FOR automatically, do not use
|
||||
this middleware. Anybody can spoof the value of HTTP_X_FORWARDED_FOR, and
|
||||
because this sets REMOTE_ADDR based on HTTP_X_FORWARDED_FOR, that means
|
||||
anybody can "fake" their IP address. Only use this when you can absolutely
|
||||
trust the value of HTTP_X_FORWARDED_FOR.
|
||||
"""
|
||||
def process_request(self, request):
|
||||
try:
|
||||
real_ip = request.META['HTTP_X_FORWARDED_FOR']
|
||||
except KeyError:
|
||||
return None
|
||||
else:
|
||||
# HTTP_X_FORWARDED_FOR can be a comma-separated list of IPs. The
|
||||
# client's IP will be the first one.
|
||||
real_ip = real_ip.split(",")[0].strip()
|
||||
request.META['REMOTE_ADDR'] = real_ip
|
||||
def __init__(self):
|
||||
import warnings
|
||||
warnings.warn("SetRemoteAddrFromForwardedFor has been removed. "
|
||||
"See the Django 1.1 release notes for details.",
|
||||
category=DeprecationWarning)
|
||||
raise MiddlewareNotUsed()
|
||||
@ -405,7 +405,7 @@ TECHNICAL_500_TEMPLATE = """
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Exception Value:</th>
|
||||
<td><pre>{{ exception_value|escape }}<pre></td>
|
||||
<td><pre>{{ exception_value|escape }}</pre></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Exception Location:</th>
|
||||
|
||||
@ -201,6 +201,7 @@ The Django open-source project
|
||||
|
||||
* **Django over time:**
|
||||
:ref:`API stability <misc-api-stability>` |
|
||||
:ref:`Archive of release notes <releases-index>` | `Backwards-incompatible changes`_
|
||||
:ref:`Archive of release notes <releases-index>` | `Backwards-incompatible changes`_ |
|
||||
:ref:`Deprecation Timeline <internals-deprecation>`
|
||||
|
||||
.. _Backwards-incompatible changes: http://code.djangoproject.com/wiki/BackwardsIncompatibleChanges
|
||||
|
||||
@ -149,10 +149,33 @@ Joseph Kocherhans
|
||||
.. _brian rosner: http://oebfare.com/
|
||||
.. _this week in django: http://thisweekindjango.com/
|
||||
|
||||
Gary Wilson
|
||||
In early 2007, Gary started contributing a lot of cleanup fixes and fixing
|
||||
broken windows. He's continued to do that necessary tidying up work
|
||||
throughout the code base since then.
|
||||
`Gary Wilson`_
|
||||
Gary starting contributing patches to Django in 2006 while developing Web
|
||||
applications for `The University of Texas`_ (UT). Since, he has made
|
||||
contributions to the e-mail and forms systems, as well as many other
|
||||
improvements and code cleanups throughout the code base.
|
||||
|
||||
Gary is currently a developer and software engineering graduate student at
|
||||
UT, where his dedication to spreading the ways of Python and Django never
|
||||
ceases.
|
||||
|
||||
Gary lives in Austin, Texas, USA.
|
||||
|
||||
.. _Gary Wilson: http://gdub.wordpress.com/
|
||||
.. _The University of Texas: http://www.utexas.edu/
|
||||
|
||||
Justin Bronn
|
||||
Justin Bronn is a computer scientist and attorney specializing
|
||||
in legal topics related to intellectual property and spatial law.
|
||||
|
||||
In 2007, Justin began developing ``django.contrib.gis`` in a branch,
|
||||
a.k.a. GeoDjango_, which was merged in time for Django 1.0. While
|
||||
implementing GeoDjango, Justin obtained a deep knowledge of Django's
|
||||
internals including the ORM, the admin, and Oracle support.
|
||||
|
||||
Justin lives in Houston, Texas.
|
||||
|
||||
.. _GeoDjango: http://geodjango.org/
|
||||
|
||||
Justin Bronn
|
||||
Justin Bronn is a computer scientist and attorney specializing
|
||||
|
||||
21
docs/internals/deprecation.txt
Normal file
21
docs/internals/deprecation.txt
Normal file
@ -0,0 +1,21 @@
|
||||
.. _internals-deprecation:
|
||||
|
||||
===========================
|
||||
Django Deprecation Timeline
|
||||
===========================
|
||||
|
||||
This document outlines when various pieces of Django will be removed, following
|
||||
their deprecation, as per the :ref:`Django deprecation policy
|
||||
<internal-release-deprecation-policy>`
|
||||
|
||||
* 1.3
|
||||
* ``AdminSite.root()``. This release will remove the old method for
|
||||
hooking up admin URLs. This has been deprecated since the 1.1
|
||||
release.
|
||||
|
||||
* 2.0
|
||||
* ``django.views.defaults.shortcut()``. This function has been moved
|
||||
to ``django.contrib.contenttypes.views.shortcut()`` as part of the
|
||||
goal of removing all ``django.contrib`` references from the core
|
||||
Django codebase. The old shortcut will be removed in the 2.0
|
||||
release.
|
||||
@ -22,3 +22,4 @@ the hood".
|
||||
documentation
|
||||
committers
|
||||
release-process
|
||||
deprecation
|
||||
|
||||
@ -50,6 +50,8 @@ Minor releases
|
||||
Minor release (1.1, 1.2, etc.) will happen roughly every six months -- see
|
||||
`release process`_, below for details.
|
||||
|
||||
.. _internal-release-deprecation-policy:
|
||||
|
||||
These releases will contain new features, improvements to existing features, and
|
||||
such. A minor release may deprecate certain features from previous releases. If a
|
||||
feature in version ``A.B`` is deprecated, it will continue to work in version
|
||||
@ -203,4 +205,3 @@ development will be happening in a bunch of places:
|
||||
|
||||
* On feature branches, development of major features is done. These
|
||||
branches will be merged into trunk before the end of phase two.
|
||||
|
||||
|
||||
@ -326,8 +326,8 @@ shortcut. Here's the ``detail()`` view, rewritten::
|
||||
return render_to_response('polls/detail.html', {'poll': p})
|
||||
|
||||
The :func:`~django.shortcuts.get_object_or_404` function takes a Django model
|
||||
module as its first argument and an arbitrary number of keyword arguments, which
|
||||
it passes to the module's :meth:`~django.db.models.QuerySet.get` function. It
|
||||
as its first argument and an arbitrary number of keyword arguments, which it
|
||||
passes to the module's :meth:`~django.db.models.QuerySet.get` function. It
|
||||
raises :exc:`~django.http.Http404` if the object doesn't exist.
|
||||
|
||||
.. admonition:: Philosophy
|
||||
|
||||
@ -122,17 +122,10 @@ Reverse proxy middleware
|
||||
|
||||
.. class:: django.middleware.http.SetRemoteAddrFromForwardedFor
|
||||
|
||||
Sets ``request.META['REMOTE_ADDR']`` based on
|
||||
``request.META['HTTP_X_FORWARDED_FOR']``, if the latter is set. This is useful
|
||||
if you're sitting behind a reverse proxy that causes each request's
|
||||
``REMOTE_ADDR`` to be set to ``127.0.0.1``.
|
||||
.. versionchanged: 1.1
|
||||
|
||||
**Important note:** This does NOT validate ``HTTP_X_FORWARDED_FOR``. If you're
|
||||
not behind a reverse proxy that sets ``HTTP_X_FORWARDED_FOR`` automatically, do
|
||||
not use this middleware. Anybody can spoof the value of
|
||||
``HTTP_X_FORWARDED_FOR``, and because this sets ``REMOTE_ADDR`` based on
|
||||
``HTTP_X_FORWARDED_FOR``, that means anybody can "fake" their IP address. Only
|
||||
use this when you can absolutely trust the value of ``HTTP_X_FORWARDED_FOR``.
|
||||
This middleware was removed in Django 1.1. See :ref:`the release notes
|
||||
<removed-setremoteaddrfromforwardedfor-middleware>` for details.
|
||||
|
||||
Locale middleware
|
||||
-----------------
|
||||
|
||||
@ -188,6 +188,46 @@ almost always do the right thing and trying to override that will lead to
|
||||
errors that are difficult to track down. This feature is for advanced use
|
||||
only.
|
||||
|
||||
Updating attributes based on existing fields
|
||||
--------------------------------------------
|
||||
|
||||
Sometimes you'll need to perform a simple arithmetic task on a field, such
|
||||
as incrementing or decrementing the current value. The obvious way to
|
||||
achieve this is to do something like::
|
||||
|
||||
>>> product = Product.objects.get(name='Venezuelan Beaver Cheese')
|
||||
>>> product.number_sold += 1
|
||||
>>> product.save()
|
||||
|
||||
If the old ``number_sold`` value retrieved from the database was 10, then
|
||||
the value of 11 will be written back to the database.
|
||||
|
||||
This can be optimized slightly by expressing the update relative to the
|
||||
original field value, rather than as an explicit assignment of a new value.
|
||||
Django provides :ref:`F() expressions <query-expressions>` as a way of
|
||||
performing this kind of relative update. Using ``F()`` expressions, the
|
||||
previous example would be expressed as::
|
||||
|
||||
>>> from django.db.models import F
|
||||
>>> product = Product.objects.get(name='Venezuelan Beaver Cheese')
|
||||
>>> product.number_sold = F('number_sold') + 1
|
||||
>>> product.save()
|
||||
|
||||
This approach doesn't use the initial value from the database. Instead, it
|
||||
makes the database do the update based on whatever value is current at the
|
||||
time that the save() is executed.
|
||||
|
||||
Once the object has been saved, you must reload the object in order to access
|
||||
the actual value that was applied to the updated field::
|
||||
|
||||
>>> product = Products.objects.get(pk=product.pk)
|
||||
>>> print product.number_sold
|
||||
42
|
||||
|
||||
For more details, see the documentation on :ref:`F() expressions
|
||||
<query-expressions>` and their :ref:`use in update queries
|
||||
<topics-db-queries-update>`.
|
||||
|
||||
Deleting objects
|
||||
================
|
||||
|
||||
|
||||
111
docs/releases/1.1-rc-1.txt
Normal file
111
docs/releases/1.1-rc-1.txt
Normal file
@ -0,0 +1,111 @@
|
||||
.. _releases-1.1-rc-1:
|
||||
|
||||
=============================
|
||||
Django 1.1 RC 1 release notes
|
||||
=============================
|
||||
|
||||
|
||||
July 21, 2009
|
||||
|
||||
Welcome to the first Django 1.1 release candidate!
|
||||
|
||||
This is the third -- and likely last -- in a series of
|
||||
preview/development releases leading up to the eventual release of
|
||||
Django 1.1, currently scheduled to take place approximately one week
|
||||
after this release candidate. This release is targeted primarily at
|
||||
developers who are interested in trying out new features and testing
|
||||
the Django codebase to help identify and resolve any critical bugs
|
||||
prior to the final 1.1 release.
|
||||
|
||||
As such, this release is not yet intended for production use, and any
|
||||
such use is discouraged.
|
||||
|
||||
|
||||
What's new in Django 1.1 RC 1
|
||||
=============================
|
||||
|
||||
The Django codebase has -- with one exception -- been in feature
|
||||
freeze since the first 1.1 beta release, and so this release candidate
|
||||
contains only one new feature (see below); work leading up to this
|
||||
release candidate has instead been focused on bugfixing, particularly
|
||||
on the new features introduced prior to the 1.1 beta.
|
||||
|
||||
For an overview of those features, consult :ref:`the Django 1.1 beta
|
||||
release notes <releases-1.1-beta-1>`.
|
||||
|
||||
|
||||
URL namespaces
|
||||
--------------
|
||||
|
||||
The 1.1 beta release introduced the ability to use reverse URL
|
||||
resolution with Django's admin application, which exposed a set of
|
||||
:ref:`named URLs <naming-url-patterns>`. Unfortunately, achieving
|
||||
consistent and correct reverse resolution for admin URLs proved
|
||||
extremely difficult, and so one additional feature was added to Django
|
||||
to resolve this issue: URL namespaces.
|
||||
|
||||
In short, this feature allows the same group of URLs, from the same
|
||||
application, to be included in a Django URLConf multiple times, with
|
||||
varying (and potentially nested) named prefixes which will be used
|
||||
when performing reverse resolution. For full details, see :ref:`the
|
||||
documentation on defining URL namespaces
|
||||
<topics-http-defining-url-namespaces>`.
|
||||
|
||||
Due to the changes needed to support this feature, the URL pattern
|
||||
names used when reversing admin URLs have changed since the 1.1 beta
|
||||
release; if you were developing applications which took advantage of
|
||||
this new feature, you will need to update your code to reflect the new
|
||||
names (for most purposes, changing ``admin_`` to ``admin:`` in names
|
||||
to be reversed will suffice). For a full list of URL pattern names
|
||||
used by the admin and information on how namespaces are applied to
|
||||
them, consult the documentation on :ref:`reversing admin URLs
|
||||
<admin-reverse-urls>`.
|
||||
|
||||
|
||||
The Django 1.1 roadmap
|
||||
======================
|
||||
|
||||
As of this release candidate, Django 1.1 is in both feature freeze and
|
||||
"string freeze" -- all strings marked for translation in the Django
|
||||
codebase will retain their current form in the final Django 1.1
|
||||
release. Only critical release-blocking bugs will receive attention
|
||||
between now and the final 1.1 release.
|
||||
|
||||
If no such bugs are discovered, Django 1.1 will be released
|
||||
approximately one week after this release candidate, on or about July
|
||||
28, 2009.
|
||||
|
||||
|
||||
What you can do to help
|
||||
=======================
|
||||
|
||||
In order to provide a high-quality 1.1 release, we need your
|
||||
help. Although this release candidate is, again, *not* intended for
|
||||
production use, you can help the Django team by trying out this
|
||||
release candidate in a safe testing environment and reporting any bugs
|
||||
or issues you encounter. The Django ticket tracker is the central
|
||||
place to search for open issues:
|
||||
|
||||
* http://code.djangoproject.com/timeline
|
||||
|
||||
Please open a new ticket only if no existing ticket corresponds to a
|
||||
problem you're running into.
|
||||
|
||||
Additionally, discussion of Django development, including progress
|
||||
toward the 1.1 release, takes place daily on the django-developers
|
||||
mailing list:
|
||||
|
||||
* http://groups.google.com/group/django-developers
|
||||
|
||||
... and in the ``#django-dev`` IRC channel on ``irc.freenode.net``. If you're
|
||||
interested in helping out with Django's development, feel free to join the
|
||||
discussions there.
|
||||
|
||||
Django's online documentation also includes pointers on how to contribute to
|
||||
Django:
|
||||
|
||||
* :ref:`How to contribute to Django <internals-contributing>`
|
||||
|
||||
Contributions on any level -- developing code, writing documentation or simply
|
||||
triaging tickets and helping to test proposed bugfixes -- are always welcome and
|
||||
appreciated.
|
||||
459
docs/releases/1.1.txt
Normal file
459
docs/releases/1.1.txt
Normal file
@ -0,0 +1,459 @@
|
||||
.. _releases-1.1:
|
||||
|
||||
========================
|
||||
Django 1.1 release notes
|
||||
========================
|
||||
|
||||
|
||||
July 29, 2009
|
||||
|
||||
Welcome to Django 1.1!
|
||||
|
||||
Django 1.1 includes a number of nifty `new features`_, lots of bug
|
||||
fixes, and an easy upgrade path from Django 1.0.
|
||||
|
||||
.. _new features: `What's new in Django 1.1`_
|
||||
|
||||
Backwards-incompatible changes
|
||||
==============================
|
||||
|
||||
Django has a policy of :ref:`API stability <misc-api-stability>`. This means
|
||||
that, in general, code you develop against Django 1.0 should continue to work
|
||||
against 1.1 unchanged. However, we do sometimes make backwards-incompatible
|
||||
changes if they're necessary to resolve bugs, and there are a handful of such
|
||||
(minor) changes between Django 1.0 and Django 1.1.
|
||||
|
||||
Before upgrading to Django 1.1 you should double-check that the following
|
||||
changes don't impact you, and upgrade your code if they do.
|
||||
|
||||
Changes to constraint names
|
||||
---------------------------
|
||||
|
||||
Django 1.1 modifies the method used to generate database constraint names so
|
||||
that names are consistent regardless of machine word size. This change is
|
||||
backwards incompatible for some users.
|
||||
|
||||
If you are using a 32-bit platform, you're off the hook; you'll observe no
|
||||
differences as a result of this change.
|
||||
|
||||
However, **users on 64-bit platforms may experience some problems** using the
|
||||
:djadmin:`reset` management command. Prior to this change, 64-bit platforms
|
||||
would generate a 64-bit, 16 character digest in the constraint name; for
|
||||
example::
|
||||
|
||||
ALTER TABLE myapp_sometable ADD CONSTRAINT object_id_refs_id_5e8f10c132091d1e FOREIGN KEY ...
|
||||
|
||||
Following this change, all platforms, regardless of word size, will generate a
|
||||
32-bit, 8 character digest in the constraint name; for example::
|
||||
|
||||
ALTER TABLE myapp_sometable ADD CONSTRAINT object_id_refs_id_32091d1e FOREIGN KEY ...
|
||||
|
||||
As a result of this change, you will not be able to use the :djadmin:`reset`
|
||||
management command on any table made by a 64-bit machine. This is because the
|
||||
the new generated name will not match the historically generated name; as a
|
||||
result, the SQL constructed by the reset command will be invalid.
|
||||
|
||||
If you need to reset an application that was created with 64-bit constraints,
|
||||
you will need to manually drop the old constraint prior to invoking
|
||||
:djadmin:`reset`.
|
||||
|
||||
Test cases are now run in a transaction
|
||||
---------------------------------------
|
||||
|
||||
Django 1.1 runs tests inside a transaction, allowing better test performance
|
||||
(see `test performance improvements`_ for details).
|
||||
|
||||
This change is slightly backwards incompatible if existing tests need to test
|
||||
transactional behavior, if they rely on invalid assumptions about the test
|
||||
environment, or if they require a specific test case ordering.
|
||||
|
||||
For these cases, :class:`~django.test.TransactionTestCase` can be used instead.
|
||||
This is a just a quick fix to get around test case errors revealed by the new
|
||||
rollback approach; in the long-term tests should be rewritten to correct the
|
||||
test case.
|
||||
|
||||
.. _removed-setremoteaddrfromforwardedfor-middleware:
|
||||
|
||||
Removed ``SetRemoteAddrFromForwardedFor`` middleware
|
||||
----------------------------------------------------
|
||||
|
||||
For convenience, Django 1.0 included an optional middleware class --
|
||||
``django.middleware.http.SetRemoteAddrFromForwardedFor`` -- which updated the
|
||||
value of ``REMOTE_ADDR`` based on the HTTP ``X-Forwarded-For`` header commonly
|
||||
set by some proxy configurations.
|
||||
|
||||
It has been demonstrated that this mechanism cannot be made reliable enough for
|
||||
general-purpose use, and that (despite documentation to the contrary) its
|
||||
inclusion in Django may lead application developers to assume that the value of
|
||||
``REMOTE_ADDR`` is "safe" or in some way reliable as a source of authentication.
|
||||
|
||||
While not directly a security issue, we've decided to remove this middleware
|
||||
with the Django 1.1 release. It has been replaced with a class that does nothing
|
||||
other than raise a ``DeprecationWarning``.
|
||||
|
||||
If you've been relying on this middleware, the easiest upgrade path is:
|
||||
|
||||
* Examine `the code as it existed before it was removed`__.
|
||||
|
||||
* Verify that it works correctly with your upstream proxy, modifying
|
||||
it to support your particular proxy (if necessary).
|
||||
|
||||
* Introduce your modified version of ``SetRemoteAddrFromForwardedFor`` as a
|
||||
piece of middleware in your own project.
|
||||
|
||||
__ http://code.djangoproject.com/browser/django/trunk/django/middleware/http.py?rev=11000#L33
|
||||
|
||||
Names of uploaded files are available later
|
||||
-------------------------------------------
|
||||
|
||||
.. currentmodule:: django.db.models
|
||||
|
||||
In Django 1.0, files uploaded and stored in a model's :class:`FileField` were
|
||||
saved to disk before the model was saved to the database. This meant that the
|
||||
actual file name assigned to the file was available before saving. For example,
|
||||
it was available in a model's pre-save signal handler.
|
||||
|
||||
In Django 1.1 the file is saved as part of saving the model in the database, so
|
||||
the actual file name used on disk cannot be relied on until *after* the model
|
||||
has been saved saved.
|
||||
|
||||
Changes to how model formsets are saved
|
||||
---------------------------------------
|
||||
|
||||
.. currentmodule:: django.forms.models
|
||||
|
||||
In Django 1.1, :class:`BaseModelFormSet` now calls :meth:`ModelForm.save()`.
|
||||
|
||||
This is backwards-incompatible if you were modifying ``self.initial`` in a model
|
||||
formset's ``__init__``, or if you relied on the internal ``_total_form_count``
|
||||
or ``_initial_form_count`` attributes of BaseFormSet. Those attributes are now
|
||||
public methods.
|
||||
|
||||
Fixed the ``join`` filter's escaping behavior
|
||||
---------------------------------------------
|
||||
|
||||
The :ttag:`join` filter no longer escapes the literal value that is
|
||||
passed in for the connector.
|
||||
|
||||
This is backwards incompatible for the special situation of the literal string
|
||||
containing one of the five special HTML characters. Thus, if you were writing
|
||||
``{{ foo|join:"&" }}``, you now have to write ``{{ foo|join:"&" }}``.
|
||||
|
||||
The previous behavior was a bug and contrary to what was documented
|
||||
and expected.
|
||||
|
||||
Permanent redirects and the ``redirect_to()`` generic view
|
||||
----------------------------------------------------------
|
||||
|
||||
Django 1.1 adds a ``permanent`` argument to the
|
||||
:func:`django.views.generic.simple.redirect_to()` view. This is technically
|
||||
backwards-incompatible if you were using the ``redirect_to`` view with a
|
||||
format-string key called 'permanent', which is highly unlikely.
|
||||
|
||||
Features deprecated in 1.1
|
||||
==========================
|
||||
|
||||
One feature has been marked as deprecated in Django 1.1:
|
||||
|
||||
* You should no longer use ``AdminSite.root()`` to register that admin
|
||||
views. That is, if your URLconf contains the line::
|
||||
|
||||
(r'^admin/(.*)', admin.site.root),
|
||||
|
||||
You should change it to read::
|
||||
|
||||
(r'^admin/', include(admin.site.urls)),
|
||||
|
||||
You should begin to remove use of this features from your code immediately.
|
||||
|
||||
``AdminSite.root`` will will raise a ``PendingDeprecationWarning`` if used in
|
||||
Django 1.1. This warning is hidden by default. In Django 1.2, this warning will
|
||||
be upgraded to a ``DeprecationWarning``, which will be displayed loudly. Django
|
||||
1.3 will remove ``AdminSite.root()`` entirely.
|
||||
|
||||
For more details on our deprecation policies and strategy, see
|
||||
:ref:`internals-release-process`.
|
||||
|
||||
What's new in Django 1.1
|
||||
========================
|
||||
|
||||
Quite a bit: since Django 1.0, we've made 1,290 code commits, fixed 1,206 bugs,
|
||||
and added roughly 10,000 lines of documentation.
|
||||
|
||||
The major new features in Django 1.1 are:
|
||||
|
||||
ORM improvements
|
||||
----------------
|
||||
|
||||
.. currentmodule:: django.db.models
|
||||
|
||||
Two major enhancements have been added to Django's object-relational mapper
|
||||
(ORM): aggregate support, and query expressions.
|
||||
|
||||
Aggregate support
|
||||
~~~~~~~~~~~~~~~~~
|
||||
|
||||
It's now possible to run SQL aggregate queries (i.e. ``COUNT()``, ``MAX()``,
|
||||
``MIN()``, etc.) from within Django's ORM. You can choose to either return the
|
||||
results of the aggregate directly, or else annotate the objects in a
|
||||
:class:`QuerySet` with the results of the aggregate query.
|
||||
|
||||
This feature is available as new :meth:`QuerySet.aggregate()`` and
|
||||
:meth:`QuerySet.annotate()`` methods, and is covered in detail in :ref:`the ORM
|
||||
aggregation documentation <topics-db-aggregation>`.
|
||||
|
||||
Query expressions
|
||||
~~~~~~~~~~~~~~~~~
|
||||
|
||||
Queries can now refer to a another field on the query and can traverse
|
||||
relationships to refer to fields on related models. This is implemented in the
|
||||
new :class:`F` object; for full details, including examples, consult the
|
||||
:ref:`documentation for F expressions <query-expressions>`.
|
||||
|
||||
Model improvements
|
||||
------------------
|
||||
|
||||
A number of features have been added to Django's model layer:
|
||||
|
||||
"Unmanaged" models
|
||||
~~~~~~~~~~~~~~~~~~
|
||||
|
||||
You can now control whether or not Django manages the life-cycle of the database
|
||||
tables for a model using the :attr:`~Options.managed` model option. This
|
||||
defaults to ``True``, meaning that Django will create the appropriate database
|
||||
tables in :djadmin:`syncdb` and remove them as part of the :djadmin:`reset`
|
||||
command. That is, Django *manages* the database table's lifecycle.
|
||||
|
||||
If you set this to ``False``, however, no database table creating or deletion
|
||||
will be automatically performed for this model. This is useful if the model
|
||||
represents an existing table or a database view that has been created by some
|
||||
other means.
|
||||
|
||||
For more details, see the documentation for the :attr:`~Options.managed`
|
||||
option.
|
||||
|
||||
Proxy models
|
||||
~~~~~~~~~~~~
|
||||
|
||||
You can now create :ref:`proxy models <proxy-models>`: subclasses of existing
|
||||
models that only add Python-level (rather than database-level) behavior and
|
||||
aren't represented by a new table. That is, the new model is a *proxy* for some
|
||||
underlying model, which stores all the real data.
|
||||
|
||||
All the details can be found in the :ref:`proxy models documentation
|
||||
<proxy-models>`. This feature is similar on the surface to unmanaged models,
|
||||
so the documentation has an explanation of :ref:`how proxy models differ from
|
||||
unmanaged models <proxy-vs-unmanaged-models>`.
|
||||
|
||||
Deferred fields
|
||||
~~~~~~~~~~~~~~~
|
||||
|
||||
In some complex situations, your models might contain fields which could
|
||||
contain a lot of data (for example, large text fields), or require expensive
|
||||
processing to convert them to Python objects. If you know you don't need those
|
||||
particular fields, you can now tell Django not to retrieve them from the
|
||||
database.
|
||||
|
||||
You'll do this with the :ref:`new queryset methods <queryset-defer>`
|
||||
``defer()`` and ``only()``.
|
||||
|
||||
Testing improvements
|
||||
--------------------
|
||||
|
||||
A few notable improvements have been made to the :ref:`testing framework
|
||||
<topics-testing>`.
|
||||
|
||||
Test performance improvements
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
.. currentmodule:: django.test
|
||||
|
||||
Tests written using Django's :ref:`testing framework <topics-testing>` now run
|
||||
dramatically faster (as much as 10 times faster in many cases).
|
||||
|
||||
This was accomplished through the introduction of transaction-based tests: when
|
||||
using :class:`django.test.TestCase`, your tests will now be run in a transaction
|
||||
which is rolled back when finished, instead of by flushing and re-populating the
|
||||
database. This results in an immense speedup for most types of unit tests. See
|
||||
the documentation for :class:`TestCase` and :class:`TransactionTestCase` for a
|
||||
full description, and some important notes on database support.
|
||||
|
||||
Test client improvements
|
||||
------------------------
|
||||
|
||||
.. currentmodule:: django.test.client
|
||||
|
||||
A couple of small -- but highly useful -- improvements have been made to the
|
||||
test client:
|
||||
|
||||
* The test :class:`Client` now can automatically follow redirects with the
|
||||
``follow`` argument to :meth:`Client.get` and :meth:`Client.post`. This
|
||||
makes testing views that issue redirects simpler.
|
||||
|
||||
* It's now easier to get at the template context in the response returned
|
||||
the test client: you'll simply access the context as
|
||||
``request.context[key]``. The old way, which treats ``request.context`` as
|
||||
a list of contexts, one for each rendered template in the inheritance
|
||||
chain, is still available if you need it.
|
||||
|
||||
New admin features
|
||||
------------------
|
||||
|
||||
Django 1.1 adds a couple of nifty new features to Django's admin interface:
|
||||
|
||||
Editable fields on the change list
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
You can now make fields editable on the admin list views via the new
|
||||
:ref:`list_editable <admin-list-editable>` admin option. These fields will show
|
||||
up as form widgets on the list pages, and can be edited and saved in bulk.
|
||||
|
||||
Admin "actions"
|
||||
~~~~~~~~~~~~~~~
|
||||
|
||||
You can now define :ref:`admin actions <ref-contrib-admin-actions>` that can
|
||||
perform some action to a group of models in bulk. Users will be able to select
|
||||
objects on the change list page and then apply these bulk actions to all
|
||||
selected objects.
|
||||
|
||||
Django ships with one pre-defined admin action to delete a group of objects in
|
||||
one fell swoop.
|
||||
|
||||
Conditional view processing
|
||||
---------------------------
|
||||
|
||||
Django now has much better support for :ref:`conditional view processing
|
||||
<topics-conditional-processing>` using the standard ``ETag`` and
|
||||
``Last-Modified`` HTTP headers. This means you can now easily short-circuit
|
||||
view processing by testing less-expensive conditions. For many views this can
|
||||
lead to a serious improvement in speed and reduction in bandwidth.
|
||||
|
||||
URL namespaces
|
||||
--------------
|
||||
|
||||
Django 1.1 improves :ref:`named URL patterns <naming-url-patterns>` with the
|
||||
introduction of URL "namespaces."
|
||||
|
||||
In short, this feature allows the same group of URLs, from the same application,
|
||||
to be included in a Django URLConf multiple times, with varying (and potentially
|
||||
nested) named prefixes which will be used when performing reverse resolution. In
|
||||
other words, reusable applications like Django's admin interface may be
|
||||
registered multiple times without URL conflicts.
|
||||
|
||||
For full details, see :ref:`the documentation on defining URL namespaces
|
||||
<topics-http-defining-url-namespaces>`.
|
||||
|
||||
GeoDjango
|
||||
---------
|
||||
|
||||
In Django 1.1, GeoDjango_ (i.e. ``django.contrib.gis``) has several new
|
||||
features:
|
||||
|
||||
* Support for SpatiaLite_ -- a spatial database for SQLite -- as a spatial
|
||||
backend.
|
||||
|
||||
* Geographic aggregates (``Collect``, ``Extent``, ``MakeLine``, ``Union``)
|
||||
and ``F`` expressions.
|
||||
|
||||
* New ``GeoQuerySet`` methods: ``collect``, ``geojson``, and
|
||||
``snap_to_grid``.
|
||||
|
||||
* A new list interface methods for ``GEOSGeometry`` objects.
|
||||
|
||||
For more details, see the `GeoDjango documentation`_.
|
||||
|
||||
.. _geodjango: http://geodjango.org/
|
||||
.. _spatialite: http://www.gaia-gis.it/spatialite/
|
||||
.. _geodjango documentation: http://geodjango.org/docs/
|
||||
|
||||
Other improvements
|
||||
------------------
|
||||
|
||||
Other new features and changes introduced since Django 1.0 include:
|
||||
|
||||
* The :ref:`CSRF protection middleware <ref-contrib-csrf>` has been split into
|
||||
two classes -- ``CsrfViewMiddleware`` checks incoming requests, and
|
||||
``CsrfResponseMiddleware`` processes outgoing responses. The combined
|
||||
``CsrfMiddleware`` class (which does both) remains for
|
||||
backwards-compatibility, but using the split classes is now recommended in
|
||||
order to allow fine-grained control of when and where the CSRF processing
|
||||
takes place.
|
||||
|
||||
* :func:`~django.core.urlresolvers.reverse` and code which uses it (e.g., the
|
||||
``{% url %}`` template tag) now works with URLs in Django's administrative
|
||||
site, provided that the admin URLs are set up via ``include(admin.site.urls)``
|
||||
(sending admin requests to the ``admin.site.root`` view still works, but URLs
|
||||
in the admin will not be "reversible" when configured this way).
|
||||
|
||||
* The ``include()`` function in Django URLconf modules can now accept sequences
|
||||
of URL patterns (generated by ``patterns()``) in addition to module names.
|
||||
|
||||
* Instances of Django forms (see `the forms overview <topics-forms-index>`_ now
|
||||
have two additional methods, ``hidden_fields()`` and ``visible_fields()``,
|
||||
which return the list of hidden -- i.e., ``<input type="hidden">`` -- and
|
||||
visible fields on the form, respectively.
|
||||
|
||||
* The ``redirect_to`` generic view (see `the generic views documentation
|
||||
<ref-generic-views>`_) now accepts an additional keyword argument
|
||||
``permanent``. If ``permanent`` is ``True``, the view will emit an HTTP
|
||||
permanent redirect (status code 301). If ``False``, the view will emit an HTTP
|
||||
temporary redirect (status code 302).
|
||||
|
||||
* A new database lookup type -- ``week_day`` -- has been added for ``DateField``
|
||||
and ``DateTimeField``. This type of lookup accepts a number between 1 (Sunday)
|
||||
and 7 (Saturday), and returns objects where the field value matches that day
|
||||
of the week. See `the full list of lookup types <field-lookups>`_ for details.
|
||||
|
||||
* The ``{% for %}`` tag in Django's template language now accepts an optional
|
||||
``{% empty %}`` clause, to be displayed when ``{% for %}`` is asked to loop
|
||||
over an empty sequence. See :ref:`the list of built-in template tags
|
||||
<ref-templates-builtins>` for examples of this.
|
||||
|
||||
* The :djadmin:`dumpdata` management command now accepts individual
|
||||
model names as arguments, allowing you to export the data just from
|
||||
particular models.
|
||||
|
||||
* There's a new :tfilter:`safeseq` template filter which works just like
|
||||
:tfilter:`safe` for lists, marking each item in the list as safe.
|
||||
|
||||
* :ref:`Cache backends <topics-cache>` now support ``incr()`` and
|
||||
``decr()`` commands to increment and decrement the value of a cache key.
|
||||
On cache backends that support atomic increment/decrement -- most
|
||||
notably, the memcached backend -- these operations will be atomic, and
|
||||
quite fast.
|
||||
|
||||
* Django now can :ref:`easily delegate authentication to the web server
|
||||
<howto-auth-remote-user>` via a new authentication backend that supports
|
||||
the standard ``REMOTE_USER`` environment variable used for this purpose.
|
||||
|
||||
* There's a new :func:`django.shortcuts.redirect` function that makes it
|
||||
easier to issue redirects given an object, a view name, or a URL.
|
||||
|
||||
* The ``postgresql_psycopg2`` backend now supports :ref:`native PostgreSQL
|
||||
autocommit <postgresql-notes>`. This is an advanced, PostgreSQL-specific
|
||||
feature, that can make certain read-heavy applications a good deal
|
||||
faster.
|
||||
|
||||
What's next?
|
||||
============
|
||||
|
||||
We'll take a short break, and then work on Django 1.2 will begin -- no rest for
|
||||
the weary! If you'd like to help, discussion of Django development, including
|
||||
progress toward the 1.2 release, takes place daily on the django-developers
|
||||
mailing list:
|
||||
|
||||
* http://groups.google.com/group/django-developers
|
||||
|
||||
... and in the ``#django-dev`` IRC channel on ``irc.freenode.net``. Feel free to
|
||||
join the discussions!
|
||||
|
||||
Django's online documentation also includes pointers on how to contribute to
|
||||
Django:
|
||||
|
||||
* :ref:`How to contribute to Django <internals-contributing>`
|
||||
|
||||
Contributions on any level -- developing code, writing documentation or simply
|
||||
triaging tickets and helping to test proposed bugfixes -- are always welcome and
|
||||
appreciated.
|
||||
|
||||
And that's the way it is.
|
||||
@ -3,7 +3,7 @@
|
||||
Release notes
|
||||
=============
|
||||
|
||||
Releases notes for the official Django releases. Each release note will tell you
|
||||
Release notes for the official Django releases. Each release note will tell you
|
||||
what's new in each version, and will also describe any backwards-incompatible
|
||||
changes made in that version.
|
||||
|
||||
@ -21,6 +21,8 @@ changes made in that version.
|
||||
1.0.2
|
||||
1.1-alpha-1
|
||||
1.1-beta-1
|
||||
1.1-rc-1
|
||||
1.1
|
||||
|
||||
.. seealso::
|
||||
|
||||
|
||||
@ -465,7 +465,7 @@ Defining URL Namespaces
|
||||
|
||||
When you need to deploy multiple instances of a single application, it can be
|
||||
helpful to be able to differentiate between instances. This is especially
|
||||
important when using _`named URL patterns <naming-url-patterns>`, since
|
||||
important when using :ref:`named URL patterns <naming-url-patterns>`, since
|
||||
multiple instances of a single application will share named URLs. Namespaces
|
||||
provide a way to tell these named URLs apart.
|
||||
|
||||
@ -642,7 +642,7 @@ view::
|
||||
|
||||
This is completely valid, but it leads to problems when you try to do reverse
|
||||
URL matching (through the ``permalink()`` decorator or the :ttag:`url` template
|
||||
tag. Continuing this example, if you wanted to retrieve the URL for the
|
||||
tag). Continuing this example, if you wanted to retrieve the URL for the
|
||||
``archive`` view, Django's reverse URL matcher would get confused, because *two*
|
||||
URLpatterns point at that view.
|
||||
|
||||
@ -706,12 +706,12 @@ the fully qualified name into parts, and then tries the following lookup:
|
||||
example, ``myapp``). This will yield a list of instances of that
|
||||
application.
|
||||
|
||||
2. If there is a ``current`` application defined, Django finds and returns
|
||||
the URL resolver for that instance. The ``current`` can be specified
|
||||
as an attribute on the template context - applications that expect to
|
||||
have multiple deployments should set the ``current_app`` attribute on
|
||||
any ``Context`` or ``RequestContext`` that is used to render a
|
||||
template.
|
||||
2. If there is a *current* application defined, Django finds and returns
|
||||
the URL resolver for that instance. The *current* application can be
|
||||
specified as an attribute on the template context - applications that
|
||||
expect to have multiple deployments should set the ``current_app``
|
||||
attribute on any ``Context`` or ``RequestContext`` that is used to
|
||||
render a template.
|
||||
|
||||
The current application can also be specified manually as an argument
|
||||
to the :func:`reverse()` function.
|
||||
@ -725,7 +725,7 @@ the fully qualified name into parts, and then tries the following lookup:
|
||||
deployed instance of the application, whatever its instance name may be.
|
||||
|
||||
5. If the provided namespace doesn't match an application namespace in
|
||||
step 2, Django will attempt a direct lookup of the namespace as an
|
||||
step 1, Django will attempt a direct lookup of the namespace as an
|
||||
instance namespace.
|
||||
|
||||
If there are nested namespaces, these steps are repeated for each part of the
|
||||
|
||||
4
setup.py
4
setup.py
@ -74,7 +74,7 @@ setup(
|
||||
name = "Django",
|
||||
version = version.replace(' ', '-'),
|
||||
url = 'http://www.djangoproject.com/',
|
||||
download_url = 'http://media.djangoproject.com/releases/1.1/Django-1.1-beta-1.tar.gz',
|
||||
download_url = 'http://media.djangoproject.com/releases/1.1/Django-1.1.tar.gz',
|
||||
author = 'Django Software Foundation',
|
||||
author_email = 'foundation@djangoproject.com',
|
||||
description = 'A high-level Python Web framework that encourages rapid development and clean, pragmatic design.',
|
||||
@ -82,7 +82,7 @@ setup(
|
||||
cmdclass = cmdclasses,
|
||||
data_files = data_files,
|
||||
scripts = ['django/bin/django-admin.py'],
|
||||
classifiers = ['Development Status :: 3 - Alpha',
|
||||
classifiers = ['Development Status :: 5 - Production/Stable',
|
||||
'Environment :: Web Environment',
|
||||
'Framework :: Django',
|
||||
'Intended Audience :: Developers',
|
||||
|
||||
@ -80,4 +80,43 @@ Traceback (most recent call last):
|
||||
...
|
||||
FieldError: Joined field references are not permitted in this query
|
||||
|
||||
# F expressions can be used to update attributes on single objects
|
||||
>>> test_gmbh = Company.objects.get(name='Test GmbH')
|
||||
>>> test_gmbh.num_employees
|
||||
32
|
||||
>>> test_gmbh.num_employees = F('num_employees') + 4
|
||||
>>> test_gmbh.save()
|
||||
>>> test_gmbh = Company.objects.get(pk=test_gmbh.pk)
|
||||
>>> test_gmbh.num_employees
|
||||
36
|
||||
|
||||
# F expressions cannot be used to update attributes which are foreign keys, or
|
||||
# attributes which involve joins.
|
||||
>>> test_gmbh.point_of_contact = None
|
||||
>>> test_gmbh.save()
|
||||
>>> test_gmbh.point_of_contact is None
|
||||
True
|
||||
>>> test_gmbh.point_of_contact = F('ceo')
|
||||
Traceback (most recent call last):
|
||||
...
|
||||
ValueError: Cannot assign "<django.db.models.expressions.F object at ...>": "Company.point_of_contact" must be a "Employee" instance.
|
||||
|
||||
>>> test_gmbh.point_of_contact = test_gmbh.ceo
|
||||
>>> test_gmbh.save()
|
||||
>>> test_gmbh.name = F('ceo__last_name')
|
||||
>>> test_gmbh.save()
|
||||
Traceback (most recent call last):
|
||||
...
|
||||
FieldError: Joined field references are not permitted in this query
|
||||
|
||||
# F expressions cannot be used to update attributes on objects which do not yet
|
||||
# exist in the database
|
||||
>>> acme = Company(name='The Acme Widget Co.', num_employees=12, num_chairs=5,
|
||||
... ceo=test_gmbh.ceo)
|
||||
>>> acme.num_employees = F('num_employees') + 16
|
||||
>>> acme.save()
|
||||
Traceback (most recent call last):
|
||||
...
|
||||
TypeError: int() argument must be a string or a number, not 'ExpressionNode'
|
||||
|
||||
"""}
|
||||
|
||||
@ -115,6 +115,7 @@ class AdminFormfieldForDBFieldWithRequestTests(DjangoTestCase):
|
||||
|
||||
class AdminForeignKeyWidgetChangeList(DjangoTestCase):
|
||||
fixtures = ["admin-widgets-users.xml"]
|
||||
admin_root = '/widget_admin'
|
||||
|
||||
def setUp(self):
|
||||
self.client.login(username="super", password="secret")
|
||||
@ -123,5 +124,9 @@ class AdminForeignKeyWidgetChangeList(DjangoTestCase):
|
||||
self.client.logout()
|
||||
|
||||
def test_changelist_foreignkey(self):
|
||||
response = self.client.get('/widget_admin/admin_widgets/car/')
|
||||
self.failUnless('/widget_admin/auth/user/add/' in response.content)
|
||||
response = self.client.get('%s/admin_widgets/car/' % self.admin_root)
|
||||
self.failUnless('%s/auth/user/add/' % self.admin_root in response.content)
|
||||
|
||||
class OldAdminForeignKeyWidgetChangeList(AdminForeignKeyWidgetChangeList):
|
||||
urls = 'regressiontests.admin_widgets.urls2'
|
||||
admin_root = '/deep/down/admin'
|
||||
|
||||
7
tests/regressiontests/admin_widgets/urls2.py
Normal file
7
tests/regressiontests/admin_widgets/urls2.py
Normal file
@ -0,0 +1,7 @@
|
||||
|
||||
from django.conf.urls.defaults import *
|
||||
import widgetadmin
|
||||
|
||||
urlpatterns = patterns('',
|
||||
(r'^deep/down/admin/(.*)', widgetadmin.site.root),
|
||||
)
|
||||
@ -18,6 +18,21 @@ class Callproc(unittest.TestCase):
|
||||
else:
|
||||
return True
|
||||
|
||||
class LongString(unittest.TestCase):
|
||||
|
||||
def test_long_string(self):
|
||||
# If the backend is Oracle, test that we can save a text longer
|
||||
# than 4000 chars and read it properly
|
||||
if settings.DATABASE_ENGINE == 'oracle':
|
||||
c = connection.cursor()
|
||||
c.execute('CREATE TABLE ltext ("TEXT" NCLOB)')
|
||||
long_str = ''.join([unicode(x) for x in xrange(4000)])
|
||||
c.execute('INSERT INTO ltext VALUES (%s)',[long_str])
|
||||
c.execute('SELECT text FROM ltext')
|
||||
row = c.fetchone()
|
||||
c.execute('DROP TABLE ltext')
|
||||
self.assertEquals(long_str, row[0].read())
|
||||
|
||||
def connection_created_test(sender, **kwargs):
|
||||
print 'connection_created signal'
|
||||
|
||||
|
||||
@ -54,7 +54,7 @@ class Parent(models.Model):
|
||||
class Child(Parent):
|
||||
data = models.CharField(max_length=10)
|
||||
|
||||
# Models to regresison check #7572
|
||||
# Models to regression test #7572
|
||||
class Channel(models.Model):
|
||||
name = models.CharField(max_length=255)
|
||||
|
||||
@ -65,6 +65,14 @@ class Article(models.Model):
|
||||
class Meta:
|
||||
ordering = ('id',)
|
||||
|
||||
# Models to regression test #11428
|
||||
class Widget(models.Model):
|
||||
name = models.CharField(max_length=255)
|
||||
|
||||
class WidgetProxy(Widget):
|
||||
class Meta:
|
||||
proxy = True
|
||||
|
||||
__test__ = {'API_TESTS':"""
|
||||
>>> from django.core import management
|
||||
|
||||
@ -170,4 +178,18 @@ Weight = 1.2 (<type 'float'>)
|
||||
>>> management.call_command('dumpdata', 'fixtures_regress.animal', format='json')
|
||||
[{"pk": 1, "model": "fixtures_regress.animal", "fields": {"count": 3, "weight": 1.2, "name": "Lion", "latin_name": "Panthera leo"}}, {"pk": 2, "model": "fixtures_regress.animal", "fields": {"count": 2, "weight": 2.29..., "name": "Platypus", "latin_name": "Ornithorhynchus anatinus"}}, {"pk": 10, "model": "fixtures_regress.animal", "fields": {"count": 42, "weight": 1.2, "name": "Emu", "latin_name": "Dromaius novaehollandiae"}}]
|
||||
|
||||
###############################################
|
||||
# Regression for #11428 - Proxy models aren't included
|
||||
# when you run dumpdata over an entire app
|
||||
|
||||
# Flush out the database first
|
||||
>>> management.call_command('reset', 'fixtures_regress', interactive=False, verbosity=0)
|
||||
|
||||
# Create an instance of the concrete class
|
||||
>>> Widget(name='grommet').save()
|
||||
|
||||
# Dump data for the entire app. The proxy class shouldn't be included
|
||||
>>> management.call_command('dumpdata', 'fixtures_regress', format='json')
|
||||
[{"pk": 1, "model": "fixtures_regress.widget", "fields": {"name": "grommet"}}]
|
||||
|
||||
"""}
|
||||
|
||||
@ -115,8 +115,7 @@ To: to@example.com
|
||||
Date: Fri, 09 Nov 2001 01:08:47 -0000
|
||||
Message-ID: foo
|
||||
...
|
||||
Content-Type: multipart/alternative; boundary="..."
|
||||
MIME-Version: 1.0
|
||||
Content-Type: multipart/alternative;...
|
||||
...
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
|
||||
0
tests/regressiontests/servers/__init__.py
Normal file
0
tests/regressiontests/servers/__init__.py
Normal file
0
tests/regressiontests/servers/models.py
Normal file
0
tests/regressiontests/servers/models.py
Normal file
67
tests/regressiontests/servers/tests.py
Normal file
67
tests/regressiontests/servers/tests.py
Normal file
@ -0,0 +1,67 @@
|
||||
"""
|
||||
Tests for django.core.servers.
|
||||
"""
|
||||
|
||||
import os
|
||||
|
||||
import django
|
||||
from django.test import TestCase
|
||||
from django.core.handlers.wsgi import WSGIHandler
|
||||
from django.core.servers.basehttp import AdminMediaHandler
|
||||
|
||||
|
||||
class AdminMediaHandlerTests(TestCase):
|
||||
|
||||
def setUp(self):
|
||||
self.admin_media_file_path = \
|
||||
os.path.join(django.__path__[0], 'contrib', 'admin', 'media')
|
||||
self.handler = AdminMediaHandler(WSGIHandler())
|
||||
|
||||
def test_media_urls(self):
|
||||
"""
|
||||
Tests that URLs that look like absolute file paths after the
|
||||
settings.ADMIN_MEDIA_PREFIX don't turn into absolute file paths.
|
||||
"""
|
||||
# Cases that should work on all platforms.
|
||||
data = (
|
||||
('/media/css/base.css', ('css', 'base.css')),
|
||||
)
|
||||
# Cases that should raise an exception.
|
||||
bad_data = ()
|
||||
|
||||
# Add platform-specific cases.
|
||||
if os.sep == '/':
|
||||
data += (
|
||||
# URL, tuple of relative path parts.
|
||||
('/media/\\css/base.css', ('\\css', 'base.css')),
|
||||
)
|
||||
bad_data += (
|
||||
'/media//css/base.css',
|
||||
'/media////css/base.css',
|
||||
'/media/../css/base.css',
|
||||
)
|
||||
elif os.sep == '\\':
|
||||
bad_data += (
|
||||
'/media/C:\css/base.css',
|
||||
'/media//\\css/base.css',
|
||||
'/media/\\css/base.css',
|
||||
'/media/\\\\css/base.css'
|
||||
)
|
||||
for url, path_tuple in data:
|
||||
try:
|
||||
output = self.handler.file_path(url)
|
||||
except ValueError:
|
||||
self.fail("Got a ValueError exception, but wasn't expecting"
|
||||
" one. URL was: %s" % url)
|
||||
rel_path = os.path.join(*path_tuple)
|
||||
desired = os.path.normcase(
|
||||
os.path.join(self.admin_media_file_path, rel_path))
|
||||
self.assertEqual(output, desired,
|
||||
"Got: %s, Expected: %s, URL was: %s" % (output, desired, url))
|
||||
for url in bad_data:
|
||||
try:
|
||||
output = self.handler.file_path(url)
|
||||
except ValueError:
|
||||
continue
|
||||
self.fail('URL: %s should have caused a ValueError exception.'
|
||||
% url)
|
||||
Loading…
x
Reference in New Issue
Block a user