diff --git a/django/contrib/auth/locale/ar/LC_MESSAGES/django.mo b/django/contrib/auth/locale/ar/LC_MESSAGES/django.mo index 2e8df6f73a5..0a2e18da3a6 100644 Binary files a/django/contrib/auth/locale/ar/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/ar/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/ar/LC_MESSAGES/django.po b/django/contrib/auth/locale/ar/LC_MESSAGES/django.po index f8de21a68d1..79538bd7ce4 100644 --- a/django/contrib/auth/locale/ar/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/ar/LC_MESSAGES/django.po @@ -1,78 +1,84 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Jannis Leidel , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:14-0400\n" -"PO-Revision-Date: 2011-03-04 18:41+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Arabic \n" +"POT-Creation-Date: 2012-03-14 00:14-0700\n" +"PO-Revision-Date: 2012-03-08 12:07+0000\n" +"Last-Translator: Jannis Leidel \n" +"Language-Team: Arabic (http://www.transifex.net/projects/p/django/language/" +"ar/)\n" +"Language: ar\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ar\n" "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 " "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n" -#: admin.py:28 +#: admin.py:41 msgid "Personal info" msgstr "المعلومات الشخصية" -#: admin.py:29 +#: admin.py:42 msgid "Permissions" msgstr "الصلاحيات" -#: admin.py:30 +#: admin.py:44 msgid "Important dates" msgstr "تواريخ مهمة" -#: admin.py:31 -msgid "Groups" -msgstr "المجموعات" - -#: admin.py:113 +#: admin.py:125 msgid "Password changed successfully." msgstr "تم تغيير كلمة المرور بنجاح." -#: admin.py:123 +#: admin.py:135 #, python-format msgid "Change password: %s" msgstr "غيّر كلمة المرور: %s" -#: forms.py:14 forms.py:48 forms.py:66 -msgid "Username" -msgstr "اسم المستخدم" - -#: forms.py:15 forms.py:49 -msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." -msgstr "مطلوب. 30 حرف أو أقل. يتكوّن من حروف، وأرقام، والرموز @/./+/-/_ فقط." - -#: forms.py:16 forms.py:50 -msgid "This value may contain only letters, numbers and @/./+/-/_ characters." -msgstr "هذه القيمة يجب أن تحتوي الأحرف، والأرقام، والرموز @/./+/-/_ فقط." - -#: forms.py:17 forms.py:67 forms.py:193 -msgid "Password" -msgstr "كلمة المرور" - -#: forms.py:18 -msgid "Password confirmation" -msgstr "تأكيد كلمة المرور" - -#: forms.py:19 -msgid "Enter the same password as above, for verification." -msgstr "أدخل كلمة المرور ذاتها التي أعلاه لتأكيدها." - -#: forms.py:31 +#: forms.py:58 msgid "A user with that username already exists." msgstr "هناك مستخدم موجود مسبقاً بهذا الاسم." -#: forms.py:37 forms.py:163 forms.py:205 +#: forms.py:59 forms.py:247 forms.py:304 msgid "The two password fields didn't match." msgstr "حقلا كلمتي المرور غير متطابقين." -#: forms.py:87 +#: forms.py:61 forms.py:106 forms.py:135 +msgid "Username" +msgstr "اسم المستخدم" + +#: forms.py:63 forms.py:107 +msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." +msgstr "مطلوب. 30 حرف أو أقل. يتكوّن من حروف، وأرقام، والرموز @/./+/-/_ فقط." + +#: forms.py:66 forms.py:110 +msgid "This value may contain only letters, numbers and @/./+/-/_ characters." +msgstr "هذه القيمة يجب أن تحتوي الأحرف، والأرقام، والرموز @/./+/-/_ فقط." + +#: forms.py:68 forms.py:112 forms.py:136 forms.py:306 +msgid "Password" +msgstr "كلمة المرور" + +#: forms.py:70 +msgid "Password confirmation" +msgstr "تأكيد كلمة المرور" + +#: forms.py:72 +msgid "Enter the same password as above, for verification." +msgstr "أدخل كلمة المرور ذاتها التي أعلاه لتأكيدها." + +#: forms.py:113 +msgid "" +"Raw passwords are not stored, so there is no way to see this user's " +"password, but you can change the password using this " +"form." +msgstr "" + +#: forms.py:139 msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." @@ -80,21 +86,17 @@ msgstr "" "رجاءً أدخل اسم مستخدم وكلمة مرور صحيحين، وانتبه إلى أن كلا الحقلين حساس لحالة " "الأحرف." -#: forms.py:89 -msgid "This account is inactive." -msgstr "هذا الحساب غير نشط." - -#: forms.py:96 +#: forms.py:141 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." msgstr "يبدو بأن الكوكيز غير مفعله في متصفحك، الكوكيز مطلوبة للتمكن من الدخول." -#: forms.py:108 -msgid "E-mail" -msgstr "عنوان بريد إلكتروني" +#: forms.py:143 +msgid "This account is inactive." +msgstr "هذا الحساب غير نشط." -#: forms.py:117 +#: forms.py:187 msgid "" "That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" @@ -102,101 +104,123 @@ msgstr "" "عنوان البريد الإلكتروني هذا ليس مرتبط بأي حساب مستخدم. أأنت متأكد أنك قمت " "بالتسجيل؟" -#: forms.py:143 -#, python-format -msgid "Password reset on %s" -msgstr "استعادة كلمة المرور في %s" +#: forms.py:189 +msgid "" +"The user account associated with this e-mail address cannot reset the " +"password." +msgstr "" -#: forms.py:151 +#: forms.py:192 +msgid "E-mail" +msgstr "عنوان بريد إلكتروني" + +#: forms.py:249 msgid "New password" msgstr "كلمة المرور الجديدة" -#: forms.py:152 +#: forms.py:251 msgid "New password confirmation" msgstr "تأكيد كلمة المرور الجديدة" -#: forms.py:177 -msgid "Old password" -msgstr "كلمة المرور القديمة" - -#: forms.py:185 +#: forms.py:280 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "كلمة مرورك القديمة غير صحيحة. رجاءً أدخلها مرة أخرى." -#: forms.py:194 +#: forms.py:283 +msgid "Old password" +msgstr "كلمة المرور القديمة" + +#: forms.py:308 msgid "Password (again)" msgstr "كلمة المرور (مجدداً)" -#: models.py:76 models.py:104 +#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355 +#: hashers.py:389 +msgid "algorithm" +msgstr "" + +#: hashers.py:219 +msgid "iterations" +msgstr "" + +#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390 +msgid "salt" +msgstr "" + +#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391 +msgid "hash" +msgstr "" + +#: hashers.py:270 +msgid "work factor" +msgstr "" + +#: hashers.py:272 +msgid "checksum" +msgstr "" + +#: models.py:66 models.py:113 msgid "name" msgstr "الاسم" -#: models.py:78 +#: models.py:68 msgid "codename" msgstr "الاسم الرمزي" -#: models.py:82 +#: models.py:72 msgid "permission" msgstr "الصلاحية" -#: models.py:83 models.py:105 +#: models.py:73 models.py:115 msgid "permissions" msgstr "الصلاحيات" -#: models.py:108 +#: models.py:120 msgid "group" msgstr "مجموعة" -#: models.py:109 models.py:216 +#: models.py:121 models.py:250 msgid "groups" msgstr "المجموعات" -#: models.py:206 +#: models.py:232 msgid "username" msgstr "اسم المستخدم" -#: models.py:206 +#: models.py:233 msgid "" "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters" msgstr "مطلوب. 30 حرف أو أقل. يتكوّن من حروف، وأرقام، والرموز @/./+/-/_ فقط." -#: models.py:207 +#: models.py:235 msgid "first name" msgstr "الاسم الأول" -#: models.py:208 +#: models.py:236 msgid "last name" msgstr "الاسم الأخير" -#: models.py:209 +#: models.py:237 msgid "e-mail address" msgstr "عنوان البريد الإلكتروني" -#: models.py:210 +#: models.py:238 msgid "password" msgstr "كلمة المرور" -#: models.py:210 -msgid "" -"Use '[algo]$[salt]$[hexdigest]' or use the change " -"password form." -msgstr "" -"استخدم '[algo]$[salt]$[hexdigest]' أو استخدم استمارة " -"تغيير كلمة المرور." - -#: models.py:211 +#: models.py:239 msgid "staff status" msgstr "حالة الطاقم" -#: models.py:211 +#: models.py:240 msgid "Designates whether the user can log into this admin site." msgstr "يحدد ما إذا كان المستخدم يستطيع الدخول إلى موقع الإدارة هذا." -#: models.py:212 +#: models.py:242 msgid "active" msgstr "نشط" -#: models.py:212 +#: models.py:243 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." @@ -204,53 +228,52 @@ msgstr "" "يحدد ما إذا كان المستخدم سيُعامل على أنّه نشط. أزل تحديد ها الخيار بدلاً من حذف " "الحسابات." -#: models.py:213 +#: models.py:245 msgid "superuser status" msgstr "حالة المستخدم الخارق" -#: models.py:213 +#: models.py:246 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." msgstr "" "حدد بأن هذا المستخدم يمتلك كافة الصلاحيات دون الحاجة لتحديدها له تصريحا." -#: models.py:214 +#: models.py:248 msgid "last login" msgstr "آخر دخول" -#: models.py:215 +#: models.py:249 msgid "date joined" msgstr "تاريخ الانضمام" -#: models.py:217 +#: models.py:251 msgid "" -"In addition to the permissions manually assigned, this user will also get " -"all permissions granted to each group he/she is in." +"The groups this user belongs to. A user will get all permissions granted to " +"each of his/her group." msgstr "" -"بالإضافة إلى الصلاحيات المحددة للمستخدم يدويا، فإن المستخدم يحصل أيضا على " -"كافة صلاحيات المجموعة التي ينتمي إليها." -#: models.py:218 +#: models.py:255 msgid "user permissions" msgstr "صلاحيات المستخدم" -#: models.py:222 +#: models.py:260 msgid "user" msgstr "مستخدم" -#: models.py:223 +#: models.py:261 msgid "users" msgstr "المستخدمين" -#: models.py:406 -msgid "message" -msgstr "رسالة" - -#: views.py:91 +#: views.py:93 msgid "Logged out" msgstr "تم الخروج" -#: management/commands/createsuperuser.py:23 +#: management/commands/createsuperuser.py:27 msgid "Enter a valid e-mail address." msgstr "أدخل عنوان بريد إلكتروني صحيح." + +#: templates/registration/password_reset_subject.txt:2 +#, python-format +msgid "Password reset on %(site_name)s" +msgstr "" diff --git a/django/contrib/auth/locale/az/LC_MESSAGES/django.mo b/django/contrib/auth/locale/az/LC_MESSAGES/django.mo index 39864cff302..3713372c939 100644 Binary files a/django/contrib/auth/locale/az/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/az/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/az/LC_MESSAGES/django.po b/django/contrib/auth/locale/az/LC_MESSAGES/django.po index b09785bbdba..9da4f124803 100644 --- a/django/contrib/auth/locale/az/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/az/LC_MESSAGES/django.po @@ -1,244 +1,285 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Ali Ismayilov , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:14-0400\n" -"PO-Revision-Date: 2011-03-04 18:41+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Azerbaijani \n" +"POT-Creation-Date: 2012-03-14 00:14-0700\n" +"PO-Revision-Date: 2012-03-08 12:07+0000\n" +"Last-Translator: Ali Ismayilov \n" +"Language-Team: Azerbaijani (http://www.transifex.net/projects/p/django/" +"language/az/)\n" +"Language: az\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: az\n" "Plural-Forms: nplurals=1; plural=0\n" -#: admin.py:28 +#: admin.py:41 msgid "Personal info" -msgstr "" +msgstr "Şəxsi məlumat" -#: admin.py:29 +#: admin.py:42 msgid "Permissions" -msgstr "" +msgstr "İcazələr" -#: admin.py:30 +#: admin.py:44 msgid "Important dates" -msgstr "" +msgstr "Vacib tarixlər" -#: admin.py:31 -msgid "Groups" -msgstr "" - -#: admin.py:113 +#: admin.py:125 msgid "Password changed successfully." -msgstr "" +msgstr "Parol uğurla dəyişdirildi" -#: admin.py:123 +#: admin.py:135 #, python-format msgid "Change password: %s" -msgstr "" +msgstr "Parolu dəyiş: %s" -#: forms.py:14 forms.py:48 forms.py:66 +#: forms.py:58 +msgid "A user with that username already exists." +msgstr "Bu istifadəçi adı altında başqa istifadəçi var." + +#: forms.py:59 forms.py:247 forms.py:304 +msgid "The two password fields didn't match." +msgstr "Parollar üst-üstə düşmədi." + +#: forms.py:61 forms.py:106 forms.py:135 msgid "Username" -msgstr "" +msgstr "İstifadəçi adı" -#: forms.py:15 forms.py:49 +#: forms.py:63 forms.py:107 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." msgstr "" +"Vacibdir. 30 simvoldan az olmalıdır. Yalnız hərf, rəqəm və @/./+/-/_ " +"simvollarından istifadə etmək olar." -#: forms.py:16 forms.py:50 +#: forms.py:66 forms.py:110 msgid "This value may contain only letters, numbers and @/./+/-/_ characters." -msgstr "" +msgstr "Yalnız hərf, rəqəm və @/./+/-/_ simvollarından istifadə etmək olar." -#: forms.py:17 forms.py:67 forms.py:193 +#: forms.py:68 forms.py:112 forms.py:136 forms.py:306 msgid "Password" -msgstr "" +msgstr "Parol" -#: forms.py:18 +#: forms.py:70 msgid "Password confirmation" -msgstr "" +msgstr "Parolun təsdiqi" -#: forms.py:19 +#: forms.py:72 msgid "Enter the same password as above, for verification." +msgstr "Yuxarıdakı parolu daxil edin ki, dəqiqliyinə əmin olaq." + +#: forms.py:113 +msgid "" +"Raw passwords are not stored, so there is no way to see this user's " +"password, but you can change the password using this " +"form." msgstr "" -#: forms.py:31 -msgid "A user with that username already exists." -msgstr "" - -#: forms.py:37 forms.py:163 forms.py:205 -msgid "The two password fields didn't match." -msgstr "" - -#: forms.py:87 +#: forms.py:139 msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." msgstr "" +"Düzgün istifadəçi adı və parolu daxil edin. Nəzərə alın ki, hər iki sahə " +"üçün böyük-kiçik hərflərdə fərq var." -#: forms.py:89 -msgid "This account is inactive." -msgstr "" - -#: forms.py:96 +#: forms.py:141 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." msgstr "" +"Sizin brauzerdə kukilər (cookie) aktiv deyil. Daxil olmaq üçün onlar aktiv " +"olmağı vacibdir." -#: forms.py:108 -msgid "E-mail" -msgstr "" +#: forms.py:143 +msgid "This account is inactive." +msgstr "Bu hesab qeyri-aktivdir." -#: forms.py:117 +#: forms.py:187 msgid "" "That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" msgstr "" +"Bu e-poçt ünvanı heç bir hesaba bağlı deyil. Qeydiyyatdan keçdiyinizə " +"əminsinizmi?" -#: forms.py:143 -#, python-format -msgid "Password reset on %s" +#: forms.py:189 +msgid "" +"The user account associated with this e-mail address cannot reset the " +"password." msgstr "" +"Bu e-poçt ünvanı ilə qeydiyyatdan keçmiş hesab parolu sıfırlaya bilməz." -#: forms.py:151 +#: forms.py:192 +msgid "E-mail" +msgstr "E-poçt" + +#: forms.py:249 msgid "New password" -msgstr "" +msgstr "Yeni parol" -#: forms.py:152 +#: forms.py:251 msgid "New password confirmation" -msgstr "" +msgstr "Yeni parolun təsdiqi" -#: forms.py:177 -msgid "Old password" -msgstr "" - -#: forms.py:185 +#: forms.py:280 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "" +"Köhnə parolu səhv daxil etdiniz. Bir daha cəhd etməyinizi xahiş edirik." -#: forms.py:194 +#: forms.py:283 +msgid "Old password" +msgstr "Köhnə parol" + +#: forms.py:308 msgid "Password (again)" +msgstr "Parol (bir daha)" + +#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355 +#: hashers.py:389 +msgid "algorithm" msgstr "" -#: models.py:76 models.py:104 +#: hashers.py:219 +msgid "iterations" +msgstr "" + +#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390 +msgid "salt" +msgstr "" + +#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391 +msgid "hash" +msgstr "" + +#: hashers.py:270 +msgid "work factor" +msgstr "" + +#: hashers.py:272 +msgid "checksum" +msgstr "" + +#: models.py:66 models.py:113 msgid "name" -msgstr "" +msgstr "ad" -#: models.py:78 +#: models.py:68 msgid "codename" -msgstr "" +msgstr "kod adı" -#: models.py:82 +#: models.py:72 msgid "permission" -msgstr "" +msgstr "icazə" -#: models.py:83 models.py:105 +#: models.py:73 models.py:115 msgid "permissions" -msgstr "" +msgstr "icazələr" -#: models.py:108 +#: models.py:120 msgid "group" -msgstr "" +msgstr "qrup" -#: models.py:109 models.py:216 +#: models.py:121 models.py:250 msgid "groups" -msgstr "" +msgstr "qruplar" -#: models.py:206 +#: models.py:232 msgid "username" -msgstr "" +msgstr "istifadəçi adı" -#: models.py:206 +#: models.py:233 msgid "" "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters" msgstr "" +"Vacibdir. 30 simvola bərabər və ya az olmalıdır. Yalnız hərf, rəqəm və @/./" +"+/-/_ simvollarından istifadə etmək olar." -#: models.py:207 +#: models.py:235 msgid "first name" -msgstr "" +msgstr "ad" -#: models.py:208 +#: models.py:236 msgid "last name" -msgstr "" +msgstr "soyad" -#: models.py:209 +#: models.py:237 msgid "e-mail address" -msgstr "" +msgstr "e-poçt ünvanı" -#: models.py:210 +#: models.py:238 msgid "password" -msgstr "" +msgstr "parol" -#: models.py:210 -msgid "" -"Use '[algo]$[salt]$[hexdigest]' or use the change " -"password form." -msgstr "" - -#: models.py:211 +#: models.py:239 msgid "staff status" -msgstr "" +msgstr "admin statusu" -#: models.py:211 +#: models.py:240 msgid "Designates whether the user can log into this admin site." -msgstr "" +msgstr "İstifadəçinin admin panelinə daxil olub, olmayacağını təyin edir." -#: models.py:212 +#: models.py:242 msgid "active" -msgstr "" +msgstr "Aktiv" -#: models.py:212 +#: models.py:243 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." msgstr "" +"İstifadəçinin aktiv və ya qeyri-aktiv olmasını təyin edir. Hesabları silmək " +"əvəzinə bundan istifadə edin." -#: models.py:213 +#: models.py:245 msgid "superuser status" -msgstr "" +msgstr "superistifadəçi statusu" -#: models.py:213 +#: models.py:246 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." -msgstr "" +msgstr "İstifadəçiyə bütün icazələri verir." -#: models.py:214 +#: models.py:248 msgid "last login" -msgstr "" +msgstr "son dəfə daxil olub" -#: models.py:215 +#: models.py:249 msgid "date joined" -msgstr "" +msgstr "qoşulub" -#: models.py:217 +#: models.py:251 msgid "" -"In addition to the permissions manually assigned, this user will also get " -"all permissions granted to each group he/she is in." +"The groups this user belongs to. A user will get all permissions granted to " +"each of his/her group." msgstr "" -#: models.py:218 +#: models.py:255 msgid "user permissions" -msgstr "" +msgstr "səlahiyyətləri" -#: models.py:222 +#: models.py:260 msgid "user" -msgstr "" +msgstr "istifadəçi" -#: models.py:223 +#: models.py:261 msgid "users" -msgstr "" +msgstr "istifadəçilər" -#: models.py:406 -msgid "message" -msgstr "" - -#: views.py:91 +#: views.py:93 msgid "Logged out" -msgstr "" +msgstr "Çıxdınız" -#: management/commands/createsuperuser.py:23 +#: management/commands/createsuperuser.py:27 msgid "Enter a valid e-mail address." -msgstr "" +msgstr "düzgün e-poçt ünvanını daxil edin." + +#: templates/registration/password_reset_subject.txt:2 +#, python-format +msgid "Password reset on %(site_name)s" +msgstr "%(site_name)s, parolun sıfırlanması" diff --git a/django/contrib/auth/locale/bg/LC_MESSAGES/django.mo b/django/contrib/auth/locale/bg/LC_MESSAGES/django.mo index a4758024f21..b05e35a5637 100644 Binary files a/django/contrib/auth/locale/bg/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/bg/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/bg/LC_MESSAGES/django.po b/django/contrib/auth/locale/bg/LC_MESSAGES/django.po index 2d553b00807..833d1ecdb14 100644 --- a/django/contrib/auth/locale/bg/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/bg/LC_MESSAGES/django.po @@ -1,258 +1,285 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Boris Chervenkov , 2012. +# Jannis Leidel , 2011. +# Todor Lubenov , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:14-0400\n" -"PO-Revision-Date: 2011-03-10 05:42+0000\n" -"Last-Translator: tlubenov \n" -"Language-Team: Bulgarian \n" +"POT-Creation-Date: 2012-03-14 00:14-0700\n" +"PO-Revision-Date: 2012-03-08 12:07+0000\n" +"Last-Translator: Boris Chervenkov \n" +"Language-Team: Bulgarian (http://www.transifex.net/projects/p/django/" +"language/bg/)\n" +"Language: bg\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: bg\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: admin.py:28 +#: admin.py:41 msgid "Personal info" msgstr "Лична информация" -#: admin.py:29 +#: admin.py:42 msgid "Permissions" msgstr "Права" -#: admin.py:30 +#: admin.py:44 msgid "Important dates" msgstr "Важни дати" -#: admin.py:31 -msgid "Groups" -msgstr "Групи" - -#: admin.py:113 +#: admin.py:125 msgid "Password changed successfully." -msgstr "Паролата бе успешно сменена. " +msgstr "Паролата беше променена успешно. " -#: admin.py:123 +#: admin.py:135 #, python-format msgid "Change password: %s" -msgstr "Смени парола: %s" +msgstr "Промени парола: %s" -#: forms.py:14 forms.py:48 forms.py:66 -msgid "Username" -msgstr "Потребител" - -#: forms.py:15 forms.py:49 -msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." -msgstr "Задължително. 30 знака или по-малко. Букви, цифри и @/./+/-/_ ." - -#: forms.py:16 forms.py:50 -msgid "This value may contain only letters, numbers and @/./+/-/_ characters." -msgstr "Тази стойност може да съдържа само букви, цифри и @/./+/-/_ символи." - -#: forms.py:17 forms.py:67 forms.py:193 -msgid "Password" -msgstr "Парола" - -#: forms.py:18 -msgid "Password confirmation" -msgstr "Потвърждение на паролата" - -#: forms.py:19 -msgid "Enter the same password as above, for verification." -msgstr "Въведете същата парола още веднъж за проверка. " - -#: forms.py:31 +#: forms.py:58 msgid "A user with that username already exists." msgstr "Потребител с това потребителско име вече съществува. " -#: forms.py:37 forms.py:163 forms.py:205 +#: forms.py:59 forms.py:247 forms.py:304 msgid "The two password fields didn't match." msgstr "Двете полета за паролата не съвпадат. " -#: forms.py:87 +#: forms.py:61 forms.py:106 forms.py:135 +msgid "Username" +msgstr "Потребител" + +#: forms.py:63 forms.py:107 +msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." +msgstr "Задължително. 30 знака или по-малко. Букви, цифри и @/./+/-/_ ." + +#: forms.py:66 forms.py:110 +msgid "This value may contain only letters, numbers and @/./+/-/_ characters." +msgstr "Тази стойност може да съдържа само букви, цифри и @/./+/-/_ символи." + +#: forms.py:68 forms.py:112 forms.py:136 forms.py:306 +msgid "Password" +msgstr "Парола" + +#: forms.py:70 +msgid "Password confirmation" +msgstr "Потвърждение на паролата" + +#: forms.py:72 +msgid "Enter the same password as above, for verification." +msgstr "Въведете същата парола още веднъж за проверка. " + +#: forms.py:113 +msgid "" +"Raw passwords are not stored, so there is no way to see this user's " +"password, but you can change the password using this " +"form." +msgstr "" + +#: forms.py:139 msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." msgstr "" -"Въведете правилно потребителско име и парола. И двете полета правят разлика " +"Въведете правилно потребителско име и парола. И двете полета правят разлика " "между малки и големи букви!" -#: forms.py:89 -msgid "This account is inactive." -msgstr "Този акаунт е деактивиран." - -#: forms.py:96 +#: forms.py:141 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." msgstr "" -"Браузерът, който използвате не поддържа cookies, а те са необходими за да " -"можете да се логнете. " +"Браузърът, който използвате не поддържа cookies, а те са необходими за да " +"можете да се впишете. " -#: forms.py:108 -msgid "E-mail" -msgstr "Е-поща" +#: forms.py:143 +msgid "This account is inactive." +msgstr "Този профил е неактивен." -#: forms.py:117 +#: forms.py:187 msgid "" "That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" msgstr "" -"С този email адрес няма обвързан потребителски акаунт. Сигурни ли сте, че " +"Няма обвързан потребителски профил с този email адрес. Сигурни ли сте, че " "сте се регистрирали?" -#: forms.py:143 -#, python-format -msgid "Password reset on %s" -msgstr "Паролата се сменя на %s" +#: forms.py:189 +msgid "" +"The user account associated with this e-mail address cannot reset the " +"password." +msgstr "" +"Потребителският профил, свързан с този email адрес, не може да променя " +"паролата." -#: forms.py:151 +#: forms.py:192 +msgid "E-mail" +msgstr "Email адрес" + +#: forms.py:249 msgid "New password" msgstr "Нова парола" -#: forms.py:152 +#: forms.py:251 msgid "New password confirmation" msgstr "потвърждение на нова паролата" -#: forms.py:177 +#: forms.py:280 +msgid "Your old password was entered incorrectly. Please enter it again." +msgstr "Въвели сте погрешна стара парола. Въведете я отново. " + +#: forms.py:283 msgid "Old password" msgstr "Стара парола" -#: forms.py:185 -msgid "Your old password was entered incorrectly. Please enter it again." -msgstr "Въвели сте погрешна стара парола. Въведете я пак. " - -#: forms.py:194 +#: forms.py:308 msgid "Password (again)" -msgstr "Парола (пак)" +msgstr "Парола (отново)" -#: models.py:76 models.py:104 +#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355 +#: hashers.py:389 +msgid "algorithm" +msgstr "" + +#: hashers.py:219 +msgid "iterations" +msgstr "" + +#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390 +msgid "salt" +msgstr "" + +#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391 +msgid "hash" +msgstr "" + +#: hashers.py:270 +msgid "work factor" +msgstr "" + +#: hashers.py:272 +msgid "checksum" +msgstr "" + +#: models.py:66 models.py:113 msgid "name" msgstr "име" -#: models.py:78 +#: models.py:68 msgid "codename" msgstr "код" -#: models.py:82 +#: models.py:72 msgid "permission" msgstr "право" -#: models.py:83 models.py:105 +#: models.py:73 models.py:115 msgid "permissions" msgstr "права" -#: models.py:108 +#: models.py:120 msgid "group" msgstr "група" -#: models.py:109 models.py:216 +#: models.py:121 models.py:250 msgid "groups" msgstr "групи" -#: models.py:206 +#: models.py:232 msgid "username" msgstr "потребител" -#: models.py:206 +#: models.py:233 msgid "" "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters" msgstr "Задължително. 30 знака или по-малко. Букви, цифри и символи @/./+/-/_" -#: models.py:207 +#: models.py:235 msgid "first name" msgstr "собствено име" -#: models.py:208 +#: models.py:236 msgid "last name" msgstr "фамилно име" -#: models.py:209 +#: models.py:237 msgid "e-mail address" -msgstr "e-mail адрес" +msgstr "email адрес" -#: models.py:210 +#: models.py:238 msgid "password" msgstr "парола" -#: models.py:210 -msgid "" -"Use '[algo]$[salt]$[hexdigest]' or use the change " -"password form." -msgstr "" -"Въведете '[algo]$[salt]$[hexdigest]' или използвайте формата за смяна на парола." - -#: models.py:211 +#: models.py:239 msgid "staff status" -msgstr "персонал" +msgstr "статус на персонал" -#: models.py:211 +#: models.py:240 msgid "Designates whether the user can log into this admin site." msgstr "Указва дали този потребител има достъп до административния панел." -#: models.py:212 +#: models.py:242 msgid "active" msgstr "активен" -#: models.py:212 +#: models.py:243 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." msgstr "" -"Означава дали този потребител трябва да се разглежда като активен. " -"Премахване на избора на това, вместо изтриване на профила." +"Указва дали този потребител трябва да се третира като активен. Премахнете на " +"избора на това, вместо да триете профила." -#: models.py:213 +#: models.py:245 msgid "superuser status" msgstr "статут на супер-потребител" -#: models.py:213 +#: models.py:246 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." msgstr "" -"Указва, че този потребител има всички права (без да има нужда да се указват " -"изрично)." +"Указва, че този потребител има всички права (без да има нужда да се " +"изброяват изрично)." -#: models.py:214 +#: models.py:248 msgid "last login" -msgstr "последен логин" +msgstr "последно вписване" -#: models.py:215 +#: models.py:249 msgid "date joined" msgstr "дата на регистриране" -#: models.py:217 +#: models.py:251 msgid "" -"In addition to the permissions manually assigned, this user will also get " -"all permissions granted to each group he/she is in." +"The groups this user belongs to. A user will get all permissions granted to " +"each of his/her group." msgstr "" -"Освен ръчно указаните права, този потребител също ще получи правата на всяка " -"група, към която принадлежи. " -#: models.py:218 +#: models.py:255 msgid "user permissions" -msgstr "потребителски права" +msgstr "права на потребител" -#: models.py:222 +#: models.py:260 msgid "user" msgstr "потребител" -#: models.py:223 +#: models.py:261 msgid "users" msgstr "потребители" -#: models.py:406 -msgid "message" -msgstr "съобщение" - -#: views.py:91 +#: views.py:93 msgid "Logged out" msgstr "Извън системата" -#: management/commands/createsuperuser.py:23 +#: management/commands/createsuperuser.py:27 msgid "Enter a valid e-mail address." -msgstr "Въведете валиден e-mail адрес. " +msgstr "Въведете валиден email адрес. " + +#: templates/registration/password_reset_subject.txt:2 +#, python-format +msgid "Password reset on %(site_name)s" +msgstr "Променена парола на %(site_name)s" diff --git a/django/contrib/auth/locale/bn/LC_MESSAGES/django.mo b/django/contrib/auth/locale/bn/LC_MESSAGES/django.mo index 49814cbbf40..af838b3ca66 100644 Binary files a/django/contrib/auth/locale/bn/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/bn/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/bn/LC_MESSAGES/django.po b/django/contrib/auth/locale/bn/LC_MESSAGES/django.po index a88077b3273..db3661adc0f 100644 --- a/django/contrib/auth/locale/bn/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/bn/LC_MESSAGES/django.po @@ -1,250 +1,273 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Jannis Leidel , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:14-0400\n" -"PO-Revision-Date: 2011-03-04 18:41+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Bengali <>\n" +"POT-Creation-Date: 2012-03-14 00:14-0700\n" +"PO-Revision-Date: 2012-03-08 12:07+0000\n" +"Last-Translator: Jannis Leidel \n" +"Language-Team: Bengali (http://www.transifex.net/projects/p/django/language/" +"bn/)\n" +"Language: bn\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: bn\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: admin.py:28 +#: admin.py:41 msgid "Personal info" msgstr "ব্যক্তিগত তথ্য" -#: admin.py:29 +#: admin.py:42 msgid "Permissions" msgstr "অনুমোদন" -#: admin.py:30 +#: admin.py:44 msgid "Important dates" msgstr "গুরুত্বপূর্ণ তারিখ" -#: admin.py:31 -msgid "Groups" -msgstr "দল" - -#: admin.py:113 +#: admin.py:125 msgid "Password changed successfully." msgstr "পাসওয়ার্ড বদল সফল হয়েছে।" -#: admin.py:123 +#: admin.py:135 #, python-format msgid "Change password: %s" msgstr "পাসওয়ার্ড বদলানঃ %s" -#: forms.py:14 forms.py:48 forms.py:66 -msgid "Username" -msgstr "সদস্যনাম" - -#: forms.py:15 forms.py:49 -msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." -msgstr "" - -#: forms.py:16 forms.py:50 -msgid "This value may contain only letters, numbers and @/./+/-/_ characters." -msgstr "" - -#: forms.py:17 forms.py:67 forms.py:193 -msgid "Password" -msgstr "পাসওয়ার্ড" - -#: forms.py:18 -msgid "Password confirmation" -msgstr "পাসওয়ার্ড নিশ্চিত করুন" - -#: forms.py:19 -msgid "Enter the same password as above, for verification." -msgstr "উপরের পাসওয়ার্ডটি পুনরায় প্রবেশ করান, যাচাইয়ের জন্য।" - -#: forms.py:31 +#: forms.py:58 msgid "A user with that username already exists." msgstr "এই সদস্যনামে একজন সদস্য আছেন।" -#: forms.py:37 forms.py:163 forms.py:205 +#: forms.py:59 forms.py:247 forms.py:304 msgid "The two password fields didn't match." msgstr "পাসওয়ার্ড দুটো মেলেনি।" -#: forms.py:87 +#: forms.py:61 forms.py:106 forms.py:135 +msgid "Username" +msgstr "সদস্যনাম" + +#: forms.py:63 forms.py:107 +msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." +msgstr "" + +#: forms.py:66 forms.py:110 +msgid "This value may contain only letters, numbers and @/./+/-/_ characters." +msgstr "" + +#: forms.py:68 forms.py:112 forms.py:136 forms.py:306 +msgid "Password" +msgstr "পাসওয়ার্ড" + +#: forms.py:70 +msgid "Password confirmation" +msgstr "পাসওয়ার্ড নিশ্চিত করুন" + +#: forms.py:72 +msgid "Enter the same password as above, for verification." +msgstr "উপরের পাসওয়ার্ডটি পুনরায় প্রবেশ করান, যাচাইয়ের জন্য।" + +#: forms.py:113 +msgid "" +"Raw passwords are not stored, so there is no way to see this user's " +"password, but you can change the password using this " +"form." +msgstr "" + +#: forms.py:139 msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." msgstr "অনুগ্রহপূর্বক সঠিক সদস্যনাম ও পাসওয়ার্ড প্রবেশ করান।" -#: forms.py:89 -msgid "This account is inactive." -msgstr "এই একাউন্টটি কার্যকর নয়।" - -#: forms.py:96 +#: forms.py:141 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." msgstr "আপনার ব্রাউজার কুকি গ্রহণে সক্ষম নয়। লগইন করার জন্য কুকি আবশ্যক।" -#: forms.py:108 -msgid "E-mail" -msgstr "ইমেইল" +#: forms.py:143 +msgid "This account is inactive." +msgstr "এই একাউন্টটি কার্যকর নয়।" -#: forms.py:117 +#: forms.py:187 msgid "" "That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" msgstr "" "এই ইমেইল ঠিকানা কোন সদস্য একাউন্টের সাথে সম্পর্কিত নয়। আপনি কি নিবন্ধন করেছেন?" -#: forms.py:143 -#, python-format -msgid "Password reset on %s" -msgstr "পাসওয়ার্ড রিসেট হয়েছে %s" +#: forms.py:189 +msgid "" +"The user account associated with this e-mail address cannot reset the " +"password." +msgstr "" -#: forms.py:151 +#: forms.py:192 +msgid "E-mail" +msgstr "ইমেইল" + +#: forms.py:249 msgid "New password" msgstr "নতুন পাসওয়ার্ড" -#: forms.py:152 +#: forms.py:251 msgid "New password confirmation" msgstr "নতুন পাসওয়ার্ড নিশ্চিতকরণ" -#: forms.py:177 -msgid "Old password" -msgstr "পুরনো পাসওয়ার্ড" - -#: forms.py:185 +#: forms.py:280 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "" "আপনার পুরনো পাসওয়ার্ড ঠিকভাবে প্রবেশ করানো হয়নি। অনুগ্রহপূর্বক সঠিক পাসওয়ার্ড দিন।" -#: forms.py:194 +#: forms.py:283 +msgid "Old password" +msgstr "পুরনো পাসওয়ার্ড" + +#: forms.py:308 msgid "Password (again)" msgstr "পাসওয়ার্ড (পুনরায়)" -#: models.py:76 models.py:104 +#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355 +#: hashers.py:389 +msgid "algorithm" +msgstr "" + +#: hashers.py:219 +msgid "iterations" +msgstr "" + +#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390 +msgid "salt" +msgstr "" + +#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391 +msgid "hash" +msgstr "" + +#: hashers.py:270 +msgid "work factor" +msgstr "" + +#: hashers.py:272 +msgid "checksum" +msgstr "" + +#: models.py:66 models.py:113 msgid "name" msgstr "নাম" -#: models.py:78 +#: models.py:68 msgid "codename" msgstr "কোডনাম" -#: models.py:82 +#: models.py:72 msgid "permission" msgstr "অনুমোদন" -#: models.py:83 models.py:105 +#: models.py:73 models.py:115 msgid "permissions" msgstr "অনুমোদন" -#: models.py:108 +#: models.py:120 msgid "group" msgstr "দল" -#: models.py:109 models.py:216 +#: models.py:121 models.py:250 msgid "groups" msgstr "দল সমূহ" -#: models.py:206 +#: models.py:232 msgid "username" msgstr "সদস্যনাম" -#: models.py:206 +#: models.py:233 msgid "" "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters" msgstr "" -#: models.py:207 +#: models.py:235 msgid "first name" msgstr "প্রথম নাম" -#: models.py:208 +#: models.py:236 msgid "last name" msgstr "শেষ নাম" -#: models.py:209 +#: models.py:237 msgid "e-mail address" msgstr "ইমেইল ঠিকানা" -#: models.py:210 +#: models.py:238 msgid "password" msgstr "পাসওয়ার্ড" -#: models.py:210 -msgid "" -"Use '[algo]$[salt]$[hexdigest]' or use the change " -"password form." -msgstr "" -"'[algo]$[salt]$[hexdigest]' ব্যবহার করুন অথবা পাসওয়ার্ড " -"বদল করুন।" - -#: models.py:211 +#: models.py:239 msgid "staff status" msgstr "স্টাফ মর্যাদা" -#: models.py:211 +#: models.py:240 msgid "Designates whether the user can log into this admin site." msgstr "সদস্যকে প্রশাসন সাইটে প্রবেশাধিকার প্রদান।" -#: models.py:212 +#: models.py:242 msgid "active" msgstr "সচল" -#: models.py:212 +#: models.py:243 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." msgstr "সদস্যকে সচল হিসেবে নির্ধারণ করুন। একাউন্ট মুছে ফেলার বদলে এটি ব্যবহার করুন।" -#: models.py:213 +#: models.py:245 msgid "superuser status" msgstr "সুপারইউজার মর্যাদা" -#: models.py:213 +#: models.py:246 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." msgstr "সদস্যকে সকল ধরণের অনুমতি প্রদান করে।" -#: models.py:214 +#: models.py:248 msgid "last login" msgstr "সর্বশেষ প্রবেশ" -#: models.py:215 +#: models.py:249 msgid "date joined" msgstr "যোগদানের তারিখ" -#: models.py:217 +#: models.py:251 msgid "" -"In addition to the permissions manually assigned, this user will also get " -"all permissions granted to each group he/she is in." +"The groups this user belongs to. A user will get all permissions granted to " +"each of his/her group." msgstr "" -"এই সদস্যকে দেয়া সকল অনুমোদনের পাশাপাশি অন্যান্য সকল দলের, যেখানে এই সদস্য " -"রয়েছেন, অনুমতিও তিনি পাবেন।" -#: models.py:218 +#: models.py:255 msgid "user permissions" msgstr "সদস্যের অনুমোদন সমূহ" -#: models.py:222 +#: models.py:260 msgid "user" msgstr "সদস্য" -#: models.py:223 +#: models.py:261 msgid "users" msgstr "সদস্যগণ" -#: models.py:406 -msgid "message" -msgstr "বার্তা" - -#: views.py:91 +#: views.py:93 msgid "Logged out" msgstr "প্রস্থান সম্পন্ন" -#: management/commands/createsuperuser.py:23 +#: management/commands/createsuperuser.py:27 msgid "Enter a valid e-mail address." msgstr "বৈধ ইমেইল ঠিকানা দিন।" + +#: templates/registration/password_reset_subject.txt:2 +#, python-format +msgid "Password reset on %(site_name)s" +msgstr "" diff --git a/django/contrib/auth/locale/bs/LC_MESSAGES/django.mo b/django/contrib/auth/locale/bs/LC_MESSAGES/django.mo index 55d0d774d0e..f37e6275918 100644 Binary files a/django/contrib/auth/locale/bs/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/bs/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/bs/LC_MESSAGES/django.po b/django/contrib/auth/locale/bs/LC_MESSAGES/django.po index fea09f70c1f..2078ecb1903 100644 --- a/django/contrib/auth/locale/bs/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/bs/LC_MESSAGES/django.po @@ -1,81 +1,87 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Jannis Leidel , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:14-0400\n" -"PO-Revision-Date: 2011-03-04 18:41+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Bosnian \n" +"POT-Creation-Date: 2012-03-14 00:14-0700\n" +"PO-Revision-Date: 2012-03-08 12:07+0000\n" +"Last-Translator: Jannis Leidel \n" +"Language-Team: Bosnian (http://www.transifex.net/projects/p/django/language/" +"bs/)\n" +"Language: bs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: bs\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" +"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" -#: admin.py:28 +#: admin.py:41 msgid "Personal info" msgstr "Lični podaci" -#: admin.py:29 +#: admin.py:42 msgid "Permissions" msgstr "Dozvole" -#: admin.py:30 +#: admin.py:44 msgid "Important dates" msgstr "Važni datumi" -#: admin.py:31 -msgid "Groups" -msgstr "Grupe" - -#: admin.py:113 +#: admin.py:125 msgid "Password changed successfully." msgstr "Lozinka uspješno izmjenjena." -#: admin.py:123 +#: admin.py:135 #, python-format msgid "Change password: %s" msgstr "Izmjeni lozinku: %s" -#: forms.py:14 forms.py:48 forms.py:66 +#: forms.py:58 +msgid "A user with that username already exists." +msgstr "Korisnik sa tim korisničkim imenom već postoji." + +#: forms.py:59 forms.py:247 forms.py:304 +msgid "The two password fields didn't match." +msgstr "Dva polja za lozinku se nisu poklopila." + +#: forms.py:61 forms.py:106 forms.py:135 msgid "Username" msgstr "Korisnik" -#: forms.py:15 forms.py:49 +#: forms.py:63 forms.py:107 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." msgstr "" "Neophodno. Najviše 30 slovnih mesta. Samo slova, brojke i @/./+/-/_ only." -#: forms.py:16 forms.py:50 +#: forms.py:66 forms.py:110 msgid "This value may contain only letters, numbers and @/./+/-/_ characters." msgstr "" "Ova vrijednost može sadržati samo slova, brojke i digits and @/./+/-/_ " "znamenke." -#: forms.py:17 forms.py:67 forms.py:193 +#: forms.py:68 forms.py:112 forms.py:136 forms.py:306 msgid "Password" msgstr "Lozinka" -#: forms.py:18 +#: forms.py:70 msgid "Password confirmation" msgstr "Potvrda lozinke" -#: forms.py:19 +#: forms.py:72 msgid "Enter the same password as above, for verification." msgstr "Radi provjere tačnosti ponovo unesite lozinku koju ste unijeli gore." -#: forms.py:31 -msgid "A user with that username already exists." -msgstr "Korisnik sa tim korisničkim imenom već postoji." +#: forms.py:113 +msgid "" +"Raw passwords are not stored, so there is no way to see this user's " +"password, but you can change the password using this " +"form." +msgstr "" -#: forms.py:37 forms.py:163 forms.py:205 -msgid "The two password fields didn't match." -msgstr "Dva polja za lozinku se nisu poklopila." - -#: forms.py:87 +#: forms.py:139 msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." @@ -83,11 +89,7 @@ msgstr "" "Unesite tačno korisničko ime i lozinku. Pazite na razliku izmjeđu malih i " "velikih slova u oba polja" -#: forms.py:89 -msgid "This account is inactive." -msgstr "Ovaj nalog je neaktivan." - -#: forms.py:96 +#: forms.py:141 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." @@ -95,11 +97,11 @@ msgstr "" "Izgleda da su kolačići isključeni u vašem browser-u. Oni moraju biti " "uključeni da bi ste se prijavili." -#: forms.py:108 -msgid "E-mail" -msgstr "Email adresa" +#: forms.py:143 +msgid "This account is inactive." +msgstr "Ovaj nalog je neaktivan." -#: forms.py:117 +#: forms.py:187 msgid "" "That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" @@ -107,103 +109,125 @@ msgstr "" "Ta email adresa nije u vezi ni sa jednim nalogom. Da li ste sigurni da ste " "se već registrovali?" -#: forms.py:143 -#, python-format -msgid "Password reset on %s" -msgstr "Resetovanje lozinke na %s" +#: forms.py:189 +msgid "" +"The user account associated with this e-mail address cannot reset the " +"password." +msgstr "" -#: forms.py:151 +#: forms.py:192 +msgid "E-mail" +msgstr "Email adresa" + +#: forms.py:249 msgid "New password" msgstr "Nova lozinka" -#: forms.py:152 +#: forms.py:251 msgid "New password confirmation" msgstr "Potvrda nove lozinke" -#: forms.py:177 -msgid "Old password" -msgstr "Stara lozinka" - -#: forms.py:185 +#: forms.py:280 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "Vaša stara lozinka nije pravilno unesena. Unesite je ponovo." -#: forms.py:194 +#: forms.py:283 +msgid "Old password" +msgstr "Stara lozinka" + +#: forms.py:308 msgid "Password (again)" msgstr "Lozinka (ponovite)" -#: models.py:76 models.py:104 +#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355 +#: hashers.py:389 +msgid "algorithm" +msgstr "" + +#: hashers.py:219 +msgid "iterations" +msgstr "" + +#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390 +msgid "salt" +msgstr "" + +#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391 +msgid "hash" +msgstr "" + +#: hashers.py:270 +msgid "work factor" +msgstr "" + +#: hashers.py:272 +msgid "checksum" +msgstr "" + +#: models.py:66 models.py:113 msgid "name" msgstr "ime" -#: models.py:78 +#: models.py:68 msgid "codename" msgstr "šifra dozvole" -#: models.py:82 +#: models.py:72 msgid "permission" msgstr "dozvola" -#: models.py:83 models.py:105 +#: models.py:73 models.py:115 msgid "permissions" msgstr "dozvole" -#: models.py:108 +#: models.py:120 msgid "group" msgstr "grupa" -#: models.py:109 models.py:216 +#: models.py:121 models.py:250 msgid "groups" msgstr "grupe" -#: models.py:206 +#: models.py:232 msgid "username" msgstr "korisničko ime" -#: models.py:206 +#: models.py:233 msgid "" "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters" msgstr "" "Neophodno. Najviše 30 slovnih mesta. Slova, brojke i @/./+/-/_ karakteri" -#: models.py:207 +#: models.py:235 msgid "first name" msgstr "ime" -#: models.py:208 +#: models.py:236 msgid "last name" msgstr "prezime" -#: models.py:209 +#: models.py:237 msgid "e-mail address" msgstr "email adresa" -#: models.py:210 +#: models.py:238 msgid "password" msgstr "lozinka" -#: models.py:210 -msgid "" -"Use '[algo]$[salt]$[hexdigest]' or use the change " -"password form." -msgstr "" -"Koristite '[algo]$[salt]$[hexdigest]' ili formular za " -"unos lozinke." - -#: models.py:211 +#: models.py:239 msgid "staff status" msgstr "status člana uredništva" -#: models.py:211 +#: models.py:240 msgid "Designates whether the user can log into this admin site." msgstr "" "Označava da li korisnik može da se prijavi na ovaj sajt za administraciju." -#: models.py:212 +#: models.py:242 msgid "active" msgstr "aktivan" -#: models.py:212 +#: models.py:243 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." @@ -211,11 +235,11 @@ msgstr "" "Označava da li se korisnik smatra aktivnim. Uklnote izbor sa ovog polja " "umjesto da brišete nalog." -#: models.py:213 +#: models.py:245 msgid "superuser status" msgstr "status administratora" -#: models.py:213 +#: models.py:246 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." @@ -223,42 +247,41 @@ msgstr "" "Označava da li korisnik ima sve dozvole bez dodjeljivanja pojedinačnih " "dozvola." -#: models.py:214 +#: models.py:248 msgid "last login" msgstr "posljednja prijava" -#: models.py:215 +#: models.py:249 msgid "date joined" msgstr "datum registracije" -#: models.py:217 +#: models.py:251 msgid "" -"In addition to the permissions manually assigned, this user will also get " -"all permissions granted to each group he/she is in." +"The groups this user belongs to. A user will get all permissions granted to " +"each of his/her group." msgstr "" -"Pored ručno dodijeljenih dozvola, ovaj korisnik će imati i dozvole " -"dodijeljene gurpama kojima pripada." -#: models.py:218 +#: models.py:255 msgid "user permissions" msgstr "korisničke dozvole" -#: models.py:222 +#: models.py:260 msgid "user" msgstr "korisnik" -#: models.py:223 +#: models.py:261 msgid "users" msgstr "korisnici" -#: models.py:406 -msgid "message" -msgstr "poruka" - -#: views.py:91 +#: views.py:93 msgid "Logged out" msgstr "Odjavljen" -#: management/commands/createsuperuser.py:23 +#: management/commands/createsuperuser.py:27 msgid "Enter a valid e-mail address." msgstr "Unesite važeću email adresu." + +#: templates/registration/password_reset_subject.txt:2 +#, python-format +msgid "Password reset on %(site_name)s" +msgstr "" diff --git a/django/contrib/auth/locale/ca/LC_MESSAGES/django.mo b/django/contrib/auth/locale/ca/LC_MESSAGES/django.mo index c68580aae75..9c588108c93 100644 Binary files a/django/contrib/auth/locale/ca/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/ca/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/ca/LC_MESSAGES/django.po b/django/contrib/auth/locale/ca/LC_MESSAGES/django.po index 4ab026de48a..1b604f7c732 100644 --- a/django/contrib/auth/locale/ca/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/ca/LC_MESSAGES/django.po @@ -1,77 +1,87 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Carles Barrobés , 2011, 2012. +# Jannis Leidel , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:14-0400\n" -"PO-Revision-Date: 2011-03-04 18:41+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Catalan \n" +"POT-Creation-Date: 2012-03-14 00:14-0700\n" +"PO-Revision-Date: 2012-03-08 12:07+0000\n" +"Last-Translator: Carles Barrobés \n" +"Language-Team: Catalan (http://www.transifex.net/projects/p/django/language/" +"ca/)\n" +"Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ca\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: admin.py:28 +#: admin.py:41 msgid "Personal info" msgstr "Informació personal" -#: admin.py:29 +#: admin.py:42 msgid "Permissions" msgstr "Permisos" -#: admin.py:30 +#: admin.py:44 msgid "Important dates" msgstr "Dates importants" -#: admin.py:31 -msgid "Groups" -msgstr "Grups" - -#: admin.py:113 +#: admin.py:125 msgid "Password changed successfully." msgstr "Contrasenya canviada amb èxit" -#: admin.py:123 +#: admin.py:135 #, python-format msgid "Change password: %s" msgstr "Canviar contrasenya: %s" -#: forms.py:14 forms.py:48 forms.py:66 -msgid "Username" -msgstr "Nom d'usuari" - -#: forms.py:15 forms.py:49 -msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." -msgstr "Obligatori. 30 o menys caràcters. Només lletres, dígits i @/./+/-/_." - -#: forms.py:16 forms.py:50 -msgid "This value may contain only letters, numbers and @/./+/-/_ characters." -msgstr "Aquest valor ha de contenir només lletres, números i @/./+/-/_." - -#: forms.py:17 forms.py:67 forms.py:193 -msgid "Password" -msgstr "Contrasenya" - -#: forms.py:18 -msgid "Password confirmation" -msgstr "Confirmació de contrasenya" - -#: forms.py:19 -msgid "Enter the same password as above, for verification." -msgstr "Introduïu la mateixa contrasenya de dalt, per fer-ne la verificació." - -#: forms.py:31 +#: forms.py:58 msgid "A user with that username already exists." msgstr "Ja existeix un usuari amb aquest nom." -#: forms.py:37 forms.py:163 forms.py:205 +#: forms.py:59 forms.py:247 forms.py:304 msgid "The two password fields didn't match." msgstr "Els dos camps de contrasenya no coincideixen." -#: forms.py:87 +#: forms.py:61 forms.py:106 forms.py:135 +msgid "Username" +msgstr "Nom d'usuari" + +#: forms.py:63 forms.py:107 +msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." +msgstr "Obligatori. 30 o menys caràcters. Només lletres, dígits i @/./+/-/_." + +#: forms.py:66 forms.py:110 +msgid "This value may contain only letters, numbers and @/./+/-/_ characters." +msgstr "Aquest valor ha de contenir només lletres, números i @/./+/-/_." + +#: forms.py:68 forms.py:112 forms.py:136 forms.py:306 +msgid "Password" +msgstr "Contrasenya" + +#: forms.py:70 +msgid "Password confirmation" +msgstr "Confirmació de contrasenya" + +#: forms.py:72 +msgid "Enter the same password as above, for verification." +msgstr "Introduïu la mateixa contrasenya de dalt, per fer-ne la verificació." + +#: forms.py:113 +msgid "" +"Raw passwords are not stored, so there is no way to see this user's " +"password, but you can change the password using this " +"form." +msgstr "" +"No s'emmagatzemen les contrasenyes en clar, per tant no hi ha manera de " +"veure la contrasenya d'aquest usuari, però la podeu canviar fent servir aquest formulari." + +#: forms.py:139 msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." @@ -79,11 +89,7 @@ msgstr "" "Si us plau, introduïu un nom d'usuari i contrasenya vàlids. Tingueu en " "compte que tots dos camps son sensibles a majúscules i minúscules." -#: forms.py:89 -msgid "This account is inactive." -msgstr "Aquest compte està inactiu" - -#: forms.py:96 +#: forms.py:141 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." @@ -91,11 +97,11 @@ msgstr "" "El vostre navegador no sembla tenir les galetes ('cookies') activades. " "Aquestes són necessàries per iniciar la sessió." -#: forms.py:108 -msgid "E-mail" -msgstr "Correu electrònic" +#: forms.py:143 +msgid "This account is inactive." +msgstr "Aquest compte està inactiu" -#: forms.py:117 +#: forms.py:187 msgid "" "That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" @@ -103,102 +109,126 @@ msgstr "" "Aquesta adreça de correu no té associat cap compte d'usuari. Esteu segurs " "que s'ha registrat?" -#: forms.py:143 -#, python-format -msgid "Password reset on %s" -msgstr "Restablir contrasenya en %s" +#: forms.py:189 +msgid "" +"The user account associated with this e-mail address cannot reset the " +"password." +msgstr "" +"El compte d'usuari associat a aquesta adreça de correu no pot reinicialitzar " +"la contrasenya." -#: forms.py:151 +#: forms.py:192 +msgid "E-mail" +msgstr "Correu electrònic" + +#: forms.py:249 msgid "New password" msgstr "Contrasenya nova" -#: forms.py:152 +#: forms.py:251 msgid "New password confirmation" msgstr "Contrasenya nova confirmada" -#: forms.py:177 -msgid "Old password" -msgstr "Contrasenya antiga" - -#: forms.py:185 +#: forms.py:280 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "" "La vostra antiga contrasenya no és correcta. Si us plau, introduïu-la de nou." -#: forms.py:194 +#: forms.py:283 +msgid "Old password" +msgstr "Contrasenya antiga" + +#: forms.py:308 msgid "Password (again)" msgstr "Contrasenya (de nou)" -#: models.py:76 models.py:104 +#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355 +#: hashers.py:389 +msgid "algorithm" +msgstr "algorisme" + +#: hashers.py:219 +msgid "iterations" +msgstr "iteracions" + +#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390 +msgid "salt" +msgstr "sal" + +#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391 +msgid "hash" +msgstr "hash" + +#: hashers.py:270 +msgid "work factor" +msgstr "factor de treball" + +#: hashers.py:272 +msgid "checksum" +msgstr "suma de comprovació" + +#: models.py:66 models.py:113 msgid "name" msgstr "nom" -#: models.py:78 +#: models.py:68 msgid "codename" msgstr "nom en clau" -#: models.py:82 +#: models.py:72 msgid "permission" msgstr "permís" -#: models.py:83 models.py:105 +#: models.py:73 models.py:115 msgid "permissions" msgstr "permisos" -#: models.py:108 +#: models.py:120 msgid "group" msgstr "grup" -#: models.py:109 models.py:216 +#: models.py:121 models.py:250 msgid "groups" msgstr "grups" -#: models.py:206 +#: models.py:232 msgid "username" msgstr "nom d'usuari" -#: models.py:206 +#: models.py:233 msgid "" "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters" msgstr "Obligatori. 30 o menys caràcters. Només lletres, números i @/./+/-/_" -#: models.py:207 +#: models.py:235 msgid "first name" msgstr "nom propi" -#: models.py:208 +#: models.py:236 msgid "last name" msgstr "cognoms" -#: models.py:209 +#: models.py:237 msgid "e-mail address" msgstr "adreça de correu electrònic" -#: models.py:210 +#: models.py:238 msgid "password" msgstr "contrasenya" -#: models.py:210 -msgid "" -"Use '[algo]$[salt]$[hexdigest]' or use the change " -"password form." -msgstr "" -"Utilitzeu '[algo]$[salt]$[hexdigest]' o el formulari " -"de canvi de contrasenya." - -#: models.py:211 +#: models.py:239 msgid "staff status" msgstr "membre del personal" -#: models.py:211 +#: models.py:240 msgid "Designates whether the user can log into this admin site." msgstr "Designa si l'usuari pot entrar al lloc administratiu." -#: models.py:212 +#: models.py:242 msgid "active" msgstr "actiu" -#: models.py:212 +#: models.py:243 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." @@ -206,11 +236,11 @@ msgstr "" "Designa si aquest usuari ha de ser tractat com a actiu. Deseleccioneu-ho " "enlloc d'esborrar comptes d'usuari." -#: models.py:213 +#: models.py:245 msgid "superuser status" msgstr "estat de superusuari" -#: models.py:213 +#: models.py:246 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." @@ -218,42 +248,43 @@ msgstr "" "Designa que aquest usuari té tots els permisos sense assignar-los " "explícitament." -#: models.py:214 +#: models.py:248 msgid "last login" msgstr "últim inici de sessió" -#: models.py:215 +#: models.py:249 msgid "date joined" msgstr "data d'incorporació" -#: models.py:217 +#: models.py:251 msgid "" -"In addition to the permissions manually assigned, this user will also get " -"all permissions granted to each group he/she is in." +"The groups this user belongs to. A user will get all permissions granted to " +"each of his/her group." msgstr "" -"A més dels permisos assignats manualment, aquest usuari tindrà també els " -"permisos dels grups dels que sigui membre." +"Els grups als quals pertany aquest usuari. A un usuari se li concediran tots " +"els permisos de cadascun dels seus grups." -#: models.py:218 +#: models.py:255 msgid "user permissions" msgstr "permisos de l'usuari" -#: models.py:222 +#: models.py:260 msgid "user" msgstr "usuari" -#: models.py:223 +#: models.py:261 msgid "users" msgstr "usuaris" -#: models.py:406 -msgid "message" -msgstr "missatge" - -#: views.py:91 +#: views.py:93 msgid "Logged out" msgstr "Sessió finalitzada" -#: management/commands/createsuperuser.py:23 +#: management/commands/createsuperuser.py:27 msgid "Enter a valid e-mail address." msgstr "Introduïu una adreça de correu vàlida." + +#: templates/registration/password_reset_subject.txt:2 +#, python-format +msgid "Password reset on %(site_name)s" +msgstr "Reinicialitzar la contrasenya a %(site_name)s" diff --git a/django/contrib/auth/locale/cs/LC_MESSAGES/django.mo b/django/contrib/auth/locale/cs/LC_MESSAGES/django.mo index 693e49e3c48..5b8cae94cfe 100644 Binary files a/django/contrib/auth/locale/cs/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/cs/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/cs/LC_MESSAGES/django.po b/django/contrib/auth/locale/cs/LC_MESSAGES/django.po index 34e5d579ab9..e6a89fb85e7 100644 --- a/django/contrib/auth/locale/cs/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/cs/LC_MESSAGES/django.po @@ -1,78 +1,87 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Jannis Leidel , 2011. +# Vlada Macek , 2011, 2012. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:14-0400\n" -"PO-Revision-Date: 2011-03-04 18:41+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Czech \n" +"POT-Creation-Date: 2012-03-14 00:14-0700\n" +"PO-Revision-Date: 2012-03-08 12:07+0000\n" +"Last-Translator: Vlada Macek \n" +"Language-Team: Czech (http://www.transifex.net/projects/p/django/language/" +"cs/)\n" +"Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: cs\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n" -#: admin.py:28 +#: admin.py:41 msgid "Personal info" msgstr "Osobní údaje" -#: admin.py:29 +#: admin.py:42 msgid "Permissions" msgstr "Oprávnění" -#: admin.py:30 +#: admin.py:44 msgid "Important dates" msgstr "Důležitá data" -#: admin.py:31 -msgid "Groups" -msgstr "Skupiny" - -#: admin.py:113 +#: admin.py:125 msgid "Password changed successfully." msgstr "Změna hesla byla úspěšná." -#: admin.py:123 +#: admin.py:135 #, python-format msgid "Change password: %s" msgstr "Heslo pro uživatele %s: změnit" -#: forms.py:14 forms.py:48 forms.py:66 +#: forms.py:58 +msgid "A user with that username already exists." +msgstr "Uživatel s tímto jménem již existuje." + +#: forms.py:59 forms.py:247 forms.py:304 +msgid "The two password fields didn't match." +msgstr "Hesla se neshodují." + +#: forms.py:61 forms.py:106 forms.py:135 msgid "Username" msgstr "Uživatelské jméno" -#: forms.py:15 forms.py:49 +#: forms.py:63 forms.py:107 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." msgstr "" "Požadováno. 30 znaků nebo méně. Pouze písmena, číslice a znaky @/./+/-/_." -#: forms.py:16 forms.py:50 +#: forms.py:66 forms.py:110 msgid "This value may contain only letters, numbers and @/./+/-/_ characters." msgstr "Hodnota může obsahovat pouze písmena, číslice a znaky @/./+/-/_." -#: forms.py:17 forms.py:67 forms.py:193 +#: forms.py:68 forms.py:112 forms.py:136 forms.py:306 msgid "Password" msgstr "Heslo" -#: forms.py:18 +#: forms.py:70 msgid "Password confirmation" msgstr "Potvrzení hesla" -#: forms.py:19 +#: forms.py:72 msgid "Enter the same password as above, for verification." msgstr "Pro ověření vložte stejné heslo znovu." -#: forms.py:31 -msgid "A user with that username already exists." -msgstr "Uživatel s tímto jménem již existuje." +#: forms.py:113 +msgid "" +"Raw passwords are not stored, so there is no way to see this user's " +"password, but you can change the password using this " +"form." +msgstr "" +"Hesla se neukládají přímo a tak je nelze zobrazit. Je ale možné je změnit " +"pomocí tohoto formuláře." -#: forms.py:37 forms.py:163 forms.py:205 -msgid "The two password fields didn't match." -msgstr "Hesla se neshodují." - -#: forms.py:87 +#: forms.py:139 msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." @@ -80,11 +89,7 @@ msgstr "" "Vložte správné uživatelské jméno a heslo (u obou položek se rozlišují malá a " "velká písmena)." -#: forms.py:89 -msgid "This account is inactive." -msgstr "Tento účet je neaktivní." - -#: forms.py:96 +#: forms.py:141 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." @@ -92,11 +97,11 @@ msgstr "" "Váš prohlížeč zřejmě nemá povoleno přijímat cookies, které jsou ale potřeba " "pro přihlášení." -#: forms.py:108 -msgid "E-mail" -msgstr "E-mail" +#: forms.py:143 +msgid "This account is inactive." +msgstr "Tento účet je neaktivní." -#: forms.py:117 +#: forms.py:187 msgid "" "That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" @@ -104,102 +109,124 @@ msgstr "" "K této e-mailové adrese není přiřazen žádný uživatelský účet. Určitě jste " "zde registrováni?" -#: forms.py:143 -#, python-format -msgid "Password reset on %s" -msgstr "Obnovení hesla na webu %s" +#: forms.py:189 +msgid "" +"The user account associated with this e-mail address cannot reset the " +"password." +msgstr "Účtu spojeném s touto e-mailovou adresou nelze obnovit heslo." -#: forms.py:151 +#: forms.py:192 +msgid "E-mail" +msgstr "E-mail" + +#: forms.py:249 msgid "New password" msgstr "Nové heslo" -#: forms.py:152 +#: forms.py:251 msgid "New password confirmation" msgstr "Potvrzení nového hesla" -#: forms.py:177 -msgid "Old password" -msgstr "Současné heslo" - -#: forms.py:185 +#: forms.py:280 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "Vaše současné heslo nebylo vloženo správně. Zkuste to znovu." -#: forms.py:194 +#: forms.py:283 +msgid "Old password" +msgstr "Současné heslo" + +#: forms.py:308 msgid "Password (again)" msgstr "Heslo (znovu)" -#: models.py:76 models.py:104 +#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355 +#: hashers.py:389 +msgid "algorithm" +msgstr "algoritmus" + +#: hashers.py:219 +msgid "iterations" +msgstr "iterace" + +#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390 +msgid "salt" +msgstr "hodnota salt" + +#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391 +msgid "hash" +msgstr "hash" + +#: hashers.py:270 +msgid "work factor" +msgstr "faktor práce" + +#: hashers.py:272 +msgid "checksum" +msgstr "kontrolní součet" + +#: models.py:66 models.py:113 msgid "name" msgstr "název" -#: models.py:78 +#: models.py:68 msgid "codename" msgstr "kódový název" -#: models.py:82 +#: models.py:72 msgid "permission" msgstr "oprávnění" -#: models.py:83 models.py:105 +#: models.py:73 models.py:115 msgid "permissions" msgstr "oprávnění" -#: models.py:108 +#: models.py:120 msgid "group" msgstr "skupina" -#: models.py:109 models.py:216 +#: models.py:121 models.py:250 msgid "groups" msgstr "skupiny" -#: models.py:206 +#: models.py:232 msgid "username" msgstr "uživatelské jméno" -#: models.py:206 +#: models.py:233 msgid "" "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters" msgstr "" "Požadováno. 30 znaků nebo méně. Pouze písmena, číslice a znaky @/./+/-/_." -#: models.py:207 +#: models.py:235 msgid "first name" msgstr "křestní jméno" -#: models.py:208 +#: models.py:236 msgid "last name" msgstr "příjmení" -#: models.py:209 +#: models.py:237 msgid "e-mail address" msgstr "e-mailová adresa" -#: models.py:210 +#: models.py:238 msgid "password" msgstr "heslo" -#: models.py:210 -msgid "" -"Use '[algo]$[salt]$[hexdigest]' or use the change " -"password form." -msgstr "" -"Použijte buď tvar \"[algo]$[salt]$[hexdigest]\" nebo formulář pro změnu hesla." - -#: models.py:211 +#: models.py:239 msgid "staff status" msgstr "administrační přístup" -#: models.py:211 +#: models.py:240 msgid "Designates whether the user can log into this admin site." msgstr "Určuje, zda se uživatel může přihlásit do správy tohoto webu." -#: models.py:212 +#: models.py:242 msgid "active" msgstr "aktivní" -#: models.py:212 +#: models.py:243 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." @@ -207,53 +234,54 @@ msgstr "" "Určuje, zda bude uživatel považován za aktivního. Použijte tuto možnost " "místo odstranění účtů." -#: models.py:213 +#: models.py:245 msgid "superuser status" msgstr "superuživatel" -#: models.py:213 +#: models.py:246 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." msgstr "" "Určuje, že uživatel má veškerá oprávnění bez jejich explicitního přiřazení." -#: models.py:214 +#: models.py:248 msgid "last login" msgstr "poslední přihlášení" -#: models.py:215 +#: models.py:249 msgid "date joined" msgstr "datum registrace" -#: models.py:217 +#: models.py:251 msgid "" -"In addition to the permissions manually assigned, this user will also get " -"all permissions granted to each group he/she is in." +"The groups this user belongs to. A user will get all permissions granted to " +"each of his/her group." msgstr "" -"Kromě manuálně přidělených oprávnění bude uživatel mít všechna oprávnění pro " -"každou skupinu, jejímž je členem." +"Skupiny, do kterých tento uživatel patří. Uživatel dostane všechna oprávnění " +"udělená každé z jeho skupin." -#: models.py:218 +#: models.py:255 msgid "user permissions" msgstr "uživatelská oprávnění" -#: models.py:222 +#: models.py:260 msgid "user" msgstr "uživatel" -#: models.py:223 +#: models.py:261 msgid "users" msgstr "uživatelé" -#: models.py:406 -msgid "message" -msgstr "zpráva" - -#: views.py:91 +#: views.py:93 msgid "Logged out" msgstr "Odhlášeno" -#: management/commands/createsuperuser.py:23 +#: management/commands/createsuperuser.py:27 msgid "Enter a valid e-mail address." msgstr "Vložte platnou e-mailovou adresu." + +#: templates/registration/password_reset_subject.txt:2 +#, python-format +msgid "Password reset on %(site_name)s" +msgstr "Obnovení hesla na webu %(site_name)s" diff --git a/django/contrib/auth/locale/cy/LC_MESSAGES/django.mo b/django/contrib/auth/locale/cy/LC_MESSAGES/django.mo index 2bf05342449..0e9cf99f3b3 100644 Binary files a/django/contrib/auth/locale/cy/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/cy/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/cy/LC_MESSAGES/django.po b/django/contrib/auth/locale/cy/LC_MESSAGES/django.po index 97dc26dadb6..5015990d6ab 100644 --- a/django/contrib/auth/locale/cy/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/cy/LC_MESSAGES/django.po @@ -1,247 +1,271 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Jannis Leidel , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:14-0400\n" -"PO-Revision-Date: 2011-03-04 18:41+0000\n" -"Last-Translator: Jannis \n" +"POT-Creation-Date: 2012-03-14 00:14-0700\n" +"PO-Revision-Date: 2012-03-08 12:07+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: English \n" +"Language: cy\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: cy\n" "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != " "11) ? 2 : 3\n" -#: admin.py:28 +#: admin.py:41 msgid "Personal info" msgstr "Gwybodaeth personol" -#: admin.py:29 +#: admin.py:42 msgid "Permissions" msgstr "Hawliau" -#: admin.py:30 +#: admin.py:44 msgid "Important dates" msgstr "Dyddiadau pwysig" -#: admin.py:31 -msgid "Groups" -msgstr "Grwpiau" - -#: admin.py:113 +#: admin.py:125 msgid "Password changed successfully." msgstr "" -#: admin.py:123 +#: admin.py:135 #, python-format msgid "Change password: %s" msgstr "" -#: forms.py:14 forms.py:48 forms.py:66 -msgid "Username" -msgstr "" - -#: forms.py:15 forms.py:49 -msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." -msgstr "" - -#: forms.py:16 forms.py:50 -msgid "This value may contain only letters, numbers and @/./+/-/_ characters." -msgstr "" - -#: forms.py:17 forms.py:67 forms.py:193 -msgid "Password" -msgstr "" - -#: forms.py:18 -msgid "Password confirmation" -msgstr "" - -#: forms.py:19 -msgid "Enter the same password as above, for verification." -msgstr "" - -#: forms.py:31 +#: forms.py:58 msgid "A user with that username already exists." msgstr "" -#: forms.py:37 forms.py:163 forms.py:205 +#: forms.py:59 forms.py:247 forms.py:304 msgid "The two password fields didn't match." msgstr "" -#: forms.py:87 +#: forms.py:61 forms.py:106 forms.py:135 +msgid "Username" +msgstr "" + +#: forms.py:63 forms.py:107 +msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." +msgstr "" + +#: forms.py:66 forms.py:110 +msgid "This value may contain only letters, numbers and @/./+/-/_ characters." +msgstr "" + +#: forms.py:68 forms.py:112 forms.py:136 forms.py:306 +msgid "Password" +msgstr "" + +#: forms.py:70 +msgid "Password confirmation" +msgstr "" + +#: forms.py:72 +msgid "Enter the same password as above, for verification." +msgstr "" + +#: forms.py:113 +msgid "" +"Raw passwords are not stored, so there is no way to see this user's " +"password, but you can change the password using this " +"form." +msgstr "" + +#: forms.py:139 msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." msgstr "" -#: forms.py:89 -msgid "This account is inactive." -msgstr "" - -#: forms.py:96 +#: forms.py:141 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." msgstr "" -#: forms.py:108 -msgid "E-mail" +#: forms.py:143 +msgid "This account is inactive." msgstr "" -#: forms.py:117 +#: forms.py:187 msgid "" "That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" msgstr "" -#: forms.py:143 -#, python-format -msgid "Password reset on %s" +#: forms.py:189 +msgid "" +"The user account associated with this e-mail address cannot reset the " +"password." msgstr "" -#: forms.py:151 +#: forms.py:192 +msgid "E-mail" +msgstr "" + +#: forms.py:249 msgid "New password" msgstr "" -#: forms.py:152 +#: forms.py:251 msgid "New password confirmation" msgstr "" -#: forms.py:177 -msgid "Old password" -msgstr "" - -#: forms.py:185 +#: forms.py:280 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "" -#: forms.py:194 +#: forms.py:283 +msgid "Old password" +msgstr "" + +#: forms.py:308 msgid "Password (again)" msgstr "" -#: models.py:76 models.py:104 +#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355 +#: hashers.py:389 +msgid "algorithm" +msgstr "" + +#: hashers.py:219 +msgid "iterations" +msgstr "" + +#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390 +msgid "salt" +msgstr "" + +#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391 +msgid "hash" +msgstr "" + +#: hashers.py:270 +msgid "work factor" +msgstr "" + +#: hashers.py:272 +msgid "checksum" +msgstr "" + +#: models.py:66 models.py:113 msgid "name" msgstr "enw" -#: models.py:78 +#: models.py:68 msgid "codename" msgstr "enw arwyddol" -#: models.py:82 +#: models.py:72 msgid "permission" msgstr "" -#: models.py:83 models.py:105 +#: models.py:73 models.py:115 msgid "permissions" msgstr "" -#: models.py:108 +#: models.py:120 msgid "group" msgstr "" -#: models.py:109 models.py:216 +#: models.py:121 models.py:250 msgid "groups" msgstr "" -#: models.py:206 +#: models.py:232 msgid "username" msgstr "enw defnyddiwr" -#: models.py:206 +#: models.py:233 msgid "" "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters" msgstr "" -#: models.py:207 +#: models.py:235 msgid "first name" msgstr "enw cyntaf" -#: models.py:208 +#: models.py:236 msgid "last name" msgstr "enw olaf" -#: models.py:209 +#: models.py:237 msgid "e-mail address" msgstr "cyfeiriad e-bost" -#: models.py:210 +#: models.py:238 msgid "password" msgstr "cyfrinair" -#: models.py:210 -msgid "" -"Use '[algo]$[salt]$[hexdigest]' or use the change " -"password form." -msgstr "" - -#: models.py:211 +#: models.py:239 msgid "staff status" msgstr "statws staff" -#: models.py:211 +#: models.py:240 msgid "Designates whether the user can log into this admin site." msgstr "Dylunio ai'r defnyddiwr yn gally mewngofnodi i'r safle weinyddiad yma." -#: models.py:212 +#: models.py:242 msgid "active" msgstr "gweithredol" -#: models.py:212 +#: models.py:243 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." msgstr "" -#: models.py:213 +#: models.py:245 msgid "superuser status" msgstr "statws defnyddiwr swper" -#: models.py:213 +#: models.py:246 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." msgstr "" -#: models.py:214 +#: models.py:248 msgid "last login" msgstr "mewngofnod olaf" -#: models.py:215 +#: models.py:249 msgid "date joined" msgstr "Dyddiad" -#: models.py:217 +#: models.py:251 msgid "" -"In addition to the permissions manually assigned, this user will also get " -"all permissions granted to each group he/she is in." +"The groups this user belongs to. A user will get all permissions granted to " +"each of his/her group." msgstr "" -"Yn ogystal â'r hawliau trosglwyddwyd dros law, byddai'r defnyddiwr yma hefyd " -"yn cael y cwbl hawliau a addefwyd i pob grŵp mae o/hi mewn." -#: models.py:218 +#: models.py:255 msgid "user permissions" msgstr "" -#: models.py:222 +#: models.py:260 msgid "user" msgstr "" -#: models.py:223 +#: models.py:261 msgid "users" msgstr "" -#: models.py:406 -msgid "message" -msgstr "" - -#: views.py:91 +#: views.py:93 msgid "Logged out" msgstr "" -#: management/commands/createsuperuser.py:23 +#: management/commands/createsuperuser.py:27 msgid "Enter a valid e-mail address." msgstr "Rhowch cyfeiriad e-bost ddilys." + +#: templates/registration/password_reset_subject.txt:2 +#, python-format +msgid "Password reset on %(site_name)s" +msgstr "" diff --git a/django/contrib/auth/locale/da/LC_MESSAGES/django.mo b/django/contrib/auth/locale/da/LC_MESSAGES/django.mo index 603b00ced5c..7e9d7539314 100644 Binary files a/django/contrib/auth/locale/da/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/da/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/da/LC_MESSAGES/django.po b/django/contrib/auth/locale/da/LC_MESSAGES/django.po index d585f1f4b69..c1d29f21d33 100644 --- a/django/contrib/auth/locale/da/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/da/LC_MESSAGES/django.po @@ -1,78 +1,89 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Christian Joergensen , 2012. +# Erik Wognsen , 2011, 2012. +# Jannis Leidel , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:14-0400\n" -"PO-Revision-Date: 2011-03-04 18:41+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Danish <>\n" +"POT-Creation-Date: 2012-03-14 00:14-0700\n" +"PO-Revision-Date: 2012-03-12 21:16+0000\n" +"Last-Translator: Erik Wognsen \n" +"Language-Team: Danish (http://www.transifex.net/projects/p/django/language/" +"da/)\n" +"Language: da\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: da\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: admin.py:28 +#: admin.py:41 msgid "Personal info" msgstr "Personlig information" -#: admin.py:29 +#: admin.py:42 msgid "Permissions" msgstr "Rettigheder" -#: admin.py:30 +#: admin.py:44 msgid "Important dates" msgstr "Vigtige datoer" -#: admin.py:31 -msgid "Groups" -msgstr "Grupper" - -#: admin.py:113 +#: admin.py:125 msgid "Password changed successfully." msgstr "Adgangskoden blev ændret." -#: admin.py:123 +#: admin.py:135 #, python-format msgid "Change password: %s" msgstr "Skift adgangskode: %s" -#: forms.py:14 forms.py:48 forms.py:66 +#: forms.py:58 +msgid "A user with that username already exists." +msgstr "En bruger med dette brugernavn findes allerede." + +#: forms.py:59 forms.py:247 forms.py:304 +msgid "The two password fields didn't match." +msgstr "De to adgangskoder var ikke identiske." + +#: forms.py:61 forms.py:106 forms.py:135 msgid "Username" msgstr "Brugernavn" -#: forms.py:15 forms.py:49 +#: forms.py:63 forms.py:107 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." msgstr "Påkrævet. Højst 30 tegn. Kun bogstaver og cifre samt @/./+/-/_" -#: forms.py:16 forms.py:50 +#: forms.py:66 forms.py:110 msgid "This value may contain only letters, numbers and @/./+/-/_ characters." msgstr "" "Dette felt må kun indeholde bogstaver og cifre samt disse tegn: @/./+/-/_" -#: forms.py:17 forms.py:67 forms.py:193 +#: forms.py:68 forms.py:112 forms.py:136 forms.py:306 msgid "Password" msgstr "Adgangskode" -#: forms.py:18 +#: forms.py:70 msgid "Password confirmation" msgstr "Bekræftelse af adgangskode" -#: forms.py:19 +#: forms.py:72 msgid "Enter the same password as above, for verification." msgstr "Indtast den samme adgangskode som ovenfor for verifikation." -#: forms.py:31 -msgid "A user with that username already exists." -msgstr "En bruger med dette brugernavn findes allerede." +#: forms.py:113 +msgid "" +"Raw passwords are not stored, so there is no way to see this user's " +"password, but you can change the password using this " +"form." +msgstr "" +"Rå passwords gemmes ikke, så det er ikke muligt at se denne brugers " +"password, men du kan ændre passwordet ved hjælp af denne formular." -#: forms.py:37 forms.py:163 forms.py:205 -msgid "The two password fields didn't match." -msgstr "De to adgangskoder var ikke identiske." - -#: forms.py:87 +#: forms.py:139 msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." @@ -80,11 +91,7 @@ msgstr "" "Indtast venligst et korrekt brugernavn og adgangskode. Bemærk, at begge " "felter er versalfølsomme." -#: forms.py:89 -msgid "This account is inactive." -msgstr "Denne konto er inaktiv." - -#: forms.py:96 +#: forms.py:141 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." @@ -92,11 +99,11 @@ msgstr "" "Din browser ser ud til ikke at have cookies aktiveret. Cookies er påkrævet " "for at kunne logge ind." -#: forms.py:108 -msgid "E-mail" -msgstr "E-mail" +#: forms.py:143 +msgid "This account is inactive." +msgstr "Denne konto er inaktiv." -#: forms.py:117 +#: forms.py:187 msgid "" "That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" @@ -104,103 +111,127 @@ msgstr "" "Den e-mail-adresse er ikke tilknyttet en konto. Er du sikker på at du har " "registreret dig?" -#: forms.py:143 -#, python-format -msgid "Password reset on %s" -msgstr "Adgangskode nulstillet på %s" +#: forms.py:189 +msgid "" +"The user account associated with this e-mail address cannot reset the " +"password." +msgstr "" +"Kontoen, der er tilknyttet denne e-mail-adresse, kan ikke nulstille " +"adgangskoden." -#: forms.py:151 +#: forms.py:192 +msgid "E-mail" +msgstr "E-mail" + +#: forms.py:249 msgid "New password" msgstr "Ny adgangskode" -#: forms.py:152 +#: forms.py:251 msgid "New password confirmation" msgstr "Bekræftelse af ny adgangskode" -#: forms.py:177 -msgid "Old password" -msgstr "Gammel adgangskode" - -#: forms.py:185 +#: forms.py:280 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "" "Din gamle adgangskode blev ikke indtastet korrekt. Indtast den venligst igen." -#: forms.py:194 +#: forms.py:283 +msgid "Old password" +msgstr "Gammel adgangskode" + +#: forms.py:308 msgid "Password (again)" msgstr "Adgangskode (igen)" -#: models.py:76 models.py:104 +#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355 +#: hashers.py:389 +msgid "algorithm" +msgstr "algoritme" + +#: hashers.py:219 +msgid "iterations" +msgstr "iterationer" + +#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390 +msgid "salt" +msgstr "salt" + +#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391 +msgid "hash" +msgstr "hash" + +#: hashers.py:270 +msgid "work factor" +msgstr "work factor" + +#: hashers.py:272 +msgid "checksum" +msgstr "tjeksum" + +#: models.py:66 models.py:113 msgid "name" msgstr "navn" -#: models.py:78 +#: models.py:68 msgid "codename" msgstr "kodenavn" -#: models.py:82 +#: models.py:72 msgid "permission" msgstr "rettighed" -#: models.py:83 models.py:105 +#: models.py:73 models.py:115 msgid "permissions" msgstr "rettigheder" -#: models.py:108 +#: models.py:120 msgid "group" msgstr "gruppe" -#: models.py:109 models.py:216 +#: models.py:121 models.py:250 msgid "groups" msgstr "grupper" -#: models.py:206 +#: models.py:232 msgid "username" msgstr "brugernavn" -#: models.py:206 +#: models.py:233 msgid "" "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters" msgstr "" "Påkrævet. Højst 30 tegn. Kun bogstaver og cifre samt disse tegn: @/./+/-/_" -#: models.py:207 +#: models.py:235 msgid "first name" msgstr "fornavn" -#: models.py:208 +#: models.py:236 msgid "last name" msgstr "efternavn" -#: models.py:209 +#: models.py:237 msgid "e-mail address" msgstr "e-mail-adresse" -#: models.py:210 +#: models.py:238 msgid "password" msgstr "adgangskode" -#: models.py:210 -msgid "" -"Use '[algo]$[salt]$[hexdigest]' or use the change " -"password form." -msgstr "" -"Brug '[algo]$[salt]$[hexdigest]' eller brug formularen " -"til skift af adgangskode." - -#: models.py:211 +#: models.py:239 msgid "staff status" msgstr "admin-status" -#: models.py:211 +#: models.py:240 msgid "Designates whether the user can log into this admin site." msgstr "Bestemmer om brugeren kan logge ind på dette administrationswebsite." -#: models.py:212 +#: models.py:242 msgid "active" msgstr "aktiv" -#: models.py:212 +#: models.py:243 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." @@ -208,53 +239,54 @@ msgstr "" "Bestemmer om brugeren skal behandles som aktiv. Fravælg dette frem for at " "slette en konto." -#: models.py:213 +#: models.py:245 msgid "superuser status" msgstr "superbrugerstatus" -#: models.py:213 +#: models.py:246 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." msgstr "" "Bestemmer at denne bruger har alle rettigheder uden at tildele dem eksplicit." -#: models.py:214 +#: models.py:248 msgid "last login" msgstr "sidst logget ind" -#: models.py:215 +#: models.py:249 msgid "date joined" msgstr "dato for registrering" -#: models.py:217 +#: models.py:251 msgid "" -"In addition to the permissions manually assigned, this user will also get " -"all permissions granted to each group he/she is in." +"The groups this user belongs to. A user will get all permissions granted to " +"each of his/her group." msgstr "" -"Udover de rettigheder, der manuelt er tildelt brugeren, vil denne også få " -"alle rettigheder, der er tildelt hver gruppe, brugeren er medlem af." +"Grupperne som denne bruger hører til. En bruger får alle rettigheder givet " +"til hver af hans/hendes grupper." -#: models.py:218 +#: models.py:255 msgid "user permissions" -msgstr "Rettigheder" +msgstr "rettigheder" -#: models.py:222 +#: models.py:260 msgid "user" msgstr "bruger" -#: models.py:223 +#: models.py:261 msgid "users" msgstr "brugere" -#: models.py:406 -msgid "message" -msgstr "meddelelse" - -#: views.py:91 +#: views.py:93 msgid "Logged out" msgstr "Logget ud" -#: management/commands/createsuperuser.py:23 +#: management/commands/createsuperuser.py:27 msgid "Enter a valid e-mail address." msgstr "Indtast en gyldig e-mail-adresse." + +#: templates/registration/password_reset_subject.txt:2 +#, python-format +msgid "Password reset on %(site_name)s" +msgstr "Password nulstillet på %(site_name)s" diff --git a/django/contrib/auth/locale/de/LC_MESSAGES/django.mo b/django/contrib/auth/locale/de/LC_MESSAGES/django.mo index 5bbba93542f..30729528778 100644 Binary files a/django/contrib/auth/locale/de/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/de/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/de/LC_MESSAGES/django.po b/django/contrib/auth/locale/de/LC_MESSAGES/django.po index ce0b3202966..efd40281665 100644 --- a/django/contrib/auth/locale/de/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/de/LC_MESSAGES/django.po @@ -1,79 +1,90 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# André Hagenbruch , 2011. +# , 2012. +# Jannis Leidel , 2011, 2012. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:14-0400\n" -"PO-Revision-Date: 2011-03-04 18:41+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: German <>\n" +"POT-Creation-Date: 2012-03-14 00:14-0700\n" +"PO-Revision-Date: 2012-03-14 05:19+0000\n" +"Last-Translator: Jannis Leidel \n" +"Language-Team: German (http://www.transifex.net/projects/p/django/language/" +"de/)\n" +"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: admin.py:28 +#: admin.py:41 msgid "Personal info" msgstr "Persönliche Infos" -#: admin.py:29 +#: admin.py:42 msgid "Permissions" msgstr "Berechtigungen" -#: admin.py:30 +#: admin.py:44 msgid "Important dates" msgstr "Wichtige Daten" -#: admin.py:31 -msgid "Groups" -msgstr "Gruppen" - -#: admin.py:113 +#: admin.py:125 msgid "Password changed successfully." msgstr "Passwort erfolgreich geändert." -#: admin.py:123 +#: admin.py:135 #, python-format msgid "Change password: %s" msgstr "Passwort ändern: %s" -#: forms.py:14 forms.py:48 forms.py:66 +#: forms.py:58 +msgid "A user with that username already exists." +msgstr "Dieser Benutzername ist bereits vergeben." + +#: forms.py:59 forms.py:247 forms.py:304 +msgid "The two password fields didn't match." +msgstr "Die beiden Passwörter sind nicht identisch." + +#: forms.py:61 forms.py:106 forms.py:135 msgid "Username" msgstr "Benutzername" -#: forms.py:15 forms.py:49 +#: forms.py:63 forms.py:107 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." msgstr "" "Erforderlich. 30 Zeichen oder weniger. Nur alphanumerische Zeichen " "(Buchstaben, Ziffern und @/./+/-/_) sind erlaubt." -#: forms.py:16 forms.py:50 +#: forms.py:66 forms.py:110 msgid "This value may contain only letters, numbers and @/./+/-/_ characters." msgstr "Dieser Wert darf nur Buchstaben, Ziffern und @/./+/-/_ enthalten." -#: forms.py:17 forms.py:67 forms.py:193 +#: forms.py:68 forms.py:112 forms.py:136 forms.py:306 msgid "Password" msgstr "Passwort" -#: forms.py:18 +#: forms.py:70 msgid "Password confirmation" msgstr "Passwort bestätigen" -#: forms.py:19 +#: forms.py:72 msgid "Enter the same password as above, for verification." msgstr "Bitte das gleiche Passwort zur Überprüfung nochmal eingeben." -#: forms.py:31 -msgid "A user with that username already exists." -msgstr "Dieser Benutzername ist bereits vergeben." +#: forms.py:113 +msgid "" +"Raw passwords are not stored, so there is no way to see this user's " +"password, but you can change the password using this " +"form." +msgstr "" +"Die Passwörter werden nicht als Klartext gespeichert, somit gibt es keine " +"Möglichkeit das Passwort dieses Benutzers anzuschauen, allerdings kann das " +"Passwort über dieses Formular geändert werden." -#: forms.py:37 forms.py:163 forms.py:205 -msgid "The two password fields didn't match." -msgstr "Die beiden Passwörter sind nicht identisch." - -#: forms.py:87 +#: forms.py:139 msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." @@ -81,11 +92,7 @@ msgstr "" "Bitte einen gültigen Benutzernamen und ein Passwort eingeben. Beide Felder " "berücksichtigen die Groß-/Kleinschreibung." -#: forms.py:89 -msgid "This account is inactive." -msgstr "Dieser Benutzer ist inaktiv." - -#: forms.py:96 +#: forms.py:141 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." @@ -93,11 +100,11 @@ msgstr "" "Der Webbrowser scheint keine Cookies aktiviert zu haben. Cookies sind für " "die Anmeldung zwingend erforderlich." -#: forms.py:108 -msgid "E-mail" -msgstr "E-Mail-Adresse" +#: forms.py:143 +msgid "This account is inactive." +msgstr "Dieser Benutzer ist inaktiv." -#: forms.py:117 +#: forms.py:187 msgid "" "That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" @@ -105,104 +112,128 @@ msgstr "" "Zu dieser E-Mail-Adresse existiert kein Benutzer. Sicher, dass Sie sich mit " "dieser Adresse registriert haben?" -#: forms.py:143 -#, python-format -msgid "Password reset on %s" -msgstr "Passwort auf %s zurücksetzen" +#: forms.py:189 +msgid "" +"The user account associated with this e-mail address cannot reset the " +"password." +msgstr "" +"Mit dem zu dieser E-Mail-Adresse gehörenden Benutzerkonto kann das Passwort " +"nicht zurückgesetzt werden." -#: forms.py:151 +#: forms.py:192 +msgid "E-mail" +msgstr "E-Mail-Adresse" + +#: forms.py:249 msgid "New password" msgstr "Neues Passwort" -#: forms.py:152 +#: forms.py:251 msgid "New password confirmation" msgstr "Neues Passwort bestätigen" -#: forms.py:177 -msgid "Old password" -msgstr "Altes Passwort" - -#: forms.py:185 +#: forms.py:280 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "Das alte Passwort war falsch. Bitte neu eingeben." -#: forms.py:194 +#: forms.py:283 +msgid "Old password" +msgstr "Altes Passwort" + +#: forms.py:308 msgid "Password (again)" msgstr "Passwort (wiederholen)" -#: models.py:76 models.py:104 +#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355 +#: hashers.py:389 +msgid "algorithm" +msgstr "Algorithmus" + +#: hashers.py:219 +msgid "iterations" +msgstr "Iterationen" + +#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390 +msgid "salt" +msgstr "Salt" + +#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391 +msgid "hash" +msgstr "Hash" + +#: hashers.py:270 +msgid "work factor" +msgstr "Arbeitsfaktor" + +#: hashers.py:272 +msgid "checksum" +msgstr "Prüfsumme" + +#: models.py:66 models.py:113 msgid "name" msgstr "Name" -#: models.py:78 +#: models.py:68 msgid "codename" msgstr "Codename" -#: models.py:82 +#: models.py:72 msgid "permission" msgstr "Berechtigung" -#: models.py:83 models.py:105 +#: models.py:73 models.py:115 msgid "permissions" msgstr "Berechtigungen" -#: models.py:108 +#: models.py:120 msgid "group" msgstr "Gruppe" -#: models.py:109 models.py:216 +#: models.py:121 models.py:250 msgid "groups" msgstr "Gruppen" -#: models.py:206 +#: models.py:232 msgid "username" msgstr "Benutzername" -#: models.py:206 +#: models.py:233 msgid "" "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters" msgstr "" "Erforderlich. 30 Zeichen oder weniger. Nur alphanumerische Zeichen " "(Buchstaben, Ziffern und @/./+/-/_) sind erlaubt." -#: models.py:207 +#: models.py:235 msgid "first name" msgstr "Vorname" -#: models.py:208 +#: models.py:236 msgid "last name" msgstr "Nachname" -#: models.py:209 +#: models.py:237 msgid "e-mail address" msgstr "E-Mail-Adresse" -#: models.py:210 +#: models.py:238 msgid "password" msgstr "Passwort" -#: models.py:210 -msgid "" -"Use '[algo]$[salt]$[hexdigest]' or use the change " -"password form." -msgstr "" -"Die Form '[algo]$[salt]$[hexdigest]' verwenden, oder das Passwort ändern Formular benutzen." - -#: models.py:211 +#: models.py:239 msgid "staff status" msgstr "Redakteur-Status" -#: models.py:211 +#: models.py:240 msgid "Designates whether the user can log into this admin site." msgstr "" "Legt fest, ob sich der Benutzer an der Administrationsseite anmelden kann." -#: models.py:212 +#: models.py:242 msgid "active" msgstr "Aktiv" -#: models.py:212 +#: models.py:243 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." @@ -210,11 +241,11 @@ msgstr "" "Legt fest, ob dieser Benutzer aktiv ist. Kann deaktiviert werden, anstatt " "Benutzer zu löschen." -#: models.py:213 +#: models.py:245 msgid "superuser status" msgstr "Administrator-Status" -#: models.py:213 +#: models.py:246 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." @@ -222,42 +253,43 @@ msgstr "" "Legt fest, dass der Benutzer alle Berechtigungen hat, ohne diese einzeln " "zuweisen zu müssen." -#: models.py:214 +#: models.py:248 msgid "last login" msgstr "Letzte Anmeldung" -#: models.py:215 +#: models.py:249 msgid "date joined" msgstr "Mitglied seit" -#: models.py:217 +#: models.py:251 msgid "" -"In addition to the permissions manually assigned, this user will also get " -"all permissions granted to each group he/she is in." +"The groups this user belongs to. A user will get all permissions granted to " +"each of his/her group." msgstr "" -"Zusätzlich zu den manuell angelegten Rechten erhält dieser Benutzer auch " -"alle Rechte, die seine zugewiesenen Gruppen haben." +"Die Gruppen, denen der Benutzer angehört. Ein Benutzer bekommt alle " +"Berechtigungen seiner zugeteilten Gruppen." -#: models.py:218 +#: models.py:255 msgid "user permissions" msgstr "Berechtigungen" -#: models.py:222 +#: models.py:260 msgid "user" msgstr "Benutzer" -#: models.py:223 +#: models.py:261 msgid "users" msgstr "Benutzer" -#: models.py:406 -msgid "message" -msgstr "Mitteilung" - -#: views.py:91 +#: views.py:93 msgid "Logged out" msgstr "Abgemeldet" -#: management/commands/createsuperuser.py:23 +#: management/commands/createsuperuser.py:27 msgid "Enter a valid e-mail address." msgstr "Bitte eine gültige E-Mail-Adresse eingeben." + +#: templates/registration/password_reset_subject.txt:2 +#, python-format +msgid "Password reset on %(site_name)s" +msgstr "Passwort auf %(site_name)s zurücksetzen" diff --git a/django/contrib/auth/locale/el/LC_MESSAGES/django.mo b/django/contrib/auth/locale/el/LC_MESSAGES/django.mo index 3540e437b6e..92e74a64df0 100644 Binary files a/django/contrib/auth/locale/el/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/el/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/el/LC_MESSAGES/django.po b/django/contrib/auth/locale/el/LC_MESSAGES/django.po index 0606cb55d76..61f3ba2642e 100644 --- a/django/contrib/auth/locale/el/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/el/LC_MESSAGES/django.po @@ -1,82 +1,91 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Dimitris Glezos , 2011, 2012. +# glogiotatidis , 2011. +# Jannis Leidel , 2011. +# Yorgos Pagles , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-20 21:04+0100\n" -"PO-Revision-Date: 2011-03-20 11:31+0000\n" -"Last-Translator: pagles \n" -"Language-Team: Greek <>\n" +"POT-Creation-Date: 2012-03-14 00:14-0700\n" +"PO-Revision-Date: 2012-03-08 12:07+0000\n" +"Last-Translator: Dimitris Glezos \n" +"Language-Team: Greek (http://www.transifex.net/projects/p/django/language/" +"el/)\n" +"Language: el\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: el\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: admin.py:28 +#: admin.py:41 msgid "Personal info" msgstr "Προσωπικές πληροφορίες" -#: admin.py:29 +#: admin.py:42 msgid "Permissions" msgstr "Δικαιώματα" -#: admin.py:30 +#: admin.py:44 msgid "Important dates" msgstr "Σημαντικές ημερομηνίες" -#: admin.py:31 -msgid "Groups" -msgstr "Ομάδες" - -#: admin.py:113 +#: admin.py:125 msgid "Password changed successfully." msgstr "Ο κωδικός πρόσβασης αλλάχτηκε με επιτυχία." -#: admin.py:123 +#: admin.py:135 #, python-format msgid "Change password: %s" msgstr "Αλλαγή κωδικού πρόσβασης: %s" -#: forms.py:14 forms.py:48 forms.py:66 +#: forms.py:58 +msgid "A user with that username already exists." +msgstr "Αυτό το όνομα χρήστη χρησιμοποιείται ήδη." + +#: forms.py:59 forms.py:247 forms.py:304 +msgid "The two password fields didn't match." +msgstr "Τα δύο πεδία κωδικού χρήστη δεν ταιριάζουν." + +#: forms.py:61 forms.py:106 forms.py:135 msgid "Username" msgstr "Όνομα χρήστη" -#: forms.py:15 forms.py:49 +#: forms.py:63 forms.py:107 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." msgstr "" "Απαραίτητο. Πρέπει να αποτελείται από 30 ή λιγότερους χαρακτήρες. Μπορείτε " "να χρησιμοποιήσετε μόνο γράμματα, αριθμούς και τους χαρακτήρες @/./+/-/_." -#: forms.py:16 forms.py:50 +#: forms.py:66 forms.py:110 msgid "This value may contain only letters, numbers and @/./+/-/_ characters." msgstr "" "Αυτή η τιμή μπορεί να περιέχει μόνο γράμματα, αριθμούς και τους χαρακτήρες " "@/./+/-/_." -#: forms.py:17 forms.py:67 forms.py:196 +#: forms.py:68 forms.py:112 forms.py:136 forms.py:306 msgid "Password" msgstr "Κωδικός χρήστη" -#: forms.py:18 +#: forms.py:70 msgid "Password confirmation" msgstr "Επιβεβαίωση κωδικού χρήστη" -#: forms.py:19 +#: forms.py:72 msgid "Enter the same password as above, for verification." msgstr "" "Εισάγετε τον ίδιο κωδικό χρήστη όπως παραπάνω, για λόγους επιβεβαίωσης." -#: forms.py:31 -msgid "A user with that username already exists." -msgstr "Αυτό το όνομα χρήστη χρησιμοποιείται ήδη." +#: forms.py:113 +msgid "" +"Raw passwords are not stored, so there is no way to see this user's " +"password, but you can change the password using this " +"form." +msgstr "" -#: forms.py:37 forms.py:166 forms.py:208 -msgid "The two password fields didn't match." -msgstr "Τα δύο πεδία κωδικού χρήστη δεν ταιριάζουν." - -#: forms.py:87 +#: forms.py:139 msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." @@ -84,11 +93,7 @@ msgstr "" "Παρακαλούμε εισάγετε ένα σωστό όνομα χρήστη και κωδικό χρήστη. Να σημειωθεί " "ότι και τα δύο πεδία κάνουν διάκριση μεταξύ πεζών και κεφαλαίων." -#: forms.py:89 -msgid "This account is inactive." -msgstr "Αυτός ο λογαριασμός είναι ανενεργός." - -#: forms.py:96 +#: forms.py:141 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." @@ -96,11 +101,11 @@ msgstr "" "Ο πλοηγητής σας δεν φαίνεται να έχει ενεργοποιημένα τα αρχεία cookie. Τα " "αρχεία cookie απαιτούνται για να συνδεθείτε." -#: forms.py:108 -msgid "E-mail" -msgstr "E-mail" +#: forms.py:143 +msgid "This account is inactive." +msgstr "Αυτός ο λογαριασμός είναι ανενεργός." -#: forms.py:120 +#: forms.py:187 msgid "" "That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" @@ -108,103 +113,125 @@ msgstr "" "Αυτή η διεύθυνση e-mail δεν αντιστοιχεί σε κάποιον λογαριασμό χρήστη. Είστε " "σίγουρος ότι έχετε γραφτεί;" -#: forms.py:146 -#, python-format -msgid "Password reset on %s" -msgstr "Επαναφορά συνθηματικού για %s" +#: forms.py:189 +msgid "" +"The user account associated with this e-mail address cannot reset the " +"password." +msgstr "" -#: forms.py:154 +#: forms.py:192 +msgid "E-mail" +msgstr "E-mail" + +#: forms.py:249 msgid "New password" msgstr "Νέο συνθηματικό" -#: forms.py:155 +#: forms.py:251 msgid "New password confirmation" msgstr "Επιβεβαίωση νέου συνθηματικού" -#: forms.py:180 -msgid "Old password" -msgstr "Παλιό συνθηματικό" - -#: forms.py:188 +#: forms.py:280 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "Το παλιό συνθηματικό σας δόθηκε λανθασμένα. Παρακαλώ δοκιμάστε ξανά." -#: forms.py:197 +#: forms.py:283 +msgid "Old password" +msgstr "Παλιό συνθηματικό" + +#: forms.py:308 msgid "Password (again)" msgstr "Συνθηματικό (ξανά)" -#: models.py:77 models.py:105 +#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355 +#: hashers.py:389 +msgid "algorithm" +msgstr "" + +#: hashers.py:219 +msgid "iterations" +msgstr "" + +#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390 +msgid "salt" +msgstr "" + +#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391 +msgid "hash" +msgstr "" + +#: hashers.py:270 +msgid "work factor" +msgstr "" + +#: hashers.py:272 +msgid "checksum" +msgstr "" + +#: models.py:66 models.py:113 msgid "name" msgstr "όνομα" -#: models.py:79 +#: models.py:68 msgid "codename" msgstr "κωδικό όνομα" -#: models.py:83 +#: models.py:72 msgid "permission" msgstr "δικαίωμα" -#: models.py:84 models.py:106 +#: models.py:73 models.py:115 msgid "permissions" msgstr "διακαιώματα" -#: models.py:109 +#: models.py:120 msgid "group" msgstr "ομάδα" -#: models.py:110 models.py:217 +#: models.py:121 models.py:250 msgid "groups" msgstr "ομάδες" -#: models.py:207 +#: models.py:232 msgid "username" msgstr "όνομα χρήστη" -#: models.py:207 +#: models.py:233 msgid "" "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters" msgstr "" "Απαραίτητα. 30 ή λιγότεροι χαρακτήρες. Γράμματα, αριθμοί και οι χαρακτήρες " "@/./+/-/_." -#: models.py:208 +#: models.py:235 msgid "first name" msgstr "όνομα" -#: models.py:209 +#: models.py:236 msgid "last name" msgstr "επώνυμο" -#: models.py:210 +#: models.py:237 msgid "e-mail address" msgstr "ηλεκτρονική διεύθυνση" -#: models.py:211 +#: models.py:238 msgid "password" msgstr "συνθηματικό" -#: models.py:211 -msgid "" -"Use '[algo]$[salt]$[hexdigest]' or use the change " -"password form." -msgstr "" -"Χρησιμοποιήστε την μορφή '[algo]$[salt]$[hexdigest]' ή εναλλακτικά την φόρμα αλλαγής κωδικού πρόσβασης." - -#: models.py:212 +#: models.py:239 msgid "staff status" msgstr "Κατάσταση προσωπικού" -#: models.py:212 +#: models.py:240 msgid "Designates whether the user can log into this admin site." msgstr "Ορίζει αν ο χρήστης μπορεί να συνδεθεί στο χώρο διαχείρισης." -#: models.py:213 +#: models.py:242 msgid "active" msgstr "ενεργό" -#: models.py:213 +#: models.py:243 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." @@ -213,11 +240,11 @@ msgstr "" "την επεπιλογή αυτής της επιλογής αντί του να πραγματοποιήσετε διαγραφή του " "χρήστη." -#: models.py:214 +#: models.py:245 msgid "superuser status" msgstr "κατάσταση υπερχρήστη" -#: models.py:214 +#: models.py:246 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." @@ -225,43 +252,41 @@ msgstr "" "Υποδηλώνει ότι ο συγκεκριμένος χρήστης έχει όλα τα δικαιώματα χωρίς να " "χρειάζεται να τα παραχωρήσετε ξεχωριστά." -#: models.py:215 +#: models.py:248 msgid "last login" msgstr "τελευταία σύνδεση" -#: models.py:216 +#: models.py:249 msgid "date joined" msgstr "ημερομηνία σύνδεσης" -#: models.py:218 +#: models.py:251 msgid "" -"In addition to the permissions manually assigned, this user will also get " -"all permissions granted to each group he/she is in." +"The groups this user belongs to. A user will get all permissions granted to " +"each of his/her group." msgstr "" -"Επιπροσθέτως των δικαιωμάτων που παρέχονται χειροκίνητα στον χρήστη θα έχει " -"και όλα τα δικαιώμετα που έχουν παραχωρηθεί στην ομάδα χρηστών στην οποία " -"ανήκει. " -#: models.py:219 +#: models.py:255 msgid "user permissions" msgstr "δικαιώματα χρήστη" -#: models.py:223 +#: models.py:260 msgid "user" msgstr "χρήστης" -#: models.py:224 +#: models.py:261 msgid "users" msgstr "χρήστες" -#: models.py:407 -msgid "message" -msgstr "μήνυμα" - -#: views.py:91 +#: views.py:93 msgid "Logged out" msgstr "Έγινε αποσύνδεση" -#: management/commands/createsuperuser.py:23 +#: management/commands/createsuperuser.py:27 msgid "Enter a valid e-mail address." msgstr "Εισάγετε μια έγκυρη διεύθυνση ηλ. ταχυδρομείου." + +#: templates/registration/password_reset_subject.txt:2 +#, python-format +msgid "Password reset on %(site_name)s" +msgstr "Επαναφοράς κωδικού πρόσβασης για το %(site_name)s " diff --git a/django/contrib/auth/locale/en/LC_MESSAGES/django.mo b/django/contrib/auth/locale/en/LC_MESSAGES/django.mo index 365af68d0d1..8d0aa545f10 100644 Binary files a/django/contrib/auth/locale/en/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/en/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/en/LC_MESSAGES/django.po b/django/contrib/auth/locale/en/LC_MESSAGES/django.po index 58bbbc6f042..ff44ac02b76 100644 --- a/django/contrib/auth/locale/en/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/en/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-03-05 02:25+0100\n" +"POT-Creation-Date: 2012-03-14 00:14-0700\n" "PO-Revision-Date: 2010-05-13 15:35+0200\n" "Last-Translator: Django team\n" "Language-Team: English \n" @@ -257,7 +257,7 @@ msgstr "" msgid "Logged out" msgstr "" -#: management/commands/createsuperuser.py:24 +#: management/commands/createsuperuser.py:27 msgid "Enter a valid e-mail address." msgstr "" diff --git a/django/contrib/auth/locale/en_GB/LC_MESSAGES/django.mo b/django/contrib/auth/locale/en_GB/LC_MESSAGES/django.mo index 03106ccd110..104979a6539 100644 Binary files a/django/contrib/auth/locale/en_GB/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/en_GB/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/en_GB/LC_MESSAGES/django.po b/django/contrib/auth/locale/en_GB/LC_MESSAGES/django.po index ce6cfc9c0c9..e8f54b6d770 100644 --- a/django/contrib/auth/locale/en_GB/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/en_GB/LC_MESSAGES/django.po @@ -1,77 +1,88 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# jon_atkinson , 2011. +# , 2012. +# Ross Poulton , 2012. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:14-0400\n" -"PO-Revision-Date: 2011-03-04 18:41+0000\n" -"Last-Translator: jon_atkinson \n" -"Language-Team: English (United Kingdom) \n" +"POT-Creation-Date: 2012-03-14 00:14-0700\n" +"PO-Revision-Date: 2012-03-12 21:52+0000\n" +"Last-Translator: Ross Poulton \n" +"Language-Team: English (United Kingdom) (http://www.transifex.net/projects/p/" +"django/language/en_GB/)\n" +"Language: en_GB\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: en_GB\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: admin.py:28 +#: admin.py:41 msgid "Personal info" msgstr "Personal info" -#: admin.py:29 +#: admin.py:42 msgid "Permissions" msgstr "Permissions" -#: admin.py:30 +#: admin.py:44 msgid "Important dates" msgstr "Important dates" -#: admin.py:31 -msgid "Groups" -msgstr "Groups" - -#: admin.py:113 +#: admin.py:125 msgid "Password changed successfully." msgstr "Password changed successfully." -#: admin.py:123 +#: admin.py:135 #, python-format msgid "Change password: %s" msgstr "Change password: %s" -#: forms.py:14 forms.py:48 forms.py:66 -msgid "Username" -msgstr "Username" - -#: forms.py:15 forms.py:49 -msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." -msgstr "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." - -#: forms.py:16 forms.py:50 -msgid "This value may contain only letters, numbers and @/./+/-/_ characters." -msgstr "This value may contain only letters, numbers and @/./+/-/_ characters." - -#: forms.py:17 forms.py:67 forms.py:193 -msgid "Password" -msgstr "Password" - -#: forms.py:18 -msgid "Password confirmation" -msgstr "Password confirmation" - -#: forms.py:19 -msgid "Enter the same password as above, for verification." -msgstr "Enter the same password as above, for verification." - -#: forms.py:31 +#: forms.py:58 msgid "A user with that username already exists." msgstr "A user with that username already exists." -#: forms.py:37 forms.py:163 forms.py:205 +#: forms.py:59 forms.py:247 forms.py:304 msgid "The two password fields didn't match." msgstr "The two password fields didn't match." -#: forms.py:87 +#: forms.py:61 forms.py:106 forms.py:135 +msgid "Username" +msgstr "Username" + +#: forms.py:63 forms.py:107 +msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." +msgstr "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." + +#: forms.py:66 forms.py:110 +msgid "This value may contain only letters, numbers and @/./+/-/_ characters." +msgstr "This value may contain only letters, numbers and @/./+/-/_ characters." + +#: forms.py:68 forms.py:112 forms.py:136 forms.py:306 +msgid "Password" +msgstr "Password" + +#: forms.py:70 +msgid "Password confirmation" +msgstr "Password confirmation" + +#: forms.py:72 +msgid "Enter the same password as above, for verification." +msgstr "Enter the same password as above, for verification." + +#: forms.py:113 +msgid "" +"Raw passwords are not stored, so there is no way to see this user's " +"password, but you can change the password using this " +"form." +msgstr "" +"Raw passwords are not stored, so there is no way to see this user's " +"password, but you can change the password using this " +"form." + +#: forms.py:139 msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." @@ -79,126 +90,146 @@ msgstr "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." -#: forms.py:89 +#: forms.py:141 +msgid "" +"Your Web browser doesn't appear to have cookies enabled. Cookies are " +"required for logging in." +msgstr "" +"Your Web browser doesn't appear to have cookies enabled. Cookies are " +"required for logging in." + +#: forms.py:143 msgid "This account is inactive." msgstr "This account is inactive." -#: forms.py:96 +#: forms.py:187 msgid "" -"Your Web browser doesn't appear to have cookies enabled. Cookies are " -"required for logging in." +"That e-mail address doesn't have an associated user account. Are you sure " +"you've registered?" msgstr "" -"Your Web browser doesn't appear to have cookies enabled. Cookies are " -"required for logging in." +"That e-mail address doesn't have an associated user account. Are you sure " +"you've registered?" -#: forms.py:108 +#: forms.py:189 +msgid "" +"The user account associated with this e-mail address cannot reset the " +"password." +msgstr "" +"The user account associated with this e-mail address cannot reset the " +"password." + +#: forms.py:192 msgid "E-mail" msgstr "E-mail" -#: forms.py:117 -msgid "" -"That e-mail address doesn't have an associated user account. Are you sure " -"you've registered?" -msgstr "" -"That e-mail address doesn't have an associated user account. Are you sure " -"you've registered?" - -#: forms.py:143 -#, python-format -msgid "Password reset on %s" -msgstr "Password reset on %s" - -#: forms.py:151 +#: forms.py:249 msgid "New password" msgstr "New password" -#: forms.py:152 +#: forms.py:251 msgid "New password confirmation" msgstr "New password confirmation" -#: forms.py:177 -msgid "Old password" -msgstr "Old password" - -#: forms.py:185 +#: forms.py:280 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "Your old password was entered incorrectly. Please enter it again." -#: forms.py:194 +#: forms.py:283 +msgid "Old password" +msgstr "Old password" + +#: forms.py:308 msgid "Password (again)" msgstr "Password (again)" -#: models.py:76 models.py:104 +#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355 +#: hashers.py:389 +msgid "algorithm" +msgstr "algorithm" + +#: hashers.py:219 +msgid "iterations" +msgstr "iterations" + +#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390 +msgid "salt" +msgstr "salt" + +#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391 +msgid "hash" +msgstr "hash" + +#: hashers.py:270 +msgid "work factor" +msgstr "work factor" + +#: hashers.py:272 +msgid "checksum" +msgstr "checksum" + +#: models.py:66 models.py:113 msgid "name" msgstr "name" -#: models.py:78 +#: models.py:68 msgid "codename" msgstr "codename" -#: models.py:82 +#: models.py:72 msgid "permission" msgstr "permission" -#: models.py:83 models.py:105 +#: models.py:73 models.py:115 msgid "permissions" msgstr "permissions" -#: models.py:108 +#: models.py:120 msgid "group" msgstr "group" -#: models.py:109 models.py:216 +#: models.py:121 models.py:250 msgid "groups" msgstr "groups" -#: models.py:206 +#: models.py:232 msgid "username" msgstr "username" -#: models.py:206 +#: models.py:233 msgid "" "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters" msgstr "" "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters" -#: models.py:207 +#: models.py:235 msgid "first name" msgstr "first name" -#: models.py:208 +#: models.py:236 msgid "last name" msgstr "last name" -#: models.py:209 +#: models.py:237 msgid "e-mail address" msgstr "e-mail address" -#: models.py:210 +#: models.py:238 msgid "password" msgstr "password" -#: models.py:210 -msgid "" -"Use '[algo]$[salt]$[hexdigest]' or use the change " -"password form." -msgstr "" -"Use '[algo]$[salt]$[hexdigest]' or use the change " -"password form." - -#: models.py:211 +#: models.py:239 msgid "staff status" msgstr "staff status" -#: models.py:211 +#: models.py:240 msgid "Designates whether the user can log into this admin site." msgstr "Designates whether the user can log into this admin site." -#: models.py:212 +#: models.py:242 msgid "active" msgstr "active" -#: models.py:212 +#: models.py:243 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." @@ -206,11 +237,11 @@ msgstr "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." -#: models.py:213 +#: models.py:245 msgid "superuser status" msgstr "superuser status" -#: models.py:213 +#: models.py:246 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." @@ -218,42 +249,43 @@ msgstr "" "Designates that this user has all permissions without explicitly assigning " "them." -#: models.py:214 +#: models.py:248 msgid "last login" msgstr "last login" -#: models.py:215 +#: models.py:249 msgid "date joined" msgstr "date joined" -#: models.py:217 +#: models.py:251 msgid "" -"In addition to the permissions manually assigned, this user will also get " -"all permissions granted to each group he/she is in." +"The groups this user belongs to. A user will get all permissions granted to " +"each of his/her group." msgstr "" -"In addition to the permissions manually assigned, this user will also get " -"all permissions granted to each group he/she is in." +"The groups this user belongs to. A user will get all permissions granted to " +"each of his/her group." -#: models.py:218 +#: models.py:255 msgid "user permissions" msgstr "user permissions" -#: models.py:222 +#: models.py:260 msgid "user" msgstr "user" -#: models.py:223 +#: models.py:261 msgid "users" msgstr "users" -#: models.py:406 -msgid "message" -msgstr "message" - -#: views.py:91 +#: views.py:93 msgid "Logged out" msgstr "Logged out" -#: management/commands/createsuperuser.py:23 +#: management/commands/createsuperuser.py:27 msgid "Enter a valid e-mail address." msgstr "Enter a valid e-mail address." + +#: templates/registration/password_reset_subject.txt:2 +#, python-format +msgid "Password reset on %(site_name)s" +msgstr "Password reset on %(site_name)s" diff --git a/django/contrib/auth/locale/es/LC_MESSAGES/django.mo b/django/contrib/auth/locale/es/LC_MESSAGES/django.mo index 63fe734c8fd..afe0bcc2769 100644 Binary files a/django/contrib/auth/locale/es/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/es/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/es/LC_MESSAGES/django.po b/django/contrib/auth/locale/es/LC_MESSAGES/django.po index 75265c0369b..c0bbf753bf6 100644 --- a/django/contrib/auth/locale/es/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/es/LC_MESSAGES/django.po @@ -1,78 +1,90 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Antoni Aloy , 2012. +# Jannis Leidel , 2011. +# Leonardo J. Caballero G. , 2011. +# , 2012. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:14-0400\n" -"PO-Revision-Date: 2011-03-04 18:41+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Spanish (Castilian) <>\n" +"POT-Creation-Date: 2012-03-14 00:14-0700\n" +"PO-Revision-Date: 2012-03-13 19:49+0000\n" +"Last-Translator: Antoni Aloy \n" +"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/" +"django/language/es/)\n" +"Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: admin.py:28 +#: admin.py:41 msgid "Personal info" msgstr "Información personal" -#: admin.py:29 +#: admin.py:42 msgid "Permissions" msgstr "Permisos" -#: admin.py:30 +#: admin.py:44 msgid "Important dates" msgstr "Fechas importantes" -#: admin.py:31 -msgid "Groups" -msgstr "Grupos" - -#: admin.py:113 +#: admin.py:125 msgid "Password changed successfully." msgstr "La contraseña se ha cambiado con éxito." -#: admin.py:123 +#: admin.py:135 #, python-format msgid "Change password: %s" msgstr "Cambiar contraseña: %s" -#: forms.py:14 forms.py:48 forms.py:66 +#: forms.py:58 +msgid "A user with that username already exists." +msgstr "Ya existe un usuario con este nombre." + +#: forms.py:59 forms.py:247 forms.py:304 +msgid "The two password fields didn't match." +msgstr "Las dos contraseñas no coinciden." + +#: forms.py:61 forms.py:106 forms.py:135 msgid "Username" msgstr "Nombre de usuario" -#: forms.py:15 forms.py:49 +#: forms.py:63 forms.py:107 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." msgstr "" "Requerido. 30 caracteres o menos. Letras, dígitos y @/./+/-/_ solamente." -#: forms.py:16 forms.py:50 +#: forms.py:66 forms.py:110 msgid "This value may contain only letters, numbers and @/./+/-/_ characters." msgstr "Este valor puede contener sólo letras, números y @/./+/-/_." -#: forms.py:17 forms.py:67 forms.py:193 +#: forms.py:68 forms.py:112 forms.py:136 forms.py:306 msgid "Password" msgstr "Contraseña" -#: forms.py:18 +#: forms.py:70 msgid "Password confirmation" msgstr "Contraseña (confirmación)" -#: forms.py:19 +#: forms.py:72 msgid "Enter the same password as above, for verification." msgstr "Introduzca la misma contraseña que arriba, para verificación." -#: forms.py:31 -msgid "A user with that username already exists." -msgstr "Ya existe un usuario con este nombre." +#: forms.py:113 +msgid "" +"Raw passwords are not stored, so there is no way to see this user's " +"password, but you can change the password using this " +"form." +msgstr "" +"Las contraseñas no se almacenan en bruto, así que no hay manera de ver la " +"contraseña del usuario, pero se puede cambiar la contraseña mediante este formulario ." -#: forms.py:37 forms.py:163 forms.py:205 -msgid "The two password fields didn't match." -msgstr "Las dos contraseñas no coinciden." - -#: forms.py:87 +#: forms.py:139 msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." @@ -80,11 +92,7 @@ msgstr "" "Por favor, introduzca un nombre de usuario y contraseña correctos. Note que " "ambos campos son sensibles a mayúsculas/minúsculas." -#: forms.py:89 -msgid "This account is inactive." -msgstr "Esta cuenta está inactiva." - -#: forms.py:96 +#: forms.py:141 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." @@ -92,11 +100,11 @@ msgstr "" "Su navegador no parece tener las cookies habilitadas. Las cookies se " "necesitan para poder ingresar." -#: forms.py:108 -msgid "E-mail" -msgstr "Correo electrónico" +#: forms.py:143 +msgid "This account is inactive." +msgstr "Esta cuenta está inactiva." -#: forms.py:117 +#: forms.py:187 msgid "" "That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" @@ -104,103 +112,127 @@ msgstr "" "Esta dirección de correo electrónico no tiene una cuenta de usuario " "asociada. ¿Está seguro de que se ha registrado?" -#: forms.py:143 -#, python-format -msgid "Password reset on %s" -msgstr "Contraseña restablecida en %s" +#: forms.py:189 +msgid "" +"The user account associated with this e-mail address cannot reset the " +"password." +msgstr "" +"La cuenta de usuario asociada a esta dirección de correo electrónico no se " +"puede restablecer la contraseña." -#: forms.py:151 +#: forms.py:192 +msgid "E-mail" +msgstr "Correo electrónico" + +#: forms.py:249 msgid "New password" msgstr "Contraseña nueva" -#: forms.py:152 +#: forms.py:251 msgid "New password confirmation" msgstr "Contraseña nueva (confirmación):" -#: forms.py:177 -msgid "Old password" -msgstr "Contraseña antigua" - -#: forms.py:185 +#: forms.py:280 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "" "Su contraseña antigua es incorrecta. Por favor, vuelva a introducirla " "correctamente." -#: forms.py:194 +#: forms.py:283 +msgid "Old password" +msgstr "Contraseña antigua" + +#: forms.py:308 msgid "Password (again)" msgstr "Contraseña (de nuevo)" -#: models.py:76 models.py:104 +#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355 +#: hashers.py:389 +msgid "algorithm" +msgstr "algoritmo" + +#: hashers.py:219 +msgid "iterations" +msgstr "iteraciones" + +#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390 +msgid "salt" +msgstr "sal" + +#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391 +msgid "hash" +msgstr "función resumen" + +#: hashers.py:270 +msgid "work factor" +msgstr "factor trabajo" + +#: hashers.py:272 +msgid "checksum" +msgstr "suma de verificación" + +#: models.py:66 models.py:113 msgid "name" msgstr "nombre" -#: models.py:78 +#: models.py:68 msgid "codename" msgstr "nombre en código" -#: models.py:82 +#: models.py:72 msgid "permission" msgstr "permiso" -#: models.py:83 models.py:105 +#: models.py:73 models.py:115 msgid "permissions" msgstr "permisos" -#: models.py:108 +#: models.py:120 msgid "group" msgstr "grupo" -#: models.py:109 models.py:216 +#: models.py:121 models.py:250 msgid "groups" msgstr "grupos" -#: models.py:206 +#: models.py:232 msgid "username" msgstr "nombre de usuario" -#: models.py:206 +#: models.py:233 msgid "" "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters" msgstr "Requerido. 30 caracteres o menos. Letras, números y @/./+/-/_" -#: models.py:207 +#: models.py:235 msgid "first name" msgstr "nombre propio" -#: models.py:208 +#: models.py:236 msgid "last name" msgstr "apellidos" -#: models.py:209 +#: models.py:237 msgid "e-mail address" msgstr "dirección de correo electrónico" -#: models.py:210 +#: models.py:238 msgid "password" msgstr "contraseña" -#: models.py:210 -msgid "" -"Use '[algo]$[salt]$[hexdigest]' or use the change " -"password form." -msgstr "" -"Use'[algo]$[sal]$[hash hexadecimal]' o use el " -"formulario para cambiar la contraseña." - -#: models.py:211 +#: models.py:239 msgid "staff status" msgstr "es staff" -#: models.py:211 +#: models.py:240 msgid "Designates whether the user can log into this admin site." msgstr "Indica si el usuario puede entrar en este sitio de administración." -#: models.py:212 +#: models.py:242 msgid "active" msgstr "activo" -#: models.py:212 +#: models.py:243 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." @@ -208,11 +240,11 @@ msgstr "" "Indica si el usuario puede ser tratado como activo. Desmarque esta opción en " "lugar de borrar la cuenta." -#: models.py:213 +#: models.py:245 msgid "superuser status" msgstr "es superusuario" -#: models.py:213 +#: models.py:246 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." @@ -220,42 +252,43 @@ msgstr "" "Indica que este usuario tiene todos los permisos sin asignárselos " "explícitamente." -#: models.py:214 +#: models.py:248 msgid "last login" msgstr "último inicio de sesión" -#: models.py:215 +#: models.py:249 msgid "date joined" msgstr "fecha de alta" -#: models.py:217 +#: models.py:251 msgid "" -"In addition to the permissions manually assigned, this user will also get " -"all permissions granted to each group he/she is in." +"The groups this user belongs to. A user will get all permissions granted to " +"each of his/her group." msgstr "" -"Además de los permisos asignados manualmente, este usuario también tendrá " -"todos los permisos de los grupos en los que esté." +"Los grupos a los que este usuario pertenece. Un usuario obtendrá todos los " +"permisos concedidos a cada uno sus grupos." -#: models.py:218 +#: models.py:255 msgid "user permissions" msgstr "permisos de usuario" -#: models.py:222 +#: models.py:260 msgid "user" msgstr "usuario" -#: models.py:223 +#: models.py:261 msgid "users" msgstr "usuarios" -#: models.py:406 -msgid "message" -msgstr "mensaje" - -#: views.py:91 +#: views.py:93 msgid "Logged out" msgstr "Sesión terminada" -#: management/commands/createsuperuser.py:23 +#: management/commands/createsuperuser.py:27 msgid "Enter a valid e-mail address." msgstr "Introduzca una dirección de correo electrónico válida." + +#: templates/registration/password_reset_subject.txt:2 +#, python-format +msgid "Password reset on %(site_name)s" +msgstr "Restablecimiento de la contraseña en %(site_name)s" diff --git a/django/contrib/auth/locale/es_AR/LC_MESSAGES/django.mo b/django/contrib/auth/locale/es_AR/LC_MESSAGES/django.mo index f87b53a2dc3..20b5bcefbac 100644 Binary files a/django/contrib/auth/locale/es_AR/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/es_AR/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/es_AR/LC_MESSAGES/django.po b/django/contrib/auth/locale/es_AR/LC_MESSAGES/django.po index 1757d5f05de..e0e57ab8a28 100644 --- a/django/contrib/auth/locale/es_AR/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/es_AR/LC_MESSAGES/django.po @@ -1,80 +1,86 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Jannis Leidel , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:14-0400\n" -"PO-Revision-Date: 2011-03-04 18:41+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Spanish (Argentinian) <>\n" +"POT-Creation-Date: 2012-03-14 00:14-0700\n" +"PO-Revision-Date: 2012-03-08 12:07+0000\n" +"Last-Translator: Jannis Leidel \n" +"Language-Team: Spanish (Argentina) (http://www.transifex.net/projects/p/" +"django/language/es_AR/)\n" +"Language: es_AR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: es_AR\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: admin.py:28 +#: admin.py:41 msgid "Personal info" msgstr "Información personal" -#: admin.py:29 +#: admin.py:42 msgid "Permissions" msgstr "Permisos" -#: admin.py:30 +#: admin.py:44 msgid "Important dates" msgstr "Fechas importantes" -#: admin.py:31 -msgid "Groups" -msgstr "Grupos" - -#: admin.py:113 +#: admin.py:125 msgid "Password changed successfully." msgstr "Cambio de contraseña exitoso" -#: admin.py:123 +#: admin.py:135 #, python-format msgid "Change password: %s" msgstr "Cambiar contraseña: %s" -#: forms.py:14 forms.py:48 forms.py:66 +#: forms.py:58 +msgid "A user with that username already exists." +msgstr "Ya existe un usuario con ese nombre." + +#: forms.py:59 forms.py:247 forms.py:304 +msgid "The two password fields didn't match." +msgstr "Los dos campos de contraseñas no coinciden entre si." + +#: forms.py:61 forms.py:106 forms.py:135 msgid "Username" msgstr "Nombre de usuario" -#: forms.py:15 forms.py:49 +#: forms.py:63 forms.py:107 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." msgstr "" "Obligatorio. Longitud máxima 30 caracteres alfanuméricos (letras, dígitos y " "@/./+/-/_) solamente." -#: forms.py:16 forms.py:50 +#: forms.py:66 forms.py:110 msgid "This value may contain only letters, numbers and @/./+/-/_ characters." msgstr "Este valor solo puede contener letras, números y @/./+/-/_." -#: forms.py:17 forms.py:67 forms.py:193 +#: forms.py:68 forms.py:112 forms.py:136 forms.py:306 msgid "Password" msgstr "Contraseña" -#: forms.py:18 +#: forms.py:70 msgid "Password confirmation" msgstr "Confirmación de contraseña" -#: forms.py:19 +#: forms.py:72 msgid "Enter the same password as above, for verification." msgstr "" "Para verificación, introduzca la misma contraseña que introdujo arriba." -#: forms.py:31 -msgid "A user with that username already exists." -msgstr "Ya existe un usuario con ese nombre." +#: forms.py:113 +msgid "" +"Raw passwords are not stored, so there is no way to see this user's " +"password, but you can change the password using this " +"form." +msgstr "" -#: forms.py:37 forms.py:163 forms.py:205 -msgid "The two password fields didn't match." -msgstr "Los dos campos de contraseñas no coinciden entre si." - -#: forms.py:87 +#: forms.py:139 msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." @@ -82,11 +88,7 @@ msgstr "" "Por favor introduzca un nombre de usuario y una contraseña correctos. Note " "que ambos campos son sensibles a mayúsculas/minúsculas." -#: forms.py:89 -msgid "This account is inactive." -msgstr "Esta cuenta está inactiva" - -#: forms.py:96 +#: forms.py:141 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." @@ -94,11 +96,11 @@ msgstr "" "Su navegador Web aparenta no estar configurado para aceptar cookies. Las " "cookies son un requerimiento para poder ingresar." -#: forms.py:108 -msgid "E-mail" -msgstr "Correo electrónico" +#: forms.py:143 +msgid "This account is inactive." +msgstr "Esta cuenta está inactiva" -#: forms.py:117 +#: forms.py:187 msgid "" "That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" @@ -106,105 +108,127 @@ msgstr "" "Esa dirección de correo electrónico no está asociada a ninguna cuenta de " "usuario. ¿Está seguro de que ya se ha registrado?" -#: forms.py:143 -#, python-format -msgid "Password reset on %s" -msgstr "Reinicialización de contraseña en %s" +#: forms.py:189 +msgid "" +"The user account associated with this e-mail address cannot reset the " +"password." +msgstr "" -#: forms.py:151 +#: forms.py:192 +msgid "E-mail" +msgstr "Correo electrónico" + +#: forms.py:249 msgid "New password" msgstr "Contraseña nueva" -#: forms.py:152 +#: forms.py:251 msgid "New password confirmation" msgstr "Confirmación de contraseña nueva" -#: forms.py:177 -msgid "Old password" -msgstr "Contraseña antigua" - -#: forms.py:185 +#: forms.py:280 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "" "La antigua contraseña introducida es incorrecta. Por favor introdúzcala " "nuevamente." -#: forms.py:194 +#: forms.py:283 +msgid "Old password" +msgstr "Contraseña antigua" + +#: forms.py:308 msgid "Password (again)" msgstr "Contraseña (de nuevo)" -#: models.py:76 models.py:104 +#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355 +#: hashers.py:389 +msgid "algorithm" +msgstr "" + +#: hashers.py:219 +msgid "iterations" +msgstr "" + +#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390 +msgid "salt" +msgstr "" + +#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391 +msgid "hash" +msgstr "" + +#: hashers.py:270 +msgid "work factor" +msgstr "" + +#: hashers.py:272 +msgid "checksum" +msgstr "" + +#: models.py:66 models.py:113 msgid "name" msgstr "nombre" -#: models.py:78 +#: models.py:68 msgid "codename" msgstr "nombre en código" -#: models.py:82 +#: models.py:72 msgid "permission" msgstr "permiso" -#: models.py:83 models.py:105 +#: models.py:73 models.py:115 msgid "permissions" msgstr "permisos" -#: models.py:108 +#: models.py:120 msgid "group" msgstr "grupo" -#: models.py:109 models.py:216 +#: models.py:121 models.py:250 msgid "groups" msgstr "grupos" -#: models.py:206 +#: models.py:232 msgid "username" msgstr "nombre de usuario" -#: models.py:206 +#: models.py:233 msgid "" "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters" msgstr "" "Obligatorio. Longitud máxima de 30 caracteres alfanuméricos (letras, dígitos " "y @/./+/-/_)." -#: models.py:207 +#: models.py:235 msgid "first name" msgstr "nombre" -#: models.py:208 +#: models.py:236 msgid "last name" msgstr "apellido" -#: models.py:209 +#: models.py:237 msgid "e-mail address" msgstr "dirección de correo electrónico" -#: models.py:210 +#: models.py:238 msgid "password" msgstr "contraseña" -#: models.py:210 -msgid "" -"Use '[algo]$[salt]$[hexdigest]' or use the change " -"password form." -msgstr "" -"Use '[algo]$[salt]$[hexdigest]' o use el formulario de " -"cambio de contraseña." - -#: models.py:211 +#: models.py:239 msgid "staff status" msgstr "es staff" -#: models.py:211 +#: models.py:240 msgid "Designates whether the user can log into this admin site." msgstr "Indica si el usuario puede ingresar a este sitio de administración." -#: models.py:212 +#: models.py:242 msgid "active" msgstr "activo" -#: models.py:212 +#: models.py:243 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." @@ -212,11 +236,11 @@ msgstr "" "Indica si el usuario debe ser tratado como un usuario activo. Desactive este " "campo en lugar de eliminar usuarios." -#: models.py:213 +#: models.py:245 msgid "superuser status" msgstr "es superusuario" -#: models.py:213 +#: models.py:246 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." @@ -224,42 +248,41 @@ msgstr "" "Indica que este usuario posee todos los permisos sin que sea necesario " "asignarle los mismos en forma explícita." -#: models.py:214 +#: models.py:248 msgid "last login" msgstr "último ingreso" -#: models.py:215 +#: models.py:249 msgid "date joined" msgstr "fecha de creación" -#: models.py:217 +#: models.py:251 msgid "" -"In addition to the permissions manually assigned, this user will also get " -"all permissions granted to each group he/she is in." +"The groups this user belongs to. A user will get all permissions granted to " +"each of his/her group." msgstr "" -"Además de los permisos asignados manualmente, este usuario también poseerá " -"todos los permisos de los grupos a los que pertenezca." -#: models.py:218 +#: models.py:255 msgid "user permissions" msgstr "permisos de usuario" -#: models.py:222 +#: models.py:260 msgid "user" msgstr "usuario" -#: models.py:223 +#: models.py:261 msgid "users" msgstr "usuarios" -#: models.py:406 -msgid "message" -msgstr "mensaje" - -#: views.py:91 +#: views.py:93 msgid "Logged out" msgstr "Sesión cerrada" -#: management/commands/createsuperuser.py:23 +#: management/commands/createsuperuser.py:27 msgid "Enter a valid e-mail address." msgstr "Introduzca una dirección de correo electrónico válida" + +#: templates/registration/password_reset_subject.txt:2 +#, python-format +msgid "Password reset on %(site_name)s" +msgstr "" diff --git a/django/contrib/auth/locale/es_MX/LC_MESSAGES/django.mo b/django/contrib/auth/locale/es_MX/LC_MESSAGES/django.mo index 5b67a6ffd0e..7b8c63dc4db 100644 Binary files a/django/contrib/auth/locale/es_MX/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/es_MX/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/es_MX/LC_MESSAGES/django.po b/django/contrib/auth/locale/es_MX/LC_MESSAGES/django.po index 32877133b2a..116c767200c 100644 --- a/django/contrib/auth/locale/es_MX/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/es_MX/LC_MESSAGES/django.po @@ -1,79 +1,88 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Abraham Estrada , 2011, 2012. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:14-0400\n" -"PO-Revision-Date: 2011-03-04 18:41+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Spanish (Mexican) \n" +"POT-Creation-Date: 2012-03-14 00:14-0700\n" +"PO-Revision-Date: 2012-03-08 12:07+0000\n" +"Last-Translator: Abraham Estrada \n" +"Language-Team: Spanish (Mexico) (http://www.transifex.net/projects/p/django/" +"language/es_MX/)\n" +"Language: es_MX\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: es_MX\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: admin.py:28 +#: admin.py:41 msgid "Personal info" msgstr "Información personal" -#: admin.py:29 +#: admin.py:42 msgid "Permissions" msgstr "Permisos" -#: admin.py:30 +#: admin.py:44 msgid "Important dates" msgstr "Fechas importantes" -#: admin.py:31 -msgid "Groups" -msgstr "Grupos" - -#: admin.py:113 +#: admin.py:125 msgid "Password changed successfully." msgstr "Cambio de contraseña exitoso" -#: admin.py:123 +#: admin.py:135 #, python-format msgid "Change password: %s" msgstr "Cambiar contraseña: %s" -#: forms.py:14 forms.py:48 forms.py:66 +#: forms.py:58 +msgid "A user with that username already exists." +msgstr "Ya existe un usuario con ese nombre." + +#: forms.py:59 forms.py:247 forms.py:304 +msgid "The two password fields didn't match." +msgstr "Los dos campos de contraseñas no coinciden entre si." + +#: forms.py:61 forms.py:106 forms.py:135 msgid "Username" msgstr "Nombre de usuario" -#: forms.py:15 forms.py:49 +#: forms.py:63 forms.py:107 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." msgstr "" "Obligatorio. Longitud máxima 30 caracteres alfanuméricos (letras, dígitos y " "@/./+/-/_) solamente." -#: forms.py:16 forms.py:50 +#: forms.py:66 forms.py:110 msgid "This value may contain only letters, numbers and @/./+/-/_ characters." msgstr "Este valor solo puede contener letras, números y @/./+/-/_." -#: forms.py:17 forms.py:67 forms.py:193 +#: forms.py:68 forms.py:112 forms.py:136 forms.py:306 msgid "Password" msgstr "Contraseña" -#: forms.py:18 +#: forms.py:70 msgid "Password confirmation" msgstr "Confirmación de contraseña" -#: forms.py:19 +#: forms.py:72 msgid "Enter the same password as above, for verification." msgstr "Para verificar, introduzca la misma contraseña que introdujo arriba." -#: forms.py:31 -msgid "A user with that username already exists." -msgstr "Ya existe un usuario con ese nombre." +#: forms.py:113 +msgid "" +"Raw passwords are not stored, so there is no way to see this user's " +"password, but you can change the password using this " +"form." +msgstr "" +"Las contraseñas no se almacenan en texto plano, así que no hay manera de ver " +"la contraseña del usuario, pero se puede cambiar la contraseña mediante este formulario." -#: forms.py:37 forms.py:163 forms.py:205 -msgid "The two password fields didn't match." -msgstr "Los dos campos de contraseñas no coinciden entre si." - -#: forms.py:87 +#: forms.py:139 msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." @@ -81,11 +90,7 @@ msgstr "" "Por favor introduzca un nombre de usuario y una contraseña correctos. Note " "que ambos campos son sensibles a mayúsculas/minúsculas." -#: forms.py:89 -msgid "This account is inactive." -msgstr "Esta cuenta está inactiva." - -#: forms.py:96 +#: forms.py:141 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." @@ -93,11 +98,11 @@ msgstr "" "Su navegador aparenta no estar configurado para aceptar cookies. Las cookies " "son un requerimiento para poder ingresar." -#: forms.py:108 -msgid "E-mail" -msgstr "Correo electrónico" +#: forms.py:143 +msgid "This account is inactive." +msgstr "Esta cuenta está inactiva." -#: forms.py:117 +#: forms.py:187 msgid "" "That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" @@ -105,105 +110,129 @@ msgstr "" "Esa dirección de correo electrónico no está asociada a ninguna cuenta de " "usuario. ¿Está seguro de que ya se ha registrado?" -#: forms.py:143 -#, python-format -msgid "Password reset on %s" -msgstr "Reinicialización de contraseña en %s" +#: forms.py:189 +msgid "" +"The user account associated with this e-mail address cannot reset the " +"password." +msgstr "" +"La cuenta de usuario asociada a esta dirección de correo electrónico no " +"puede restablecer la contraseña." -#: forms.py:151 +#: forms.py:192 +msgid "E-mail" +msgstr "Correo electrónico" + +#: forms.py:249 msgid "New password" msgstr "Contraseña nueva" -#: forms.py:152 +#: forms.py:251 msgid "New password confirmation" msgstr "Confirmación de contraseña nueva" -#: forms.py:177 -msgid "Old password" -msgstr "Contraseña antigua" - -#: forms.py:185 +#: forms.py:280 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "" "La antigua contraseña introducida es incorrecta. Por favor introdúzcala " "nuevamente." -#: forms.py:194 +#: forms.py:283 +msgid "Old password" +msgstr "Contraseña antigua" + +#: forms.py:308 msgid "Password (again)" msgstr "Contraseña (de nuevo)" -#: models.py:76 models.py:104 +#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355 +#: hashers.py:389 +msgid "algorithm" +msgstr "algoritmo" + +#: hashers.py:219 +msgid "iterations" +msgstr "repeticiones" + +#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390 +msgid "salt" +msgstr "salt" + +#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391 +msgid "hash" +msgstr "hash" + +#: hashers.py:270 +msgid "work factor" +msgstr "factor trabajo" + +#: hashers.py:272 +msgid "checksum" +msgstr "checksum" + +#: models.py:66 models.py:113 msgid "name" msgstr "nombre" -#: models.py:78 +#: models.py:68 msgid "codename" msgstr "nombre código" -#: models.py:82 +#: models.py:72 msgid "permission" msgstr "permiso" -#: models.py:83 models.py:105 +#: models.py:73 models.py:115 msgid "permissions" msgstr "permisos" -#: models.py:108 +#: models.py:120 msgid "group" msgstr "grupo" -#: models.py:109 models.py:216 +#: models.py:121 models.py:250 msgid "groups" msgstr "grupos" -#: models.py:206 +#: models.py:232 msgid "username" msgstr "nombre de usuario" -#: models.py:206 +#: models.py:233 msgid "" "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters" msgstr "" "Obligatorio. Longitud máxima de 30 caracteres alfanuméricos (letras, dígitos " "y @/./+/-/_)." -#: models.py:207 +#: models.py:235 msgid "first name" msgstr "nombre" -#: models.py:208 +#: models.py:236 msgid "last name" msgstr "apellido" -#: models.py:209 +#: models.py:237 msgid "e-mail address" msgstr "dirección de correo electrónico" -#: models.py:210 +#: models.py:238 msgid "password" msgstr "contraseña" -#: models.py:210 -msgid "" -"Use '[algo]$[salt]$[hexdigest]' or use the change " -"password form." -msgstr "" -"Use '[algo]$[salt]$[hexdigest]' o use el formulario de " -"cambio de contraseña." - -#: models.py:211 +#: models.py:239 msgid "staff status" msgstr "es staff" -#: models.py:211 +#: models.py:240 msgid "Designates whether the user can log into this admin site." msgstr "Indica si el usuario puede ingresar a este sitio de administración." -#: models.py:212 +#: models.py:242 msgid "active" msgstr "activo" -#: models.py:212 +#: models.py:243 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." @@ -211,11 +240,11 @@ msgstr "" "Indica si el usuario debe ser tratado como un usuario activo. Desactive este " "campo en lugar de eliminar usuarios." -#: models.py:213 +#: models.py:245 msgid "superuser status" msgstr "es superusuario" -#: models.py:213 +#: models.py:246 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." @@ -223,42 +252,43 @@ msgstr "" "Indica que este usuario posee todos los permisos sin que sea necesario " "asignarle los mismos en forma explícita." -#: models.py:214 +#: models.py:248 msgid "last login" msgstr "último ingreso" -#: models.py:215 +#: models.py:249 msgid "date joined" msgstr "fecha de creación" -#: models.py:217 +#: models.py:251 msgid "" -"In addition to the permissions manually assigned, this user will also get " -"all permissions granted to each group he/she is in." +"The groups this user belongs to. A user will get all permissions granted to " +"each of his/her group." msgstr "" -"Además de los permisos asignados manualmente, este usuario también poseerá " -"todos los permisos de los grupos a los que pertenezca." +"Los grupos a los que pertenece este usuario. Un usuario obtendrá todos los " +"permisos concedidos para cada uno de su grupo." -#: models.py:218 +#: models.py:255 msgid "user permissions" msgstr "permisos de usuario" -#: models.py:222 +#: models.py:260 msgid "user" msgstr "usuario" -#: models.py:223 +#: models.py:261 msgid "users" msgstr "usuarios" -#: models.py:406 -msgid "message" -msgstr "mensaje" - -#: views.py:91 +#: views.py:93 msgid "Logged out" msgstr "Sesión cerrada" -#: management/commands/createsuperuser.py:23 +#: management/commands/createsuperuser.py:27 msgid "Enter a valid e-mail address." msgstr "Introduzca una dirección de correo electrónico válida." + +#: templates/registration/password_reset_subject.txt:2 +#, python-format +msgid "Password reset on %(site_name)s" +msgstr "Restablecimiento de la contraseña en %(site_name)s " diff --git a/django/contrib/auth/locale/et/LC_MESSAGES/django.mo b/django/contrib/auth/locale/et/LC_MESSAGES/django.mo index f9ffdafdb1d..a0327f77058 100644 Binary files a/django/contrib/auth/locale/et/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/et/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/et/LC_MESSAGES/django.po b/django/contrib/auth/locale/et/LC_MESSAGES/django.po index 35b1795aaf5..1d9995cb8f0 100644 --- a/django/contrib/auth/locale/et/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/et/LC_MESSAGES/django.po @@ -1,80 +1,87 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Jannis Leidel , 2011. +# madisvain , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:14-0400\n" -"PO-Revision-Date: 2011-03-07 21:13+0000\n" +"POT-Creation-Date: 2012-03-14 00:14-0700\n" +"PO-Revision-Date: 2012-03-08 12:07+0000\n" "Last-Translator: madisvain \n" -"Language-Team: Estonian <>\n" +"Language-Team: Estonian (http://www.transifex.net/projects/p/django/language/" +"et/)\n" +"Language: et\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: et\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: admin.py:28 +#: admin.py:41 msgid "Personal info" msgstr "Isiklikud andmd" -#: admin.py:29 +#: admin.py:42 msgid "Permissions" msgstr "Õigused" -#: admin.py:30 +#: admin.py:44 msgid "Important dates" msgstr "Tähtsad kuupäevad" -#: admin.py:31 -msgid "Groups" -msgstr "Grupid" - -#: admin.py:113 +#: admin.py:125 msgid "Password changed successfully." msgstr "Salasõna edukalt muudetud." -#: admin.py:123 +#: admin.py:135 #, python-format msgid "Change password: %s" msgstr "Muuda salasõna: %s" -#: forms.py:14 forms.py:48 forms.py:66 +#: forms.py:58 +msgid "A user with that username already exists." +msgstr "Sama kasutajatunnusega kasutaja on juba olemas." + +#: forms.py:59 forms.py:247 forms.py:304 +msgid "The two password fields didn't match." +msgstr "Kaks sisestatud parooli ei olnud identsed." + +#: forms.py:61 forms.py:106 forms.py:135 msgid "Username" msgstr "Kasutajatunnus" -#: forms.py:15 forms.py:49 +#: forms.py:63 forms.py:107 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." msgstr "" "Nõutav. 30 märki või vähem. Ainult tähed, numbrid ja /./+/-/_ tähemärgid." -#: forms.py:16 forms.py:50 +#: forms.py:66 forms.py:110 msgid "This value may contain only letters, numbers and @/./+/-/_ characters." msgstr "" "See väärtust võib sisaldada ainult tähti, numbreid ja/./+/-/_ tähemärke." -#: forms.py:17 forms.py:67 forms.py:193 +#: forms.py:68 forms.py:112 forms.py:136 forms.py:306 msgid "Password" msgstr "Salasõna" -#: forms.py:18 +#: forms.py:70 msgid "Password confirmation" msgstr "Salasõna kinnitus" -#: forms.py:19 +#: forms.py:72 msgid "Enter the same password as above, for verification." msgstr "" "Sisestage sama salasõna uuesti veendumaks, et sisestamisel ei tekkinud vigu" -#: forms.py:31 -msgid "A user with that username already exists." -msgstr "Sama kasutajatunnusega kasutaja on juba olemas." +#: forms.py:113 +msgid "" +"Raw passwords are not stored, so there is no way to see this user's " +"password, but you can change the password using this " +"form." +msgstr "" -#: forms.py:37 forms.py:163 forms.py:205 -msgid "The two password fields didn't match." -msgstr "Kaks sisestatud parooli ei olnud identsed." - -#: forms.py:87 +#: forms.py:139 msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." @@ -82,11 +89,7 @@ msgstr "" "Palun sisestage korrektne kasutajatunnus ja salasõna. Mõlemad väljad on " "tõstutundlikud." -#: forms.py:89 -msgid "This account is inactive." -msgstr "See konto ei ole aktiivne." - -#: forms.py:96 +#: forms.py:141 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." @@ -94,11 +97,11 @@ msgstr "" "Teie veebibrauser ei aktsepteeri küpsiseid, aga küpsised on sisselogimiseks " "vajalikud." -#: forms.py:108 -msgid "E-mail" -msgstr "E-posti aadress" +#: forms.py:143 +msgid "This account is inactive." +msgstr "See konto ei ole aktiivne." -#: forms.py:117 +#: forms.py:187 msgid "" "That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" @@ -106,102 +109,124 @@ msgstr "" "Selle e-posti aadressiga ei ole seotud ühtegi kasutajakontot. Veenduge, et " "olete registreerunud." -#: forms.py:143 -#, python-format -msgid "Password reset on %s" -msgstr "Salasõna vahetatud saidil %s" +#: forms.py:189 +msgid "" +"The user account associated with this e-mail address cannot reset the " +"password." +msgstr "" -#: forms.py:151 +#: forms.py:192 +msgid "E-mail" +msgstr "E-posti aadress" + +#: forms.py:249 msgid "New password" msgstr "Uus salasõna" -#: forms.py:152 +#: forms.py:251 msgid "New password confirmation" msgstr "Uue salasõna kinnitus" -#: forms.py:177 -msgid "Old password" -msgstr "Vana salasõna" - -#: forms.py:185 +#: forms.py:280 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "Te sisestasite oma vana parooli vigaselt. Palun sisestage see uuesti." -#: forms.py:194 +#: forms.py:283 +msgid "Old password" +msgstr "Vana salasõna" + +#: forms.py:308 msgid "Password (again)" msgstr "Salasõna (uuesti)" -#: models.py:76 models.py:104 +#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355 +#: hashers.py:389 +msgid "algorithm" +msgstr "" + +#: hashers.py:219 +msgid "iterations" +msgstr "" + +#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390 +msgid "salt" +msgstr "" + +#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391 +msgid "hash" +msgstr "" + +#: hashers.py:270 +msgid "work factor" +msgstr "" + +#: hashers.py:272 +msgid "checksum" +msgstr "" + +#: models.py:66 models.py:113 msgid "name" msgstr "nimi" -#: models.py:78 +#: models.py:68 msgid "codename" msgstr "koodnimi" -#: models.py:82 +#: models.py:72 msgid "permission" msgstr "õigus" -#: models.py:83 models.py:105 +#: models.py:73 models.py:115 msgid "permissions" msgstr "õigused" -#: models.py:108 +#: models.py:120 msgid "group" msgstr "grupp" -#: models.py:109 models.py:216 +#: models.py:121 models.py:250 msgid "groups" msgstr "grupid" -#: models.py:206 +#: models.py:232 msgid "username" msgstr "kasutajatunnus" -#: models.py:206 +#: models.py:233 msgid "" "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters" msgstr "Nõutav. 30 märki või vähem. Tähted, numbreid ja/./+/-/_ tähemärgid." -#: models.py:207 +#: models.py:235 msgid "first name" msgstr "eesnimi" -#: models.py:208 +#: models.py:236 msgid "last name" msgstr "perenimi" -#: models.py:209 +#: models.py:237 msgid "e-mail address" msgstr "e-posti aadress" -#: models.py:210 +#: models.py:238 msgid "password" msgstr "salasõna" -#: models.py:210 -msgid "" -"Use '[algo]$[salt]$[hexdigest]' or use the change " -"password form." -msgstr "" -"Formaat '[algoritm]$[sool]$[kuueteistkümnendtulend]' või kasutage salasõna muutmise vormi." - -#: models.py:211 +#: models.py:239 msgid "staff status" msgstr "personalistaatus" -#: models.py:211 +#: models.py:240 msgid "Designates whether the user can log into this admin site." msgstr "" "Määrab, kas kasutaja saab sisse logida sellesse admininistreerimisliidesesse." -#: models.py:212 +#: models.py:242 msgid "active" msgstr "aktiivne" -#: models.py:212 +#: models.py:243 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." @@ -209,52 +234,51 @@ msgstr "" "Määrab, kas see konto on aktiivne. Kustutamise asemel lihtsalt deaktiveerige " "konto." -#: models.py:213 +#: models.py:245 msgid "superuser status" msgstr "superkasutaja staatus" -#: models.py:213 +#: models.py:246 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." msgstr "Määrab, kas see kasutaja omab automaatselt ja alati kõiki õigus." -#: models.py:214 +#: models.py:248 msgid "last login" msgstr "viimane sisenemine" -#: models.py:215 +#: models.py:249 msgid "date joined" msgstr "liitumise kuupäev" -#: models.py:217 +#: models.py:251 msgid "" -"In addition to the permissions manually assigned, this user will also get " -"all permissions granted to each group he/she is in." +"The groups this user belongs to. A user will get all permissions granted to " +"each of his/her group." msgstr "" -"Lisaks neile õigustele, mis kasutajale on määratud, omab kasutaja ka neid " -"õigusi, mis on nendel gruppidel, millesse ta kuulub." -#: models.py:218 +#: models.py:255 msgid "user permissions" msgstr "kasutajaõigused" -#: models.py:222 +#: models.py:260 msgid "user" msgstr "kasutaja" -#: models.py:223 +#: models.py:261 msgid "users" msgstr "kasutajad" -#: models.py:406 -msgid "message" -msgstr "sõnum" - -#: views.py:91 +#: views.py:93 msgid "Logged out" msgstr "Välja logitud" -#: management/commands/createsuperuser.py:23 +#: management/commands/createsuperuser.py:27 msgid "Enter a valid e-mail address." msgstr "Sisestage korrektne e-posti aadress:" + +#: templates/registration/password_reset_subject.txt:2 +#, python-format +msgid "Password reset on %(site_name)s" +msgstr "" diff --git a/django/contrib/auth/locale/eu/LC_MESSAGES/django.mo b/django/contrib/auth/locale/eu/LC_MESSAGES/django.mo index b9c8b1f8aa2..f22cc982f5b 100644 Binary files a/django/contrib/auth/locale/eu/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/eu/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/eu/LC_MESSAGES/django.po b/django/contrib/auth/locale/eu/LC_MESSAGES/django.po index 5a13fbeb672..091a3cba98c 100644 --- a/django/contrib/auth/locale/eu/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/eu/LC_MESSAGES/django.po @@ -1,79 +1,88 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Aitzol Naberan , 2011, 2012. +# Jannis Leidel , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:14-0400\n" -"PO-Revision-Date: 2011-03-04 18:41+0000\n" -"Last-Translator: aitzol \n" -"Language-Team: Basque \n" +"POT-Creation-Date: 2012-03-14 00:14-0700\n" +"PO-Revision-Date: 2012-03-08 18:38+0000\n" +"Last-Translator: Aitzol Naberan \n" +"Language-Team: Basque (http://www.transifex.net/projects/p/django/language/" +"eu/)\n" +"Language: eu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: eu\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: admin.py:28 +#: admin.py:41 msgid "Personal info" msgstr "Informazio pertsonala" -#: admin.py:29 +#: admin.py:42 msgid "Permissions" msgstr "Baimenak" -#: admin.py:30 +#: admin.py:44 msgid "Important dates" msgstr "Data garrantzitsuak" -#: admin.py:31 -msgid "Groups" -msgstr "Taldeak" - -#: admin.py:113 +#: admin.py:125 msgid "Password changed successfully." msgstr "Ondo aldatu da pasahitza." -#: admin.py:123 +#: admin.py:135 #, python-format msgid "Change password: %s" msgstr "Pasahitza aldatu: %s" -#: forms.py:14 forms.py:48 forms.py:66 +#: forms.py:58 +msgid "A user with that username already exists." +msgstr "Erabiltzaile izen hori ez dago eskuragarri." + +#: forms.py:59 forms.py:247 forms.py:304 +msgid "The two password fields didn't match." +msgstr "Pasahitzak ez datoz bat." + +#: forms.py:61 forms.py:106 forms.py:135 msgid "Username" msgstr "Erabiltzaile izena" -#: forms.py:15 forms.py:49 +#: forms.py:63 forms.py:107 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." msgstr "" "Beharrezkoa. 30 karaktere edo gutxiago. Hizki, zenbaki eta @/./+/-/_ " "bakarrik." -#: forms.py:16 forms.py:50 +#: forms.py:66 forms.py:110 msgid "This value may contain only letters, numbers and @/./+/-/_ characters." msgstr "Hizki, zenbaki eta @/./+/-/_ karaktereak bakarrik izan ditzazke" -#: forms.py:17 forms.py:67 forms.py:193 +#: forms.py:68 forms.py:112 forms.py:136 forms.py:306 msgid "Password" msgstr "Pasahitza" -#: forms.py:18 +#: forms.py:70 msgid "Password confirmation" msgstr "Pasahitza berretsi" -#: forms.py:19 +#: forms.py:72 msgid "Enter the same password as above, for verification." msgstr "Idatzi berriro pasahitza." -#: forms.py:31 -msgid "A user with that username already exists." -msgstr "Erabiltzaile izen hori ez dago eskuragarri." +#: forms.py:113 +msgid "" +"Raw passwords are not stored, so there is no way to see this user's " +"password, but you can change the password using this " +"form." +msgstr "" +"Pasahitzak zifratuta gordetzen direnez ez dago erabiltzaile pasahitza " +"ikusterik, baina pasahitza aldatu dezakezu hemen" -#: forms.py:37 forms.py:163 forms.py:205 -msgid "The two password fields didn't match." -msgstr "Pasahitzak ez datoz bat." - -#: forms.py:87 +#: forms.py:139 msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." @@ -81,11 +90,7 @@ msgstr "" "Mesedez idatzi erabiltzaile izen eta pasahitz egokiak. Maiskula eta " "minuskulak ondo bereiztu." -#: forms.py:89 -msgid "This account is inactive." -msgstr "Kontu hau az dago aktibo." - -#: forms.py:96 +#: forms.py:141 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." @@ -93,11 +98,11 @@ msgstr "" "Zure nabigatzaileak ez ditu cookiak onartzen. Cookia-k beharrezkoak dira " "sisteman sartzeko." -#: forms.py:108 -msgid "E-mail" -msgstr "Eposta" +#: forms.py:143 +msgid "This account is inactive." +msgstr "Kontu hau az dago aktibo." -#: forms.py:117 +#: forms.py:187 msgid "" "That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" @@ -105,105 +110,129 @@ msgstr "" "E-mail helbide horrek ez du lotutako erabiltzailerik. Ziur al zaude " "erregistratu duzula?" -#: forms.py:143 -#, python-format -msgid "Password reset on %s" -msgstr "Pasahitza berrezarri %s n" +#: forms.py:189 +msgid "" +"The user account associated with this e-mail address cannot reset the " +"password." +msgstr "" +"E-mail helbide honekin lotutako erabiltzaile kontuan ezin da pasahitza " +"berrezarri." -#: forms.py:151 +#: forms.py:192 +msgid "E-mail" +msgstr "Eposta" + +#: forms.py:249 msgid "New password" msgstr "Pasahitz berria" -#: forms.py:152 +#: forms.py:251 msgid "New password confirmation" msgstr "Pasahitz berria berretsi" -#: forms.py:177 -msgid "Old password" -msgstr "Pasahitz zaharra" - -#: forms.py:185 +#: forms.py:280 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "Zure pasahitz zaharra ez da zuzena. Idatzi ezazu berriro." -#: forms.py:194 +#: forms.py:283 +msgid "Old password" +msgstr "Pasahitz zaharra" + +#: forms.py:308 msgid "Password (again)" msgstr "Pasahitza (berriro)" -#: models.py:76 models.py:104 +#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355 +#: hashers.py:389 +msgid "algorithm" +msgstr "algoritmoak" + +#: hashers.py:219 +msgid "iterations" +msgstr "begiztak" + +#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390 +msgid "salt" +msgstr "salt" + +#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391 +msgid "hash" +msgstr "hash" + +#: hashers.py:270 +msgid "work factor" +msgstr "work factor" + +#: hashers.py:272 +msgid "checksum" +msgstr "checksum" + +#: models.py:66 models.py:113 msgid "name" msgstr "izena" -#: models.py:78 +#: models.py:68 msgid "codename" msgstr "kode izena" -#: models.py:82 +#: models.py:72 msgid "permission" msgstr "baimena" -#: models.py:83 models.py:105 +#: models.py:73 models.py:115 msgid "permissions" msgstr "baimenak" -#: models.py:108 +#: models.py:120 msgid "group" msgstr "taldea" -#: models.py:109 models.py:216 +#: models.py:121 models.py:250 msgid "groups" msgstr "taldeak" -#: models.py:206 +#: models.py:232 msgid "username" msgstr "erabiltzaile izena" -#: models.py:206 +#: models.py:233 msgid "" "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters" msgstr "" "Beharrezkoa. 30 karaktere edo gutxiago. Hizki, zenbaki eta @/./+/-/_ " "karaktereak" -#: models.py:207 +#: models.py:235 msgid "first name" msgstr "izena" -#: models.py:208 +#: models.py:236 msgid "last name" msgstr "abizena" -#: models.py:209 +#: models.py:237 msgid "e-mail address" msgstr "e-mail helbidea" -#: models.py:210 +#: models.py:238 msgid "password" msgstr "pasahitza" -#: models.py:210 -msgid "" -"Use '[algo]$[salt]$[hexdigest]' or use the change " -"password form." -msgstr "" -"Erabili '[algo]$[salt]$[hexdigest]' edo erabili pasahitza aldatzeko formularioa ." - -#: models.py:211 +#: models.py:239 msgid "staff status" msgstr "Arduradun egoera" -#: models.py:211 +#: models.py:240 msgid "Designates whether the user can log into this admin site." msgstr "" "Erabiltzaileak kudeaketa gune honetan sartzeko baimena duen edo ez " "adierazten du." -#: models.py:212 +#: models.py:242 msgid "active" msgstr "Aktiboa" -#: models.py:212 +#: models.py:243 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." @@ -211,11 +240,11 @@ msgstr "" "Erabiltzaile bat aktibo gisa tratatu edo ez zehazten du. Ezgaitu hau kontuak " "ezabatu beharrean." -#: models.py:213 +#: models.py:245 msgid "superuser status" msgstr "Erabiltzaile nagusia" -#: models.py:213 +#: models.py:246 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." @@ -223,42 +252,43 @@ msgstr "" "Erabiltzaileari baimen guztiak esleitzeko banan-banan aukeratu behar izan " "gabe." -#: models.py:214 +#: models.py:248 msgid "last login" msgstr "azken sarrera" -#: models.py:215 +#: models.py:249 msgid "date joined" msgstr "erregistro eguna" -#: models.py:217 +#: models.py:251 msgid "" -"In addition to the permissions manually assigned, this user will also get " -"all permissions granted to each group he/she is in." +"The groups this user belongs to. A user will get all permissions granted to " +"each of his/her group." msgstr "" -"Erabiltzaile honek, eskuz emandako baimen guztiez gain, berari egokitutako " -"talde bakoitzari emandako baimenak ere izango ditu." +"Erabiltzailea zein taldetakoa den. Erabiltzaileak taldeari emandako baimen " +"guztiak jasoko ditu." -#: models.py:218 +#: models.py:255 msgid "user permissions" msgstr "Erabiltzailearen baimenak" -#: models.py:222 +#: models.py:260 msgid "user" msgstr "Erabiltzailea" -#: models.py:223 +#: models.py:261 msgid "users" msgstr "Erabiltzaileak" -#: models.py:406 -msgid "message" -msgstr "mezua" - -#: views.py:91 +#: views.py:93 msgid "Logged out" msgstr "Sesiotik kanpo" -#: management/commands/createsuperuser.py:23 +#: management/commands/createsuperuser.py:27 msgid "Enter a valid e-mail address." msgstr "e-mail helbide zuzena idatzi." + +#: templates/registration/password_reset_subject.txt:2 +#, python-format +msgid "Password reset on %(site_name)s" +msgstr "Pasahitza berrezarri %(site_name)s webgunean" diff --git a/django/contrib/auth/locale/fa/LC_MESSAGES/django.mo b/django/contrib/auth/locale/fa/LC_MESSAGES/django.mo index 62fea7aa0a8..5823b9e4fa0 100644 Binary files a/django/contrib/auth/locale/fa/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/fa/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/fa/LC_MESSAGES/django.po b/django/contrib/auth/locale/fa/LC_MESSAGES/django.po index c34eceeb8e1..46f5b27224a 100644 --- a/django/contrib/auth/locale/fa/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/fa/LC_MESSAGES/django.po @@ -1,77 +1,85 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Ali Nikneshan , 2011. +# Jannis Leidel , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:14-0400\n" -"PO-Revision-Date: 2011-03-04 18:41+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Persian \n" +"POT-Creation-Date: 2012-03-14 00:14-0700\n" +"PO-Revision-Date: 2012-03-08 12:07+0000\n" +"Last-Translator: Ali Nikneshan \n" +"Language-Team: Persian (http://www.transifex.net/projects/p/django/language/" +"fa/)\n" +"Language: fa\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: fa\n" "Plural-Forms: nplurals=1; plural=0\n" -#: admin.py:28 +#: admin.py:41 msgid "Personal info" msgstr "اطلاعات شخصی" -#: admin.py:29 +#: admin.py:42 msgid "Permissions" msgstr "اجازه‌ها" -#: admin.py:30 +#: admin.py:44 msgid "Important dates" msgstr "تاریخ‌های مهم" -#: admin.py:31 -msgid "Groups" -msgstr "گروه‌ها" - -#: admin.py:113 +#: admin.py:125 msgid "Password changed successfully." msgstr "گذرواژه با موفقیت تغییر یافت." -#: admin.py:123 +#: admin.py:135 #, python-format msgid "Change password: %s" msgstr "تغییر گذرواژه: %s" -#: forms.py:14 forms.py:48 forms.py:66 -msgid "Username" -msgstr "نام کاربری" - -#: forms.py:15 forms.py:49 -msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." -msgstr "" - -#: forms.py:16 forms.py:50 -msgid "This value may contain only letters, numbers and @/./+/-/_ characters." -msgstr "" - -#: forms.py:17 forms.py:67 forms.py:193 -msgid "Password" -msgstr "گذرواژه" - -#: forms.py:18 -msgid "Password confirmation" -msgstr "تصدیق گذرواژه" - -#: forms.py:19 -msgid "Enter the same password as above, for verification." -msgstr "همان گذرواژهٔ بالایی را برای اطمینان دوباره وارد کنید." - -#: forms.py:31 +#: forms.py:58 msgid "A user with that username already exists." msgstr "کاربری با این نام کاربری وجود دارد." -#: forms.py:37 forms.py:163 forms.py:205 +#: forms.py:59 forms.py:247 forms.py:304 msgid "The two password fields didn't match." msgstr "دو فیلد گذرواژه با هم مطابقت ندارند." -#: forms.py:87 +#: forms.py:61 forms.py:106 forms.py:135 +msgid "Username" +msgstr "نام کاربری" + +#: forms.py:63 forms.py:107 +msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." +msgstr "" +"الزامی. ۳۰ حرف یا کمتر. فقط حروف الفبا (ارقام، الفبا و علائم @/./+/-/_)." + +#: forms.py:66 forms.py:110 +msgid "This value may contain only letters, numbers and @/./+/-/_ characters." +msgstr "این مقدار فقط باید حاوی حروف، اعداد و یا علائم @/./+/-/_ باشد." + +#: forms.py:68 forms.py:112 forms.py:136 forms.py:306 +msgid "Password" +msgstr "گذرواژه" + +#: forms.py:70 +msgid "Password confirmation" +msgstr "تصدیق گذرواژه" + +#: forms.py:72 +msgid "Enter the same password as above, for verification." +msgstr "همان گذرواژهٔ بالایی را برای اطمینان دوباره وارد کنید." + +#: forms.py:113 +msgid "" +"Raw passwords are not stored, so there is no way to see this user's " +"password, but you can change the password using this " +"form." +msgstr "" + +#: forms.py:139 msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." @@ -79,11 +87,7 @@ msgstr "" "لطفاً نام کاربری و گذرواژه صحیح را وارد کنید. توجه کنید که هر دو مقدار به " "حروف کوچک و بزرگ (انگلیسی) حساس هستند." -#: forms.py:89 -msgid "This account is inactive." -msgstr "این حساب غیرفعال است." - -#: forms.py:96 +#: forms.py:141 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." @@ -91,109 +95,134 @@ msgstr "" "به نطر می رسد مرورگر شما کوکی‌ها را قبول نمی‌کند. کوکی‌ها برای ورود به وبگاه " "لازم هستند." -#: forms.py:108 -msgid "E-mail" -msgstr "پست الکترونیکی" +#: forms.py:143 +msgid "This account is inactive." +msgstr "این حساب غیرفعال است." -#: forms.py:117 +#: forms.py:187 msgid "" "That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" msgstr "این پست الکترونیکی در سیستم حساب ندارد. آیا مطمئن هستید که عضو شده‌اید؟" -#: forms.py:143 -#, python-format -msgid "Password reset on %s" -msgstr "ایجاد گذرواژهٔ جدید در %s" +#: forms.py:189 +msgid "" +"The user account associated with this e-mail address cannot reset the " +"password." +msgstr "" -#: forms.py:151 +#: forms.py:192 +msgid "E-mail" +msgstr "پست الکترونیکی" + +#: forms.py:249 msgid "New password" msgstr "گذرواژهٔ جدید" -#: forms.py:152 +#: forms.py:251 msgid "New password confirmation" msgstr "تصدیق گذرواژهٔ جدید" -#: forms.py:177 -msgid "Old password" -msgstr "گذرواژهٔ قدیمی" - -#: forms.py:185 +#: forms.py:280 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "گذرواژهٔ قدیمی شما اشتباه بود. لطفاً دوباره وارد کنید." -#: forms.py:194 +#: forms.py:283 +msgid "Old password" +msgstr "گذرواژهٔ قدیمی" + +#: forms.py:308 msgid "Password (again)" msgstr "گذرواژه (تکرار)" -#: models.py:76 models.py:104 +#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355 +#: hashers.py:389 +msgid "algorithm" +msgstr "" + +#: hashers.py:219 +msgid "iterations" +msgstr "" + +#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390 +msgid "salt" +msgstr "" + +#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391 +msgid "hash" +msgstr "" + +#: hashers.py:270 +msgid "work factor" +msgstr "" + +#: hashers.py:272 +msgid "checksum" +msgstr "" + +#: models.py:66 models.py:113 msgid "name" msgstr "نام" -#: models.py:78 +#: models.py:68 msgid "codename" msgstr "نام کد" -#: models.py:82 +#: models.py:72 msgid "permission" msgstr "اجازه" -#: models.py:83 models.py:105 +#: models.py:73 models.py:115 msgid "permissions" msgstr "اجازه‌ها" -#: models.py:108 +#: models.py:120 msgid "group" msgstr "گروه" -#: models.py:109 models.py:216 +#: models.py:121 models.py:250 msgid "groups" msgstr "گروه‌ها" -#: models.py:206 +#: models.py:232 msgid "username" msgstr "نام کاربری" -#: models.py:206 +#: models.py:233 msgid "" "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters" msgstr "" +"الزامی. 30 حرف یا کمتر. فقط حروف الفبا (ارقام، الفبا و علائم @/./+/-/_ )." -#: models.py:207 +#: models.py:235 msgid "first name" msgstr "نام" -#: models.py:208 +#: models.py:236 msgid "last name" msgstr "نام خانوادگی" -#: models.py:209 +#: models.py:237 msgid "e-mail address" msgstr "نشانی پست الکترونیکی" -#: models.py:210 +#: models.py:238 msgid "password" msgstr "گذرواژه" -#: models.py:210 -msgid "" -"Use '[algo]$[salt]$[hexdigest]' or use the change " -"password form." -msgstr "" - -#: models.py:211 +#: models.py:239 msgid "staff status" msgstr "وضعیت کارمندی" -#: models.py:211 +#: models.py:240 msgid "Designates whether the user can log into this admin site." msgstr "تعبیه شده برای اینکه در وبگاه مدیریت، کاربر بتواند یا نتواند وارد شود." -#: models.py:212 +#: models.py:242 msgid "active" msgstr "فعال" -#: models.py:212 +#: models.py:243 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." @@ -201,53 +230,52 @@ msgstr "" "برای نشان دادن اینکه آیا باید با این کاربر به عنوان کاربر فعال رفتار کرد " "تعبیه شده است. به جای حذف کاربر تیک را بردارید." -#: models.py:213 +#: models.py:245 msgid "superuser status" msgstr "ابرکاربر" -#: models.py:213 +#: models.py:246 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." msgstr "" "نشان می‌دهد که آیا این کاربر دسترسی نامحدود به کلیهٔ بخشهای وبگاه مدیریت دارد." -#: models.py:214 +#: models.py:248 msgid "last login" msgstr "آخرین ورود" -#: models.py:215 +#: models.py:249 msgid "date joined" msgstr "تاریخ پیوستن" -#: models.py:217 +#: models.py:251 msgid "" -"In addition to the permissions manually assigned, this user will also get " -"all permissions granted to each group he/she is in." +"The groups this user belongs to. A user will get all permissions granted to " +"each of his/her group." msgstr "" -"علاوه بر دسترسی‌هایی که به طور دستی تنظیم شده، این کاربر تمامی دسترسی‌های اعطا " -"شده به گروه‌هایی که عضو آن‌ها هست را خواهد داشت." -#: models.py:218 +#: models.py:255 msgid "user permissions" msgstr "اجازه‌های کاربر" -#: models.py:222 +#: models.py:260 msgid "user" msgstr "کاربر" -#: models.py:223 +#: models.py:261 msgid "users" msgstr "کاربرها" -#: models.py:406 -msgid "message" -msgstr "پیغام" - -#: views.py:91 +#: views.py:93 msgid "Logged out" msgstr "خارج شدید" -#: management/commands/createsuperuser.py:23 +#: management/commands/createsuperuser.py:27 msgid "Enter a valid e-mail address." msgstr "یک نشانی پست الکترونیکی معتبر وارد کنید." + +#: templates/registration/password_reset_subject.txt:2 +#, python-format +msgid "Password reset on %(site_name)s" +msgstr "" diff --git a/django/contrib/auth/locale/fi/LC_MESSAGES/django.mo b/django/contrib/auth/locale/fi/LC_MESSAGES/django.mo index 246c4cda12e..cc25ec328ca 100644 Binary files a/django/contrib/auth/locale/fi/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/fi/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/fi/LC_MESSAGES/django.po b/django/contrib/auth/locale/fi/LC_MESSAGES/django.po index 32febcf0f36..9419a89614a 100644 --- a/django/contrib/auth/locale/fi/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/fi/LC_MESSAGES/django.po @@ -1,79 +1,86 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Antti Kaihola , 2011. +# Jannis Leidel , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:14-0400\n" -"PO-Revision-Date: 2011-03-04 18:41+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Finnish \n" +"POT-Creation-Date: 2012-03-14 00:14-0700\n" +"PO-Revision-Date: 2012-03-08 12:07+0000\n" +"Last-Translator: Antti Kaihola \n" +"Language-Team: Finnish (http://www.transifex.net/projects/p/django/language/" +"fi/)\n" +"Language: fi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: fi\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: admin.py:28 +#: admin.py:41 msgid "Personal info" msgstr "Henkilökohtaiset tiedot" -#: admin.py:29 +#: admin.py:42 msgid "Permissions" msgstr "Oikeudet" -#: admin.py:30 +#: admin.py:44 msgid "Important dates" msgstr "Tärkeät päivämäärät" -#: admin.py:31 -msgid "Groups" -msgstr "Ryhmät" - -#: admin.py:113 +#: admin.py:125 msgid "Password changed successfully." msgstr "Salasana muutettu onnistuneesti." -#: admin.py:123 +#: admin.py:135 #, python-format msgid "Change password: %s" msgstr "Vaihda salasana: %s" -#: forms.py:14 forms.py:48 forms.py:66 +#: forms.py:58 +msgid "A user with that username already exists." +msgstr "Käyttäjätunnus on jo rekisteröity." + +#: forms.py:59 forms.py:247 forms.py:304 +msgid "The two password fields didn't match." +msgstr "Salasanat eivät täsmää." + +#: forms.py:61 forms.py:106 forms.py:135 msgid "Username" msgstr "Käyttäjätunnus" -#: forms.py:15 forms.py:49 +#: forms.py:63 forms.py:107 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." msgstr "" " Vaaditaan. Enintään 30 merkkiä. Vain kirjaimet, numerot ja @/./+/-/_ ovat " "sallittuja." -#: forms.py:16 forms.py:50 +#: forms.py:66 forms.py:110 msgid "This value may contain only letters, numbers and @/./+/-/_ characters." msgstr "Tässä voidaan käyttää vain kirjaimia, numeroita ja @/./+/-/_ merkkejä." -#: forms.py:17 forms.py:67 forms.py:193 +#: forms.py:68 forms.py:112 forms.py:136 forms.py:306 msgid "Password" msgstr "Salasana" -#: forms.py:18 +#: forms.py:70 msgid "Password confirmation" msgstr "Salasanan vahvistaminen" -#: forms.py:19 +#: forms.py:72 msgid "Enter the same password as above, for verification." msgstr "Syötä sama salasana tarkistuksen vuoksi toistamiseen." -#: forms.py:31 -msgid "A user with that username already exists." -msgstr "Käyttäjätunnus on jo rekisteröity." +#: forms.py:113 +msgid "" +"Raw passwords are not stored, so there is no way to see this user's " +"password, but you can change the password using this " +"form." +msgstr "" -#: forms.py:37 forms.py:163 forms.py:205 -msgid "The two password fields didn't match." -msgstr "Salasanat eivät täsmää." - -#: forms.py:87 +#: forms.py:139 msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." @@ -81,22 +88,18 @@ msgstr "" "Käyttäjätunnus tai salasana ei kelpaa. Huomaa, että isot ja pienet kirjaimet " "ovat merkitseviä." -#: forms.py:89 -msgid "This account is inactive." -msgstr "Tämä käyttäjätili ei ole voimassa." - -#: forms.py:96 +#: forms.py:141 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." msgstr "" "Selaimesi ei näytä sallivan evästeitä. Sisäänkirjautuminen vaatii evästeen." -#: forms.py:108 -msgid "E-mail" -msgstr "Sähköposti" +#: forms.py:143 +msgid "This account is inactive." +msgstr "Tämä käyttäjätili ei ole voimassa." -#: forms.py:117 +#: forms.py:187 msgid "" "That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" @@ -104,103 +107,127 @@ msgstr "" "Sähköpostiosoitetta vastaavaa käyttäjätunnusta ei löydy. Oletko varmasti jo " "rekisteröitynyt?" -#: forms.py:143 -#, python-format -msgid "Password reset on %s" -msgstr "Salasanan nollaus sivustolla %s" +#: forms.py:189 +msgid "" +"The user account associated with this e-mail address cannot reset the " +"password." +msgstr "" +"Tätä sähköpostiosoitetta vastaavalla käyttäjätilillä ei ole oikeutta nollata " +"salasanaa." -#: forms.py:151 +#: forms.py:192 +msgid "E-mail" +msgstr "Sähköposti" + +#: forms.py:249 msgid "New password" msgstr "Uusi salasana" -#: forms.py:152 +#: forms.py:251 msgid "New password confirmation" msgstr "Uusi salasana uudelleen" -#: forms.py:177 -msgid "Old password" -msgstr "Vanha salasana" - -#: forms.py:185 +#: forms.py:280 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "Vanha salasana on virheellinen. Yritä uudelleen." -#: forms.py:194 +#: forms.py:283 +msgid "Old password" +msgstr "Vanha salasana" + +#: forms.py:308 msgid "Password (again)" msgstr "Salasana toistamiseen" -#: models.py:76 models.py:104 +#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355 +#: hashers.py:389 +msgid "algorithm" +msgstr "" + +#: hashers.py:219 +msgid "iterations" +msgstr "" + +#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390 +msgid "salt" +msgstr "" + +#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391 +msgid "hash" +msgstr "" + +#: hashers.py:270 +msgid "work factor" +msgstr "" + +#: hashers.py:272 +msgid "checksum" +msgstr "" + +#: models.py:66 models.py:113 msgid "name" msgstr "nimi" -#: models.py:78 +#: models.py:68 msgid "codename" msgstr "tunniste" -#: models.py:82 +#: models.py:72 msgid "permission" msgstr "oikeus" -#: models.py:83 models.py:105 +#: models.py:73 models.py:115 msgid "permissions" msgstr "oikeudet" -#: models.py:108 +#: models.py:120 msgid "group" msgstr "ryhmä" -#: models.py:109 models.py:216 +#: models.py:121 models.py:250 msgid "groups" msgstr "ryhmät" -#: models.py:206 +#: models.py:232 msgid "username" msgstr "käyttäjätunnus" -#: models.py:206 +#: models.py:233 msgid "" "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters" msgstr "" " Vaaditaan. Enintään 30 merkkiä. Vain kirjaimet, numerot ja @/./+/-/_ ovat " "sallittuja." -#: models.py:207 +#: models.py:235 msgid "first name" msgstr "etunimi" -#: models.py:208 +#: models.py:236 msgid "last name" msgstr "sukunimi" -#: models.py:209 +#: models.py:237 msgid "e-mail address" msgstr "sähköposti" -#: models.py:210 +#: models.py:238 msgid "password" msgstr "salasana" -#: models.py:210 -msgid "" -"Use '[algo]$[salt]$[hexdigest]' or use the change " -"password form." -msgstr "" -"Syötä muodossa '[algo]$[suola]$[heksa-digest]' tai käytä muutoslomaketta." - -#: models.py:211 +#: models.py:239 msgid "staff status" msgstr "ylläpitäjä" -#: models.py:211 +#: models.py:240 msgid "Designates whether the user can log into this admin site." msgstr "Määrittää, pääseekö käyttäjä tähän sivuston ylläpito-osioon." -#: models.py:212 +#: models.py:242 msgid "active" msgstr "voimassa" -#: models.py:212 +#: models.py:243 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." @@ -208,53 +235,52 @@ msgstr "" "Määrää, voiko käyttäjä kirjautua sisään. Tällä voi estää käyttäjätilin " "käytön poistamatta sitä." -#: models.py:213 +#: models.py:245 msgid "superuser status" msgstr "pääkäyttäjä" -#: models.py:213 +#: models.py:246 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." msgstr "" "Antaa käyttäjälle kaikki oikeudet ilman, että niitä täytyy erikseen luetella." -#: models.py:214 +#: models.py:248 msgid "last login" msgstr "viimeisin kirjautuminen" -#: models.py:215 +#: models.py:249 msgid "date joined" msgstr "liittynyt" -#: models.py:217 +#: models.py:251 msgid "" -"In addition to the permissions manually assigned, this user will also get " -"all permissions granted to each group he/she is in." +"The groups this user belongs to. A user will get all permissions granted to " +"each of his/her group." msgstr "" -"Erikseen mainittujen oikeuksien lisäksi käyttäjä saa myös kaikki niiden " -"ryhmien oikeudet, joiden jäsen hän on." -#: models.py:218 +#: models.py:255 msgid "user permissions" msgstr "käyttäjän oikeudet" -#: models.py:222 +#: models.py:260 msgid "user" msgstr "käyttäjä" -#: models.py:223 +#: models.py:261 msgid "users" msgstr "käyttäjät" -#: models.py:406 -msgid "message" -msgstr "viesti" - -#: views.py:91 +#: views.py:93 msgid "Logged out" msgstr "Kirjautunut ulos" -#: management/commands/createsuperuser.py:23 +#: management/commands/createsuperuser.py:27 msgid "Enter a valid e-mail address." msgstr "Syötä kelvollinen sähköpostiosoite." + +#: templates/registration/password_reset_subject.txt:2 +#, python-format +msgid "Password reset on %(site_name)s" +msgstr "Salasanan nollaus sivustolla %(site_name)s " diff --git a/django/contrib/auth/locale/fr/LC_MESSAGES/django.mo b/django/contrib/auth/locale/fr/LC_MESSAGES/django.mo index 0edb77fcb34..a6dd7dd6d98 100644 Binary files a/django/contrib/auth/locale/fr/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/fr/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/fr/LC_MESSAGES/django.po b/django/contrib/auth/locale/fr/LC_MESSAGES/django.po index 3627dd2807c..bf576ed7826 100644 --- a/django/contrib/auth/locale/fr/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/fr/LC_MESSAGES/django.po @@ -1,81 +1,91 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# , 2011, 2012. +# Jannis Leidel , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:14-0400\n" -"PO-Revision-Date: 2011-03-04 18:41+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: French \n" +"POT-Creation-Date: 2012-03-14 00:14-0700\n" +"PO-Revision-Date: 2012-03-08 12:07+0000\n" +"Last-Translator: claudep \n" +"Language-Team: French (http://www.transifex.net/projects/p/django/language/" +"fr/)\n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1)\n" -#: admin.py:28 +#: admin.py:41 msgid "Personal info" msgstr "Information personnelle" -#: admin.py:29 +#: admin.py:42 msgid "Permissions" msgstr "Permissions" -#: admin.py:30 +#: admin.py:44 msgid "Important dates" msgstr "Dates importantes" -#: admin.py:31 -msgid "Groups" -msgstr "Groupes" - -#: admin.py:113 +#: admin.py:125 msgid "Password changed successfully." msgstr "Mot de passe modifié avec succès" -#: admin.py:123 +#: admin.py:135 #, python-format msgid "Change password: %s" msgstr "Modifier le mot de passe : %s" -#: forms.py:14 forms.py:48 forms.py:66 +#: forms.py:58 +msgid "A user with that username already exists." +msgstr "Un utilisateur avec ce nom existe déjà." + +#: forms.py:59 forms.py:247 forms.py:304 +msgid "The two password fields didn't match." +msgstr "Les deux mots de passe ne correspondent pas." + +#: forms.py:61 forms.py:106 forms.py:135 msgid "Username" msgstr "Nom d'utilisateur" -#: forms.py:15 forms.py:49 +#: forms.py:63 forms.py:107 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." msgstr "" "Requis. 30 caractères maximum. Uniquement des lettres, nombres et les " "caractères « @ », « . », « + », « - » et « _ »." -#: forms.py:16 forms.py:50 +#: forms.py:66 forms.py:110 msgid "This value may contain only letters, numbers and @/./+/-/_ characters." msgstr "" "Cette valeur peut uniquement contenir des lettres, nombres et les caractères " "« @ », « . », « + », « - » et « _ »." -#: forms.py:17 forms.py:67 forms.py:193 +#: forms.py:68 forms.py:112 forms.py:136 forms.py:306 msgid "Password" msgstr "Mot de passe" -#: forms.py:18 +#: forms.py:70 msgid "Password confirmation" -msgstr "Confirmation de votre mot de passe" +msgstr "Confirmation du mot de passe" -#: forms.py:19 +#: forms.py:72 msgid "Enter the same password as above, for verification." msgstr "Saisissez le même mot de passe que précédemment, pour vérification." -#: forms.py:31 -msgid "A user with that username already exists." -msgstr "Un utilisateur avec ce nom existe déjà." +#: forms.py:113 +msgid "" +"Raw passwords are not stored, so there is no way to see this user's " +"password, but you can change the password using this " +"form." +msgstr "" +"Les mots de passe ne sont pas enregistrés en clair, ce qui ne permet pas " +"d'afficher le mot de passe de cet utilisateur, mais il est possible de le " +"changer en utilisant ce formulaire. " -#: forms.py:37 forms.py:163 forms.py:205 -msgid "The two password fields didn't match." -msgstr "Les deux mots de passe ne correspondent pas." - -#: forms.py:87 +#: forms.py:139 msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." @@ -84,11 +94,7 @@ msgstr "" "chacun de ces champs est sensible à la casse (différenciation des majuscules/" "minuscules)." -#: forms.py:89 -msgid "This account is inactive." -msgstr "Ce compte est inactif." - -#: forms.py:96 +#: forms.py:141 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." @@ -96,11 +102,11 @@ msgstr "" "Votre navigateur ne semble pas avoir activé les cookies. Les cookies sont " "nécessaires pour se connecter." -#: forms.py:108 -msgid "E-mail" -msgstr "Courriel" +#: forms.py:143 +msgid "This account is inactive." +msgstr "Ce compte est inactif." -#: forms.py:117 +#: forms.py:187 msgid "" "That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" @@ -108,103 +114,127 @@ msgstr "" "Cette adresse électronique ne correspond à aucun compte utilisateur. Êtes-" "vous sûr de vous être enregistré ?" -#: forms.py:143 -#, python-format -msgid "Password reset on %s" -msgstr "Mise à jour du mot de passe sur %s" +#: forms.py:189 +msgid "" +"The user account associated with this e-mail address cannot reset the " +"password." +msgstr "" +"Le compte associé à cette adresse électronique ne peut pas réinitialiser son " +"mot de passe." -#: forms.py:151 +#: forms.py:192 +msgid "E-mail" +msgstr "Courriel" + +#: forms.py:249 msgid "New password" msgstr "Nouveau mot de passe" -#: forms.py:152 +#: forms.py:251 msgid "New password confirmation" msgstr "Confirmation du nouveau mot de passe" -#: forms.py:177 -msgid "Old password" -msgstr "Ancien mot de passe" - -#: forms.py:185 +#: forms.py:280 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "Votre ancien mot de passe est incorrect. Veuillez le rectifier." -#: forms.py:194 +#: forms.py:283 +msgid "Old password" +msgstr "Ancien mot de passe" + +#: forms.py:308 msgid "Password (again)" msgstr "Mot de passe (à nouveau)" -#: models.py:76 models.py:104 +#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355 +#: hashers.py:389 +msgid "algorithm" +msgstr "algorithme" + +#: hashers.py:219 +msgid "iterations" +msgstr "itérations" + +#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390 +msgid "salt" +msgstr "salage" + +#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391 +msgid "hash" +msgstr "empreinte" + +#: hashers.py:270 +msgid "work factor" +msgstr "facteur travail" + +#: hashers.py:272 +msgid "checksum" +msgstr "somme de contrôle" + +#: models.py:66 models.py:113 msgid "name" msgstr "nom" -#: models.py:78 +#: models.py:68 msgid "codename" msgstr "nom de code" -#: models.py:82 +#: models.py:72 msgid "permission" msgstr "permission" -#: models.py:83 models.py:105 +#: models.py:73 models.py:115 msgid "permissions" msgstr "permissions" -#: models.py:108 +#: models.py:120 msgid "group" msgstr "groupe" -#: models.py:109 models.py:216 +#: models.py:121 models.py:250 msgid "groups" msgstr "groupes" -#: models.py:206 +#: models.py:232 msgid "username" msgstr "nom d'utilisateur" -#: models.py:206 +#: models.py:233 msgid "" "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters" msgstr "" "Requis. 30 caractères maximum. Uniquement des lettres, nombres et les " "caractères « @ », « . », « + », « - » et « _ »." -#: models.py:207 +#: models.py:235 msgid "first name" msgstr "prénom" -#: models.py:208 +#: models.py:236 msgid "last name" msgstr "nom" -#: models.py:209 +#: models.py:237 msgid "e-mail address" msgstr "adresse électronique" -#: models.py:210 +#: models.py:238 msgid "password" msgstr "mot de passe" -#: models.py:210 -msgid "" -"Use '[algo]$[salt]$[hexdigest]' or use the change " -"password form." -msgstr "" -"Utilisez « [algo]$[salt]$[hexdigest] » ou le formulaire " -"de changement de mot de passe." - -#: models.py:211 +#: models.py:239 msgid "staff status" msgstr "statut équipe" -#: models.py:211 +#: models.py:240 msgid "Designates whether the user can log into this admin site." msgstr "Précise si l'utilisateur peut se connecter à ce site d'administration." -#: models.py:212 +#: models.py:242 msgid "active" msgstr "actif" -#: models.py:212 +#: models.py:243 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." @@ -212,11 +242,11 @@ msgstr "" "Précise si l'utilisateur doit être considéré comme actif. Décochez ceci " "plutôt que de supprimer le compte." -#: models.py:213 +#: models.py:245 msgid "superuser status" msgstr "statut super-utilisateur" -#: models.py:213 +#: models.py:246 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." @@ -224,43 +254,43 @@ msgstr "" "Précise que l'utilisateur possède toutes les permissions sans les assigner " "explicitement." -#: models.py:214 +#: models.py:248 msgid "last login" msgstr "dernière connexion" -#: models.py:215 +#: models.py:249 msgid "date joined" msgstr "date d'inscription" -#: models.py:217 +#: models.py:251 msgid "" -"In addition to the permissions manually assigned, this user will also get " -"all permissions granted to each group he/she is in." +"The groups this user belongs to. A user will get all permissions granted to " +"each of his/her group." msgstr "" -"En plus des permissions qui lui sont manuellement assignées, cet utilisateur " -"recevra aussi toutes les permissions de tous les groupes auxquels il " -"appartient. " +"Les groupes dont fait partie cet utilisateur. Celui-ci obtient tous les " +"droits de tous ses groupes." -#: models.py:218 +#: models.py:255 msgid "user permissions" msgstr "permissions de l'utilisateur" -#: models.py:222 +#: models.py:260 msgid "user" msgstr "utilisateur" -#: models.py:223 +#: models.py:261 msgid "users" msgstr "utilisateurs" -#: models.py:406 -msgid "message" -msgstr "message" - -#: views.py:91 +#: views.py:93 msgid "Logged out" msgstr "Déconnecté" -#: management/commands/createsuperuser.py:23 +#: management/commands/createsuperuser.py:27 msgid "Enter a valid e-mail address." msgstr "Entrez une adresse de courriel valide." + +#: templates/registration/password_reset_subject.txt:2 +#, python-format +msgid "Password reset on %(site_name)s" +msgstr "Mot de passe réinitialisé sur %(site_name)s" diff --git a/django/contrib/auth/locale/fy_NL/LC_MESSAGES/django.mo b/django/contrib/auth/locale/fy_NL/LC_MESSAGES/django.mo index 3e22ce4fcea..32e22e864f9 100644 Binary files a/django/contrib/auth/locale/fy_NL/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/fy_NL/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/fy_NL/LC_MESSAGES/django.po b/django/contrib/auth/locale/fy_NL/LC_MESSAGES/django.po index c011b2a42c4..171cffded07 100644 --- a/django/contrib/auth/locale/fy_NL/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/fy_NL/LC_MESSAGES/django.po @@ -4,241 +4,265 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:14-0400\n" +"POT-Creation-Date: 2012-03-14 00:14-0700\n" "PO-Revision-Date: 2011-03-15 15:33+0000\n" "Last-Translator: Django team\n" "Language-Team: English \n" +"Language: fy_NL\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: fy_NL\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: admin.py:28 +#: admin.py:41 msgid "Personal info" msgstr "" -#: admin.py:29 +#: admin.py:42 msgid "Permissions" msgstr "" -#: admin.py:30 +#: admin.py:44 msgid "Important dates" msgstr "" -#: admin.py:31 -msgid "Groups" -msgstr "" - -#: admin.py:113 +#: admin.py:125 msgid "Password changed successfully." msgstr "" -#: admin.py:123 +#: admin.py:135 #, python-format msgid "Change password: %s" msgstr "" -#: forms.py:14 forms.py:48 forms.py:66 -msgid "Username" -msgstr "" - -#: forms.py:15 forms.py:49 -msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." -msgstr "" - -#: forms.py:16 forms.py:50 -msgid "This value may contain only letters, numbers and @/./+/-/_ characters." -msgstr "" - -#: forms.py:17 forms.py:67 forms.py:193 -msgid "Password" -msgstr "" - -#: forms.py:18 -msgid "Password confirmation" -msgstr "" - -#: forms.py:19 -msgid "Enter the same password as above, for verification." -msgstr "" - -#: forms.py:31 +#: forms.py:58 msgid "A user with that username already exists." msgstr "" -#: forms.py:37 forms.py:163 forms.py:205 +#: forms.py:59 forms.py:247 forms.py:304 msgid "The two password fields didn't match." msgstr "" -#: forms.py:87 +#: forms.py:61 forms.py:106 forms.py:135 +msgid "Username" +msgstr "" + +#: forms.py:63 forms.py:107 +msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." +msgstr "" + +#: forms.py:66 forms.py:110 +msgid "This value may contain only letters, numbers and @/./+/-/_ characters." +msgstr "" + +#: forms.py:68 forms.py:112 forms.py:136 forms.py:306 +msgid "Password" +msgstr "" + +#: forms.py:70 +msgid "Password confirmation" +msgstr "" + +#: forms.py:72 +msgid "Enter the same password as above, for verification." +msgstr "" + +#: forms.py:113 +msgid "" +"Raw passwords are not stored, so there is no way to see this user's " +"password, but you can change the password using this " +"form." +msgstr "" + +#: forms.py:139 msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." msgstr "" -#: forms.py:89 -msgid "This account is inactive." -msgstr "" - -#: forms.py:96 +#: forms.py:141 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." msgstr "" -#: forms.py:108 -msgid "E-mail" +#: forms.py:143 +msgid "This account is inactive." msgstr "" -#: forms.py:117 +#: forms.py:187 msgid "" "That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" msgstr "" -#: forms.py:143 -#, python-format -msgid "Password reset on %s" +#: forms.py:189 +msgid "" +"The user account associated with this e-mail address cannot reset the " +"password." msgstr "" -#: forms.py:151 +#: forms.py:192 +msgid "E-mail" +msgstr "" + +#: forms.py:249 msgid "New password" msgstr "" -#: forms.py:152 +#: forms.py:251 msgid "New password confirmation" msgstr "" -#: forms.py:177 -msgid "Old password" -msgstr "" - -#: forms.py:185 +#: forms.py:280 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "" -#: forms.py:194 +#: forms.py:283 +msgid "Old password" +msgstr "" + +#: forms.py:308 msgid "Password (again)" msgstr "" -#: models.py:76 models.py:104 +#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355 +#: hashers.py:389 +msgid "algorithm" +msgstr "" + +#: hashers.py:219 +msgid "iterations" +msgstr "" + +#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390 +msgid "salt" +msgstr "" + +#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391 +msgid "hash" +msgstr "" + +#: hashers.py:270 +msgid "work factor" +msgstr "" + +#: hashers.py:272 +msgid "checksum" +msgstr "" + +#: models.py:66 models.py:113 msgid "name" msgstr "" -#: models.py:78 +#: models.py:68 msgid "codename" msgstr "" -#: models.py:82 +#: models.py:72 msgid "permission" msgstr "" -#: models.py:83 models.py:105 +#: models.py:73 models.py:115 msgid "permissions" msgstr "" -#: models.py:108 +#: models.py:120 msgid "group" msgstr "" -#: models.py:109 models.py:216 +#: models.py:121 models.py:250 msgid "groups" msgstr "" -#: models.py:206 +#: models.py:232 msgid "username" msgstr "" -#: models.py:206 +#: models.py:233 msgid "" "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters" msgstr "" -#: models.py:207 +#: models.py:235 msgid "first name" msgstr "" -#: models.py:208 +#: models.py:236 msgid "last name" msgstr "" -#: models.py:209 +#: models.py:237 msgid "e-mail address" msgstr "" -#: models.py:210 +#: models.py:238 msgid "password" msgstr "" -#: models.py:210 -msgid "" -"Use '[algo]$[salt]$[hexdigest]' or use the change " -"password form." -msgstr "" - -#: models.py:211 +#: models.py:239 msgid "staff status" msgstr "" -#: models.py:211 +#: models.py:240 msgid "Designates whether the user can log into this admin site." msgstr "" -#: models.py:212 +#: models.py:242 msgid "active" msgstr "" -#: models.py:212 +#: models.py:243 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." msgstr "" -#: models.py:213 +#: models.py:245 msgid "superuser status" msgstr "" -#: models.py:213 +#: models.py:246 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." msgstr "" -#: models.py:214 +#: models.py:248 msgid "last login" msgstr "" -#: models.py:215 +#: models.py:249 msgid "date joined" msgstr "" -#: models.py:217 +#: models.py:251 msgid "" -"In addition to the permissions manually assigned, this user will also get " -"all permissions granted to each group he/she is in." +"The groups this user belongs to. A user will get all permissions granted to " +"each of his/her group." msgstr "" -#: models.py:218 +#: models.py:255 msgid "user permissions" msgstr "" -#: models.py:222 +#: models.py:260 msgid "user" msgstr "" -#: models.py:223 +#: models.py:261 msgid "users" msgstr "" -#: models.py:406 -msgid "message" -msgstr "" - -#: views.py:91 +#: views.py:93 msgid "Logged out" msgstr "" -#: management/commands/createsuperuser.py:23 +#: management/commands/createsuperuser.py:27 msgid "Enter a valid e-mail address." msgstr "" + +#: templates/registration/password_reset_subject.txt:2 +#, python-format +msgid "Password reset on %(site_name)s" +msgstr "" diff --git a/django/contrib/auth/locale/ga/LC_MESSAGES/django.mo b/django/contrib/auth/locale/ga/LC_MESSAGES/django.mo index e54228a2cb9..1f2bc5ce230 100644 Binary files a/django/contrib/auth/locale/ga/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/ga/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/ga/LC_MESSAGES/django.po b/django/contrib/auth/locale/ga/LC_MESSAGES/django.po index 36e7cd45a18..0b5bf952a15 100644 --- a/django/contrib/auth/locale/ga/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/ga/LC_MESSAGES/django.po @@ -1,82 +1,88 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Jannis Leidel , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:14-0400\n" -"PO-Revision-Date: 2011-03-04 18:41+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Irish \n" +"POT-Creation-Date: 2012-03-14 00:14-0700\n" +"PO-Revision-Date: 2012-03-08 12:07+0000\n" +"Last-Translator: Jannis Leidel \n" +"Language-Team: Irish (http://www.transifex.net/projects/p/django/language/" +"ga/)\n" +"Language: ga\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ga\n" "Plural-Forms: nplurals=5; plural=(n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : " "4)\n" -#: admin.py:28 +#: admin.py:41 msgid "Personal info" msgstr "Eolas pearsantach" -#: admin.py:29 +#: admin.py:42 msgid "Permissions" msgstr "Ceada" -#: admin.py:30 +#: admin.py:44 msgid "Important dates" msgstr "Dáta tábhactach" -#: admin.py:31 -msgid "Groups" -msgstr "Grúpa" - -#: admin.py:113 +#: admin.py:125 msgid "Password changed successfully." msgstr "Focal faire aithraithe rathúil" -#: admin.py:123 +#: admin.py:135 #, python-format msgid "Change password: %s" msgstr "Athraigh focal faire: %s" -#: forms.py:14 forms.py:48 forms.py:66 +#: forms.py:58 +msgid "A user with that username already exists." +msgstr "In ann do úsáideoir leis an ainm úsáideora." + +#: forms.py:59 forms.py:247 forms.py:304 +msgid "The two password fields didn't match." +msgstr "Níl an dá focla faire comhoiriúnigh" + +#: forms.py:61 forms.py:106 forms.py:135 msgid "Username" msgstr "Ainm úsaideoir" -#: forms.py:15 forms.py:49 +#: forms.py:63 forms.py:107 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." msgstr "" "Riachtanach. 30 carachtair nó níos lú. Litreacha, digite agus @/./+/-/_ " "amháin." -#: forms.py:16 forms.py:50 +#: forms.py:66 forms.py:110 msgid "This value may contain only letters, numbers and @/./+/-/_ characters." msgstr "" "Cathaigh litreacha, digite agus na carachtair @/./+/-/_ amhain le hadhaigh " "an méid seo." -#: forms.py:17 forms.py:67 forms.py:193 +#: forms.py:68 forms.py:112 forms.py:136 forms.py:306 msgid "Password" msgstr "Focal faire" -#: forms.py:18 +#: forms.py:70 msgid "Password confirmation" msgstr "Focal faire deimhniú" -#: forms.py:19 +#: forms.py:72 msgid "Enter the same password as above, for verification." msgstr "Iontráíl an focal faire céanna mar thuas, le fíorúchán." -#: forms.py:31 -msgid "A user with that username already exists." -msgstr "In ann do úsáideoir leis an ainm úsáideora." +#: forms.py:113 +msgid "" +"Raw passwords are not stored, so there is no way to see this user's " +"password, but you can change the password using this " +"form." +msgstr "" -#: forms.py:37 forms.py:163 forms.py:205 -msgid "The two password fields didn't match." -msgstr "Níl an dá focla faire comhoiriúnigh" - -#: forms.py:87 +#: forms.py:139 msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." @@ -84,11 +90,7 @@ msgstr "" "Le do thoil, iontráil aihm úsaideora agus focal faire ceart. Bí cúramach go " "bhfuil an beirt acu cásíogair." -#: forms.py:89 -msgid "This account is inactive." -msgstr "Tá an cuntas seo neamhghníomhach." - -#: forms.py:96 +#: forms.py:141 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." @@ -96,11 +98,11 @@ msgstr "" "Feictear nach bhfuil do brabhsálaí réidh le cuaiche a glacadh. Tá cuaiche ag " "teastail le logáil isteach." -#: forms.py:108 -msgid "E-mail" -msgstr "R-phost" +#: forms.py:143 +msgid "This account is inactive." +msgstr "Tá an cuntas seo neamhghníomhach." -#: forms.py:117 +#: forms.py:187 msgid "" "That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" @@ -108,106 +110,128 @@ msgstr "" "Níl cuntas in éineacht leis an r-phost sin. An bhfuil tú cinnte go bhfuil tú " "cláraithe?" -#: forms.py:143 -#, python-format -msgid "Password reset on %s" -msgstr "Athsocraigh focal faire ar %s" +#: forms.py:189 +msgid "" +"The user account associated with this e-mail address cannot reset the " +"password." +msgstr "" -#: forms.py:151 +#: forms.py:192 +msgid "E-mail" +msgstr "R-phost" + +#: forms.py:249 msgid "New password" msgstr "Focal faire nua" -#: forms.py:152 +#: forms.py:251 msgid "New password confirmation" msgstr "Deimnhiú focal faire nua" -#: forms.py:177 -msgid "Old password" -msgstr "Sean-focal faire " - -#: forms.py:185 +#: forms.py:280 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "" "Cuireadh do sean-focal faire isteach go mícheart. Iontráil isteach é arís." -#: forms.py:194 +#: forms.py:283 +msgid "Old password" +msgstr "Sean-focal faire " + +#: forms.py:308 msgid "Password (again)" msgstr "Focal faire (arís)" -#: models.py:76 models.py:104 +#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355 +#: hashers.py:389 +msgid "algorithm" +msgstr "" + +#: hashers.py:219 +msgid "iterations" +msgstr "" + +#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390 +msgid "salt" +msgstr "" + +#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391 +msgid "hash" +msgstr "" + +#: hashers.py:270 +msgid "work factor" +msgstr "" + +#: hashers.py:272 +msgid "checksum" +msgstr "" + +#: models.py:66 models.py:113 msgid "name" msgstr "ainm" -#: models.py:78 +#: models.py:68 msgid "codename" msgstr "Ainm cód" -#: models.py:82 +#: models.py:72 msgid "permission" msgstr "cead" -#: models.py:83 models.py:105 +#: models.py:73 models.py:115 msgid "permissions" msgstr "ceada" -#: models.py:108 +#: models.py:120 msgid "group" msgstr "grúpa" -#: models.py:109 models.py:216 +#: models.py:121 models.py:250 msgid "groups" msgstr "grúpa" -#: models.py:206 +#: models.py:232 msgid "username" msgstr "Ainm úsáideoir" -#: models.py:206 +#: models.py:233 msgid "" "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters" msgstr "" "Riachtanach. 30 carachtair nó níos lú. Litreacha, digite agus na carachtair " "@/./+/-/_" -#: models.py:207 +#: models.py:235 msgid "first name" msgstr "ainm baiste" -#: models.py:208 +#: models.py:236 msgid "last name" msgstr "sloinne" -#: models.py:209 +#: models.py:237 msgid "e-mail address" msgstr "seoladh r-phost" -#: models.py:210 +#: models.py:238 msgid "password" msgstr "focal faire" -#: models.py:210 -msgid "" -"Use '[algo]$[salt]$[hexdigest]' or use the change " -"password form." -msgstr "" -"Úsáid '[algo]$[salt]$[hexdigest]' nó athraigh focal " -"faire foirm." - -#: models.py:211 +#: models.py:239 msgid "staff status" msgstr "stádas foirne" -#: models.py:211 +#: models.py:240 msgid "Designates whether the user can log into this admin site." msgstr "" "Sainigh an bhfuil cead ag an úsáideoir logáil isteach go dtí an suíomh " "riaracháin seo." -#: models.py:212 +#: models.py:242 msgid "active" msgstr "gníomhach" -#: models.py:212 +#: models.py:243 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." @@ -215,11 +239,11 @@ msgstr "" "Sainíonn an bhfuil an úsáideoir gníomhach. Míroghnaigh seo in aineonn de " "scriseadh cuntasí." -#: models.py:213 +#: models.py:245 msgid "superuser status" msgstr "stádas forúsáideoir" -#: models.py:213 +#: models.py:246 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." @@ -227,42 +251,41 @@ msgstr "" "Sainíonn go bhfuil gach ceada ag an úsáideoir seo gan iad a cur le go " "díreach." -#: models.py:214 +#: models.py:248 msgid "last login" msgstr "logáil deirneach" -#: models.py:215 +#: models.py:249 msgid "date joined" msgstr "Dáta teacht isteach" -#: models.py:217 +#: models.py:251 msgid "" -"In addition to the permissions manually assigned, this user will also get " -"all permissions granted to each group he/she is in." +"The groups this user belongs to. A user will get all permissions granted to " +"each of his/her group." msgstr "" -"Breis leis na ceada sannta láimhe, faigheann an úsáideoir seo gach ceada " -"sannta do na grúpaí a bhfuil sé/sí isteach in." -#: models.py:218 +#: models.py:255 msgid "user permissions" msgstr "ceada úsáideoira" -#: models.py:222 +#: models.py:260 msgid "user" msgstr "úsáideoir" -#: models.py:223 +#: models.py:261 msgid "users" msgstr "úsáideora" -#: models.py:406 -msgid "message" -msgstr "teachtaireacht" - -#: views.py:91 +#: views.py:93 msgid "Logged out" msgstr "Logáilte amach" -#: management/commands/createsuperuser.py:23 +#: management/commands/createsuperuser.py:27 msgid "Enter a valid e-mail address." msgstr "Cuir isteach seoladh ríomhphoist bhailí." + +#: templates/registration/password_reset_subject.txt:2 +#, python-format +msgid "Password reset on %(site_name)s" +msgstr "" diff --git a/django/contrib/auth/locale/gl/LC_MESSAGES/django.mo b/django/contrib/auth/locale/gl/LC_MESSAGES/django.mo index 20a61f1a056..ddda27120ba 100644 Binary files a/django/contrib/auth/locale/gl/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/gl/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/gl/LC_MESSAGES/django.po b/django/contrib/auth/locale/gl/LC_MESSAGES/django.po index 710307f1054..c21a6590da4 100644 --- a/django/contrib/auth/locale/gl/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/gl/LC_MESSAGES/django.po @@ -1,79 +1,88 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# fasouto , 2011. +# fonso , 2011. +# Jannis Leidel , 2011. +# Leandro Regueiro , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:14-0400\n" -"PO-Revision-Date: 2011-03-08 18:36+0000\n" -"Last-Translator: fonso \n" -"Language-Team: Galician \n" +"POT-Creation-Date: 2012-03-14 00:15-0700\n" +"PO-Revision-Date: 2012-03-08 12:07+0000\n" +"Last-Translator: Leandro Regueiro \n" +"Language-Team: Galician (http://www.transifex.net/projects/p/django/language/" +"gl/)\n" +"Language: gl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: gl\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: admin.py:28 +#: admin.py:41 msgid "Personal info" msgstr "Información persoal" -#: admin.py:29 +#: admin.py:42 msgid "Permissions" msgstr "Permisos" -#: admin.py:30 +#: admin.py:44 msgid "Important dates" msgstr "Datas importantes" -#: admin.py:31 -msgid "Groups" -msgstr "Grupos" - -#: admin.py:113 +#: admin.py:125 msgid "Password changed successfully." msgstr "O contrasinal cambiouse correctamente." -#: admin.py:123 +#: admin.py:135 #, python-format msgid "Change password: %s" msgstr "Cambiar contrasinal: %s" -#: forms.py:14 forms.py:48 forms.py:66 +#: forms.py:58 +msgid "A user with that username already exists." +msgstr "Xa existe un usuario con ese nome de usuario." + +#: forms.py:59 forms.py:247 forms.py:304 +msgid "The two password fields didn't match." +msgstr "Os dous campos de contrasinal non coinciden." + +#: forms.py:61 forms.py:106 forms.py:135 msgid "Username" msgstr "Usuario" -#: forms.py:15 forms.py:49 +#: forms.py:63 forms.py:107 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." msgstr "" "Requirido. 30 caracteres ou menos. Soamente letras, díxitos e @/./+/-/_." -#: forms.py:16 forms.py:50 +#: forms.py:66 forms.py:110 msgid "This value may contain only letters, numbers and @/./+/-/_ characters." msgstr "" "Este valor soamente pode conter letras, números e os caracteres @/./+/-/_." -#: forms.py:17 forms.py:67 forms.py:193 +#: forms.py:68 forms.py:112 forms.py:136 forms.py:306 msgid "Password" msgstr "Contrasinal" -#: forms.py:18 +#: forms.py:70 msgid "Password confirmation" msgstr "Confirmación do contrasinal" -#: forms.py:19 +#: forms.py:72 msgid "Enter the same password as above, for verification." msgstr "Insira o mesmo contrasinal ca enriba para verificalo." -#: forms.py:31 -msgid "A user with that username already exists." -msgstr "Xa existe un usuario con ese nome de usuario." +#: forms.py:113 +msgid "" +"Raw passwords are not stored, so there is no way to see this user's " +"password, but you can change the password using this " +"form." +msgstr "" -#: forms.py:37 forms.py:163 forms.py:205 -msgid "The two password fields didn't match." -msgstr "Os dous campos de contrasinal non coinciden." - -#: forms.py:87 +#: forms.py:139 msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." @@ -81,11 +90,7 @@ msgstr "" "Insira un nome de usuario e un contrasinal correctos. Teña en conta que nos " "dous campos se distingue entre maiúsculas e minúsculas." -#: forms.py:89 -msgid "This account is inactive." -msgstr "Esta conta está inactiva." - -#: forms.py:96 +#: forms.py:141 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." @@ -93,11 +98,11 @@ msgstr "" "Semella que o seu navegador non acepta 'cookies'. Requírense 'cookies' para " "iniciar sesión." -#: forms.py:108 -msgid "E-mail" -msgstr "Correo electrónico" +#: forms.py:143 +msgid "This account is inactive." +msgstr "Esta conta está inactiva." -#: forms.py:117 +#: forms.py:187 msgid "" "That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" @@ -105,102 +110,124 @@ msgstr "" "Este enderezo de correo electrónico non ten unha conta de usuario asociada. " "Está seguro de que está rexistrado?" -#: forms.py:143 -#, python-format -msgid "Password reset on %s" -msgstr "Restableceuse o contrasinal (%s)" +#: forms.py:189 +msgid "" +"The user account associated with this e-mail address cannot reset the " +"password." +msgstr "" -#: forms.py:151 +#: forms.py:192 +msgid "E-mail" +msgstr "Correo electrónico" + +#: forms.py:249 msgid "New password" msgstr "Novo contrasinal" -#: forms.py:152 +#: forms.py:251 msgid "New password confirmation" msgstr "Confirmación do novo contrasinal" -#: forms.py:177 -msgid "Old password" -msgstr "Contrasinal antigo" - -#: forms.py:185 +#: forms.py:280 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "" "Inseriu incorrectamente o seu contrasinal actual. Por favor, insírao de novo." -#: forms.py:194 +#: forms.py:283 +msgid "Old password" +msgstr "Contrasinal antigo" + +#: forms.py:308 msgid "Password (again)" msgstr "Contrasinal (outra vez)" -#: models.py:76 models.py:104 +#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355 +#: hashers.py:389 +msgid "algorithm" +msgstr "" + +#: hashers.py:219 +msgid "iterations" +msgstr "" + +#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390 +msgid "salt" +msgstr "" + +#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391 +msgid "hash" +msgstr "" + +#: hashers.py:270 +msgid "work factor" +msgstr "" + +#: hashers.py:272 +msgid "checksum" +msgstr "" + +#: models.py:66 models.py:113 msgid "name" msgstr "nome" -#: models.py:78 +#: models.py:68 msgid "codename" msgstr "código" -#: models.py:82 +#: models.py:72 msgid "permission" msgstr "permiso" -#: models.py:83 models.py:105 +#: models.py:73 models.py:115 msgid "permissions" msgstr "permisos" -#: models.py:108 +#: models.py:120 msgid "group" msgstr "grupo" -#: models.py:109 models.py:216 +#: models.py:121 models.py:250 msgid "groups" msgstr "grupos" -#: models.py:206 +#: models.py:232 msgid "username" msgstr "nome de usuario" -#: models.py:206 +#: models.py:233 msgid "" "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters" msgstr "Requirido. 30 caracteres ou menos. Letras, díxitos e @/./+/-/_." -#: models.py:207 +#: models.py:235 msgid "first name" msgstr "nome" -#: models.py:208 +#: models.py:236 msgid "last name" msgstr "apelidos" -#: models.py:209 +#: models.py:237 msgid "e-mail address" msgstr "enderezo de correo electrónico" -#: models.py:210 +#: models.py:238 msgid "password" msgstr "contrasinal" -#: models.py:210 -msgid "" -"Use '[algo]$[salt]$[hexdigest]' or use the change " -"password form." -msgstr "" -"Use '[algo]$[salt]$[hexdigest]' ou utilice o formulario de cambio de contrasinal." - -#: models.py:211 +#: models.py:239 msgid "staff status" msgstr "membro do persoal" -#: models.py:211 +#: models.py:240 msgid "Designates whether the user can log into this admin site." msgstr "Indica se o usuario pode entrar neste sitio de administración." -#: models.py:212 +#: models.py:242 msgid "active" msgstr "activo" -#: models.py:212 +#: models.py:243 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." @@ -208,53 +235,52 @@ msgstr "" "Determina se este usuario se debe considerar activo. Deseleccione isto en " "vez de borrar contas de usuario." -#: models.py:213 +#: models.py:245 msgid "superuser status" msgstr "estatus de superusuario" -#: models.py:213 +#: models.py:246 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." msgstr "" "Indica que este usuario ten todos os permisos sen asignarllos explicitamente." -#: models.py:214 +#: models.py:248 msgid "last login" msgstr "última sesión" -#: models.py:215 +#: models.py:249 msgid "date joined" msgstr "data de rexistro" -#: models.py:217 +#: models.py:251 msgid "" -"In addition to the permissions manually assigned, this user will also get " -"all permissions granted to each group he/she is in." +"The groups this user belongs to. A user will get all permissions granted to " +"each of his/her group." msgstr "" -"Ademais dos permisos asignados manualmente, este usuario gozará de todos os " -"permisos concedidos a cada un dos grupos aos que pertence." -#: models.py:218 +#: models.py:255 msgid "user permissions" msgstr "permisos de usuario" -#: models.py:222 +#: models.py:260 msgid "user" msgstr "usuario" -#: models.py:223 +#: models.py:261 msgid "users" msgstr "usuarios" -#: models.py:406 -msgid "message" -msgstr "mensaxe" - -#: views.py:91 +#: views.py:93 msgid "Logged out" msgstr "Rematou a sesión" -#: management/commands/createsuperuser.py:23 +#: management/commands/createsuperuser.py:27 msgid "Enter a valid e-mail address." msgstr "Insira un enderezo de correo electrónico válido." + +#: templates/registration/password_reset_subject.txt:2 +#, python-format +msgid "Password reset on %(site_name)s" +msgstr "Cambio de contrasinal en %(site_name)s" diff --git a/django/contrib/auth/locale/he/LC_MESSAGES/django.mo b/django/contrib/auth/locale/he/LC_MESSAGES/django.mo index 3e55f944aa7..5e2b1b572bd 100644 Binary files a/django/contrib/auth/locale/he/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/he/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/he/LC_MESSAGES/django.po b/django/contrib/auth/locale/he/LC_MESSAGES/django.po index 743c056e557..b0830300214 100644 --- a/django/contrib/auth/locale/he/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/he/LC_MESSAGES/django.po @@ -1,198 +1,224 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Alex Gaynor , 2011, 2012. +# Jannis Leidel , 2011. +# Meir Kriheli , 2012. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:14-0400\n" -"PO-Revision-Date: 2011-03-04 18:41+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Hebrew <>\n" +"POT-Creation-Date: 2012-03-14 00:15-0700\n" +"PO-Revision-Date: 2012-03-08 12:07+0000\n" +"Last-Translator: Meir Kriheli \n" +"Language-Team: Hebrew (http://www.transifex.net/projects/p/django/language/" +"he/)\n" +"Language: he\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: he\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: admin.py:28 +#: admin.py:41 msgid "Personal info" msgstr "מידע אישי" -#: admin.py:29 +#: admin.py:42 msgid "Permissions" msgstr "הרשאות" -#: admin.py:30 +#: admin.py:44 msgid "Important dates" msgstr "תאריכים חשובים" -#: admin.py:31 -msgid "Groups" -msgstr "קבוצות" - -#: admin.py:113 +#: admin.py:125 msgid "Password changed successfully." msgstr "הסיסמה שונתה בהצלחה." -#: admin.py:123 +#: admin.py:135 #, python-format msgid "Change password: %s" msgstr "שינוי סיסמה: %s" -#: forms.py:14 forms.py:48 forms.py:66 -msgid "Username" -msgstr "שם משתמש" - -#: forms.py:15 forms.py:49 -msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." -msgstr "שדה חובה. 30 תווים או פחות. אותיות, ספרות ו-@/./+/-/_ בלבד." - -#: forms.py:16 forms.py:50 -msgid "This value may contain only letters, numbers and @/./+/-/_ characters." -msgstr "ערך זה יכול להכיל אותיות, ספרות והתווים @/./+/-/_ בלבד." - -#: forms.py:17 forms.py:67 forms.py:193 -msgid "Password" -msgstr "סיסמה" - -#: forms.py:18 -msgid "Password confirmation" -msgstr "אימות סיסמה" - -#: forms.py:19 -msgid "Enter the same password as above, for verification." -msgstr "יש להזין את אותה סיסמה שוב,לאימות." - -#: forms.py:31 +#: forms.py:58 msgid "A user with that username already exists." msgstr "משתמש עם שם משתמש זה קיים כבר" -#: forms.py:37 forms.py:163 forms.py:205 +#: forms.py:59 forms.py:247 forms.py:304 msgid "The two password fields didn't match." msgstr "שני שדות הסיסמה אינם זהים." -#: forms.py:87 +#: forms.py:61 forms.py:106 forms.py:135 +msgid "Username" +msgstr "שם משתמש" + +#: forms.py:63 forms.py:107 +msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." +msgstr "שדה חובה. 30 תווים או פחות. אותיות, ספרות ו-@/./+/-/_ בלבד." + +#: forms.py:66 forms.py:110 +msgid "This value may contain only letters, numbers and @/./+/-/_ characters." +msgstr "ערך זה יכול להכיל אותיות, ספרות והתווים @/./+/-/_ בלבד." + +#: forms.py:68 forms.py:112 forms.py:136 forms.py:306 +msgid "Password" +msgstr "סיסמה" + +#: forms.py:70 +msgid "Password confirmation" +msgstr "אימות סיסמה" + +#: forms.py:72 +msgid "Enter the same password as above, for verification." +msgstr "יש להזין את אותה סיסמה שוב,לאימות." + +#: forms.py:113 +msgid "" +"Raw passwords are not stored, so there is no way to see this user's " +"password, but you can change the password using this " +"form." +msgstr "" + +#: forms.py:139 msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." msgstr "" "נא להזין שם משתמש וסיסמה נכונים. בשני השדות גודל האותיות האנגליות משנה." -#: forms.py:89 -msgid "This account is inactive." -msgstr "חשבון זה אינו פעיל." - -#: forms.py:96 +#: forms.py:141 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." msgstr "נראה שעוגיות לא מאופשרות בדפדפן שלך. הן נדרשות כדי להתחבר." -#: forms.py:108 -msgid "E-mail" -msgstr "כתובת דוא\"ל" +#: forms.py:143 +msgid "This account is inactive." +msgstr "חשבון זה אינו פעיל." -#: forms.py:117 +#: forms.py:187 msgid "" "That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" msgstr "כתובת דואר אלקטרוני זו אינה משוייכת למשתמש. בטוח שנרשמת ?" -#: forms.py:143 -#, python-format -msgid "Password reset on %s" -msgstr "איפוס סיסמה על %s" +#: forms.py:189 +msgid "" +"The user account associated with this e-mail address cannot reset the " +"password." +msgstr "החשבון מחובר לדוא\"ל זה לא יכול להחליף את הסיסמה." -#: forms.py:151 +#: forms.py:192 +msgid "E-mail" +msgstr "כתובת דוא\"ל" + +#: forms.py:249 msgid "New password" msgstr "סיסמה חדשה" -#: forms.py:152 +#: forms.py:251 msgid "New password confirmation" msgstr "אימות סיסמה חדשה" -#: forms.py:177 -msgid "Old password" -msgstr "סיסמה ישנה" - -#: forms.py:185 +#: forms.py:280 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "סיסמתך הישנה הוזנה בצורה שגויה. נא להזינה שוב." -#: forms.py:194 +#: forms.py:283 +msgid "Old password" +msgstr "סיסמה ישנה" + +#: forms.py:308 msgid "Password (again)" msgstr "סיסמה (שוב)" -#: models.py:76 models.py:104 +#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355 +#: hashers.py:389 +msgid "algorithm" +msgstr "אלגוריתם" + +#: hashers.py:219 +msgid "iterations" +msgstr "חזרות" + +#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390 +msgid "salt" +msgstr "" + +#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391 +msgid "hash" +msgstr "" + +#: hashers.py:270 +msgid "work factor" +msgstr "" + +#: hashers.py:272 +msgid "checksum" +msgstr "סיכום ביקורת" + +#: models.py:66 models.py:113 msgid "name" msgstr "שם" -#: models.py:78 +#: models.py:68 msgid "codename" msgstr "שם קוד" -#: models.py:82 +#: models.py:72 msgid "permission" msgstr "הרשאה" -#: models.py:83 models.py:105 +#: models.py:73 models.py:115 msgid "permissions" msgstr "הרשאות" -#: models.py:108 +#: models.py:120 msgid "group" msgstr "קבוצה" -#: models.py:109 models.py:216 +#: models.py:121 models.py:250 msgid "groups" msgstr "קבוצות" -#: models.py:206 +#: models.py:232 msgid "username" msgstr "שם משתמש" -#: models.py:206 +#: models.py:233 msgid "" "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters" msgstr "שדה חובה. 30 תווים או פחות. אותיות, ספרות והתווים @/./+/-/_ בלבד." -#: models.py:207 +#: models.py:235 msgid "first name" msgstr "שם פרטי" -#: models.py:208 +#: models.py:236 msgid "last name" msgstr "שם משפחה" -#: models.py:209 +#: models.py:237 msgid "e-mail address" msgstr "כתובת דוא\"ל" -#: models.py:210 +#: models.py:238 msgid "password" msgstr "סיסמה" -#: models.py:210 -msgid "" -"Use '[algo]$[salt]$[hexdigest]' or use the change " -"password form." -msgstr "" -"יש להזין '[algo]$[salt]$[hexdigest]' או להשתמש בטופס " -"שינוי הסיסמה." - -#: models.py:211 +#: models.py:239 msgid "staff status" msgstr "סטטוס איש צוות" -#: models.py:211 +#: models.py:240 msgid "Designates whether the user can log into this admin site." msgstr "מציין האם המשתמש יכול להתחבר לאתר הניהול." -#: models.py:212 +#: models.py:242 msgid "active" msgstr "פעיל" -#: models.py:212 +#: models.py:243 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." @@ -200,52 +226,53 @@ msgstr "" "מציין האם יש להתייחס למשתמש כפעיל. יש לבטל בחירה זו במקום למחוק חשבונות " "משתמשים." -#: models.py:213 +#: models.py:245 msgid "superuser status" msgstr "סטטוס משתמש על" -#: models.py:213 +#: models.py:246 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." msgstr "מציין שלמשתמש זה יש את כל ההרשאות ללא הצורך המפורש בהענקתן." -#: models.py:214 +#: models.py:248 msgid "last login" msgstr "כניסה אחרונה" -#: models.py:215 +#: models.py:249 msgid "date joined" msgstr "תאריך הצטרפות" -#: models.py:217 +#: models.py:251 msgid "" -"In addition to the permissions manually assigned, this user will also get " -"all permissions granted to each group he/she is in." +"The groups this user belongs to. A user will get all permissions granted to " +"each of his/her group." msgstr "" -"בנוסף לכל ההרשאות שהוקצו ידנית, יוענקו למשתמש גם כל ההרשאות של כל קבוצה " -"המשוייכת אליו." +"הקבוצות שמשתמש זה שייך אליהן. משתמש יקבל את כל ההרשאות המוקצות לקבוצה שלו/" +"שלה." -#: models.py:218 +#: models.py:255 msgid "user permissions" msgstr "הרשאות משתמש" -#: models.py:222 +#: models.py:260 msgid "user" msgstr "משתמש" -#: models.py:223 +#: models.py:261 msgid "users" msgstr "משתמשים" -#: models.py:406 -msgid "message" -msgstr "הודעה" - -#: views.py:91 +#: views.py:93 msgid "Logged out" msgstr "יצאת מהמערכת" -#: management/commands/createsuperuser.py:23 +#: management/commands/createsuperuser.py:27 msgid "Enter a valid e-mail address." msgstr "יש להזין כתובת דוא\"ל חוקית." + +#: templates/registration/password_reset_subject.txt:2 +#, python-format +msgid "Password reset on %(site_name)s" +msgstr "החלפת הסיסמה ב-%(site_name)s" diff --git a/django/contrib/auth/locale/hi/LC_MESSAGES/django.mo b/django/contrib/auth/locale/hi/LC_MESSAGES/django.mo index 417b3b13b30..72414608187 100644 Binary files a/django/contrib/auth/locale/hi/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/hi/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/hi/LC_MESSAGES/django.po b/django/contrib/auth/locale/hi/LC_MESSAGES/django.po index 518591b2d79..48fb983eb85 100644 --- a/django/contrib/auth/locale/hi/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/hi/LC_MESSAGES/django.po @@ -1,77 +1,85 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Chandan kumar , 2012. +# Jannis Leidel , 2011. +# Sandeep Satavlekar , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:14-0400\n" -"PO-Revision-Date: 2011-03-07 07:41+0000\n" -"Last-Translator: sandeepsatavlekar \n" -"Language-Team: Hindi \n" +"POT-Creation-Date: 2012-03-14 00:15-0700\n" +"PO-Revision-Date: 2012-03-08 12:07+0000\n" +"Last-Translator: Chandan kumar \n" +"Language-Team: Hindi (http://www.transifex.net/projects/p/django/language/" +"hi/)\n" +"Language: hi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: hi\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: admin.py:28 +#: admin.py:41 msgid "Personal info" msgstr "व्यक्तिगत सूचना" -#: admin.py:29 +#: admin.py:42 msgid "Permissions" msgstr "अनुमतियाँ" -#: admin.py:30 +#: admin.py:44 msgid "Important dates" msgstr "महत्त्वपूर्ण तिथियाँ" -#: admin.py:31 -msgid "Groups" -msgstr "वर्गों" - -#: admin.py:113 +#: admin.py:125 msgid "Password changed successfully." msgstr "शब्दकूट बदली कामयाब" -#: admin.py:123 +#: admin.py:135 #, python-format msgid "Change password: %s" msgstr "शब्दकूट बदलें: %s" -#: forms.py:14 forms.py:48 forms.py:66 -msgid "Username" -msgstr "प्रवोक्ता नाम" - -#: forms.py:15 forms.py:49 -msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." -msgstr "जरूरी है | 30 या कम | केवल वर्णों, अक्षर, अंक और @/./+/-/_ |" - -#: forms.py:16 forms.py:50 -msgid "This value may contain only letters, numbers and @/./+/-/_ characters." -msgstr "यह मूल्य केवल अक्षर, संख्या और @/./+/-/_ हो सकते हैं |" - -#: forms.py:17 forms.py:67 forms.py:193 -msgid "Password" -msgstr "कूटशब्द" - -#: forms.py:18 -msgid "Password confirmation" -msgstr "कूटशब्द पुष्टि" - -#: forms.py:19 -msgid "Enter the same password as above, for verification." -msgstr "सत्याप्ती के लिए ऊपर दर्ज किए शब्दकूट को फिर से प्रवेश करें" - -#: forms.py:31 +#: forms.py:58 msgid "A user with that username already exists." msgstr "इस नाम के साथ प्रवोक्ता अस्तित्व है" -#: forms.py:37 forms.py:163 forms.py:205 +#: forms.py:59 forms.py:247 forms.py:304 msgid "The two password fields didn't match." msgstr "यह दो शब्दकूट क्षेत्रों का मेल नहीं होता " -#: forms.py:87 +#: forms.py:61 forms.py:106 forms.py:135 +msgid "Username" +msgstr "प्रवोक्ता नाम" + +#: forms.py:63 forms.py:107 +msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." +msgstr "जरूरी है | 30 या कम | केवल वर्णों, अक्षर, अंक और @/./+/-/_ |" + +#: forms.py:66 forms.py:110 +msgid "This value may contain only letters, numbers and @/./+/-/_ characters." +msgstr "यह मूल्य केवल अक्षर, संख्या और @/./+/-/_ हो सकते हैं |" + +#: forms.py:68 forms.py:112 forms.py:136 forms.py:306 +msgid "Password" +msgstr "कूटशब्द" + +#: forms.py:70 +msgid "Password confirmation" +msgstr "कूटशब्द पुष्टि" + +#: forms.py:72 +msgid "Enter the same password as above, for verification." +msgstr "सत्याप्ती के लिए ऊपर दर्ज किए शब्दकूट को फिर से प्रवेश करें" + +#: forms.py:113 +msgid "" +"Raw passwords are not stored, so there is no way to see this user's " +"password, but you can change the password using this " +"form." +msgstr "" + +#: forms.py:139 msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." @@ -79,22 +87,18 @@ msgstr "" "एक सही उपयोगकर्ता नाम और कूटशब्द दर्ज करें. कृपया ध्यान दें कि दोनों क्षेत्र मामले के प्रति " "संवेदनशील होते हैं." -#: forms.py:89 -msgid "This account is inactive." -msgstr "यस खाता सुस्त है" - -#: forms.py:96 +#: forms.py:141 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." msgstr "" "ऐसा लग रहा हैं की आप के वेब-ब्राउज़र में कुकीज़ सक्षम नहीं हैं | प्रवेश हेतु कुकीज़ आवश्यक हैं |" -#: forms.py:108 -msgid "E-mail" -msgstr "ईमेल" +#: forms.py:143 +msgid "This account is inactive." +msgstr "यस खाता सुस्त है" -#: forms.py:117 +#: forms.py:187 msgid "" "That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" @@ -102,150 +106,177 @@ msgstr "" "उस इ-मेल पते से जुड़ा कोई उपयोगकर्ता खता नहीं हैं | क्या आप को यकीन हैं की आप ने पंजीकरण " "किया हैं?" -#: forms.py:143 -#, python-format -msgid "Password reset on %s" -msgstr "%s पर शब्दकूट पुनस्थाप" +#: forms.py:189 +msgid "" +"The user account associated with this e-mail address cannot reset the " +"password." +msgstr "इस ई - मेल पते के साथ जुड़े उपयोगकर्ता खाता पासवर्ड को रीसेट नहीं कर सकते है." -#: forms.py:151 +#: forms.py:192 +msgid "E-mail" +msgstr "ईमेल" + +#: forms.py:249 msgid "New password" msgstr "नया शब्दकूट" -#: forms.py:152 +#: forms.py:251 msgid "New password confirmation" msgstr "नया शब्दकूट पुष्टि" -#: forms.py:177 -msgid "Old password" -msgstr "पुराना शब्दकूट" - -#: forms.py:185 +#: forms.py:280 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "आपने पुराना शब्दकूट गलत दर्ज किया है । कृपया फिर से दर्ज करें" -#: forms.py:194 +#: forms.py:283 +msgid "Old password" +msgstr "पुराना शब्दकूट" + +#: forms.py:308 msgid "Password (again)" msgstr "शब्दकूट (दुबारा)" -#: models.py:76 models.py:104 +#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355 +#: hashers.py:389 +msgid "algorithm" +msgstr "" + +#: hashers.py:219 +msgid "iterations" +msgstr "" + +#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390 +msgid "salt" +msgstr "" + +#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391 +msgid "hash" +msgstr "" + +#: hashers.py:270 +msgid "work factor" +msgstr "" + +#: hashers.py:272 +msgid "checksum" +msgstr "" + +#: models.py:66 models.py:113 msgid "name" msgstr "नाम" -#: models.py:78 +#: models.py:68 msgid "codename" msgstr "कोडनेम" -#: models.py:82 +#: models.py:72 msgid "permission" msgstr "अनुमति" -#: models.py:83 models.py:105 +#: models.py:73 models.py:115 msgid "permissions" msgstr "अनुमतियाँ" -#: models.py:108 +#: models.py:120 msgid "group" msgstr "वर्ग" -#: models.py:109 models.py:216 +#: models.py:121 models.py:250 msgid "groups" msgstr "वर्गों" -#: models.py:206 +#: models.py:232 msgid "username" msgstr "प्रयोक्ता नाम" -#: models.py:206 +#: models.py:233 msgid "" "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters" msgstr "जरूरी है | 30 या कम वर्णों | केवल अक्षर, संख्या और @/./+/-/_" -#: models.py:207 +#: models.py:235 msgid "first name" msgstr "पहला नाम" -#: models.py:208 +#: models.py:236 msgid "last name" msgstr "आखिरी नाम" -#: models.py:209 +#: models.py:237 msgid "e-mail address" msgstr "ईमेल पता" -#: models.py:210 +#: models.py:238 msgid "password" msgstr "शब्दकूट" -#: models.py:210 -msgid "" -"Use '[algo]$[salt]$[hexdigest]' or use the change " -"password form." -msgstr "" -"'[algo]$[salt]$[hexdigest]' अथ‌वा शब्दकूट बदली फार्म " -"प्रयोग करें" - -#: models.py:211 +#: models.py:239 msgid "staff status" msgstr "कर्मचारी स्थिति" -#: models.py:211 +#: models.py:240 msgid "Designates whether the user can log into this admin site." msgstr "तय करता हैं की उपयोगकर्ता इस साईट प्रशासन में प्रवेश कर सकता हैं या नहीं |" -#: models.py:212 +#: models.py:242 msgid "active" msgstr "सक्रिय" -#: models.py:212 +#: models.py:243 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." msgstr "" +"निर्दिष्ट करता है कि क्या इस उपयोगकर्ता को सक्रिय माना जाना चाहिए.खातों को हटाने की " +"बजाय इस अचयनित करे." -#: models.py:213 +#: models.py:245 msgid "superuser status" msgstr "सर्वोच्च प्रयोक्ता स्थिति" -#: models.py:213 +#: models.py:246 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." msgstr "" +"निर्दिष्ट करता है कि जो इस उपयोगकर्ता के पास सभी अनुमतियाँ उन्हें बिना बताए स्पष्ट रूप से " +"निर्धारित है." -#: models.py:214 +#: models.py:248 msgid "last login" msgstr "पिछला लॉगिन" -#: models.py:215 +#: models.py:249 msgid "date joined" msgstr "तिथि भरती" -#: models.py:217 +#: models.py:251 msgid "" -"In addition to the permissions manually assigned, this user will also get " -"all permissions granted to each group he/she is in." +"The groups this user belongs to. A user will get all permissions granted to " +"each of his/her group." msgstr "" -#: models.py:218 +#: models.py:255 msgid "user permissions" msgstr "प्रयोक्ता अनुमतियाँ" -#: models.py:222 +#: models.py:260 msgid "user" msgstr "उपभोक्ता" -#: models.py:223 +#: models.py:261 msgid "users" msgstr "उपभोक्ताऐं" -#: models.py:406 -msgid "message" -msgstr "सन्देश" - -#: views.py:91 +#: views.py:93 msgid "Logged out" -msgstr "" +msgstr "लाग्ड आउट " -#: management/commands/createsuperuser.py:23 +#: management/commands/createsuperuser.py:27 msgid "Enter a valid e-mail address." msgstr "मान्य ईमेल पता भरें" + +#: templates/registration/password_reset_subject.txt:2 +#, python-format +msgid "Password reset on %(site_name)s" +msgstr "%(site_name)s पर कूटशब्द को पुनःठीक करे" diff --git a/django/contrib/auth/locale/hr/LC_MESSAGES/django.mo b/django/contrib/auth/locale/hr/LC_MESSAGES/django.mo index b6ec1bea17d..c7d3088d87e 100644 Binary files a/django/contrib/auth/locale/hr/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/hr/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/hr/LC_MESSAGES/django.po b/django/contrib/auth/locale/hr/LC_MESSAGES/django.po index afd9e526945..84c7a963090 100644 --- a/django/contrib/auth/locale/hr/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/hr/LC_MESSAGES/django.po @@ -1,81 +1,87 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Jannis Leidel , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:14-0400\n" -"PO-Revision-Date: 2011-03-17 18:16-0300\n" -"Last-Translator: Jannis \n" -"Language-Team: Croatian <>\n" +"POT-Creation-Date: 2012-03-14 00:15-0700\n" +"PO-Revision-Date: 2012-03-08 12:07+0000\n" +"Last-Translator: Jannis Leidel \n" +"Language-Team: Croatian (http://www.transifex.net/projects/p/django/language/" +"hr/)\n" +"Language: hr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: hr\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" +"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" -#: admin.py:28 +#: admin.py:41 msgid "Personal info" msgstr "Osobni podaci" -#: admin.py:29 +#: admin.py:42 msgid "Permissions" msgstr "Privilegije" -#: admin.py:30 +#: admin.py:44 msgid "Important dates" msgstr "Važni datumi" -#: admin.py:31 -msgid "Groups" -msgstr "Grupe" - -#: admin.py:113 +#: admin.py:125 msgid "Password changed successfully." msgstr "Lozinka uspješno promijenjena." -#: admin.py:123 +#: admin.py:135 #, python-format msgid "Change password: %s" msgstr "Promijeni lozinku: %s" -#: forms.py:14 forms.py:48 forms.py:66 +#: forms.py:58 +msgid "A user with that username already exists." +msgstr "Korisnik sa navedenim imenom već postoji." + +#: forms.py:59 forms.py:247 forms.py:304 +msgid "The two password fields didn't match." +msgstr "Dva polja za lozinku nisu jednaka." + +#: forms.py:61 forms.py:106 forms.py:135 msgid "Username" msgstr "Korisničko ime" -#: forms.py:15 forms.py:49 +#: forms.py:63 forms.py:107 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." msgstr "" "Obavezan unos. 30 alfanumeričkih znakova ili manje. Samo slova, brojevi i " "@/./+/-/_ znakovi." -#: forms.py:16 forms.py:50 +#: forms.py:66 forms.py:110 msgid "This value may contain only letters, numbers and @/./+/-/_ characters." msgstr "" "Ova vrijednost može sadržavati samo slova, brojeve i @/./+/-/_ znakove." -#: forms.py:17 forms.py:67 forms.py:193 +#: forms.py:68 forms.py:112 forms.py:136 forms.py:306 msgid "Password" msgstr "Lozinka" -#: forms.py:18 +#: forms.py:70 msgid "Password confirmation" msgstr "Potvrda lozinke" -#: forms.py:19 +#: forms.py:72 msgid "Enter the same password as above, for verification." msgstr "Unesite istu lozinku, za potvrdu." -#: forms.py:31 -msgid "A user with that username already exists." -msgstr "Korisnik sa navedenim imenom već postoji." +#: forms.py:113 +msgid "" +"Raw passwords are not stored, so there is no way to see this user's " +"password, but you can change the password using this " +"form." +msgstr "" -#: forms.py:37 forms.py:163 forms.py:205 -msgid "The two password fields didn't match." -msgstr "Dva polja za lozinku nisu jednaka." - -#: forms.py:87 +#: forms.py:139 msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." @@ -83,11 +89,7 @@ msgstr "" "Molim unesite ispravno korisničko ime i lozinku. Uzmite u obzir da oba polja " "razlikuju velika/mala slova." -#: forms.py:89 -msgid "This account is inactive." -msgstr "Ovaj korisnički račun nije aktivan." - -#: forms.py:96 +#: forms.py:141 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." @@ -95,11 +97,11 @@ msgstr "" "Izgleda da Vaš browser ne podržava kolačiće (cookies). Kolačići su potrebni " "da bi se prijavili." -#: forms.py:108 -msgid "E-mail" -msgstr "E-mail" +#: forms.py:143 +msgid "This account is inactive." +msgstr "Ovaj korisnički račun nije aktivan." -#: forms.py:117 +#: forms.py:187 msgid "" "That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" @@ -107,103 +109,125 @@ msgstr "" "Za navedenu e-mail adresu ne postoji korisnički račun. Jeste li sigurni da " "ste registrirani?" -#: forms.py:143 -#, python-format -msgid "Password reset on %s" -msgstr "Lozinka resetirana na %s" +#: forms.py:189 +msgid "" +"The user account associated with this e-mail address cannot reset the " +"password." +msgstr "" -#: forms.py:151 +#: forms.py:192 +msgid "E-mail" +msgstr "E-mail" + +#: forms.py:249 msgid "New password" msgstr "Nova lozinka" -#: forms.py:152 +#: forms.py:251 msgid "New password confirmation" msgstr "Potvrda nove lozinke" -#: forms.py:177 -msgid "Old password" -msgstr "Stara lozinka" - -#: forms.py:185 +#: forms.py:280 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "Vaša stara lozinka je pogrešno unesena. Molim unesite ponovo." -#: forms.py:194 +#: forms.py:283 +msgid "Old password" +msgstr "Stara lozinka" + +#: forms.py:308 msgid "Password (again)" msgstr "Lozinka (unesi ponovo)" -#: models.py:76 models.py:104 +#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355 +#: hashers.py:389 +msgid "algorithm" +msgstr "" + +#: hashers.py:219 +msgid "iterations" +msgstr "" + +#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390 +msgid "salt" +msgstr "" + +#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391 +msgid "hash" +msgstr "" + +#: hashers.py:270 +msgid "work factor" +msgstr "" + +#: hashers.py:272 +msgid "checksum" +msgstr "" + +#: models.py:66 models.py:113 msgid "name" msgstr "ime" -#: models.py:78 +#: models.py:68 msgid "codename" msgstr "kodno ime" -#: models.py:82 +#: models.py:72 msgid "permission" msgstr "privilegija" -#: models.py:83 models.py:105 +#: models.py:73 models.py:115 msgid "permissions" msgstr "privilegije" -#: models.py:108 +#: models.py:120 msgid "group" msgstr "grupa" -#: models.py:109 models.py:216 +#: models.py:121 models.py:250 msgid "groups" msgstr "grupe" -#: models.py:206 +#: models.py:232 msgid "username" msgstr "korisničko ime" -#: models.py:206 +#: models.py:233 msgid "" "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters" msgstr "" "Obavezan unos. 30 alfanumeričkih znakova ili manje. Samo slova, brojevi i " "@/./+/-/_ dozvoljeni." -#: models.py:207 +#: models.py:235 msgid "first name" msgstr "ime" -#: models.py:208 +#: models.py:236 msgid "last name" msgstr "prezime" -#: models.py:209 +#: models.py:237 msgid "e-mail address" msgstr "e-mail adresa" -#: models.py:210 +#: models.py:238 msgid "password" msgstr "lozinka" -#: models.py:210 -msgid "" -"Use '[algo]$[salt]$[hexdigest]' or use the change " -"password form." -msgstr "" -"Koristite '[algo]$[salt]$[hexdigest]' ili formu za " -"promjenu lozinke." - -#: models.py:211 +#: models.py:239 msgid "staff status" msgstr "status osoblja" -#: models.py:211 +#: models.py:240 msgid "Designates whether the user can log into this admin site." msgstr "Određuje može li se korisnik prijaviti na ove stranice administracije." -#: models.py:212 +#: models.py:242 msgid "active" msgstr "aktivan" -#: models.py:212 +#: models.py:243 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." @@ -211,11 +235,11 @@ msgstr "" "Određuje treba li se ovaj korisnik tretirati kao aktivan korisnik. Koristite " "ovu opciju umjesto brisanja korisničkih računa." -#: models.py:213 +#: models.py:245 msgid "superuser status" msgstr "superuser status" -#: models.py:213 +#: models.py:246 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." @@ -223,42 +247,41 @@ msgstr "" "Određuje da ovaj korisnik ima sve privilegije te uklanja potrebu da se " "privilegije unose eksplicitno/ručno." -#: models.py:214 +#: models.py:248 msgid "last login" msgstr "posljednja prijava" -#: models.py:215 +#: models.py:249 msgid "date joined" msgstr "datum učlanjenja" -#: models.py:217 +#: models.py:251 msgid "" -"In addition to the permissions manually assigned, this user will also get " -"all permissions granted to each group he/she is in." +"The groups this user belongs to. A user will get all permissions granted to " +"each of his/her group." msgstr "" -"Uz ručno dodane privilegije korisnik će također dobiti sve privilegije " -"odobrene grupama kojima korisnik pripada." -#: models.py:218 +#: models.py:255 msgid "user permissions" msgstr "privilegije korisnika" -#: models.py:222 +#: models.py:260 msgid "user" msgstr "korisnik" -#: models.py:223 +#: models.py:261 msgid "users" msgstr "korisnici" -#: models.py:406 -msgid "message" -msgstr "poruka" - -#: views.py:91 +#: views.py:93 msgid "Logged out" msgstr "Niste logirani" -#: management/commands/createsuperuser.py:23 +#: management/commands/createsuperuser.py:27 msgid "Enter a valid e-mail address." msgstr "Unesite ispravnu e-mail adresu." + +#: templates/registration/password_reset_subject.txt:2 +#, python-format +msgid "Password reset on %(site_name)s" +msgstr "" diff --git a/django/contrib/auth/locale/hu/LC_MESSAGES/django.mo b/django/contrib/auth/locale/hu/LC_MESSAGES/django.mo index 8959ce46e45..d262904d024 100644 Binary files a/django/contrib/auth/locale/hu/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/hu/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/hu/LC_MESSAGES/django.po b/django/contrib/auth/locale/hu/LC_MESSAGES/django.po index bdaccef12d3..b481809b618 100644 --- a/django/contrib/auth/locale/hu/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/hu/LC_MESSAGES/django.po @@ -1,79 +1,86 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Jannis Leidel , 2011. +# Szilveszter Farkas , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:14-0400\n" -"PO-Revision-Date: 2011-03-05 16:01+0000\n" -"Last-Translator: szilveszter \n" -"Language-Team: Hungarian <>\n" +"POT-Creation-Date: 2012-03-14 00:15-0700\n" +"PO-Revision-Date: 2012-03-08 12:07+0000\n" +"Last-Translator: Szilveszter Farkas \n" +"Language-Team: Hungarian (http://www.transifex.net/projects/p/django/" +"language/hu/)\n" +"Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: hu\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: admin.py:28 +#: admin.py:41 msgid "Personal info" msgstr "személyes információ" -#: admin.py:29 +#: admin.py:42 msgid "Permissions" msgstr "jogosultságok" -#: admin.py:30 +#: admin.py:44 msgid "Important dates" msgstr "Fontos dátumok" -#: admin.py:31 -msgid "Groups" -msgstr "Csoportok" - -#: admin.py:113 +#: admin.py:125 msgid "Password changed successfully." msgstr "Sikeres jelszóváltoztatás." -#: admin.py:123 +#: admin.py:135 #, python-format msgid "Change password: %s" msgstr "Jelszó megváltoztatása: %s" -#: forms.py:14 forms.py:48 forms.py:66 +#: forms.py:58 +msgid "A user with that username already exists." +msgstr "Létezik már egy felhasználó ezzel a névvel." + +#: forms.py:59 forms.py:247 forms.py:304 +msgid "The two password fields didn't match." +msgstr "A két jelszó mező tartalma nem egyezik meg." + +#: forms.py:61 forms.py:106 forms.py:135 msgid "Username" msgstr "Felhasználó" -#: forms.py:15 forms.py:49 +#: forms.py:63 forms.py:107 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." msgstr "" "Kötelező. Legfeljebb 30 karakter. Betűk, számok és @/./+/-/_ karakterek." -#: forms.py:16 forms.py:50 +#: forms.py:66 forms.py:110 msgid "This value may contain only letters, numbers and @/./+/-/_ characters." msgstr "" "Ez az érték csak betűket, számokat és @/./+/-/_ karaktereket tartalmazhat." -#: forms.py:17 forms.py:67 forms.py:193 +#: forms.py:68 forms.py:112 forms.py:136 forms.py:306 msgid "Password" msgstr "Jelszó" -#: forms.py:18 +#: forms.py:70 msgid "Password confirmation" msgstr "Jelszó megerősítése" -#: forms.py:19 +#: forms.py:72 msgid "Enter the same password as above, for verification." msgstr "Írja be a fenti jelszót ellenőrzés céljából." -#: forms.py:31 -msgid "A user with that username already exists." -msgstr "Létezik már egy felhasználó ezzel a névvel." +#: forms.py:113 +msgid "" +"Raw passwords are not stored, so there is no way to see this user's " +"password, but you can change the password using this " +"form." +msgstr "" -#: forms.py:37 forms.py:163 forms.py:205 -msgid "The two password fields didn't match." -msgstr "A két jelszó mező tartalma nem egyezik meg." - -#: forms.py:87 +#: forms.py:139 msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." @@ -81,11 +88,7 @@ msgstr "" "Írjon be egy helyes felhasználónevet és jelszót. Mindkét mező kisbetű-" "nagybetű érzékeny." -#: forms.py:89 -msgid "This account is inactive." -msgstr "Ez a fiók inaktív." - -#: forms.py:96 +#: forms.py:141 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." @@ -93,11 +96,11 @@ msgstr "" "A böngészője úgy tűnik nem támogatja a cookie-kat. A cookie-k engedélyezése " "szükséges a bejelentkezéshez." -#: forms.py:108 -msgid "E-mail" -msgstr "E-mail cím" +#: forms.py:143 +msgid "This account is inactive." +msgstr "Ez a fiók inaktív." -#: forms.py:117 +#: forms.py:187 msgid "" "That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" @@ -105,103 +108,125 @@ msgstr "" "Ehhez az e-mail címhez nem tartozik felhasználói fiók. Biztos benne, hogy " "regisztrált?" -#: forms.py:143 -#, python-format -msgid "Password reset on %s" -msgstr "Jelszó beállítása: %s" +#: forms.py:189 +msgid "" +"The user account associated with this e-mail address cannot reset the " +"password." +msgstr "" -#: forms.py:151 +#: forms.py:192 +msgid "E-mail" +msgstr "E-mail cím" + +#: forms.py:249 msgid "New password" msgstr "Új jelszó" -#: forms.py:152 +#: forms.py:251 msgid "New password confirmation" msgstr "Új jelszó megerősítése" -#: forms.py:177 -msgid "Old password" -msgstr "Régi jelszó" - -#: forms.py:185 +#: forms.py:280 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "A régi jelszó hibásan lett megadva. Írja be újra." -#: forms.py:194 +#: forms.py:283 +msgid "Old password" +msgstr "Régi jelszó" + +#: forms.py:308 msgid "Password (again)" msgstr "Jelszó újra" -#: models.py:76 models.py:104 +#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355 +#: hashers.py:389 +msgid "algorithm" +msgstr "" + +#: hashers.py:219 +msgid "iterations" +msgstr "" + +#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390 +msgid "salt" +msgstr "" + +#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391 +msgid "hash" +msgstr "" + +#: hashers.py:270 +msgid "work factor" +msgstr "" + +#: hashers.py:272 +msgid "checksum" +msgstr "" + +#: models.py:66 models.py:113 msgid "name" msgstr "név" -#: models.py:78 +#: models.py:68 msgid "codename" msgstr "kódnév" -#: models.py:82 +#: models.py:72 msgid "permission" msgstr "jogosultság" -#: models.py:83 models.py:105 +#: models.py:73 models.py:115 msgid "permissions" msgstr "jogosultságok" -#: models.py:108 +#: models.py:120 msgid "group" msgstr "csoport" -#: models.py:109 models.py:216 +#: models.py:121 models.py:250 msgid "groups" msgstr "csoportok" -#: models.py:206 +#: models.py:232 msgid "username" msgstr "felhasználónév" -#: models.py:206 +#: models.py:233 msgid "" "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters" msgstr "" "Kötelező. Legfeljebb 30 karakter. Betűk, számok és @/./+/-/_ karakterek." -#: models.py:207 +#: models.py:235 msgid "first name" msgstr "keresztnév" -#: models.py:208 +#: models.py:236 msgid "last name" msgstr "vezetéknév" -#: models.py:209 +#: models.py:237 msgid "e-mail address" msgstr "e-mail cím" -#: models.py:210 +#: models.py:238 msgid "password" msgstr "jelszó" -#: models.py:210 -msgid "" -"Use '[algo]$[salt]$[hexdigest]' or use the change " -"password form." -msgstr "" -"Használja az \"[algo]$[salt]$[hexdigest]\" formátumot, vagy a jelszó megváltoztatása űrlapot." - -#: models.py:211 +#: models.py:239 msgid "staff status" msgstr "személyzet státusz" -#: models.py:211 +#: models.py:240 msgid "Designates whether the user can log into this admin site." msgstr "" "Megadja, hogy a felhasználó bejelentkezhet-e erre az adminisztrációs oldalra." -#: models.py:212 +#: models.py:242 msgid "active" msgstr "aktív" -#: models.py:212 +#: models.py:243 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." @@ -209,11 +234,11 @@ msgstr "" "Megadja, hogy a felhasználó aktív-e. Állítsa át ezt az értéket a fiók " "törlése helyett." -#: models.py:213 +#: models.py:245 msgid "superuser status" msgstr "rendszergazda státusz" -#: models.py:213 +#: models.py:246 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." @@ -221,42 +246,41 @@ msgstr "" "Megadja, hogy ez a felhasználó rendelkezik-e minden jogosultsággal anélkül, " "hogy azt külön meg kellene adni." -#: models.py:214 +#: models.py:248 msgid "last login" msgstr "utolsó bejelentkezés" -#: models.py:215 +#: models.py:249 msgid "date joined" msgstr "csatlakozás dátuma" -#: models.py:217 +#: models.py:251 msgid "" -"In addition to the permissions manually assigned, this user will also get " -"all permissions granted to each group he/she is in." +"The groups this user belongs to. A user will get all permissions granted to " +"each of his/her group." msgstr "" -"A kézzel beállított jogosultságok mellett a felhasználó a csoportjának " -"jogait is megkapja." -#: models.py:218 +#: models.py:255 msgid "user permissions" msgstr "felhasználói jogosultságok" -#: models.py:222 +#: models.py:260 msgid "user" msgstr "felhasználó" -#: models.py:223 +#: models.py:261 msgid "users" msgstr "felhasználók" -#: models.py:406 -msgid "message" -msgstr "üzenet" - -#: views.py:91 +#: views.py:93 msgid "Logged out" msgstr "Kijelentkezve" -#: management/commands/createsuperuser.py:23 +#: management/commands/createsuperuser.py:27 msgid "Enter a valid e-mail address." msgstr "Írjon be egy érvényes e-mail címet." + +#: templates/registration/password_reset_subject.txt:2 +#, python-format +msgid "Password reset on %(site_name)s" +msgstr "" diff --git a/django/contrib/auth/locale/id/LC_MESSAGES/django.mo b/django/contrib/auth/locale/id/LC_MESSAGES/django.mo index 44aa78f7a38..0b323249e54 100644 Binary files a/django/contrib/auth/locale/id/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/id/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/id/LC_MESSAGES/django.po b/django/contrib/auth/locale/id/LC_MESSAGES/django.po index 81a06d056b7..fe55f0e5cac 100644 --- a/django/contrib/auth/locale/id/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/id/LC_MESSAGES/django.po @@ -1,79 +1,90 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Jannis Leidel , 2011. +# rodin , 2011. +# , 2011, 2012. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:14-0400\n" -"PO-Revision-Date: 2011-03-04 18:41+0000\n" +"POT-Creation-Date: 2012-03-14 00:15-0700\n" +"PO-Revision-Date: 2012-03-08 12:07+0000\n" "Last-Translator: rodin \n" -"Language-Team: Indonesian \n" +"Language-Team: Indonesian (http://www.transifex.net/projects/p/django/" +"language/id/)\n" +"Language: id\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: id\n" "Plural-Forms: nplurals=1; plural=0\n" -#: admin.py:28 +#: admin.py:41 msgid "Personal info" msgstr "Informasi pribadi" -#: admin.py:29 +#: admin.py:42 msgid "Permissions" msgstr "Hak akses" -#: admin.py:30 +#: admin.py:44 msgid "Important dates" msgstr "Tanggal penting" -#: admin.py:31 -msgid "Groups" -msgstr "Grup" - -#: admin.py:113 +#: admin.py:125 msgid "Password changed successfully." msgstr "Sandi berhasil diubah." -#: admin.py:123 +#: admin.py:135 #, python-format msgid "Change password: %s" msgstr "Ganti sandi: %s" -#: forms.py:14 forms.py:48 forms.py:66 +#: forms.py:58 +msgid "A user with that username already exists." +msgstr "Seorang pengguna dengan nama pengguna tersebut sudah ada." + +#: forms.py:59 forms.py:247 forms.py:304 +msgid "The two password fields didn't match." +msgstr "Dua bidang sandi tidak cocok." + +#: forms.py:61 forms.py:106 forms.py:135 msgid "Username" msgstr "Username" -#: forms.py:15 forms.py:49 +#: forms.py:63 forms.py:107 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." msgstr "" "Wajib. 30 karakter atau kurang dalam kombinasi huruf, angka, dan karakter " "@/./+/-/_ ." -#: forms.py:16 forms.py:50 +#: forms.py:66 forms.py:110 msgid "This value may contain only letters, numbers and @/./+/-/_ characters." msgstr "Nilai ini hanya boleh berisi huruf, angka, dan karakter @/./+/-/_ ." -#: forms.py:17 forms.py:67 forms.py:193 +#: forms.py:68 forms.py:112 forms.py:136 forms.py:306 msgid "Password" msgstr "Sandi" -#: forms.py:18 +#: forms.py:70 msgid "Password confirmation" msgstr "Konfirmasi sandi" -#: forms.py:19 +#: forms.py:72 msgid "Enter the same password as above, for verification." msgstr "Masukkan sandi yang sama dengan di atas, untuk verifikasi." -#: forms.py:31 -msgid "A user with that username already exists." -msgstr "Seorang pengguna dengan nama pengguna tersebut sudah ada." +#: forms.py:113 +msgid "" +"Raw passwords are not stored, so there is no way to see this user's " +"password, but you can change the password using this " +"form." +msgstr "" +"Sandi mentah tidak akan disimpan dan tidak ada cara untuk membaca sandi " +"pengguna ini, namun Anda dapat mengganti sandi tersebut lewat formulir ini." -#: forms.py:37 forms.py:163 forms.py:205 -msgid "The two password fields didn't match." -msgstr "Dua bidang sandi tidak cocok." - -#: forms.py:87 +#: forms.py:139 msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." @@ -81,11 +92,7 @@ msgstr "" "Masukkan nama pengguna dan sandi yang benar. Huruf besar/kecil pada bidang " "ini berpengaruh." -#: forms.py:89 -msgid "This account is inactive." -msgstr "Akun ini tidak aktif." - -#: forms.py:96 +#: forms.py:141 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." @@ -93,11 +100,11 @@ msgstr "" "Tampaknya peramban Anda disetel untuk tidak menerima kuki. Kuki diperlukan " "untuk proses masuk." -#: forms.py:108 -msgid "E-mail" -msgstr "Email" +#: forms.py:143 +msgid "This account is inactive." +msgstr "Akun ini tidak aktif." -#: forms.py:117 +#: forms.py:187 msgid "" "That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" @@ -105,103 +112,127 @@ msgstr "" "Alamat email tersebut tidak terkait dengan akun apapun. Anda yakin sudah " "terdaftar?" -#: forms.py:143 -#, python-format -msgid "Password reset on %s" -msgstr "Setel ulang sandi di %s" +#: forms.py:189 +msgid "" +"The user account associated with this e-mail address cannot reset the " +"password." +msgstr "" +"Akun pengguna yang terkait dengan alamat email ini tidak dapat menyetel " +"ulang sandi." -#: forms.py:151 +#: forms.py:192 +msgid "E-mail" +msgstr "Email" + +#: forms.py:249 msgid "New password" msgstr "Sandi baru" -#: forms.py:152 +#: forms.py:251 msgid "New password confirmation" msgstr "Konfirmasi sandi baru" -#: forms.py:177 -msgid "Old password" -msgstr "Sandi lama" - -#: forms.py:185 +#: forms.py:280 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "Sandi lama Anda yang dimasukkan salah. Masukkan sekali lagi." -#: forms.py:194 +#: forms.py:283 +msgid "Old password" +msgstr "Sandi lama" + +#: forms.py:308 msgid "Password (again)" msgstr "Sandi (ulangi)" -#: models.py:76 models.py:104 +#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355 +#: hashers.py:389 +msgid "algorithm" +msgstr "algoritme" + +#: hashers.py:219 +msgid "iterations" +msgstr "iterasi" + +#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390 +msgid "salt" +msgstr "garam" + +#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391 +msgid "hash" +msgstr "hash" + +#: hashers.py:270 +msgid "work factor" +msgstr "faktor kerja" + +#: hashers.py:272 +msgid "checksum" +msgstr "ceksum" + +#: models.py:66 models.py:113 msgid "name" msgstr "nama" -#: models.py:78 +#: models.py:68 msgid "codename" msgstr "namasandi" -#: models.py:82 +#: models.py:72 msgid "permission" msgstr "hak akses" -#: models.py:83 models.py:105 +#: models.py:73 models.py:115 msgid "permissions" msgstr "hak akses" -#: models.py:108 +#: models.py:120 msgid "group" msgstr "grup" -#: models.py:109 models.py:216 +#: models.py:121 models.py:250 msgid "groups" msgstr "grup" -#: models.py:206 +#: models.py:232 msgid "username" msgstr "nama pengguna" -#: models.py:206 +#: models.py:233 msgid "" "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters" msgstr "" "Wajib. 30 karakter atau kurang dalam kombinasi huruf, angka, karakter @/./" "+/-/_ " -#: models.py:207 +#: models.py:235 msgid "first name" msgstr "nama depan" -#: models.py:208 +#: models.py:236 msgid "last name" msgstr "nama belakang" -#: models.py:209 +#: models.py:237 msgid "e-mail address" msgstr "alamat email" -#: models.py:210 +#: models.py:238 msgid "password" msgstr "sandi" -#: models.py:210 -msgid "" -"Use '[algo]$[salt]$[hexdigest]' or use the change " -"password form." -msgstr "" -"Gunakan '[algo]$[salt]$[hexdigest]' atau formulir " -"ganti sandi." - -#: models.py:211 +#: models.py:239 msgid "staff status" msgstr "status staf" -#: models.py:211 +#: models.py:240 msgid "Designates whether the user can log into this admin site." msgstr "Menentukan apakah pengguna berhak masuk ke situs administrasi ini." -#: models.py:212 +#: models.py:242 msgid "active" msgstr "aktif" -#: models.py:212 +#: models.py:243 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." @@ -209,11 +240,11 @@ msgstr "" "Menentukan apakah pengguna dianggap aktif. Hapus pilihan ini tanpa perlu " "menghapus akunnya." -#: models.py:213 +#: models.py:245 msgid "superuser status" msgstr "status superuser" -#: models.py:213 +#: models.py:246 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." @@ -221,43 +252,43 @@ msgstr "" "Menentukan apakah pengguna memiliki semua hak akses tanpa perlu diberikan " "secara manual." -#: models.py:214 +#: models.py:248 msgid "last login" msgstr "masuk terakhir" -#: models.py:215 +#: models.py:249 msgid "date joined" msgstr "tanggal daftar" -#: models.py:217 +#: models.py:251 msgid "" -"In addition to the permissions manually assigned, this user will also get " -"all permissions granted to each group he/she is in." +"The groups this user belongs to. A user will get all permissions granted to " +"each of his/her group." msgstr "" -"Selain hak akses yang diberikan secara manual, pengguna ini juga akan " -"mendapatkan hak akses yang diberikan kepada semua grup tempat dia menjadi " -"anggotanya." +"Grup tempat pengguna ini dikelompokkan. Pengguna akan mendapatkan semua hak " +"akses yang diberikan pada grupnya." -#: models.py:218 +#: models.py:255 msgid "user permissions" msgstr "hak akses pengguna" -#: models.py:222 +#: models.py:260 msgid "user" msgstr "pengguna" -#: models.py:223 +#: models.py:261 msgid "users" msgstr "pengguna" -#: models.py:406 -msgid "message" -msgstr "pesan" - -#: views.py:91 +#: views.py:93 msgid "Logged out" msgstr "Keluar" -#: management/commands/createsuperuser.py:23 +#: management/commands/createsuperuser.py:27 msgid "Enter a valid e-mail address." msgstr "Masukkan alamat email yang valid." + +#: templates/registration/password_reset_subject.txt:2 +#, python-format +msgid "Password reset on %(site_name)s" +msgstr "Penyetelan ulang sandi di %(site_name)s" diff --git a/django/contrib/auth/locale/is/LC_MESSAGES/django.mo b/django/contrib/auth/locale/is/LC_MESSAGES/django.mo index af3423e0dcd..114657d2974 100644 Binary files a/django/contrib/auth/locale/is/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/is/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/is/LC_MESSAGES/django.po b/django/contrib/auth/locale/is/LC_MESSAGES/django.po index dd05dee6baa..5b6b50249fc 100644 --- a/django/contrib/auth/locale/is/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/is/LC_MESSAGES/django.po @@ -1,81 +1,89 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Hafsteinn Einarsson , 2011. +# Jannis Leidel , 2011. +# Logi Ragnarsson , 2012. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:14-0400\n" -"PO-Revision-Date: 2011-03-04 18:41+0000\n" -"Last-Translator: haffi67 \n" -"Language-Team: Icelandic \n" +"POT-Creation-Date: 2012-03-14 00:15-0700\n" +"PO-Revision-Date: 2012-03-08 12:07+0000\n" +"Last-Translator: Logi Ragnarsson \n" +"Language-Team: Icelandic (http://www.transifex.net/projects/p/django/" +"language/is/)\n" +"Language: is\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: is\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: admin.py:28 +#: admin.py:41 msgid "Personal info" msgstr "Persónuupplýsingar" -#: admin.py:29 +#: admin.py:42 msgid "Permissions" msgstr "Réttindi" -#: admin.py:30 +#: admin.py:44 msgid "Important dates" msgstr "Mikilvægar dagsetningar" -#: admin.py:31 -msgid "Groups" -msgstr "Hópar" - -#: admin.py:113 +#: admin.py:125 msgid "Password changed successfully." msgstr "Breyting á lykilorði tókst." -#: admin.py:123 +#: admin.py:135 #, python-format msgid "Change password: %s" msgstr "Breyta lykilorði: %s" -#: forms.py:14 forms.py:48 forms.py:66 +#: forms.py:58 +msgid "A user with that username already exists." +msgstr "Notandi með þetta notendanafn er nú þegar til." + +#: forms.py:59 forms.py:247 forms.py:304 +msgid "The two password fields didn't match." +msgstr "Lykilorðin tvö pössuðu ekki saman." + +#: forms.py:61 forms.py:106 forms.py:135 msgid "Username" msgstr "Notandanafn" -#: forms.py:15 forms.py:49 +#: forms.py:63 forms.py:107 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." msgstr "" "Nauðsynlegt að fylla út. 30 stafir eða færri. Bókstafir (ekki broddstafir), " "tölustafir og @/./+/-/_ aðeins leyft." -#: forms.py:16 forms.py:50 +#: forms.py:66 forms.py:110 msgid "This value may contain only letters, numbers and @/./+/-/_ characters." msgstr "" "Þessi reitur má aðeins innihalda bókstafi (ekki broddstafi), tölustafi og " "@/./+/-/_ táknin" -#: forms.py:17 forms.py:67 forms.py:193 +#: forms.py:68 forms.py:112 forms.py:136 forms.py:306 msgid "Password" msgstr "Lykilorð" -#: forms.py:18 +#: forms.py:70 msgid "Password confirmation" msgstr "Staðfesting lykilorðs" -#: forms.py:19 +#: forms.py:72 msgid "Enter the same password as above, for verification." msgstr "Settu inn sama lykilorðið aftur til staðfestingar." -#: forms.py:31 -msgid "A user with that username already exists." -msgstr "Notandi með þetta notendanafn er nú þegar til." +#: forms.py:113 +msgid "" +"Raw passwords are not stored, so there is no way to see this user's " +"password, but you can change the password using this " +"form." +msgstr "" -#: forms.py:37 forms.py:163 forms.py:205 -msgid "The two password fields didn't match." -msgstr "Lykilorðin tvö pössuðu ekki saman." - -#: forms.py:87 +#: forms.py:139 msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." @@ -83,11 +91,7 @@ msgstr "" "Vinsamlegast sláðu inn rétt notandanafn og lykilorð. Athugaðu að báðir " "reitirnir þurfa að vera stafréttir." -#: forms.py:89 -msgid "This account is inactive." -msgstr "Þessi reikningur er óvirku." - -#: forms.py:96 +#: forms.py:141 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." @@ -95,11 +99,11 @@ msgstr "" "Vafri þinn virðist ekki vera stilltur til að leyfa dúsur (cookies). Dúsur " "eru nauðsynlegar fyrir innskráningu." -#: forms.py:108 -msgid "E-mail" -msgstr "Netfang" +#: forms.py:143 +msgid "This account is inactive." +msgstr "Þessi reikningur er óvirkur." -#: forms.py:117 +#: forms.py:187 msgid "" "That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" @@ -107,104 +111,126 @@ msgstr "" "Þetta netfang hefur engan tengdan notandareikning. Ertu viss um að þú hafi " "skráð þig?" -#: forms.py:143 -#, python-format -msgid "Password reset on %s" -msgstr "Lykilorð endurstillt á %s" +#: forms.py:189 +msgid "" +"The user account associated with this e-mail address cannot reset the " +"password." +msgstr "" -#: forms.py:151 +#: forms.py:192 +msgid "E-mail" +msgstr "Netfang" + +#: forms.py:249 msgid "New password" msgstr "Nýtt lykilorð" -#: forms.py:152 +#: forms.py:251 msgid "New password confirmation" msgstr "Nýtt lykilorð (endurtekið)" -#: forms.py:177 -msgid "Old password" -msgstr "Gamalt lykilorð" - -#: forms.py:185 +#: forms.py:280 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "Gamla lykilorðið var vitlaust. Vinsamlegast reyndu aftur." -#: forms.py:194 +#: forms.py:283 +msgid "Old password" +msgstr "Gamalt lykilorð" + +#: forms.py:308 msgid "Password (again)" msgstr "Lykilorð (aftur)" -#: models.py:76 models.py:104 +#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355 +#: hashers.py:389 +msgid "algorithm" +msgstr "" + +#: hashers.py:219 +msgid "iterations" +msgstr "" + +#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390 +msgid "salt" +msgstr "" + +#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391 +msgid "hash" +msgstr "" + +#: hashers.py:270 +msgid "work factor" +msgstr "" + +#: hashers.py:272 +msgid "checksum" +msgstr "" + +#: models.py:66 models.py:113 msgid "name" msgstr "nafn" -#: models.py:78 +#: models.py:68 msgid "codename" msgstr "vinnuheiti" -#: models.py:82 +#: models.py:72 msgid "permission" msgstr "réttindi" -#: models.py:83 models.py:105 +#: models.py:73 models.py:115 msgid "permissions" msgstr "réttindi" -#: models.py:108 +#: models.py:120 msgid "group" msgstr "hópur" -#: models.py:109 models.py:216 +#: models.py:121 models.py:250 msgid "groups" msgstr "hópar" -#: models.py:206 +#: models.py:232 msgid "username" msgstr "notandanafn" -#: models.py:206 +#: models.py:233 msgid "" "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters" msgstr "" "Nauðsynlegt að fylla út. 30 stafir eða færri. Bókstafir (ekki broddstafir), " "tölustafir og @/./+/-/_ aðeins leyft." -#: models.py:207 +#: models.py:235 msgid "first name" msgstr "skírnarnafn" -#: models.py:208 +#: models.py:236 msgid "last name" msgstr "eftirnafn" -#: models.py:209 +#: models.py:237 msgid "e-mail address" msgstr "tölvupóstfang" -#: models.py:210 +#: models.py:238 msgid "password" msgstr "lykilorð" -#: models.py:210 -msgid "" -"Use '[algo]$[salt]$[hexdigest]' or use the change " -"password form." -msgstr "" -"Notaðu '[algo]$[salt]$[hexdigest]' eða 'breyta " -"lykilorði' formið." - -#: models.py:211 +#: models.py:239 msgid "staff status" msgstr "staða starfsmanns" -#: models.py:211 +#: models.py:240 msgid "Designates whether the user can log into this admin site." msgstr "" "Segir til um hvort notandinn getur skráð sig inn á þetta stjórnunarsvæði." -#: models.py:212 +#: models.py:242 msgid "active" msgstr "virkur" -#: models.py:212 +#: models.py:243 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." @@ -212,11 +238,11 @@ msgstr "" "Til marks um að notandinn sé virku. Taktu hakið úr þessum möguleika til að " "eyða aðgangi." -#: models.py:213 +#: models.py:245 msgid "superuser status" msgstr "staða ofurnotanda" -#: models.py:213 +#: models.py:246 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." @@ -224,42 +250,41 @@ msgstr "" "Til marks um að notandinn hafi öll réttindi án þess að taka þau sérstaklega " "fram." -#: models.py:214 +#: models.py:248 msgid "last login" msgstr "síðasta innskráning" -#: models.py:215 +#: models.py:249 msgid "date joined" msgstr "skráning dags." -#: models.py:217 +#: models.py:251 msgid "" -"In addition to the permissions manually assigned, this user will also get " -"all permissions granted to each group he/she is in." +"The groups this user belongs to. A user will get all permissions granted to " +"each of his/her group." msgstr "" -"Auk réttindanna sem notandanum var gefið sérstaklega fær hann öll þau " -"réttindi sem hópurinn hans hefur." -#: models.py:218 +#: models.py:255 msgid "user permissions" msgstr "réttindi" -#: models.py:222 +#: models.py:260 msgid "user" msgstr "notandi" -#: models.py:223 +#: models.py:261 msgid "users" msgstr "notendur" -#: models.py:406 -msgid "message" -msgstr "skilaboð" - -#: views.py:91 +#: views.py:93 msgid "Logged out" msgstr "Útskráð(ur)" -#: management/commands/createsuperuser.py:23 +#: management/commands/createsuperuser.py:27 msgid "Enter a valid e-mail address." msgstr "Sláðu inn gilt tölvupóstfang." + +#: templates/registration/password_reset_subject.txt:2 +#, python-format +msgid "Password reset on %(site_name)s" +msgstr "" diff --git a/django/contrib/auth/locale/it/LC_MESSAGES/django.mo b/django/contrib/auth/locale/it/LC_MESSAGES/django.mo index 8c58d225b53..ff5c2ace127 100644 Binary files a/django/contrib/auth/locale/it/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/it/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/it/LC_MESSAGES/django.po b/django/contrib/auth/locale/it/LC_MESSAGES/django.po index dbec08defdf..ce0fc8334a4 100644 --- a/django/contrib/auth/locale/it/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/it/LC_MESSAGES/django.po @@ -1,77 +1,88 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Federico Capoano , 2011. +# Jannis Leidel , 2011. +# Nicola Larosa , 2011, 2012. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:14-0400\n" -"PO-Revision-Date: 2011-03-08 17:21+0000\n" -"Last-Translator: teknico \n" -"Language-Team: Italian <>\n" +"POT-Creation-Date: 2012-03-14 00:15-0700\n" +"PO-Revision-Date: 2012-03-08 12:07+0000\n" +"Last-Translator: Nicola Larosa \n" +"Language-Team: Italian (http://www.transifex.net/projects/p/django/language/" +"it/)\n" +"Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: admin.py:28 +#: admin.py:41 msgid "Personal info" msgstr "Informazioni personali" -#: admin.py:29 +#: admin.py:42 msgid "Permissions" msgstr "Permessi" -#: admin.py:30 +#: admin.py:44 msgid "Important dates" msgstr "Date importanti" -#: admin.py:31 -msgid "Groups" -msgstr "Gruppi" - -#: admin.py:113 +#: admin.py:125 msgid "Password changed successfully." msgstr "La password è stata cambiata correttamente." -#: admin.py:123 +#: admin.py:135 #, python-format msgid "Change password: %s" msgstr "Cambia la password: %s" -#: forms.py:14 forms.py:48 forms.py:66 -msgid "Username" -msgstr "Nome utente" - -#: forms.py:15 forms.py:49 -msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." -msgstr "Obbligatorio. 30 caratteri o meno. Solo lettere, cifre e @/./+/-/_ ." - -#: forms.py:16 forms.py:50 -msgid "This value may contain only letters, numbers and @/./+/-/_ characters." -msgstr "Questo valore può contenere solo lettere, cifre e @/./+/-/_ ." - -#: forms.py:17 forms.py:67 forms.py:193 -msgid "Password" -msgstr "Password" - -#: forms.py:18 -msgid "Password confirmation" -msgstr "Conferma password" - -#: forms.py:19 -msgid "Enter the same password as above, for verification." -msgstr "Inserisci la stessa password inserita sopra, come verifica." - -#: forms.py:31 +#: forms.py:58 msgid "A user with that username already exists." msgstr "Un utente con questo nome è già presente." -#: forms.py:37 forms.py:163 forms.py:205 +#: forms.py:59 forms.py:247 forms.py:304 msgid "The two password fields didn't match." msgstr "I due campi password non corrispondono." -#: forms.py:87 +#: forms.py:61 forms.py:106 forms.py:135 +msgid "Username" +msgstr "Nome utente" + +#: forms.py:63 forms.py:107 +msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." +msgstr "Obbligatorio. 30 caratteri o meno. Solo lettere, cifre e @/./+/-/_ ." + +#: forms.py:66 forms.py:110 +msgid "This value may contain only letters, numbers and @/./+/-/_ characters." +msgstr "Questo valore può contenere solo lettere, cifre e @/./+/-/_ ." + +#: forms.py:68 forms.py:112 forms.py:136 forms.py:306 +msgid "Password" +msgstr "Password" + +#: forms.py:70 +msgid "Password confirmation" +msgstr "Conferma password" + +#: forms.py:72 +msgid "Enter the same password as above, for verification." +msgstr "Inserisci la stessa password inserita sopra, come verifica." + +#: forms.py:113 +msgid "" +"Raw passwords are not stored, so there is no way to see this user's " +"password, but you can change the password using this " +"form." +msgstr "" +"Le password originarie non vengono conservate, quindi non c'è modo di vedere " +"la password di questo utente, ma è possibile modificare la password usando " +"questa form." + +#: forms.py:139 msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." @@ -79,11 +90,7 @@ msgstr "" "Inserisci nome utente e password corretti. In entrambi i campi le maiuscole " "sono significative." -#: forms.py:89 -msgid "This account is inactive." -msgstr "Questo account non è attivo." - -#: forms.py:96 +#: forms.py:141 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." @@ -91,11 +98,11 @@ msgstr "" "Il browser web sembra non avere i cookie abilitati. I cookie sono necessari " "per poter accedere." -#: forms.py:108 -msgid "E-mail" -msgstr "E-mail" +#: forms.py:143 +msgid "This account is inactive." +msgstr "Questo account non è attivo." -#: forms.py:117 +#: forms.py:187 msgid "" "That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" @@ -103,102 +110,126 @@ msgstr "" "Questo indirizzo email non è associato ad alcun account utente. Sei sicuro " "di esserti registrato?" -#: forms.py:143 -#, python-format -msgid "Password reset on %s" -msgstr "Password reimpostata su %s" +#: forms.py:189 +msgid "" +"The user account associated with this e-mail address cannot reset the " +"password." +msgstr "" +"L'account utente associato con quest'indirizzo email non può resettare la " +"password." -#: forms.py:151 +#: forms.py:192 +msgid "E-mail" +msgstr "E-mail" + +#: forms.py:249 msgid "New password" msgstr "Nuova password" -#: forms.py:152 +#: forms.py:251 msgid "New password confirmation" msgstr "Conferma nuova password" -#: forms.py:177 -msgid "Old password" -msgstr "Password attuale" - -#: forms.py:185 +#: forms.py:280 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "" "La password attuale non è stata inserita correttamente: va inserita di nuovo." -#: forms.py:194 +#: forms.py:283 +msgid "Old password" +msgstr "Password attuale" + +#: forms.py:308 msgid "Password (again)" msgstr "Password (di nuovo)" -#: models.py:76 models.py:104 +#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355 +#: hashers.py:389 +msgid "algorithm" +msgstr "algoritmo" + +#: hashers.py:219 +msgid "iterations" +msgstr "iterazioni" + +#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390 +msgid "salt" +msgstr "salt" + +#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391 +msgid "hash" +msgstr "hash" + +#: hashers.py:270 +msgid "work factor" +msgstr "work factor" + +#: hashers.py:272 +msgid "checksum" +msgstr "checksum" + +#: models.py:66 models.py:113 msgid "name" msgstr "nome" -#: models.py:78 +#: models.py:68 msgid "codename" msgstr "nome in codice" -#: models.py:82 +#: models.py:72 msgid "permission" msgstr "permesso" -#: models.py:83 models.py:105 +#: models.py:73 models.py:115 msgid "permissions" msgstr "permessi" -#: models.py:108 +#: models.py:120 msgid "group" msgstr "gruppo" -#: models.py:109 models.py:216 +#: models.py:121 models.py:250 msgid "groups" msgstr "gruppi" -#: models.py:206 +#: models.py:232 msgid "username" msgstr "nome utente" -#: models.py:206 +#: models.py:233 msgid "" "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters" msgstr "Obbligatorio. 30 caratteri o meno. Solo lettere, cifre e @/./+/-/_" -#: models.py:207 +#: models.py:235 msgid "first name" msgstr "nome" -#: models.py:208 +#: models.py:236 msgid "last name" msgstr "cognome" -#: models.py:209 +#: models.py:237 msgid "e-mail address" msgstr "indirizzo e-mail" -#: models.py:210 +#: models.py:238 msgid "password" msgstr "password" -#: models.py:210 -msgid "" -"Use '[algo]$[salt]$[hexdigest]' or use the change " -"password form." -msgstr "" -"Usa '[algo]$[salt]$[hexdigest]' oppure la maschera di " -"cambio password." - -#: models.py:211 +#: models.py:239 msgid "staff status" msgstr "privilegi di staff" -#: models.py:211 +#: models.py:240 msgid "Designates whether the user can log into this admin site." msgstr "Indica se l'utente può accedere a questo sito di amministrazione." -#: models.py:212 +#: models.py:242 msgid "active" msgstr "attivo" -#: models.py:212 +#: models.py:243 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." @@ -206,11 +237,11 @@ msgstr "" "Stabilisce se l'utente debba essere considerato attivo. Deseleziona qui, " "piuttosto che cancellare gli account." -#: models.py:213 +#: models.py:245 msgid "superuser status" msgstr "privilegi di superutente" -#: models.py:213 +#: models.py:246 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." @@ -218,42 +249,43 @@ msgstr "" "Stabilisce che l'utente ha tutti i privilegi, senza che siano stati " "assegnati esplicitamente." -#: models.py:214 +#: models.py:248 msgid "last login" msgstr "ultimo accesso" -#: models.py:215 +#: models.py:249 msgid "date joined" msgstr "iscritto in data" -#: models.py:217 +#: models.py:251 msgid "" -"In addition to the permissions manually assigned, this user will also get " -"all permissions granted to each group he/she is in." +"The groups this user belongs to. A user will get all permissions granted to " +"each of his/her group." msgstr "" -"In aggiunta ai privilegi assegnati manualmente, l'utente riceverà anche " -"tutti i privilegi assegnati ad ogni gruppo cui appartiene." +"I gruppi cui l'utente appartiene. Un utente otterrà tutte le autorizzazioni " +"concesse a ciascuno dei suoi gruppi." -#: models.py:218 +#: models.py:255 msgid "user permissions" msgstr "privilegi utente" -#: models.py:222 +#: models.py:260 msgid "user" msgstr "utente" -#: models.py:223 +#: models.py:261 msgid "users" msgstr "utenti" -#: models.py:406 -msgid "message" -msgstr "messaggio" - -#: views.py:91 +#: views.py:93 msgid "Logged out" msgstr "Accesso annullato" -#: management/commands/createsuperuser.py:23 +#: management/commands/createsuperuser.py:27 msgid "Enter a valid e-mail address." msgstr "Inserisci un indirizzo e-mail valido." + +#: templates/registration/password_reset_subject.txt:2 +#, python-format +msgid "Password reset on %(site_name)s" +msgstr "Password reset su %(site_name)s" diff --git a/django/contrib/auth/locale/ja/LC_MESSAGES/django.mo b/django/contrib/auth/locale/ja/LC_MESSAGES/django.mo index 0a2f1832d2e..0312764625d 100644 Binary files a/django/contrib/auth/locale/ja/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/ja/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/ja/LC_MESSAGES/django.po b/django/contrib/auth/locale/ja/LC_MESSAGES/django.po index ec1aa17fb2d..f13fccb20f8 100644 --- a/django/contrib/auth/locale/ja/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/ja/LC_MESSAGES/django.po @@ -1,90 +1,96 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Jannis Leidel , 2011. +# Shinya Okano , 2012. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:14-0400\n" -"PO-Revision-Date: 2011-03-04 18:41+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Japanese \n" +"POT-Creation-Date: 2012-03-14 00:15-0700\n" +"PO-Revision-Date: 2012-03-08 14:16+0000\n" +"Last-Translator: Shinya Okano \n" +"Language-Team: Japanese (http://www.transifex.net/projects/p/django/language/" +"ja/)\n" +"Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ja\n" "Plural-Forms: nplurals=1; plural=0\n" -#: admin.py:28 +#: admin.py:41 msgid "Personal info" msgstr "個人情報" -#: admin.py:29 +#: admin.py:42 msgid "Permissions" msgstr "パーミッション" -#: admin.py:30 +#: admin.py:44 msgid "Important dates" msgstr "重要な日程" -#: admin.py:31 -msgid "Groups" -msgstr "グループ" - -#: admin.py:113 +#: admin.py:125 msgid "Password changed successfully." msgstr "パスワードを変更しました" -#: admin.py:123 +#: admin.py:135 #, python-format msgid "Change password: %s" msgstr "パスワードの変更: %s" -#: forms.py:14 forms.py:48 forms.py:66 +#: forms.py:58 +msgid "A user with that username already exists." +msgstr "同じユーザ名が既に登録済みです。" + +#: forms.py:59 forms.py:247 forms.py:304 +msgid "The two password fields didn't match." +msgstr "確認用パスワードが一致しません。" + +#: forms.py:61 forms.py:106 forms.py:135 msgid "Username" msgstr "ユーザ名" -#: forms.py:15 forms.py:49 +#: forms.py:63 forms.py:107 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." msgstr "" "この項目は必須です。半角アルファベット、半角数字、@/./+/-/_ で30文字以下にし" "てください。" -#: forms.py:16 forms.py:50 +#: forms.py:66 forms.py:110 msgid "This value may contain only letters, numbers and @/./+/-/_ characters." msgstr "半角の英数字および次の記号 @/./+/-/_ 以外は使用できません。" -#: forms.py:17 forms.py:67 forms.py:193 +#: forms.py:68 forms.py:112 forms.py:136 forms.py:306 msgid "Password" msgstr "パスワード" -#: forms.py:18 +#: forms.py:70 msgid "Password confirmation" msgstr "パスワードの確認" -#: forms.py:19 +#: forms.py:72 msgid "Enter the same password as above, for verification." msgstr "確認のため、再度パスワードを入力してください。" -#: forms.py:31 -msgid "A user with that username already exists." -msgstr "同じユーザ名が既に登録済みです。" +#: forms.py:113 +msgid "" +"Raw passwords are not stored, so there is no way to see this user's " +"password, but you can change the password using this " +"form." +msgstr "" +"生のパスワードが格納されているので、このユーザのパスワードは参照できません" +"が、 このフォーム を使用してパスワードを変更できま" +"す 。" -#: forms.py:37 forms.py:163 forms.py:205 -msgid "The two password fields didn't match." -msgstr "確認用パスワードが一致しません。" - -#: forms.py:87 +#: forms.py:139 msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." msgstr "" "正しいユーザ名とパスワードを入力してください (大文字小文字は区別します) 。" -#: forms.py:89 -msgid "This account is inactive." -msgstr "アカウントが無効です。" - -#: forms.py:96 +#: forms.py:141 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." @@ -92,113 +98,137 @@ msgstr "" "お使いのブラウザはクッキーを有効にしていないようです。ログインにはクッキーが" "必要です。" -#: forms.py:108 -msgid "E-mail" -msgstr "メールアドレス" +#: forms.py:143 +msgid "This account is inactive." +msgstr "アカウントが無効です。" -#: forms.py:117 +#: forms.py:187 msgid "" "That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" msgstr "メールアドレスの一致するユーザはいません。本当に登録しましたか？" -#: forms.py:143 -#, python-format -msgid "Password reset on %s" -msgstr "%s のパスワードのリセット" +#: forms.py:189 +msgid "" +"The user account associated with this e-mail address cannot reset the " +"password." +msgstr "" +"この電子メールアドレスに関連付けられたユーザーアカウントはパスワードをリセッ" +"トすることはできません。" -#: forms.py:151 +#: forms.py:192 +msgid "E-mail" +msgstr "メールアドレス" + +#: forms.py:249 msgid "New password" msgstr "新しいパスワード" -#: forms.py:152 +#: forms.py:251 msgid "New password confirmation" msgstr "新しいパスワード(確認用)" -#: forms.py:177 -msgid "Old password" -msgstr "元のパスワード" - -#: forms.py:185 +#: forms.py:280 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "元のパスワードが間違っています。もう一度入力してください。" -#: forms.py:194 +#: forms.py:283 +msgid "Old password" +msgstr "元のパスワード" + +#: forms.py:308 msgid "Password (again)" msgstr "パスワード(確認用)" -#: models.py:76 models.py:104 +#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355 +#: hashers.py:389 +msgid "algorithm" +msgstr "アルゴリズム" + +#: hashers.py:219 +msgid "iterations" +msgstr "イテレーション" + +#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390 +msgid "salt" +msgstr "ソルト" + +#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391 +msgid "hash" +msgstr "ハッシュ" + +#: hashers.py:270 +msgid "work factor" +msgstr "ワークファクター" + +#: hashers.py:272 +msgid "checksum" +msgstr "チェックサム" + +#: models.py:66 models.py:113 msgid "name" msgstr "名前" -#: models.py:78 +#: models.py:68 msgid "codename" msgstr "コード名" -#: models.py:82 +#: models.py:72 msgid "permission" msgstr "パーミッション" -#: models.py:83 models.py:105 +#: models.py:73 models.py:115 msgid "permissions" msgstr "パーミッション" -#: models.py:108 +#: models.py:120 msgid "group" msgstr "グループ" -#: models.py:109 models.py:216 +#: models.py:121 models.py:250 msgid "groups" msgstr "グループ" -#: models.py:206 +#: models.py:232 msgid "username" msgstr "ユーザ名" -#: models.py:206 +#: models.py:233 msgid "" "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters" msgstr "" "この項目は必須です。半角アルファベット、半角数字、次の記号 @/./+/-/_ で30文字" "以下にしてください。" -#: models.py:207 +#: models.py:235 msgid "first name" msgstr "名" -#: models.py:208 +#: models.py:236 msgid "last name" msgstr "姓" -#: models.py:209 +#: models.py:237 msgid "e-mail address" msgstr "メールアドレス" -#: models.py:210 +#: models.py:238 msgid "password" msgstr "パスワード" -#: models.py:210 -msgid "" -"Use '[algo]$[salt]$[hexdigest]' or use the change " -"password form." -msgstr "" -"'[algo]$[salt]$[hexdigest]'形式か、パスワード変更フォー" -"ムを使ってください。" - -#: models.py:211 +#: models.py:239 msgid "staff status" msgstr "スタッフ権限" -#: models.py:211 +#: models.py:240 msgid "Designates whether the user can log into this admin site." msgstr "ユーザが管理サイトにログイン可能かどうかを示します。" -#: models.py:212 +#: models.py:242 msgid "active" msgstr "有効" -#: models.py:212 +#: models.py:243 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." @@ -206,52 +236,53 @@ msgstr "" "ユーザがアクティブかどうかを示します。アカウントを消す代わりに選択を解除して" "ください。" -#: models.py:213 +#: models.py:245 msgid "superuser status" msgstr "スーパーユーザ権限" -#: models.py:213 +#: models.py:246 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." msgstr "全ての権限を持っているとみなされます。" -#: models.py:214 +#: models.py:248 msgid "last login" msgstr "最終ログイン" -#: models.py:215 +#: models.py:249 msgid "date joined" msgstr "登録日" -#: models.py:217 +#: models.py:251 msgid "" -"In addition to the permissions manually assigned, this user will also get " -"all permissions granted to each group he/she is in." +"The groups this user belongs to. A user will get all permissions granted to " +"each of his/her group." msgstr "" -"手動で付与したパーミッションに加え、所属しているグループに付与された全ての" -"パーミッションを獲得します。" +"このユーザーが所属するグループ。ユーザーはグループのそれぞれに付与されている" +"すべての権限を持ちます。" -#: models.py:218 +#: models.py:255 msgid "user permissions" msgstr "ユーザパーミッション" -#: models.py:222 +#: models.py:260 msgid "user" msgstr "ユーザ" -#: models.py:223 +#: models.py:261 msgid "users" msgstr "ユーザ" -#: models.py:406 -msgid "message" -msgstr "メッセージ" - -#: views.py:91 +#: views.py:93 msgid "Logged out" msgstr "ログアウト" -#: management/commands/createsuperuser.py:23 +#: management/commands/createsuperuser.py:27 msgid "Enter a valid e-mail address." msgstr "有効なメールアドレスを入力してください。" + +#: templates/registration/password_reset_subject.txt:2 +#, python-format +msgid "Password reset on %(site_name)s" +msgstr "%(site_name)s のパスワードリセット" diff --git a/django/contrib/auth/locale/ka/LC_MESSAGES/django.mo b/django/contrib/auth/locale/ka/LC_MESSAGES/django.mo index d4f60e2367b..cd14f2d94ba 100644 Binary files a/django/contrib/auth/locale/ka/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/ka/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/ka/LC_MESSAGES/django.po b/django/contrib/auth/locale/ka/LC_MESSAGES/django.po index e775d4cd9ec..acb216109b8 100644 --- a/django/contrib/auth/locale/ka/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/ka/LC_MESSAGES/django.po @@ -1,80 +1,86 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Jannis Leidel , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:14-0400\n" -"PO-Revision-Date: 2011-03-14 21:09+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Georgian \n" +"POT-Creation-Date: 2012-03-14 00:15-0700\n" +"PO-Revision-Date: 2012-03-08 12:07+0000\n" +"Last-Translator: Jannis Leidel \n" +"Language-Team: Georgian (http://www.transifex.net/projects/p/django/language/" +"ka/)\n" +"Language: ka\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ka\n" "Plural-Forms: nplurals=1; plural=0\n" -#: admin.py:28 +#: admin.py:41 msgid "Personal info" msgstr "პირადი ინფორმაცია" -#: admin.py:29 +#: admin.py:42 msgid "Permissions" msgstr "უფლებები" -#: admin.py:30 +#: admin.py:44 msgid "Important dates" msgstr "მნიშვნელოვანი თარიღები" -#: admin.py:31 -msgid "Groups" -msgstr "ჯგუფები" - -#: admin.py:113 +#: admin.py:125 msgid "Password changed successfully." msgstr "პაროლი წარმატებით შეიცვალა." -#: admin.py:123 +#: admin.py:135 #, python-format msgid "Change password: %s" msgstr "შევცვალოთ პაროლი: %s" -#: forms.py:14 forms.py:48 forms.py:66 +#: forms.py:58 +msgid "A user with that username already exists." +msgstr "მომხმარებელი ამ სახელით უკვე არსებობს." + +#: forms.py:59 forms.py:247 forms.py:304 +msgid "The two password fields didn't match." +msgstr "პაროლის ორი ველი ერთმანეთს არ ემთხვევა." + +#: forms.py:61 forms.py:106 forms.py:135 msgid "Username" msgstr "მომხმარებელი" -#: forms.py:15 forms.py:49 +#: forms.py:63 forms.py:107 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." msgstr "" "აუცილებელია. 30-მდე სიმბოლო. მხოლოდ ლათინური ასოები, ციფრები და შემდეგი " "სიმბოლოები: @/./+/-/_." -#: forms.py:16 forms.py:50 +#: forms.py:66 forms.py:110 msgid "This value may contain only letters, numbers and @/./+/-/_ characters." msgstr "" "დასაშვებია მხოლოდ ლათინური ასოები, ციფრები და შემდეგი სიმბოლოები: @/./+/-/_." -#: forms.py:17 forms.py:67 forms.py:193 +#: forms.py:68 forms.py:112 forms.py:136 forms.py:306 msgid "Password" msgstr "პაროლი" -#: forms.py:18 +#: forms.py:70 msgid "Password confirmation" msgstr "პაროლის დამოწმება" -#: forms.py:19 +#: forms.py:72 msgid "Enter the same password as above, for verification." msgstr "შეიყვანეთ იგივე პაროლი, დამოწმებისათვის." -#: forms.py:31 -msgid "A user with that username already exists." -msgstr "მომხმარებელი ამ სახელით უკვე არსებობს." +#: forms.py:113 +msgid "" +"Raw passwords are not stored, so there is no way to see this user's " +"password, but you can change the password using this " +"form." +msgstr "" -#: forms.py:37 forms.py:163 forms.py:205 -msgid "The two password fields didn't match." -msgstr "პაროლის ორი ველი ერთმანეთს არ ემთხვევა." - -#: forms.py:87 +#: forms.py:139 msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." @@ -82,22 +88,18 @@ msgstr "" "გთხოვთ, შეიყვანოთ სწორი მომხმარებლის სახელი და პაროლი. გაითვალისწინეთ, რომ " "ორივე ველი დამოკიდებულია რეგისტრზე." -#: forms.py:89 -msgid "This account is inactive." -msgstr "თქვენი ანგარიში არააქტიურია." - -#: forms.py:96 +#: forms.py:141 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." msgstr "" "თქვენი ბროუზერი არ ღებულობს cookie-ებს. Cookie საჭიროა საიტზე შესასვლელად." -#: forms.py:108 -msgid "E-mail" -msgstr "ელ. ფოსტა" +#: forms.py:143 +msgid "This account is inactive." +msgstr "თქვენი ანგარიში არააქტიურია." -#: forms.py:117 +#: forms.py:187 msgid "" "That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" @@ -105,104 +107,126 @@ msgstr "" "ელ.ფოსტის ეს მისამართი არ შეესაბამება არცერთ მომხმარებელს. ნამდვილად ხართ " "დარეგისტრირებული?" -#: forms.py:143 -#, python-format -msgid "Password reset on %s" -msgstr "პაროლი შეცვლილია: %s" +#: forms.py:189 +msgid "" +"The user account associated with this e-mail address cannot reset the " +"password." +msgstr "" -#: forms.py:151 +#: forms.py:192 +msgid "E-mail" +msgstr "ელ. ფოსტა" + +#: forms.py:249 msgid "New password" msgstr "ახალი პაროლი" -#: forms.py:152 +#: forms.py:251 msgid "New password confirmation" msgstr "ახალი პაროლის დამოწმება" -#: forms.py:177 -msgid "Old password" -msgstr "ძველი პაროლი" - -#: forms.py:185 +#: forms.py:280 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "თქვენი ძველი პაროლი შეყვანილია არასწორად. გთხოვთ, შეიყვანოთ ხელახლა." -#: forms.py:194 +#: forms.py:283 +msgid "Old password" +msgstr "ძველი პაროლი" + +#: forms.py:308 msgid "Password (again)" msgstr "პაროლი (განმეორებით)" -#: models.py:76 models.py:104 +#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355 +#: hashers.py:389 +msgid "algorithm" +msgstr "" + +#: hashers.py:219 +msgid "iterations" +msgstr "" + +#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390 +msgid "salt" +msgstr "" + +#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391 +msgid "hash" +msgstr "" + +#: hashers.py:270 +msgid "work factor" +msgstr "" + +#: hashers.py:272 +msgid "checksum" +msgstr "" + +#: models.py:66 models.py:113 msgid "name" msgstr "სახელი" -#: models.py:78 +#: models.py:68 msgid "codename" msgstr "კოდური სახელი" -#: models.py:82 +#: models.py:72 msgid "permission" msgstr "უფლება" -#: models.py:83 models.py:105 +#: models.py:73 models.py:115 msgid "permissions" msgstr "უფლებები" -#: models.py:108 +#: models.py:120 msgid "group" msgstr "ჯგუფი" -#: models.py:109 models.py:216 +#: models.py:121 models.py:250 msgid "groups" msgstr "ჯგუფები" -#: models.py:206 +#: models.py:232 msgid "username" msgstr "მომხმარებლის სახელი" -#: models.py:206 +#: models.py:233 msgid "" "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters" msgstr "" "აუცილებელია. 30-მდე სიმბოლო. მხოლოდ ლათინური ასოები, ციფრები და შემდეგი " "სიმბოლოები: @/./+/-/_." -#: models.py:207 +#: models.py:235 msgid "first name" msgstr "სახელი" -#: models.py:208 +#: models.py:236 msgid "last name" msgstr "გვარი" -#: models.py:209 +#: models.py:237 msgid "e-mail address" msgstr "ელ. ფოსტა" -#: models.py:210 +#: models.py:238 msgid "password" msgstr "პაროლი" -#: models.py:210 -msgid "" -"Use '[algo]$[salt]$[hexdigest]' or use the change " -"password form." -msgstr "" -"გამოიყენეთ '[algo]$[salt]$[hexdigest]' ან პაროლის " -"შეცვლის ფორმა." - -#: models.py:211 +#: models.py:239 msgid "staff status" msgstr "თანამშრომლობის სტატუსი" -#: models.py:211 +#: models.py:240 msgid "Designates whether the user can log into this admin site." msgstr "" "განსაზღვრავს, აქვს თუ არა მომხმარებელს ადმინისტრირების საიტზე შესვლის უფლება." -#: models.py:212 +#: models.py:242 msgid "active" msgstr "აქტიურია" -#: models.py:212 +#: models.py:243 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." @@ -210,52 +234,51 @@ msgstr "" "განსაზღვრავს, რომ მომხმარებელი გააქტიურებულია. მომხმარებლის წაშლის მაგივრად " "გადანიშნეთ ეს დროშა." -#: models.py:213 +#: models.py:245 msgid "superuser status" msgstr "სუპერმომხმარებლის სტატუსი" -#: models.py:213 +#: models.py:246 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." msgstr "განსაზღვრავს, რომ ამ მომხმარებელს აქვს ყველა უფლება." -#: models.py:214 +#: models.py:248 msgid "last login" msgstr "ბოლო შესვლა" -#: models.py:215 +#: models.py:249 msgid "date joined" msgstr "გაწევრიანების თარიღი" -#: models.py:217 +#: models.py:251 msgid "" -"In addition to the permissions manually assigned, this user will also get " -"all permissions granted to each group he/she is in." +"The groups this user belongs to. A user will get all permissions granted to " +"each of his/her group." msgstr "" -"ინდივიდუალურად მითითებული უფლებების გარდა, ეს მომხმარებელი მიიღებს აგრეთვე " -"ყველა იმ ჯგუფის უფლებას, რომელშიც იგი გაწევრიანებულია." -#: models.py:218 +#: models.py:255 msgid "user permissions" msgstr "მომხმარებლის უფლებები" -#: models.py:222 +#: models.py:260 msgid "user" msgstr "მომხმარებელი" -#: models.py:223 +#: models.py:261 msgid "users" msgstr "მომხმარებლები" -#: models.py:406 -msgid "message" -msgstr "შეტყობინება" - -#: views.py:91 +#: views.py:93 msgid "Logged out" msgstr "გამოსული ხართ" -#: management/commands/createsuperuser.py:23 +#: management/commands/createsuperuser.py:27 msgid "Enter a valid e-mail address." msgstr "შეიყვანეთ სწორი ელ. ფოსტის მისამართი." + +#: templates/registration/password_reset_subject.txt:2 +#, python-format +msgid "Password reset on %(site_name)s" +msgstr "" diff --git a/django/contrib/auth/locale/km/LC_MESSAGES/django.mo b/django/contrib/auth/locale/km/LC_MESSAGES/django.mo index 293b6bbaea5..63d85c4bbe6 100644 Binary files a/django/contrib/auth/locale/km/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/km/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/km/LC_MESSAGES/django.po b/django/contrib/auth/locale/km/LC_MESSAGES/django.po index a915bae682d..57e31eb6468 100644 --- a/django/contrib/auth/locale/km/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/km/LC_MESSAGES/django.po @@ -1,87 +1,88 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Jannis Leidel , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:14-0400\n" -"PO-Revision-Date: 2011-03-04 18:41+0000\n" -"Last-Translator: Jannis \n" +"POT-Creation-Date: 2012-03-14 00:15-0700\n" +"PO-Revision-Date: 2012-03-08 12:07+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: English \n" +"Language: km\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: km\n" "Plural-Forms: nplurals=1; plural=0\n" -#: admin.py:28 +#: admin.py:41 msgid "Personal info" msgstr "ព័ត៌មានផ្ទាល់ខ្លួន" -#: admin.py:29 +#: admin.py:42 msgid "Permissions" msgstr "ការអនុញ្ញាត" -#: admin.py:30 +#: admin.py:44 msgid "Important dates" msgstr "កាលបរិច្ឆេទសំខាន់" -#: admin.py:31 -msgid "Groups" -msgstr "ក្រុម" - -#: admin.py:113 +#: admin.py:125 msgid "Password changed successfully." msgstr "" -#: admin.py:123 +#: admin.py:135 #, python-format msgid "Change password: %s" msgstr "" -#: forms.py:14 forms.py:48 forms.py:66 -msgid "Username" -msgstr "ឈ្មោះជាសមាជិក" - -#: forms.py:15 forms.py:49 -msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." -msgstr "" - -#: forms.py:16 forms.py:50 -msgid "This value may contain only letters, numbers and @/./+/-/_ characters." -msgstr "" - -#: forms.py:17 forms.py:67 forms.py:193 -msgid "Password" -msgstr "ពាក្យសំងាត់" - -#: forms.py:18 -msgid "Password confirmation" -msgstr "" - -#: forms.py:19 -msgid "Enter the same password as above, for verification." -msgstr "សូមបំពេញពាក្យសំងាត់ដូចខាងលើ ដើម្បីត្រួតពិនិត្យ។ " - -#: forms.py:31 +#: forms.py:58 msgid "A user with that username already exists." msgstr "" -#: forms.py:37 forms.py:163 forms.py:205 +#: forms.py:59 forms.py:247 forms.py:304 msgid "The two password fields didn't match." msgstr "" -#: forms.py:87 +#: forms.py:61 forms.py:106 forms.py:135 +msgid "Username" +msgstr "ឈ្មោះជាសមាជិក" + +#: forms.py:63 forms.py:107 +msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." +msgstr "" + +#: forms.py:66 forms.py:110 +msgid "This value may contain only letters, numbers and @/./+/-/_ characters." +msgstr "" + +#: forms.py:68 forms.py:112 forms.py:136 forms.py:306 +msgid "Password" +msgstr "ពាក្យសំងាត់" + +#: forms.py:70 +msgid "Password confirmation" +msgstr "" + +#: forms.py:72 +msgid "Enter the same password as above, for verification." +msgstr "សូមបំពេញពាក្យសំងាត់ដូចខាងលើ ដើម្បីត្រួតពិនិត្យ។ " + +#: forms.py:113 +msgid "" +"Raw passwords are not stored, so there is no way to see this user's " +"password, but you can change the password using this " +"form." +msgstr "" + +#: forms.py:139 msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." msgstr "សូមបំពេញ ឈ្មោះសមាជិក និង ពាក្យសំងាត់ ។ " -#: forms.py:89 -msgid "This account is inactive." -msgstr "ឈ្មោះសមាជិកនេះ​លែងដំណើរការ" - -#: forms.py:96 +#: forms.py:141 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." @@ -89,160 +90,183 @@ msgstr "" "កម្មវិធីសំរាប់មើលគេហទំព័រនេះហាក់បីដូចជាមិនទាន់បានទទួលយកគុគី ។ ចាំបាច់ត្រូវកំណត់អោយ​" "កម្មវិធីសំរាប់មើលគេហទំព័រទទួល​យក គុគី ដើម្បីពិនិត្យចូល ។" -#: forms.py:108 -msgid "E-mail" -msgstr "" +#: forms.py:143 +msgid "This account is inactive." +msgstr "ឈ្មោះសមាជិកនេះ​លែងដំណើរការ" -#: forms.py:117 +#: forms.py:187 msgid "" "That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" msgstr "អ៊ីមែល នេះ មិនមាន​នៅក្នុង​ទិន្នន័យ​របស់​យើង​ខ្ញុំ​ទេ។" -#: forms.py:143 -#, python-format -msgid "Password reset on %s" +#: forms.py:189 +msgid "" +"The user account associated with this e-mail address cannot reset the " +"password." msgstr "" -#: forms.py:151 +#: forms.py:192 +msgid "E-mail" +msgstr "" + +#: forms.py:249 msgid "New password" msgstr "" -#: forms.py:152 +#: forms.py:251 msgid "New password confirmation" msgstr "" -#: forms.py:177 -msgid "Old password" -msgstr "" - -#: forms.py:185 +#: forms.py:280 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "" -#: forms.py:194 +#: forms.py:283 +msgid "Old password" +msgstr "" + +#: forms.py:308 msgid "Password (again)" msgstr "ពាក្យសំងាត់ (ម្តងទៀត)" -#: models.py:76 models.py:104 +#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355 +#: hashers.py:389 +msgid "algorithm" +msgstr "" + +#: hashers.py:219 +msgid "iterations" +msgstr "" + +#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390 +msgid "salt" +msgstr "" + +#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391 +msgid "hash" +msgstr "" + +#: hashers.py:270 +msgid "work factor" +msgstr "" + +#: hashers.py:272 +msgid "checksum" +msgstr "" + +#: models.py:66 models.py:113 msgid "name" msgstr "ឈ្មោះ" -#: models.py:78 +#: models.py:68 msgid "codename" msgstr "ឈ្មោះលេខកូត" -#: models.py:82 +#: models.py:72 msgid "permission" msgstr "អនុញ្ញាត" -#: models.py:83 models.py:105 +#: models.py:73 models.py:115 msgid "permissions" msgstr "អនុញ្ញាត" -#: models.py:108 +#: models.py:120 msgid "group" msgstr "ក្រុម" -#: models.py:109 models.py:216 +#: models.py:121 models.py:250 msgid "groups" msgstr "ក្រុម" -#: models.py:206 +#: models.py:232 msgid "username" msgstr "ឈ្មោះជាសមាជិក" -#: models.py:206 +#: models.py:233 msgid "" "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters" msgstr "" -#: models.py:207 +#: models.py:235 msgid "first name" msgstr "នាម" -#: models.py:208 +#: models.py:236 msgid "last name" msgstr "គោត្តនាម" -#: models.py:209 +#: models.py:237 msgid "e-mail address" msgstr "អ៊ីមែល" -#: models.py:210 +#: models.py:238 msgid "password" msgstr "ពាក្យសំងាត់" -#: models.py:210 -msgid "" -"Use '[algo]$[salt]$[hexdigest]' or use the change " -"password form." -msgstr "" - -#: models.py:211 +#: models.py:239 msgid "staff status" msgstr "ស្ថានភាពបុគ្គលិក" -#: models.py:211 +#: models.py:240 msgid "Designates whether the user can log into this admin site." msgstr "កំណត់អោយសមាជិកអាចចូលមកប្រើប្រាស់ទំព័រគ្រប់គ្រងនេះ។" -#: models.py:212 +#: models.py:242 msgid "active" msgstr "សកម្ម" -#: models.py:212 +#: models.py:243 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." msgstr "" -#: models.py:213 +#: models.py:245 msgid "superuser status" msgstr "ស្ថានភាពអ្នកគ្រងគ្រង" -#: models.py:213 +#: models.py:246 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." msgstr "កំណត់អោយសមាជិកនេះមានសិទ្ធិទាំងអស់។" -#: models.py:214 +#: models.py:248 msgid "last login" msgstr "ការពិនិត្យចូលកន្លងមក" -#: models.py:215 +#: models.py:249 msgid "date joined" msgstr "កាលបរិច្ឆេទចូលរួម" -#: models.py:217 +#: models.py:251 msgid "" -"In addition to the permissions manually assigned, this user will also get " -"all permissions granted to each group he/she is in." +"The groups this user belongs to. A user will get all permissions granted to " +"each of his/her group." msgstr "" -"បន្ថែមចំពោះសិទ្ធិដែលគេបាន​ផ្តល់​អោយ សមាជិកនេះអាចទទួលបានសិទ្ធិទាំងអស់​ដែលកំណត់​សំរាប់​ក្រុម​" -" ដែលសមាជិកនេះស្ថិតនៅ។" -#: models.py:218 +#: models.py:255 msgid "user permissions" msgstr "ការអនុញ្ញាតអោយសមាជិក" -#: models.py:222 +#: models.py:260 msgid "user" msgstr "សមាជិក" -#: models.py:223 +#: models.py:261 msgid "users" msgstr "សមាជិក" -#: models.py:406 -msgid "message" -msgstr "អត្ថបទ" - -#: views.py:91 +#: views.py:93 msgid "Logged out" msgstr "ចាកចេញ" -#: management/commands/createsuperuser.py:23 +#: management/commands/createsuperuser.py:27 msgid "Enter a valid e-mail address." msgstr "សូមបំពេញអ៊ីមែល" + +#: templates/registration/password_reset_subject.txt:2 +#, python-format +msgid "Password reset on %(site_name)s" +msgstr "" diff --git a/django/contrib/auth/locale/kn/LC_MESSAGES/django.mo b/django/contrib/auth/locale/kn/LC_MESSAGES/django.mo index d9f920bdc18..0fcb49ffcb9 100644 Binary files a/django/contrib/auth/locale/kn/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/kn/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/kn/LC_MESSAGES/django.po b/django/contrib/auth/locale/kn/LC_MESSAGES/django.po index d1364218e04..ed4b2eda0c5 100644 --- a/django/contrib/auth/locale/kn/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/kn/LC_MESSAGES/django.po @@ -1,77 +1,84 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Jannis Leidel , 2011. +# , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:14-0400\n" -"PO-Revision-Date: 2011-03-04 18:41+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Kannada \n" +"POT-Creation-Date: 2012-03-14 00:15-0700\n" +"PO-Revision-Date: 2012-03-08 12:07+0000\n" +"Last-Translator: karthikbgl \n" +"Language-Team: Kannada (http://www.transifex.net/projects/p/django/language/" +"kn/)\n" +"Language: kn\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: kn\n" "Plural-Forms: nplurals=1; plural=0\n" -#: admin.py:28 +#: admin.py:41 msgid "Personal info" msgstr "ವೈಯುಕ್ತಿಕ ಮಾಹಿತಿ" -#: admin.py:29 +#: admin.py:42 msgid "Permissions" msgstr "ಅನುಮತಿಗಳು" -#: admin.py:30 +#: admin.py:44 msgid "Important dates" msgstr "ಮಹತ್ವದ ದಿನಾಂಕಗಳು" -#: admin.py:31 -msgid "Groups" -msgstr "ಗುಂಪುಗಳು" - -#: admin.py:113 +#: admin.py:125 msgid "Password changed successfully." -msgstr "" +msgstr "ಪಾಸ್ವರ್ಡ್ ಸಫಲವಾಗಿ ಬದಲಾಯಿಸಲಾಯಿತು" -#: admin.py:123 +#: admin.py:135 #, python-format msgid "Change password: %s" -msgstr "" +msgstr "ಪಾಸ್ವರ್ಡ್ ಬದಲಾಯಿಸಲು: %s" -#: forms.py:14 forms.py:48 forms.py:66 +#: forms.py:58 +msgid "A user with that username already exists." +msgstr "ಆ ಬಳಕೆದಾರಹೆಸರು ಒಂದು ಬಳಕೆದಾರ ಈಗಾಗಲೇ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ." + +#: forms.py:59 forms.py:247 forms.py:304 +msgid "The two password fields didn't match." +msgstr "ಎರಡು ಪ್ರವೇಶಪದ ಕ್ಷೇತ್ರಗಳ ಹೊಂದಿಕೆಯಾಗುತ್ತಿಲ್ಲ" + +#: forms.py:61 forms.py:106 forms.py:135 msgid "Username" msgstr "ಬಳಕೆದಾರ-ಹೆಸರು" -#: forms.py:15 forms.py:49 +#: forms.py:63 forms.py:107 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." msgstr "" -#: forms.py:16 forms.py:50 +#: forms.py:66 forms.py:110 msgid "This value may contain only letters, numbers and @/./+/-/_ characters." msgstr "" -#: forms.py:17 forms.py:67 forms.py:193 +#: forms.py:68 forms.py:112 forms.py:136 forms.py:306 msgid "Password" msgstr "ಪ್ರವೇಶಪದ" -#: forms.py:18 +#: forms.py:70 msgid "Password confirmation" -msgstr "" +msgstr "ಪಾಸ್ವರ್ಡ್ ಖಚಿತತೆ" -#: forms.py:19 +#: forms.py:72 msgid "Enter the same password as above, for verification." msgstr "ಖಚಿತಗೊಳಿಸಲು ಮೇಲಿನ ಪ್ರವೇಶಪದವನ್ನು ಇನ್ನೊಮ್ಮೆ ಬರೆಯಿರಿ." -#: forms.py:31 -msgid "A user with that username already exists." +#: forms.py:113 +msgid "" +"Raw passwords are not stored, so there is no way to see this user's " +"password, but you can change the password using this " +"form." msgstr "" -#: forms.py:37 forms.py:163 forms.py:205 -msgid "The two password fields didn't match." -msgstr "" - -#: forms.py:87 +#: forms.py:139 msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." @@ -79,129 +86,149 @@ msgstr "" "ದಯವಿಟ್ಟು ಸರಿಯಾದ ಬಳಕೆದಾರ-ಪದ ಮತ್ತು ಪ್ರವೇಶಪದ ಬರೆಯಿರಿ .ಎರಡೂ ಇಂಗ್ಲೀಷಿನ ಸಣ್ಣ ಮತ್ತು " "ದೊಡ್ಡ ಅಕ್ಷರ ಸಂವೇದಿ ಎಂಬುದನ್ನು ಗಮನದಲ್ಲಿಡಿ" -#: forms.py:89 -msgid "This account is inactive." -msgstr "ಈ ಖಾತೆಯು ನಿಷ್ಕ್ರಿಯವಾಗಿದೆ" - -#: forms.py:96 +#: forms.py:141 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." msgstr "ನಿಮ್ಮ ಜಾಲವೀಕ್ಷಕದಲ್ಲಿ ಕುಕೀಗಳು ಸಕ್ರಿಯಗೊಳಿಸಲ್ಪಟ್ಟಂತಿಲ್ಲ. ಒಳಬರಲು ಕುಕೀಗಳು ಅಗತ್ಯ. " -#: forms.py:108 -msgid "E-mail" -msgstr "" +#: forms.py:143 +msgid "This account is inactive." +msgstr "ಈ ಖಾತೆಯು ನಿಷ್ಕ್ರಿಯವಾಗಿದೆ" -#: forms.py:117 +#: forms.py:187 msgid "" "That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" msgstr "" -#: forms.py:143 -#, python-format -msgid "Password reset on %s" +#: forms.py:189 +msgid "" +"The user account associated with this e-mail address cannot reset the " +"password." msgstr "" -#: forms.py:151 +#: forms.py:192 +msgid "E-mail" +msgstr "" + +#: forms.py:249 msgid "New password" -msgstr "" +msgstr "ಹೊಸ ಪ್ರವೇಶಪದ" -#: forms.py:152 +#: forms.py:251 msgid "New password confirmation" -msgstr "" +msgstr "ಹೊಸ ಪ್ರವೇಶಪದ ಖಚಿತತೆ" -#: forms.py:177 -msgid "Old password" -msgstr "" - -#: forms.py:185 +#: forms.py:280 msgid "Your old password was entered incorrectly. Please enter it again." -msgstr "" +msgstr "ನಿಮ್ಮ ಹಳೆಯ ಪ್ರವೇಶಪದ ತಪ್ಪಾಗಿ ಪ್ರವೇಶಿಸಲಾಗಿದೆ ಮತ್ತೆ ದಯವಿಟ್ಟು ನಮೂದಿಸಿ" -#: forms.py:194 +#: forms.py:283 +msgid "Old password" +msgstr "ಹಳೆಯ ಪ್ರವೇಶಪದ" + +#: forms.py:308 msgid "Password (again)" msgstr "ಪ್ರವೇಶಪದ(ಇನ್ನೊಮ್ಮೆ)" -#: models.py:76 models.py:104 +#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355 +#: hashers.py:389 +msgid "algorithm" +msgstr "" + +#: hashers.py:219 +msgid "iterations" +msgstr "" + +#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390 +msgid "salt" +msgstr "" + +#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391 +msgid "hash" +msgstr "" + +#: hashers.py:270 +msgid "work factor" +msgstr "" + +#: hashers.py:272 +msgid "checksum" +msgstr "" + +#: models.py:66 models.py:113 msgid "name" msgstr "ಹೆಸರು" -#: models.py:78 +#: models.py:68 msgid "codename" msgstr "ಸಾಂಕೇತಿಕ ಹೆಸರು" -#: models.py:82 +#: models.py:72 msgid "permission" msgstr "ಅನುಮತಿ" -#: models.py:83 models.py:105 +#: models.py:73 models.py:115 msgid "permissions" msgstr "ಅನುಮತಿಗಳು" -#: models.py:108 +#: models.py:120 msgid "group" msgstr "ಗುಂಪು" -#: models.py:109 models.py:216 +#: models.py:121 models.py:250 msgid "groups" msgstr "ಗುಂಪುಗಳು" -#: models.py:206 +#: models.py:232 msgid "username" msgstr "ಬಳಕೆದಾರ-ಹೆಸರು" -#: models.py:206 +#: models.py:233 msgid "" "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters" msgstr "" -#: models.py:207 +#: models.py:235 msgid "first name" msgstr "ಮೊದಲ ಹೆಸರು" -#: models.py:208 +#: models.py:236 msgid "last name" msgstr "ಕೊನೆಯ ಹೆಸರು" -#: models.py:209 +#: models.py:237 msgid "e-mail address" msgstr "ವಿ-ಅಂಚೆ ವಿಳಾಸ" -#: models.py:210 +#: models.py:238 msgid "password" msgstr "ಪ್ರವೇಶಪದ" -#: models.py:210 -msgid "" -"Use '[algo]$[salt]$[hexdigest]' or use the change " -"password form." -msgstr "" - -#: models.py:211 +#: models.py:239 msgid "staff status" msgstr "ಸಿಬ್ಬಂದಿ ಸ್ಥಿತಿ" -#: models.py:211 +#: models.py:240 msgid "Designates whether the user can log into this admin site." msgstr "ಬಲಕೆದಾರರು ಈ ಆಡಳಿತ ತಾಣಕ್ಕೆ ಪ್ರವೇಶಪಡೆಯಬಹುದೇ ಎಂಬುದನ್ನು ತಿಳಿಸುತ್ತದೆ." -#: models.py:212 +#: models.py:242 msgid "active" msgstr "ಸಕ್ರಿಯ" -#: models.py:212 +#: models.py:243 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." msgstr "" -#: models.py:213 +#: models.py:245 msgid "superuser status" msgstr "ಮಹಾಬಳಕೆದಾರನ ಸ್ಧಿತಿ" -#: models.py:213 +#: models.py:246 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." @@ -209,42 +236,41 @@ msgstr "" "ಈ ಸದಸ್ಯರು ಸುವ್ಯಕ್ತವಾಗಿ ನೀಡದಿದ್ದರೂ ಎಲ್ಲಾ ಅನುಮತಿಗಳನ್ನು ಪಡೆದಿರುವರು ಎಂಬುದನ್ನು " "ಸೂಚಿಸುತ್ತದೆ." -#: models.py:214 +#: models.py:248 msgid "last login" msgstr "ಕಡೇ ಸಾರಿ ಒಳಬಂದದ್ದು" -#: models.py:215 +#: models.py:249 msgid "date joined" msgstr "ಸೇರಿದ ದಿನಾಂಕ" -#: models.py:217 +#: models.py:251 msgid "" -"In addition to the permissions manually assigned, this user will also get " -"all permissions granted to each group he/she is in." +"The groups this user belongs to. A user will get all permissions granted to " +"each of his/her group." msgstr "" -"ವೈಯಕ್ತಿಕವಾಗಿ ನೀಡಲಾಗಿರುವ ಅನುಮತಿಗಳ ಜೊತೆಗೆ, ಈ ಸದಸ್ಯರು ತಮ್ಮ ಗುಂಪಿಗೆ ನೀಡಲಾಗಿರುವ " -"ಅನುಮತಿಗಳನ್ನೂ ಕೂಡ ಪಡೆಯುತ್ತಾರೆ." -#: models.py:218 +#: models.py:255 msgid "user permissions" msgstr "ಬಳಕೆದಾರ ಅನುಮತಿಗಳು" -#: models.py:222 +#: models.py:260 msgid "user" msgstr "ಬಳಕೆದಾರ" -#: models.py:223 +#: models.py:261 msgid "users" msgstr "ಬಳಕೆದಾರರು" -#: models.py:406 -msgid "message" -msgstr "ಸಂದೇಶ" - -#: views.py:91 +#: views.py:93 msgid "Logged out" msgstr "ಹೊರಬರಲಾಗಿದೆ" -#: management/commands/createsuperuser.py:23 +#: management/commands/createsuperuser.py:27 msgid "Enter a valid e-mail address." msgstr "ಕ್ರಮಬದ್ಧ ವಿ-ವಿಳಾಸವೊಂದನ್ನು ಇಲ್ಲಿ ಬರೆಯಿರಿ" + +#: templates/registration/password_reset_subject.txt:2 +#, python-format +msgid "Password reset on %(site_name)s" +msgstr "" diff --git a/django/contrib/auth/locale/ko/LC_MESSAGES/django.mo b/django/contrib/auth/locale/ko/LC_MESSAGES/django.mo index d85d99a50ab..0db1397df6a 100644 Binary files a/django/contrib/auth/locale/ko/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/ko/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/ko/LC_MESSAGES/django.po b/django/contrib/auth/locale/ko/LC_MESSAGES/django.po index 2951557f39e..cde31a34628 100644 --- a/django/contrib/auth/locale/ko/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/ko/LC_MESSAGES/django.po @@ -1,88 +1,90 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Jannis Leidel , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:14-0400\n" -"PO-Revision-Date: 2011-03-04 18:41+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Korean \n" +"POT-Creation-Date: 2012-03-14 00:15-0700\n" +"PO-Revision-Date: 2012-03-08 12:07+0000\n" +"Last-Translator: Jannis Leidel \n" +"Language-Team: Korean (http://www.transifex.net/projects/p/django/language/" +"ko/)\n" +"Language: ko\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ko\n" "Plural-Forms: nplurals=1; plural=0\n" -#: admin.py:28 +#: admin.py:41 msgid "Personal info" msgstr "개인정보" -#: admin.py:29 +#: admin.py:42 msgid "Permissions" msgstr "권한" -#: admin.py:30 +#: admin.py:44 msgid "Important dates" msgstr "중요한 일정" -#: admin.py:31 -msgid "Groups" -msgstr "그룹" - -#: admin.py:113 +#: admin.py:125 msgid "Password changed successfully." msgstr "비밀번호가 변경되었습니다." -#: admin.py:123 +#: admin.py:135 #, python-format msgid "Change password: %s" msgstr "비밀번호 변경: %s" -#: forms.py:14 forms.py:48 forms.py:66 +#: forms.py:58 +msgid "A user with that username already exists." +msgstr "해당 사용자명은 이미 존재합니다." + +#: forms.py:59 forms.py:247 forms.py:304 +msgid "The two password fields didn't match." +msgstr "비밀번호가 일치하지 않습니다." + +#: forms.py:61 forms.py:106 forms.py:135 msgid "Username" msgstr "사용자명" -#: forms.py:15 forms.py:49 +#: forms.py:63 forms.py:107 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." msgstr "" "필수항목입니다. 30자 이내로 입력하세요. (알파벳, 숫자, @/./+/-/_만 가능)" -#: forms.py:16 forms.py:50 +#: forms.py:66 forms.py:110 msgid "This value may contain only letters, numbers and @/./+/-/_ characters." msgstr "알파벳, 숫자 및 @/./+/-/_만 가능합니다." -#: forms.py:17 forms.py:67 forms.py:193 +#: forms.py:68 forms.py:112 forms.py:136 forms.py:306 msgid "Password" msgstr "비밀번호" -#: forms.py:18 +#: forms.py:70 msgid "Password confirmation" msgstr "비밀번호 확인" -#: forms.py:19 +#: forms.py:72 msgid "Enter the same password as above, for verification." msgstr "확인을 위해 위와 동일한 비밀번호를 입력하세요. " -#: forms.py:31 -msgid "A user with that username already exists." -msgstr "해당 사용자명은 이미 존재합니다." +#: forms.py:113 +msgid "" +"Raw passwords are not stored, so there is no way to see this user's " +"password, but you can change the password using this " +"form." +msgstr "" -#: forms.py:37 forms.py:163 forms.py:205 -msgid "The two password fields didn't match." -msgstr "비밀번호가 일치하지 않습니다." - -#: forms.py:87 +#: forms.py:139 msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." msgstr "사용자명과 비밀번호를 입력하세요. (대소문자 구별)" -#: forms.py:89 -msgid "This account is inactive." -msgstr "이 계정은 유효하지 않습니다." - -#: forms.py:96 +#: forms.py:141 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." @@ -90,112 +92,135 @@ msgstr "" "사용하시는 브라우저가 쿠키를 허용하지 않습니다.로그인하기 위해서는 쿠키 사용" "이 필요합니다." -#: forms.py:108 -msgid "E-mail" -msgstr "이메일 주소" +#: forms.py:143 +msgid "This account is inactive." +msgstr "이 계정은 유효하지 않습니다." -#: forms.py:117 +#: forms.py:187 msgid "" "That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" msgstr "" "이메일주소와 일치하는 사용자가 없습니다.이 이메일주소로 등록하셨습니까?" -#: forms.py:143 -#, python-format -msgid "Password reset on %s" -msgstr "%s에 대한 비밀번호 초기화" +#: forms.py:189 +msgid "" +"The user account associated with this e-mail address cannot reset the " +"password." +msgstr "" -#: forms.py:151 +#: forms.py:192 +msgid "E-mail" +msgstr "이메일 주소" + +#: forms.py:249 msgid "New password" msgstr "새 비밀번호:" -#: forms.py:152 +#: forms.py:251 msgid "New password confirmation" msgstr "새 비밀번호 확인:" -#: forms.py:177 -msgid "Old password" -msgstr "기존 비밀번호:" - -#: forms.py:185 +#: forms.py:280 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "기존 비밀번호를 잘못 입력하셨습니다. 다시 입력해 주세요." -#: forms.py:194 +#: forms.py:283 +msgid "Old password" +msgstr "기존 비밀번호:" + +#: forms.py:308 msgid "Password (again)" msgstr "비밀번호 (확인)" -#: models.py:76 models.py:104 +#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355 +#: hashers.py:389 +msgid "algorithm" +msgstr "" + +#: hashers.py:219 +msgid "iterations" +msgstr "" + +#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390 +msgid "salt" +msgstr "" + +#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391 +msgid "hash" +msgstr "" + +#: hashers.py:270 +msgid "work factor" +msgstr "" + +#: hashers.py:272 +msgid "checksum" +msgstr "" + +#: models.py:66 models.py:113 msgid "name" msgstr "이름" -#: models.py:78 +#: models.py:68 msgid "codename" msgstr "코드명" -#: models.py:82 +#: models.py:72 msgid "permission" msgstr "허가" -#: models.py:83 models.py:105 +#: models.py:73 models.py:115 msgid "permissions" msgstr "허가" -#: models.py:108 +#: models.py:120 msgid "group" msgstr "그룹" -#: models.py:109 models.py:216 +#: models.py:121 models.py:250 msgid "groups" msgstr "그룹" -#: models.py:206 +#: models.py:232 msgid "username" msgstr "사용자명" -#: models.py:206 +#: models.py:233 msgid "" "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters" msgstr "" "필수항목입니다. 30자 이내로 입력하세요. (알파벳, 숫자, @/./+/-/_만 가능)" -#: models.py:207 +#: models.py:235 msgid "first name" msgstr "이름" -#: models.py:208 +#: models.py:236 msgid "last name" msgstr "성" -#: models.py:209 +#: models.py:237 msgid "e-mail address" msgstr "이메일 주소" -#: models.py:210 +#: models.py:238 msgid "password" msgstr "비밀번호" -#: models.py:210 -msgid "" -"Use '[algo]$[salt]$[hexdigest]' or use the change " -"password form." -msgstr "" -"'[algo]$[salt]$[hexdigest]' 또는 비밀번호 변경" - -#: models.py:211 +#: models.py:239 msgid "staff status" msgstr "스태프 권한" -#: models.py:211 +#: models.py:240 msgid "Designates whether the user can log into this admin site." msgstr "사용자가 관리사이트에 로그인이 가능한지를 나타냅니다." -#: models.py:212 +#: models.py:242 msgid "active" msgstr "활성" -#: models.py:212 +#: models.py:243 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." @@ -203,50 +228,51 @@ msgstr "" "사용자가 'Django 관리'에 로그인이 가능한지를 나타냅니다.계정을 삭제하는 대신 " "이것을 선택 해제하세요." -#: models.py:213 +#: models.py:245 msgid "superuser status" msgstr "최상위 사용자 권한" -#: models.py:213 +#: models.py:246 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." msgstr "해당 사용자에게 모든 권한을 허가합니다." -#: models.py:214 +#: models.py:248 msgid "last login" msgstr "마지막 로그인" -#: models.py:215 +#: models.py:249 msgid "date joined" msgstr "등록일" -#: models.py:217 +#: models.py:251 msgid "" -"In addition to the permissions manually assigned, this user will also get " -"all permissions granted to each group he/she is in." -msgstr "해당 사용자에게 속해있는 그룹의 모든 권한을 허가합니다." +"The groups this user belongs to. A user will get all permissions granted to " +"each of his/her group." +msgstr "" -#: models.py:218 +#: models.py:255 msgid "user permissions" msgstr "사용자 권한" -#: models.py:222 +#: models.py:260 msgid "user" msgstr "사용자" -#: models.py:223 +#: models.py:261 msgid "users" msgstr "사용자(들)" -#: models.py:406 -msgid "message" -msgstr "메시지" - -#: views.py:91 +#: views.py:93 msgid "Logged out" msgstr "로그 아웃" -#: management/commands/createsuperuser.py:23 +#: management/commands/createsuperuser.py:27 msgid "Enter a valid e-mail address." msgstr "올바른 이메일 주소를 입력하세요." + +#: templates/registration/password_reset_subject.txt:2 +#, python-format +msgid "Password reset on %(site_name)s" +msgstr "" diff --git a/django/contrib/auth/locale/lt/LC_MESSAGES/django.mo b/django/contrib/auth/locale/lt/LC_MESSAGES/django.mo index 7e38b7fdbd9..ab37a731f97 100644 Binary files a/django/contrib/auth/locale/lt/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/lt/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/lt/LC_MESSAGES/django.po b/django/contrib/auth/locale/lt/LC_MESSAGES/django.po index a82fc29568c..ce21fc39fc9 100644 --- a/django/contrib/auth/locale/lt/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/lt/LC_MESSAGES/django.po @@ -1,80 +1,91 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Jannis Leidel , 2011. +# lauris , 2011. +# Simonas Simas , 2012. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:14-0400\n" -"PO-Revision-Date: 2011-03-06 09:41+0000\n" -"Last-Translator: lauris \n" -"Language-Team: Lithuanian \n" +"POT-Creation-Date: 2012-03-14 00:15-0700\n" +"PO-Revision-Date: 2012-03-09 16:03+0000\n" +"Last-Translator: Simonas Simas \n" +"Language-Team: Lithuanian (http://www.transifex.net/projects/p/django/" +"language/lt/)\n" +"Language: lt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: lt\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%" -"100<10 || n%100>=20) ? 1 : 2)\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n" +"%100<10 || n%100>=20) ? 1 : 2)\n" -#: admin.py:28 +#: admin.py:41 msgid "Personal info" msgstr "Asmeninė informacija" -#: admin.py:29 +#: admin.py:42 msgid "Permissions" msgstr "Leidimai" -#: admin.py:30 +#: admin.py:44 msgid "Important dates" msgstr "Svarbios datos" -#: admin.py:31 -msgid "Groups" -msgstr "Grupės" - -#: admin.py:113 +#: admin.py:125 msgid "Password changed successfully." msgstr "Slaptažodis pakeistas sėkmingai." -#: admin.py:123 +#: admin.py:135 #, python-format msgid "Change password: %s" msgstr "Pakeisti slaptažodį: %s" -#: forms.py:14 forms.py:48 forms.py:66 +#: forms.py:58 +msgid "A user with that username already exists." +msgstr "Jau egzistuoja vartotojas su tokiu vardu." + +#: forms.py:59 forms.py:247 forms.py:304 +msgid "The two password fields didn't match." +msgstr "Slaptažodžio laukai nesutapo" + +#: forms.py:61 forms.py:106 forms.py:135 msgid "Username" msgstr "Vartotojo vardas" -#: forms.py:15 forms.py:49 +#: forms.py:63 forms.py:107 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." msgstr "" "Privalomas. 30 arba mažiau simbolių. Raidės, skaičiai bei @/./+/-/_ " "simboliai." -#: forms.py:16 forms.py:50 +#: forms.py:66 forms.py:110 msgid "This value may contain only letters, numbers and @/./+/-/_ characters." msgstr "Ši reikšmė gali turėti tik raides, skaičius ir @/./+/-/_ simbolius." -#: forms.py:17 forms.py:67 forms.py:193 +#: forms.py:68 forms.py:112 forms.py:136 forms.py:306 msgid "Password" msgstr "Slaptažodis" -#: forms.py:18 +#: forms.py:70 msgid "Password confirmation" msgstr "Slaptažodžio patvirtinimas" -#: forms.py:19 +#: forms.py:72 msgid "Enter the same password as above, for verification." msgstr "Patikrinimui įvesk tokį patį slaptažodį, kaip viršuje." -#: forms.py:31 -msgid "A user with that username already exists." -msgstr "Jau egzistuoja vartotojas su tokiu vardu." +#: forms.py:113 +msgid "" +"Raw passwords are not stored, so there is no way to see this user's " +"password, but you can change the password using this " +"form." +msgstr "" +"Neužkoduoti slaptažodžiai nėra saugomi, todėl galimybės pasižiūrėti šio " +"vartotojo slaptažodį nėra. Tiesa galite slaptažodį pakeisti naudodamiesi šia forma." -#: forms.py:37 forms.py:163 forms.py:205 -msgid "The two password fields didn't match." -msgstr "Slaptažodžio laukai nesutapo" - -#: forms.py:87 +#: forms.py:139 msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." @@ -82,11 +93,7 @@ msgstr "" "Įveskite teisingą vartotojo vardą ir slaptažodį. Abiejuose laukuose " "didžiosios mažosios raidės skiriasi" -#: forms.py:89 -msgid "This account is inactive." -msgstr "Ši paskyra yra neaktyvi." - -#: forms.py:96 +#: forms.py:141 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." @@ -94,11 +101,11 @@ msgstr "" "Atrodo, jūsų naršyklė nepriima sausainėlių(cookies). Sausainėliai yra " "reikalingi norint prisijungti." -#: forms.py:108 -msgid "E-mail" -msgstr "El. paštas" +#: forms.py:143 +msgid "This account is inactive." +msgstr "Ši paskyra yra neaktyvi." -#: forms.py:117 +#: forms.py:187 msgid "" "That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" @@ -106,103 +113,126 @@ msgstr "" "Šis emailas nėra registruotas sistemoje. Ar esi tikras, kad tu " "užsiregistravęs?" -#: forms.py:143 -#, python-format -msgid "Password reset on %s" -msgstr "Slaptažodžio %s atstatymas" +#: forms.py:189 +msgid "" +"The user account associated with this e-mail address cannot reset the " +"password." +msgstr "" +"Vartotojas susietas su šiuo el. pašto adresu negali atkurti slaptažodžio." -#: forms.py:151 +#: forms.py:192 +msgid "E-mail" +msgstr "El. paštas" + +#: forms.py:249 msgid "New password" msgstr "Naujas slaptažodis" -#: forms.py:152 +#: forms.py:251 msgid "New password confirmation" msgstr "Naujo slaptažodžio patvirtinimas" -#: forms.py:177 -msgid "Old password" -msgstr "Senas slaptažodis" - -#: forms.py:185 +#: forms.py:280 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "Blogai įvestas senas slaptažodis. Bandykite dar kartą." -#: forms.py:194 +#: forms.py:283 +msgid "Old password" +msgstr "Senas slaptažodis" + +#: forms.py:308 msgid "Password (again)" msgstr "Slaptažodis (dar kartą)" -#: models.py:76 models.py:104 +#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355 +#: hashers.py:389 +msgid "algorithm" +msgstr "algoritmas" + +#: hashers.py:219 +msgid "iterations" +msgstr "iteracijos" + +#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390 +msgid "salt" +msgstr "druska" + +#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391 +msgid "hash" +msgstr "maiša" + +#: hashers.py:270 +msgid "work factor" +msgstr "" + +#: hashers.py:272 +msgid "checksum" +msgstr "kontrolinė suma" + +#: models.py:66 models.py:113 msgid "name" msgstr "vardas" -#: models.py:78 +#: models.py:68 msgid "codename" msgstr "kodinis vardas" -#: models.py:82 +#: models.py:72 msgid "permission" msgstr "leidimas" -#: models.py:83 models.py:105 +#: models.py:73 models.py:115 msgid "permissions" msgstr "leidimai" -#: models.py:108 +#: models.py:120 msgid "group" msgstr "grupė" -#: models.py:109 models.py:216 +#: models.py:121 models.py:250 msgid "groups" msgstr "grupės" -#: models.py:206 +#: models.py:232 msgid "username" msgstr "vartotojo vardas" -#: models.py:206 +#: models.py:233 msgid "" "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters" msgstr "" "Privalomas. 30 arba mažiau simbolių. Raidės, skaičiai bei @/./+/-/_ " "simboliai." -#: models.py:207 +#: models.py:235 msgid "first name" msgstr "vardas" -#: models.py:208 +#: models.py:236 msgid "last name" msgstr "pavardė" -#: models.py:209 +#: models.py:237 msgid "e-mail address" msgstr "e-mailo adresas" -#: models.py:210 +#: models.py:238 msgid "password" msgstr "slaptažodis" -#: models.py:210 -msgid "" -"Use '[algo]$[salt]$[hexdigest]' or use the change " -"password form." -msgstr "" -"Naudok '[algo]$[salt]$[hexdigest]' arba naudok slaptažodžio keitimo formą." - -#: models.py:211 +#: models.py:239 msgid "staff status" msgstr "personalo statusas" -#: models.py:211 +#: models.py:240 msgid "Designates whether the user can log into this admin site." msgstr "Nurodo ar vartotojas gali prisijungti prie administravimo puslapio." -#: models.py:212 +#: models.py:242 msgid "active" msgstr "aktyvus" -#: models.py:212 +#: models.py:243 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." @@ -210,52 +240,53 @@ msgstr "" "Nurodo ar vartotojas yra aktyvuotas. Užuot pašalinę vartotoją, galite nuimti " "šią žymę." -#: models.py:213 +#: models.py:245 msgid "superuser status" msgstr "supervartotojo statusas" -#: models.py:213 +#: models.py:246 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." msgstr "Pažymi, kad šis vartotojas turi visas teises be specialių nustatymų." -#: models.py:214 +#: models.py:248 msgid "last login" msgstr "paskutinį kartą prisijungęs" -#: models.py:215 +#: models.py:249 msgid "date joined" msgstr "data, kada prisijungė" -#: models.py:217 +#: models.py:251 msgid "" -"In addition to the permissions manually assigned, this user will also get " -"all permissions granted to each group he/she is in." +"The groups this user belongs to. A user will get all permissions granted to " +"each of his/her group." msgstr "" -"Prie rankiniu būdų priskirtų teisių, šis vartotojas taip pat gaus visas " -"teises, kurias turi grupės, kurioms jis priklauso." +"Grupės, kurioms šis vartotojas priklauso. Vartotojas gaus visas teises, " +"kurios yra suteiktos jo grupėms." -#: models.py:218 +#: models.py:255 msgid "user permissions" msgstr "vartotojo leidimai" -#: models.py:222 +#: models.py:260 msgid "user" msgstr "vartotojas" -#: models.py:223 +#: models.py:261 msgid "users" msgstr "vartotojai" -#: models.py:406 -msgid "message" -msgstr "žinutė" - -#: views.py:91 +#: views.py:93 msgid "Logged out" msgstr "Atsijungęs" -#: management/commands/createsuperuser.py:23 +#: management/commands/createsuperuser.py:27 msgid "Enter a valid e-mail address." msgstr "Įvesk tinkamą e-mailą." + +#: templates/registration/password_reset_subject.txt:2 +#, python-format +msgid "Password reset on %(site_name)s" +msgstr "Slaptažodis atkurtas ant %(site_name)s" diff --git a/django/contrib/auth/locale/lv/LC_MESSAGES/django.mo b/django/contrib/auth/locale/lv/LC_MESSAGES/django.mo index fe920ed296a..91588e0bdbb 100644 Binary files a/django/contrib/auth/locale/lv/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/lv/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/lv/LC_MESSAGES/django.po b/django/contrib/auth/locale/lv/LC_MESSAGES/django.po index b65962d4e32..b9e48c47826 100644 --- a/django/contrib/auth/locale/lv/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/lv/LC_MESSAGES/django.po @@ -1,78 +1,84 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Jannis Leidel , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:14-0400\n" -"PO-Revision-Date: 2011-03-04 18:41+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Latvian \n" +"POT-Creation-Date: 2012-03-14 00:15-0700\n" +"PO-Revision-Date: 2012-03-08 12:07+0000\n" +"Last-Translator: Jannis Leidel \n" +"Language-Team: Latvian (http://www.transifex.net/projects/p/django/language/" +"lv/)\n" +"Language: lv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: lv\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : " "2)\n" -#: admin.py:28 +#: admin.py:41 msgid "Personal info" msgstr "Personīgā informācija" -#: admin.py:29 +#: admin.py:42 msgid "Permissions" msgstr "Tiesības" -#: admin.py:30 +#: admin.py:44 msgid "Important dates" msgstr "Svarīgi datumi" -#: admin.py:31 -msgid "Groups" -msgstr "Grupas" - -#: admin.py:113 +#: admin.py:125 msgid "Password changed successfully." msgstr "Paroles nomainīta sekmīgi." -#: admin.py:123 +#: admin.py:135 #, python-format msgid "Change password: %s" msgstr "Paroles maiņa: %s" -#: forms.py:14 forms.py:48 forms.py:66 -msgid "Username" -msgstr "Lietotāja vārds" - -#: forms.py:15 forms.py:49 -msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." -msgstr "Obligāts. 30 vai mazāk zīmes. Tikai burti, cipari un @/./+/-/_ ." - -#: forms.py:16 forms.py:50 -msgid "This value may contain only letters, numbers and @/./+/-/_ characters." -msgstr "Šī vērtība var saturēt tikai burtus, ciparus un @/./+/-/_ simbolus" - -#: forms.py:17 forms.py:67 forms.py:193 -msgid "Password" -msgstr "Parole" - -#: forms.py:18 -msgid "Password confirmation" -msgstr "Paroles apstiprinājums" - -#: forms.py:19 -msgid "Enter the same password as above, for verification." -msgstr "Pārbaudei atkārtoti ievadiet to pašu paroli kā augstāk." - -#: forms.py:31 +#: forms.py:58 msgid "A user with that username already exists." msgstr "Lietotājs ar šādu lietotāja vārdu jau eksistē." -#: forms.py:37 forms.py:163 forms.py:205 +#: forms.py:59 forms.py:247 forms.py:304 msgid "The two password fields didn't match." msgstr "Paroles lauki nesakrita." -#: forms.py:87 +#: forms.py:61 forms.py:106 forms.py:135 +msgid "Username" +msgstr "Lietotāja vārds" + +#: forms.py:63 forms.py:107 +msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." +msgstr "Obligāts. 30 vai mazāk zīmes. Tikai burti, cipari un @/./+/-/_ ." + +#: forms.py:66 forms.py:110 +msgid "This value may contain only letters, numbers and @/./+/-/_ characters." +msgstr "Šī vērtība var saturēt tikai burtus, ciparus un @/./+/-/_ simbolus" + +#: forms.py:68 forms.py:112 forms.py:136 forms.py:306 +msgid "Password" +msgstr "Parole" + +#: forms.py:70 +msgid "Password confirmation" +msgstr "Paroles apstiprinājums" + +#: forms.py:72 +msgid "Enter the same password as above, for verification." +msgstr "Pārbaudei atkārtoti ievadiet to pašu paroli kā augstāk." + +#: forms.py:113 +msgid "" +"Raw passwords are not stored, so there is no way to see this user's " +"password, but you can change the password using this " +"form." +msgstr "" + +#: forms.py:139 msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." @@ -80,11 +86,7 @@ msgstr "" "Lūdzu ievadiet lietotājvārdu un paroli. Ievērojiet, ka abi lauki ir " "reģistrjūtīgi." -#: forms.py:89 -msgid "This account is inactive." -msgstr "Šis konts nav aktīvs." - -#: forms.py:96 +#: forms.py:141 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." @@ -92,11 +94,11 @@ msgstr "" "Izskatās, ka izmantotajam pārlūkam nav ieslēgtas sīkdatnes (cookies). Tās ir " "obligātas, lai pieslēgtos." -#: forms.py:108 -msgid "E-mail" -msgstr "E-pasts" +#: forms.py:143 +msgid "This account is inactive." +msgstr "Šis konts nav aktīvs." -#: forms.py:117 +#: forms.py:187 msgid "" "That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" @@ -104,154 +106,175 @@ msgstr "" "Šim e-pastam nav registrēta lietotāja konta. Vai tiešām esat " "piereģistrējušies?" -#: forms.py:143 -#, python-format -msgid "Password reset on %s" -msgstr "Paroles pārstatīšana(reset) uz %s" +#: forms.py:189 +msgid "" +"The user account associated with this e-mail address cannot reset the " +"password." +msgstr "" -#: forms.py:151 +#: forms.py:192 +msgid "E-mail" +msgstr "E-pasts" + +#: forms.py:249 msgid "New password" msgstr "Jaunā parole" -#: forms.py:152 +#: forms.py:251 msgid "New password confirmation" msgstr "Jaunās parole vēlreiz" -#: forms.py:177 -msgid "Old password" -msgstr "Vecā parole" - -#: forms.py:185 +#: forms.py:280 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "" "Jūsu iepriekšējā parole netika ievadīta korekti. Lūdzu ievadiet to atkārtoti." -#: forms.py:194 +#: forms.py:283 +msgid "Old password" +msgstr "Vecā parole" + +#: forms.py:308 msgid "Password (again)" msgstr "Parole (vēlreiz)" -#: models.py:76 models.py:104 +#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355 +#: hashers.py:389 +msgid "algorithm" +msgstr "" + +#: hashers.py:219 +msgid "iterations" +msgstr "" + +#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390 +msgid "salt" +msgstr "" + +#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391 +msgid "hash" +msgstr "" + +#: hashers.py:270 +msgid "work factor" +msgstr "" + +#: hashers.py:272 +msgid "checksum" +msgstr "" + +#: models.py:66 models.py:113 msgid "name" msgstr "nosaukums" -#: models.py:78 +#: models.py:68 msgid "codename" msgstr "kods" -#: models.py:82 +#: models.py:72 msgid "permission" msgstr "tiesība" -#: models.py:83 models.py:105 +#: models.py:73 models.py:115 msgid "permissions" msgstr "tiesības" -#: models.py:108 +#: models.py:120 msgid "group" msgstr "grupa" -#: models.py:109 models.py:216 +#: models.py:121 models.py:250 msgid "groups" msgstr "grupas" -#: models.py:206 +#: models.py:232 msgid "username" msgstr "lietotāja vārds" -#: models.py:206 +#: models.py:233 msgid "" "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters" msgstr "Obligāts. 30 vai mazāk zīmes. Tikai burti, cipari un @/./+/-/_ simboli" -#: models.py:207 +#: models.py:235 msgid "first name" msgstr "vārds" -#: models.py:208 +#: models.py:236 msgid "last name" msgstr "uzvārds" -#: models.py:209 +#: models.py:237 msgid "e-mail address" msgstr "e-pasta adrese" -#: models.py:210 +#: models.py:238 msgid "password" msgstr "parole" -#: models.py:210 -msgid "" -"Use '[algo]$[salt]$[hexdigest]' or use the change " -"password form." -msgstr "" -"Lietojiet '[algo]$[salt]$[hexdigest]', vai arī paroles " -"maiņas formu." - -#: models.py:211 +#: models.py:239 msgid "staff status" msgstr "personāla statuss" -#: models.py:211 +#: models.py:240 msgid "Designates whether the user can log into this admin site." msgstr "" "Atzīmējiet, ja vēlaties, lai lietotājs var pieslēgties administrācijas lapā." -#: models.py:212 +#: models.py:242 msgid "active" msgstr "aktīvs" -#: models.py:212 +#: models.py:243 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." msgstr "Nosaka, vai lietotājs ir aktīvs. Atceliet šo konta dzēšanas vietā." -#: models.py:213 +#: models.py:245 msgid "superuser status" msgstr "superlietotāja statuss" -#: models.py:213 +#: models.py:246 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." msgstr "Lietotājam ir visas tiesības arī bez to atsevišķas piešķiršanas." -#: models.py:214 +#: models.py:248 msgid "last login" msgstr "pēdējoreiz pieslēdzies" -#: models.py:215 +#: models.py:249 msgid "date joined" msgstr "datums, kad pievienojies" -#: models.py:217 +#: models.py:251 msgid "" -"In addition to the permissions manually assigned, this user will also get " -"all permissions granted to each group he/she is in." +"The groups this user belongs to. A user will get all permissions granted to " +"each of his/her group." msgstr "" -"Papildus manuāli piešķirtajām atļaujām, šis lietotājs papildus iegūs arī " -"visas tiesības, kas piešķirtas arī lietotāja grupām." -#: models.py:218 +#: models.py:255 msgid "user permissions" msgstr "lietotāja tiesības" -#: models.py:222 +#: models.py:260 msgid "user" msgstr "lietotājs" -#: models.py:223 +#: models.py:261 msgid "users" msgstr "lietotāji" -#: models.py:406 -msgid "message" -msgstr "ziņa" - -#: views.py:91 +#: views.py:93 msgid "Logged out" msgstr "Atslēdzies" -#: management/commands/createsuperuser.py:23 +#: management/commands/createsuperuser.py:27 msgid "Enter a valid e-mail address." msgstr "Ievadiet korektu e-pasta adresi." + +#: templates/registration/password_reset_subject.txt:2 +#, python-format +msgid "Password reset on %(site_name)s" +msgstr "" diff --git a/django/contrib/auth/locale/mk/LC_MESSAGES/django.mo b/django/contrib/auth/locale/mk/LC_MESSAGES/django.mo index e9a82545004..4c9cdf18474 100644 Binary files a/django/contrib/auth/locale/mk/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/mk/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/mk/LC_MESSAGES/django.po b/django/contrib/auth/locale/mk/LC_MESSAGES/django.po index 503e14b3ec7..e5e2e9f82ff 100644 --- a/django/contrib/auth/locale/mk/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/mk/LC_MESSAGES/django.po @@ -1,78 +1,88 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Jannis Leidel , 2011. +# , 2012. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:14-0400\n" -"PO-Revision-Date: 2011-03-04 18:41+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Macedonian <>\n" +"POT-Creation-Date: 2012-03-14 00:15-0700\n" +"PO-Revision-Date: 2012-03-12 11:21+0000\n" +"Last-Translator: vvangelovski \n" +"Language-Team: Macedonian (http://www.transifex.net/projects/p/django/" +"language/mk/)\n" +"Language: mk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: mk\n" "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1\n" -#: admin.py:28 +#: admin.py:41 msgid "Personal info" msgstr "Лични информации" -#: admin.py:29 +#: admin.py:42 msgid "Permissions" msgstr "Привилегии" -#: admin.py:30 +#: admin.py:44 msgid "Important dates" msgstr "Важни датуми" -#: admin.py:31 -msgid "Groups" -msgstr "Групи" - -#: admin.py:113 +#: admin.py:125 msgid "Password changed successfully." msgstr "Успешна промена на лозинката." -#: admin.py:123 +#: admin.py:135 #, python-format msgid "Change password: %s" msgstr "Промени лозинка: %s" -#: forms.py:14 forms.py:48 forms.py:66 +#: forms.py:58 +msgid "A user with that username already exists." +msgstr "Веќе постои корисник со тоа корисничко име." + +#: forms.py:59 forms.py:247 forms.py:304 +msgid "The two password fields didn't match." +msgstr "Двете полиња со лозинките не се совпаѓаат." + +#: forms.py:61 forms.py:106 forms.py:135 msgid "Username" msgstr "Корисник" -#: forms.py:15 forms.py:49 +#: forms.py:63 forms.py:107 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." msgstr "" "Задолжително. 30 или помалку знаци. Единствено букви, бројки и @/./+/-/_ ." -#: forms.py:16 forms.py:50 +#: forms.py:66 forms.py:110 msgid "This value may contain only letters, numbers and @/./+/-/_ characters." msgstr "Оваа вредност смее да содржи само букви, бројки и @/./+/-/_ знаци." -#: forms.py:17 forms.py:67 forms.py:193 +#: forms.py:68 forms.py:112 forms.py:136 forms.py:306 msgid "Password" msgstr "Лозинка" -#: forms.py:18 +#: forms.py:70 msgid "Password confirmation" msgstr "Потврда на лозинка" -#: forms.py:19 +#: forms.py:72 msgid "Enter the same password as above, for verification." msgstr "Заради верификација внесете ја истата лозинка како и горе." -#: forms.py:31 -msgid "A user with that username already exists." -msgstr "Веќе постои корисник со тоа корисничко име." +#: forms.py:113 +msgid "" +"Raw passwords are not stored, so there is no way to see this user's " +"password, but you can change the password using this " +"form." +msgstr "" +"Лозинките не се чуваат во оригинална форма, така што не постои начин да ја " +"видите лозинката на овој корисник, но можете да ја смените лозинката со " +"користење на оваа форма ." -#: forms.py:37 forms.py:163 forms.py:205 -msgid "The two password fields didn't match." -msgstr "Двете полиња со лозинките не се совпаѓаат." - -#: forms.py:87 +#: forms.py:139 msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." @@ -80,11 +90,7 @@ msgstr "" "Ве молам внесете точно корисничко име и лозинка. Имајте на ум дека и во " "двете полиња се битни големите и малите букви." -#: forms.py:89 -msgid "This account is inactive." -msgstr "Оваа сметка е неактивна." - -#: forms.py:96 +#: forms.py:141 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." @@ -92,11 +98,11 @@ msgstr "" "Не изгледа дека вашиот прелистувач има овозможено колачиња. Колачињата се " "потребни за да се најавите." -#: forms.py:108 -msgid "E-mail" -msgstr "Е-пошта" +#: forms.py:143 +msgid "This account is inactive." +msgstr "Оваа сметка е неактивна." -#: forms.py:117 +#: forms.py:187 msgid "" "That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" @@ -104,103 +110,127 @@ msgstr "" "Нема регистрирано корисник со оваа адреса за е-пошта. Сигурни ли сте дека " "сте регистрирани?" -#: forms.py:143 -#, python-format -msgid "Password reset on %s" -msgstr "Ресетирање на лозинка на %s" +#: forms.py:189 +msgid "" +"The user account associated with this e-mail address cannot reset the " +"password." +msgstr "" +"Корисничка сметка поврзана со оваа e-mail адреса не може да ја ресетира на " +"лозинката." -#: forms.py:151 +#: forms.py:192 +msgid "E-mail" +msgstr "Е-пошта" + +#: forms.py:249 msgid "New password" msgstr "Нова лозинка" -#: forms.py:152 +#: forms.py:251 msgid "New password confirmation" msgstr "Потврда за нова лозинка" -#: forms.py:177 -msgid "Old password" -msgstr "Стара лозинка" - -#: forms.py:185 +#: forms.py:280 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "" "Не ја внесовте точно вашата стара лозинка. Ве молам внесете ја повторно." -#: forms.py:194 +#: forms.py:283 +msgid "Old password" +msgstr "Стара лозинка" + +#: forms.py:308 msgid "Password (again)" msgstr "Лозинка (повторно)" -#: models.py:76 models.py:104 +#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355 +#: hashers.py:389 +msgid "algorithm" +msgstr "алгоритам" + +#: hashers.py:219 +msgid "iterations" +msgstr "повторувања" + +#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390 +msgid "salt" +msgstr "случаен клуч" + +#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391 +msgid "hash" +msgstr "хеш" + +#: hashers.py:270 +msgid "work factor" +msgstr "фактор на работа" + +#: hashers.py:272 +msgid "checksum" +msgstr "проверка" + +#: models.py:66 models.py:113 msgid "name" msgstr "име" -#: models.py:78 +#: models.py:68 msgid "codename" msgstr "кодно име" -#: models.py:82 +#: models.py:72 msgid "permission" msgstr "привилегија" -#: models.py:83 models.py:105 +#: models.py:73 models.py:115 msgid "permissions" msgstr "привилегии" -#: models.py:108 +#: models.py:120 msgid "group" msgstr "група" -#: models.py:109 models.py:216 +#: models.py:121 models.py:250 msgid "groups" msgstr "групи" -#: models.py:206 +#: models.py:232 msgid "username" msgstr "корисничко име" -#: models.py:206 +#: models.py:233 msgid "" "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters" msgstr "Задолжително. 30 или помалку знаци. Букви, бројки и @/./+/-/_ знаци" -#: models.py:207 +#: models.py:235 msgid "first name" msgstr "име" -#: models.py:208 +#: models.py:236 msgid "last name" msgstr "презиме" -#: models.py:209 +#: models.py:237 msgid "e-mail address" msgstr "е-пошта" -#: models.py:210 +#: models.py:238 msgid "password" msgstr "лозинка" -#: models.py:210 -msgid "" -"Use '[algo]$[salt]$[hexdigest]' or use the change " -"password form." -msgstr "" -"Користете '[algo]$[salt]$[hexdigest]' или користете ја формата за промена на лозинката." - -#: models.py:211 +#: models.py:239 msgid "staff status" msgstr "статус на администраторите" -#: models.py:211 +#: models.py:240 msgid "Designates whether the user can log into this admin site." msgstr "" "Означува дали корисникот може да се логира во сајтот за администрација." -#: models.py:212 +#: models.py:242 msgid "active" msgstr "активен" -#: models.py:212 +#: models.py:243 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." @@ -208,11 +238,11 @@ msgstr "" "Означува дали корисникот треба да биде активен. Одштиклирајте го ова наместо " "да бришете корисници." -#: models.py:213 +#: models.py:245 msgid "superuser status" msgstr "статус на суперкорисник" -#: models.py:213 +#: models.py:246 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." @@ -220,42 +250,43 @@ msgstr "" "Означува дека овој корисник ги има сите привилегии без експлицитно да се " "доделуваат сите." -#: models.py:214 +#: models.py:248 msgid "last login" msgstr "последна најава" -#: models.py:215 +#: models.py:249 msgid "date joined" msgstr "датум на зачленување" -#: models.py:217 +#: models.py:251 msgid "" -"In addition to the permissions manually assigned, this user will also get " -"all permissions granted to each group he/she is in." +"The groups this user belongs to. A user will get all permissions granted to " +"each of his/her group." msgstr "" -"Како дополнување на рачно доделени привилегии, овој корисник ќе ги добие " -"автоматски и сите привилегии за секоја група во која тој/таа членува." +"Групите на кои овој корисник припаѓа. Корисникот ќе ги добие сите привилегии " +"доделени на секоја од неговите / нејзините групи." -#: models.py:218 +#: models.py:255 msgid "user permissions" msgstr "кориснички привилегии" -#: models.py:222 +#: models.py:260 msgid "user" msgstr "корисник" -#: models.py:223 +#: models.py:261 msgid "users" msgstr "корисници" -#: models.py:406 -msgid "message" -msgstr "порака" - -#: views.py:91 +#: views.py:93 msgid "Logged out" msgstr "Одјавен" -#: management/commands/createsuperuser.py:23 +#: management/commands/createsuperuser.py:27 msgid "Enter a valid e-mail address." msgstr "Внесeте правилна адреса за е-пошта." + +#: templates/registration/password_reset_subject.txt:2 +#, python-format +msgid "Password reset on %(site_name)s" +msgstr "Ресетирање на лозинка за %(site_name)s" diff --git a/django/contrib/auth/locale/ml/LC_MESSAGES/django.mo b/django/contrib/auth/locale/ml/LC_MESSAGES/django.mo index ba121065dd4..0f53253e172 100644 Binary files a/django/contrib/auth/locale/ml/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/ml/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/ml/LC_MESSAGES/django.po b/django/contrib/auth/locale/ml/LC_MESSAGES/django.po index a272406b3f5..ddde71106cb 100644 --- a/django/contrib/auth/locale/ml/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/ml/LC_MESSAGES/django.po @@ -1,79 +1,85 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Jannis Leidel , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:14-0400\n" -"PO-Revision-Date: 2011-03-04 18:41+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Malayalam \n" +"POT-Creation-Date: 2012-03-14 00:15-0700\n" +"PO-Revision-Date: 2012-03-08 12:07+0000\n" +"Last-Translator: Jannis Leidel \n" +"Language-Team: Malayalam (http://www.transifex.net/projects/p/django/" +"language/ml/)\n" +"Language: ml\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ml\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: admin.py:28 +#: admin.py:41 msgid "Personal info" msgstr "വ്യക്തിപരമായ വിവരങ്ങള്‍" -#: admin.py:29 +#: admin.py:42 msgid "Permissions" msgstr "അനുമതികള്‍" -#: admin.py:30 +#: admin.py:44 msgid "Important dates" msgstr "പ്രധാന തീയതികള്‍" -#: admin.py:31 -msgid "Groups" -msgstr "ഗ്രൂപ്പുകള്‍" - -#: admin.py:113 +#: admin.py:125 msgid "Password changed successfully." msgstr "പാസ് വേര്‍ഡ് മാറ്റിയിരിക്കുന്നു." -#: admin.py:123 +#: admin.py:135 #, python-format msgid "Change password: %s" msgstr "പാസ് വേര്‍ഡ് മാറ്റുക: %s" -#: forms.py:14 forms.py:48 forms.py:66 +#: forms.py:58 +msgid "A user with that username already exists." +msgstr "ആ പേരുള്ള ഒരു ഉപയോക്താവ് നിലവിലുണ്ട്." + +#: forms.py:59 forms.py:247 forms.py:304 +msgid "The two password fields didn't match." +msgstr "പാസ് വേര്‍ഡ് നല്കിയ കള്ളികള്‍ രണ്ടും തമ്മില്‍ സാമ്യമില്ല." + +#: forms.py:61 forms.py:106 forms.py:135 msgid "Username" msgstr "യൂസര്‍ നാമം (ഉപയോക്ത്രു നാമം)" -#: forms.py:15 forms.py:49 +#: forms.py:63 forms.py:107 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." msgstr "" "നിര്‍ബന്ധം. 30 ഓ അതില്‍ കുറവോ ചിഹ്നങ്ങള്‍. അക്ഷരങ്ങള്‍, അക്കങ്ങള്‍, പിന്നെ @/./+/-/_എന്നിവയും " "മാത്രം." -#: forms.py:16 forms.py:50 +#: forms.py:66 forms.py:110 msgid "This value may contain only letters, numbers and @/./+/-/_ characters." msgstr "അക്ഷരങ്ങള്‍, അക്കങ്ങള്‍, പിന്നെ @/./+/-/_എന്നിവയും മാത്രം." -#: forms.py:17 forms.py:67 forms.py:193 +#: forms.py:68 forms.py:112 forms.py:136 forms.py:306 msgid "Password" msgstr "പാസ് വേര്‍ഡ്" -#: forms.py:18 +#: forms.py:70 msgid "Password confirmation" msgstr "പാസ് വേര്‍ഡ് ഉറപ്പാക്കല്‍" -#: forms.py:19 +#: forms.py:72 msgid "Enter the same password as above, for verification." msgstr "പാസ് വേര്‍ഡ് മുകളിലെ പോലെ തന്നെ നല്കുക. (ഉറപ്പു വരുത്താനാണ്.)" -#: forms.py:31 -msgid "A user with that username already exists." -msgstr "ആ പേരുള്ള ഒരു ഉപയോക്താവ് നിലവിലുണ്ട്." +#: forms.py:113 +msgid "" +"Raw passwords are not stored, so there is no way to see this user's " +"password, but you can change the password using this " +"form." +msgstr "" -#: forms.py:37 forms.py:163 forms.py:205 -msgid "The two password fields didn't match." -msgstr "പാസ് വേര്‍ഡ് നല്കിയ കള്ളികള്‍ രണ്ടും തമ്മില്‍ സാമ്യമില്ല." - -#: forms.py:87 +#: forms.py:139 msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." @@ -81,176 +87,194 @@ msgstr "" "ദയവായി ശരിയായ യൂസര്‍നാമവും പാസ്വേര്ഡും നല്കുക. ഇംഗ്ളീഷ് അക്ഷരങ്ങള്‍ വല്യക്ഷരമാണോ അല്ലയോ എന്നത് " "ശ്രദ്ധിക്കണം" -#: forms.py:89 -msgid "This account is inactive." -msgstr "ഈ അക്കൗണ്ട് മരവിപ്പിച്ചതാണ്." - -#: forms.py:96 +#: forms.py:141 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." msgstr "" "നിങ്ങളുടെ വെബ്-ബ്രൗസറിലെ കുക്കീസൊന്നും പ്രവര്‍ത്തിക്കുന്നില്ല. ഇതിലേക്ക് പ്രവേശിക്കാന്‍ അവ ആവശ്യമാണ്." -#: forms.py:108 -msgid "E-mail" -msgstr "ഇ-മെയില്‍" +#: forms.py:143 +msgid "This account is inactive." +msgstr "ഈ അക്കൗണ്ട് മരവിപ്പിച്ചതാണ്." -#: forms.py:117 +#: forms.py:187 msgid "" "That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" msgstr "" "ആ ഇ-മെയിലുമായി ബന്ധപ്പെട്ട യൂസര് അക്കൗണ്ടൊന്നും നിലവിലില്ല. രജിസ്റ്റര്‍ ചെയ്തെന്നു തീര്‍ച്ചയാണോ?" -#: forms.py:143 -#, python-format -msgid "Password reset on %s" -msgstr "%s ലെ പാസ് വേര്‍ഡ് പുനസ്ഥാപിച്ചു." +#: forms.py:189 +msgid "" +"The user account associated with this e-mail address cannot reset the " +"password." +msgstr "" -#: forms.py:151 +#: forms.py:192 +msgid "E-mail" +msgstr "ഇ-മെയില്‍" + +#: forms.py:249 msgid "New password" msgstr "പുതിയ പാസ് വേര്‍ഡ്" -#: forms.py:152 +#: forms.py:251 msgid "New password confirmation" msgstr "പുതിയ പാസ് വേര്‍ഡ് ഉറപ്പാക്കല്‍" -#: forms.py:177 -msgid "Old password" -msgstr "പഴയ പാസ് വേര്‍ഡ്" - -#: forms.py:185 +#: forms.py:280 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "നിങ്ങളുടെ പഴയ പാസ് വേര്‍ഡ് തെറ്റായാണ് നല്കിയത്. തിരുത്തുക." -#: forms.py:194 +#: forms.py:283 +msgid "Old password" +msgstr "പഴയ പാസ് വേര്‍ഡ്" + +#: forms.py:308 msgid "Password (again)" msgstr "പാസ് വേര്‍ഡ് (വീണ്ടും)" -#: models.py:76 models.py:104 +#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355 +#: hashers.py:389 +msgid "algorithm" +msgstr "" + +#: hashers.py:219 +msgid "iterations" +msgstr "" + +#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390 +msgid "salt" +msgstr "" + +#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391 +msgid "hash" +msgstr "" + +#: hashers.py:270 +msgid "work factor" +msgstr "" + +#: hashers.py:272 +msgid "checksum" +msgstr "" + +#: models.py:66 models.py:113 msgid "name" msgstr "പേര്" -#: models.py:78 +#: models.py:68 msgid "codename" msgstr "കോഡ്-നാമം" -#: models.py:82 +#: models.py:72 msgid "permission" msgstr "അനുമതി" -#: models.py:83 models.py:105 +#: models.py:73 models.py:115 msgid "permissions" msgstr "അനുമതികള്‍" -#: models.py:108 +#: models.py:120 msgid "group" msgstr "ഗ്രൂപ്പ്" -#: models.py:109 models.py:216 +#: models.py:121 models.py:250 msgid "groups" msgstr "ഗ്രൂപ്പുകള്‍" -#: models.py:206 +#: models.py:232 msgid "username" msgstr "യൂസര്‍ നാമം (ഉപയോക്ത്രു നാമം)" -#: models.py:206 +#: models.py:233 msgid "" "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters" msgstr "" "നിര്‍ബന്ധം. 30 ഓ അതില്‍ കുറവോ ചിഹ്നങ്ങള്‍. അക്ഷരങ്ങള്‍, അക്കങ്ങള്‍, പിന്നെ @/./+/-/_എന്നിവയും " "മാത്രം." -#: models.py:207 +#: models.py:235 msgid "first name" msgstr "പേര് - ആദ്യഭാഗം" -#: models.py:208 +#: models.py:236 msgid "last name" msgstr "പേര് - അന്ത്യഭാഗം" -#: models.py:209 +#: models.py:237 msgid "e-mail address" msgstr "ഇ-മെയില്‍ വിലാസം" -#: models.py:210 +#: models.py:238 msgid "password" msgstr "പാസ് വേര്‍ഡ്" -#: models.py:210 -msgid "" -"Use '[algo]$[salt]$[hexdigest]' or use the change " -"password form." -msgstr "" -"'[algo]$[salt]$[hexdigest]' അല്ലെങ്കില്‍ പാസ് വേര്‍ഡ് മാറ്റാനുള്ള " -"ഫോം ഉപയോഗിക്കുക." - -#: models.py:211 +#: models.py:239 msgid "staff status" msgstr "സ്റ്റാഫ് പദവി" -#: models.py:211 +#: models.py:240 msgid "Designates whether the user can log into this admin site." msgstr "ഈ യൂസര്‍ക്ക് ഈ അഡ്മിന് സൈറ്റിലേക്ക് പ്രവേശിക്കാമോ എന്നു വ്യക്തമാക്കാന്‍" -#: models.py:212 +#: models.py:242 msgid "active" msgstr "സജീവം" -#: models.py:212 +#: models.py:243 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." msgstr "" "ഈ യൂസര്‍ സജീവമാണോയെന്ന് വ്യക്തമാക്കുന്നു. അക്കൗണ്ട് ഡിലീറ്റ് ചെയ്യുന്നതിനു പകരം ഇത് ഒഴിവാക്കുക." -#: models.py:213 +#: models.py:245 msgid "superuser status" msgstr "സൂപ്പര്‍-യൂസര്‍ പദവി" -#: models.py:213 +#: models.py:246 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." msgstr "ഈ ഉപയോക്താവിന് എടുത്തു പറയാതെ തന്നെ എല്ലാ അനുമതികളും ലഭിക്കുന്നതാണെന്ന് വ്യക്തമാക്കുന്നു" -#: models.py:214 +#: models.py:248 msgid "last login" msgstr "അവസാനമായി ലോഗിന്‍ ചെയ്തതു" -#: models.py:215 +#: models.py:249 msgid "date joined" msgstr "ചേര്‍ന്ന തീയതി" -#: models.py:217 +#: models.py:251 msgid "" -"In addition to the permissions manually assigned, this user will also get " -"all permissions granted to each group he/she is in." +"The groups this user belongs to. A user will get all permissions granted to " +"each of his/her group." msgstr "" -"ഈ ഉപയോക്താവിന് നേരിട്ട് ലഭിച്ചതു കൂടാതെ അവര്‍ അംഗമായ ഗ്രൂപ്പിന് ലഭിച്ച അനുമതികളും അനുഭവിക്കാം" -#: models.py:218 +#: models.py:255 msgid "user permissions" msgstr "യൂസര്‍ (ഉപയോക്താവ്)നുള്ള അനുമതികള്‍" -#: models.py:222 +#: models.py:260 msgid "user" msgstr "യൂസര്‍ (ഉപയോക്താവ്)" -#: models.py:223 +#: models.py:261 msgid "users" msgstr "യൂസേര്‍സ് (ഉപയോക്താക്കള്‍)" -#: models.py:406 -msgid "message" -msgstr "സന്ദേശം" - -#: views.py:91 +#: views.py:93 msgid "Logged out" msgstr "ലോഗ്-ഔട്ട് ചെയ്തു (പുറത്തിറങ്ങി)" -#: management/commands/createsuperuser.py:23 +#: management/commands/createsuperuser.py:27 msgid "Enter a valid e-mail address." msgstr "ശരിയായ ഇ-മെയില്‍ വിലാസം നല്കുക." + +#: templates/registration/password_reset_subject.txt:2 +#, python-format +msgid "Password reset on %(site_name)s" +msgstr "" diff --git a/django/contrib/auth/locale/mn/LC_MESSAGES/django.mo b/django/contrib/auth/locale/mn/LC_MESSAGES/django.mo index c149d9b789d..fc838e920b2 100644 Binary files a/django/contrib/auth/locale/mn/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/mn/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/mn/LC_MESSAGES/django.po b/django/contrib/auth/locale/mn/LC_MESSAGES/django.po index 2e605f72810..b4eb91900e0 100644 --- a/django/contrib/auth/locale/mn/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/mn/LC_MESSAGES/django.po @@ -1,79 +1,89 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Jannis Leidel , 2011. +# Анхбаяр Анхаа , 2011, 2012. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:14-0400\n" -"PO-Revision-Date: 2011-03-04 18:41+0000\n" -"Last-Translator: Ankhbayar \n" -"Language-Team: Mongolian <>\n" +"POT-Creation-Date: 2012-03-14 00:15-0700\n" +"PO-Revision-Date: 2012-03-08 12:07+0000\n" +"Last-Translator: Анхбаяр Анхаа \n" +"Language-Team: Mongolian (http://www.transifex.net/projects/p/django/" +"language/mn/)\n" +"Language: mn\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: mn\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: admin.py:28 +#: admin.py:41 msgid "Personal info" msgstr "Хувийн мэдээлэл" -#: admin.py:29 +#: admin.py:42 msgid "Permissions" msgstr "Эрхүүд" -#: admin.py:30 +#: admin.py:44 msgid "Important dates" msgstr "Чухал огноо" -#: admin.py:31 -msgid "Groups" -msgstr "Бүлгүүд" - -#: admin.py:113 +#: admin.py:125 msgid "Password changed successfully." msgstr "Нууц үг амжилттай өөрчлөгдлөө." -#: admin.py:123 +#: admin.py:135 #, python-format msgid "Change password: %s" msgstr "Нууц үг өөрчлөх: %s" -#: forms.py:14 forms.py:48 forms.py:66 +#: forms.py:58 +msgid "A user with that username already exists." +msgstr "Ийм хэрэглэгчийн нэртэй хэрэглэгч өмнө нь бүртгүүлсэн байна." + +#: forms.py:59 forms.py:247 forms.py:304 +msgid "The two password fields didn't match." +msgstr "Хоёр нууц үг зөрж байна." + +#: forms.py:61 forms.py:106 forms.py:135 msgid "Username" msgstr "Хэрэглэгчийн нэр" -#: forms.py:15 forms.py:49 +#: forms.py:63 forms.py:107 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." msgstr "" "Заавал. 30 ба түүнээс бага үсэгтэй. Зөвхөн латин үсэг, тоо болон @/./+/-/_ " "тэмдэгтүүдийг зөвшөөрнө." -#: forms.py:16 forms.py:50 +#: forms.py:66 forms.py:110 msgid "This value may contain only letters, numbers and @/./+/-/_ characters." msgstr "Энэ утга дотор зөвхөн үсэг, тоо болон @/./+/-/_ тэмдэгтүүд байж болно." -#: forms.py:17 forms.py:67 forms.py:193 +#: forms.py:68 forms.py:112 forms.py:136 forms.py:306 msgid "Password" msgstr "Нууц үг " -#: forms.py:18 +#: forms.py:70 msgid "Password confirmation" msgstr "Нууц үгийн баталгаа" -#: forms.py:19 +#: forms.py:72 msgid "Enter the same password as above, for verification." msgstr "Батлахын тулд дээрх нууц үгээ ахин хийнэ үү." -#: forms.py:31 -msgid "A user with that username already exists." -msgstr "Ийм хэрэглэгчийн нэртэй хэрэглэгч өмнө нь бүртгүүлсэн байна." +#: forms.py:113 +msgid "" +"Raw passwords are not stored, so there is no way to see this user's " +"password, but you can change the password using this " +"form." +msgstr "" +"Жинхэн нууц үгүүдийг хадгалдаггүй учраас хэрэглэгчийн нууц үгийг харах " +"боломжгүй юм. Гэхдээ та нууц үгийг цонхоор өөрчлөх " +"боломжтой." -#: forms.py:37 forms.py:163 forms.py:205 -msgid "The two password fields didn't match." -msgstr "Хоёр нууц үг зөрж байна." - -#: forms.py:87 +#: forms.py:139 msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." @@ -81,11 +91,7 @@ msgstr "" "Хэрэглэгчийн нэр, нууц үгээ зөв оруулна уу. Том жижиг үсгийн ялгааг гаргах " "хэрэгтэй." -#: forms.py:89 -msgid "This account is inactive." -msgstr "Энэ бүртгэл идэвхгүй байна." - -#: forms.py:96 +#: forms.py:141 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." @@ -93,11 +99,11 @@ msgstr "" "Та вэб хөтчөө cookie ажиллахаар тохируулаагүй юм шиг байна. Нэвтрэхэд cookie " "шаардлагатай байдаг." -#: forms.py:108 -msgid "E-mail" -msgstr "Цахим шуудан" +#: forms.py:143 +msgid "This account is inactive." +msgstr "Энэ бүртгэл идэвхгүй байна." -#: forms.py:117 +#: forms.py:187 msgid "" "That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" @@ -105,104 +111,127 @@ msgstr "" "Цахим шуудангийн энэ хаягт хэрэглэгчийн бүртгэл байхгүй байна. Та " "бүртгүүлсэн гэдэгтээ итгэлтэй байна уу?" -#: forms.py:143 -#, python-format -msgid "Password reset on %s" -msgstr "Нууц үг %s дээр хийгдсэн" +#: forms.py:189 +msgid "" +"The user account associated with this e-mail address cannot reset the " +"password." +msgstr "" +"Энэ email хаягаар бүртгүүлсэн хэрэглэгчийн нууц үгийг сэргээх боломжгүй." -#: forms.py:151 +#: forms.py:192 +msgid "E-mail" +msgstr "Цахим шуудан" + +#: forms.py:249 msgid "New password" msgstr "Шинэ нууц үг" -#: forms.py:152 +#: forms.py:251 msgid "New password confirmation" msgstr "Шинэ нууц үгийн баталгаа" -#: forms.py:177 -msgid "Old password" -msgstr "Хуучин нууц үг" - -#: forms.py:185 +#: forms.py:280 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "Хуучин нууц үгээ буруу оруулсан байна. Ахин оруулна уу." -#: forms.py:194 +#: forms.py:283 +msgid "Old password" +msgstr "Хуучин нууц үг" + +#: forms.py:308 msgid "Password (again)" msgstr "Нууц үг (ахиад)" -#: models.py:76 models.py:104 +#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355 +#: hashers.py:389 +msgid "algorithm" +msgstr "Алгоритм" + +#: hashers.py:219 +msgid "iterations" +msgstr "давталтууд" + +#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390 +msgid "salt" +msgstr "давс" + +#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391 +msgid "hash" +msgstr "хаш" + +#: hashers.py:270 +msgid "work factor" +msgstr "ажлын байгуулагч" + +#: hashers.py:272 +msgid "checksum" +msgstr "checksum" + +#: models.py:66 models.py:113 msgid "name" msgstr "нэр" -#: models.py:78 +#: models.py:68 msgid "codename" msgstr "Код" -#: models.py:82 +#: models.py:72 msgid "permission" msgstr "зөвшөөрөл" -#: models.py:83 models.py:105 +#: models.py:73 models.py:115 msgid "permissions" msgstr "зөвшөөрлүүд" -#: models.py:108 +#: models.py:120 msgid "group" msgstr "бүлэг " -#: models.py:109 models.py:216 +#: models.py:121 models.py:250 msgid "groups" msgstr "бүлгүүд" -#: models.py:206 +#: models.py:232 msgid "username" msgstr "хэрэглэгчийн нэр" -#: models.py:206 +#: models.py:233 msgid "" "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters" msgstr "" "Заавал. 30 болон түүнээс бага тэмдэгт. Үсэг, тоо болон @/./+/-/_ тэмдэгтүүд " "ашиглана уу." -#: models.py:207 +#: models.py:235 msgid "first name" msgstr "нэр" -#: models.py:208 +#: models.py:236 msgid "last name" msgstr "овог" -#: models.py:209 +#: models.py:237 msgid "e-mail address" msgstr "цахим шуудангийн хаяг" -#: models.py:210 +#: models.py:238 msgid "password" msgstr "нууц үг" -#: models.py:210 -msgid "" -"Use '[algo]$[salt]$[hexdigest]' or use the change " -"password form." -msgstr "" -"Формат нь '[algo]$[salt]$[hexdigest]' эсвэл нууц үг " -"солих цонх хэрэглэнэ үү." - -#: models.py:211 +#: models.py:239 msgid "staff status" msgstr "Хэрэглэгчдийн төлөв" -#: models.py:211 +#: models.py:240 msgid "Designates whether the user can log into this admin site." msgstr "" "Уг удирдлагын сайт руу хэрэглэгч нэвтрэх боломжтой эсэхийг тодорхойлно." -#: models.py:212 +#: models.py:242 msgid "active" msgstr "идэвхтэй" -#: models.py:212 +#: models.py:243 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." @@ -210,52 +239,53 @@ msgstr "" "Энэ хэрэглэгчийг идэвхтэй болгох эсэхийг тодорхойлно. Бүртгэлийг нь устгахын " "оронд сонгохгүй байхад л хангалттай." -#: models.py:213 +#: models.py:245 msgid "superuser status" msgstr "Удирдлагын төлөв" -#: models.py:213 +#: models.py:246 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." msgstr "Энэ хэрэглэгчид бүх зөвшөөрөл байгааг ил тод харуулалгүй тодорхойлно. " -#: models.py:214 +#: models.py:248 msgid "last login" msgstr "сүүлд нэвтэрсэн" -#: models.py:215 +#: models.py:249 msgid "date joined" msgstr "бүртгүүлсэн огноо" -#: models.py:217 +#: models.py:251 msgid "" -"In addition to the permissions manually assigned, this user will also get " -"all permissions granted to each group he/she is in." +"The groups this user belongs to. A user will get all permissions granted to " +"each of his/her group." msgstr "" -"Энэ хэрэглэгч зөвшөөрлийг гар ажиллагаагаар авахаас гадна өөрийн байгаа " -"бүлэг бүртээ зөвшөөрөл олгуулна." +"Бүлэгүүд энэ хэрэглэгчийнхээс тусдаа. Хэрэглэгчид нь сонгосон бүлэгт " +"олгогдсон бүх эрх зөвшөөрөгдөх болно." -#: models.py:218 +#: models.py:255 msgid "user permissions" msgstr "хэрэглэгчийн эрхүүд" -#: models.py:222 +#: models.py:260 msgid "user" msgstr "хэрэглэгч " -#: models.py:223 +#: models.py:261 msgid "users" msgstr "хэрэглэгчид" -#: models.py:406 -msgid "message" -msgstr "мэдээлэл" - -#: views.py:91 +#: views.py:93 msgid "Logged out" msgstr "Гарсан" -#: management/commands/createsuperuser.py:23 +#: management/commands/createsuperuser.py:27 msgid "Enter a valid e-mail address." msgstr "Хүчинтэй цахим шуудангийн хаяг оруул" + +#: templates/registration/password_reset_subject.txt:2 +#, python-format +msgid "Password reset on %(site_name)s" +msgstr "%(site_name)s cайт дээрх нууц үг сэргээлт" diff --git a/django/contrib/auth/locale/nb/LC_MESSAGES/django.mo b/django/contrib/auth/locale/nb/LC_MESSAGES/django.mo index cd855e2a2f6..4cde54a98b8 100644 Binary files a/django/contrib/auth/locale/nb/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/nb/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/nb/LC_MESSAGES/django.po b/django/contrib/auth/locale/nb/LC_MESSAGES/django.po index 321cec1b877..3863809b645 100644 --- a/django/contrib/auth/locale/nb/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/nb/LC_MESSAGES/django.po @@ -1,89 +1,96 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Jannis Leidel , 2011. +# , 2012. +# , 2012. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:14-0400\n" -"PO-Revision-Date: 2011-03-04 18:41+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Norwegian Bokmål <>\n" +"POT-Creation-Date: 2012-03-14 00:15-0700\n" +"PO-Revision-Date: 2012-03-12 14:54+0000\n" +"Last-Translator: sigurdga \n" +"Language-Team: Norwegian Bokmål (http://www.transifex.net/projects/p/django/" +"language/nb/)\n" +"Language: nb\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: nb\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: admin.py:28 +#: admin.py:41 msgid "Personal info" msgstr "Personlig informasjon" -#: admin.py:29 +#: admin.py:42 msgid "Permissions" msgstr "Rettigheter" -#: admin.py:30 +#: admin.py:44 msgid "Important dates" msgstr "Viktige datoer" -#: admin.py:31 -msgid "Groups" -msgstr "Grupper" - -#: admin.py:113 +#: admin.py:125 msgid "Password changed successfully." msgstr "Passordet er endret." -#: admin.py:123 +#: admin.py:135 #, python-format msgid "Change password: %s" msgstr "Endre passord: %s" -#: forms.py:14 forms.py:48 forms.py:66 -msgid "Username" -msgstr "Brukernavn" - -#: forms.py:15 forms.py:49 -msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." -msgstr "Påkrevet. 30 tegn eller færre. Kun bokstaver, tall og @/./+/-/_." - -#: forms.py:16 forms.py:50 -msgid "This value may contain only letters, numbers and @/./+/-/_ characters." -msgstr "Verdien kan kun inneholde bokstaver, tall og @/./+/-/_." - -#: forms.py:17 forms.py:67 forms.py:193 -msgid "Password" -msgstr "Passord" - -#: forms.py:18 -msgid "Password confirmation" -msgstr "Passordbekreftelse" - -#: forms.py:19 -msgid "Enter the same password as above, for verification." -msgstr "Skriv inn det samme passordet som ovenfor, for verifisering." - -#: forms.py:31 +#: forms.py:58 msgid "A user with that username already exists." msgstr "Det eksisterer allerede en bruker med dette brukernavnet." -#: forms.py:37 forms.py:163 forms.py:205 +#: forms.py:59 forms.py:247 forms.py:304 msgid "The two password fields didn't match." msgstr "De to passordfeltene er ikke like." -#: forms.py:87 +#: forms.py:61 forms.py:106 forms.py:135 +msgid "Username" +msgstr "Brukernavn" + +#: forms.py:63 forms.py:107 +msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." +msgstr "Påkrevet. 30 tegn eller færre. Kun bokstaver, tall og @/./+/-/_." + +#: forms.py:66 forms.py:110 +msgid "This value may contain only letters, numbers and @/./+/-/_ characters." +msgstr "Verdien kan kun inneholde bokstaver, tall og @/./+/-/_." + +#: forms.py:68 forms.py:112 forms.py:136 forms.py:306 +msgid "Password" +msgstr "Passord" + +#: forms.py:70 +msgid "Password confirmation" +msgstr "Passordbekreftelse" + +#: forms.py:72 +msgid "Enter the same password as above, for verification." +msgstr "Skriv inn det samme passordet som ovenfor, for verifisering." + +#: forms.py:113 +msgid "" +"Raw passwords are not stored, so there is no way to see this user's " +"password, but you can change the password using this " +"form." +msgstr "" +"Selve passordet lagres ikke, så det finnes ingen måte å se denne brukerens " +"passord på. Du kan endre passordet med dette skjemaet." + +#: forms.py:139 msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." msgstr "" -"Vennligst angi korrekt brukernavn og passord. Merk at det er forskjell på " -"små og store bokstaver." +"Skriv inn korrekt brukernavn og passord. Merk at det er forskjell på små og " +"store bokstaver." -#: forms.py:89 -msgid "This account is inactive." -msgstr "Denne kontoen er inaktiv." - -#: forms.py:96 +#: forms.py:141 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." @@ -91,11 +98,11 @@ msgstr "" "Din nettleser ser ikke ut til å støtte informasjonskapsler (cookies). " "Informasjonskapsler er påkrevet for å logge inn." -#: forms.py:108 -msgid "E-mail" -msgstr "E-post" +#: forms.py:143 +msgid "This account is inactive." +msgstr "Denne kontoen er inaktiv." -#: forms.py:117 +#: forms.py:187 msgid "" "That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" @@ -103,154 +110,179 @@ msgstr "" "Den oppgitte e-postadressen er ikke registrert hos oss. Er du sikker på at " "du er registrert?" -#: forms.py:143 -#, python-format -msgid "Password reset on %s" -msgstr "Nullstilling av passord på %s" +#: forms.py:189 +msgid "" +"The user account associated with this e-mail address cannot reset the " +"password." +msgstr "" +"Brukerkontoen assosiert med denne e-postadressen kan ikke nullstille " +"passordet." -#: forms.py:151 +#: forms.py:192 +msgid "E-mail" +msgstr "E-post" + +#: forms.py:249 msgid "New password" msgstr "Nytt passord" -#: forms.py:152 +#: forms.py:251 msgid "New password confirmation" msgstr "Bekreft nytt passord" -#: forms.py:177 -msgid "Old password" -msgstr "Gammelt passord" - -#: forms.py:185 +#: forms.py:280 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "Ditt gamle passord er galt. Vennligst prøv igjen." -#: forms.py:194 +#: forms.py:283 +msgid "Old password" +msgstr "Gammelt passord" + +#: forms.py:308 msgid "Password (again)" msgstr "Passord (gjenta)" -#: models.py:76 models.py:104 +#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355 +#: hashers.py:389 +msgid "algorithm" +msgstr "algoritme" + +#: hashers.py:219 +msgid "iterations" +msgstr "iterasjoner" + +#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390 +msgid "salt" +msgstr "salt" + +#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391 +msgid "hash" +msgstr "hash" + +#: hashers.py:270 +msgid "work factor" +msgstr "arbeidsfaktor" + +#: hashers.py:272 +msgid "checksum" +msgstr "sjekksum" + +#: models.py:66 models.py:113 msgid "name" msgstr "navn" -#: models.py:78 +#: models.py:68 msgid "codename" msgstr "kodenavn" -#: models.py:82 +#: models.py:72 msgid "permission" msgstr "rettighet" -#: models.py:83 models.py:105 +#: models.py:73 models.py:115 msgid "permissions" msgstr "rettigheter" -#: models.py:108 +#: models.py:120 msgid "group" msgstr "gruppe" -#: models.py:109 models.py:216 +#: models.py:121 models.py:250 msgid "groups" msgstr "grupper" -#: models.py:206 +#: models.py:232 msgid "username" msgstr "brukernavn" -#: models.py:206 +#: models.py:233 msgid "" "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters" msgstr "Påkrevet. 30 tegn eller færre. Bokstaver, tall og @/./+/-/_." -#: models.py:207 +#: models.py:235 msgid "first name" msgstr "fornavn" -#: models.py:208 +#: models.py:236 msgid "last name" msgstr "etternavn" -#: models.py:209 +#: models.py:237 msgid "e-mail address" msgstr "e-postadresse" -#: models.py:210 +#: models.py:238 msgid "password" msgstr "passord" -#: models.py:210 -msgid "" -"Use '[algo]$[salt]$[hexdigest]' or use the change " -"password form." -msgstr "" -"Bruk '[algo]$[salt]$[hexdigest]' eller endre passord-" -"skjemaet." - -#: models.py:211 +#: models.py:239 msgid "staff status" msgstr "administrasjonsstatus" -#: models.py:211 +#: models.py:240 msgid "Designates whether the user can log into this admin site." msgstr "Angir at brukeren kan logge inn på denne administrasjonssiden." -#: models.py:212 +#: models.py:242 msgid "active" msgstr "aktiv" -#: models.py:212 +#: models.py:243 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." msgstr "" "Angir at denne brukeren er aktiv. Avmerk denne i stedet for å slette kontoen." -#: models.py:213 +#: models.py:245 msgid "superuser status" msgstr "superbruker" -#: models.py:213 +#: models.py:246 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." msgstr "" -"Angir at denne brukeren har alle rettigheter uten å eksplisitt sette de." +"Angir at denne brukeren har alle rettigheter uten å eksplisitt sette dem." -#: models.py:214 +#: models.py:248 msgid "last login" msgstr "siste innlogging" -#: models.py:215 +#: models.py:249 msgid "date joined" msgstr "registrert" -#: models.py:217 +#: models.py:251 msgid "" -"In addition to the permissions manually assigned, this user will also get " -"all permissions granted to each group he/she is in." +"The groups this user belongs to. A user will get all permissions granted to " +"each of his/her group." msgstr "" -"I tillegg til de rettighetene som blir angitt manuelt, får brukeren også " -"rettighetene til gruppene han/hun er med i." +"Gruppene denne brukeren er tilknyttet. En bruker vil ha alle rettigheter " +"tilhørende gruppene han/hun er medlem av." -#: models.py:218 +#: models.py:255 msgid "user permissions" msgstr "Brukerrettigheter" -#: models.py:222 +#: models.py:260 msgid "user" msgstr "bruker" -#: models.py:223 +#: models.py:261 msgid "users" msgstr "brukere" -#: models.py:406 -msgid "message" -msgstr "melding" - -#: views.py:91 +#: views.py:93 msgid "Logged out" msgstr "Logget ut" -#: management/commands/createsuperuser.py:23 +#: management/commands/createsuperuser.py:27 msgid "Enter a valid e-mail address." msgstr "Oppgi en gyldig e-postadresse." + +#: templates/registration/password_reset_subject.txt:2 +#, python-format +msgid "Password reset on %(site_name)s" +msgstr "Passord-nullstilling på %(site_name)s" diff --git a/django/contrib/auth/locale/nl/LC_MESSAGES/django.mo b/django/contrib/auth/locale/nl/LC_MESSAGES/django.mo index 0f86020b7bb..b51480b2ed7 100644 Binary files a/django/contrib/auth/locale/nl/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/nl/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/nl/LC_MESSAGES/django.po b/django/contrib/auth/locale/nl/LC_MESSAGES/django.po index 01585cd8f09..ba8e7f16263 100644 --- a/django/contrib/auth/locale/nl/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/nl/LC_MESSAGES/django.po @@ -1,79 +1,91 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Harro van der Klauw , 2012. +# Jannis Leidel , 2011. +# Jeffrey Gelens , 2011, 2012. +# Tino de Bruijn , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:14-0400\n" -"PO-Revision-Date: 2011-03-04 18:41+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Dutch <>\n" +"POT-Creation-Date: 2012-03-14 00:15-0700\n" +"PO-Revision-Date: 2012-03-08 12:07+0000\n" +"Last-Translator: Harro van der Klauw \n" +"Language-Team: Dutch (http://www.transifex.net/projects/p/django/language/" +"nl/)\n" +"Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: nl\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: admin.py:28 +#: admin.py:41 msgid "Personal info" msgstr "Persoonlijke informatie" -#: admin.py:29 +#: admin.py:42 msgid "Permissions" msgstr "Rechten" -#: admin.py:30 +#: admin.py:44 msgid "Important dates" msgstr "Belangrijke datums" -#: admin.py:31 -msgid "Groups" -msgstr "Groepen" - -#: admin.py:113 +#: admin.py:125 msgid "Password changed successfully." msgstr "Wachtwoord wijzigen is geslaagd." -#: admin.py:123 +#: admin.py:135 #, python-format msgid "Change password: %s" msgstr "Wijzig wachtwoord: %s" -#: forms.py:14 forms.py:48 forms.py:66 +#: forms.py:58 +msgid "A user with that username already exists." +msgstr "Een gebruiker met deze gebruikersnaam bestaat al." + +#: forms.py:59 forms.py:247 forms.py:304 +msgid "The two password fields didn't match." +msgstr "De twee ingevulde wachtwoorden zijn niet gelijk." + +#: forms.py:61 forms.py:106 forms.py:135 msgid "Username" msgstr "Gebruikersnaam" -#: forms.py:15 forms.py:49 +#: forms.py:63 forms.py:107 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." msgstr "" "Vereist. 30 tekens of minder. Alleen letters, cijfers en @/,/+/-/_ tekens " "zijn toegestaan." -#: forms.py:16 forms.py:50 +#: forms.py:66 forms.py:110 msgid "This value may contain only letters, numbers and @/./+/-/_ characters." msgstr "Dit veld mag alleen letters, cijfers en @/,/+/-/_ tekens bevatten." -#: forms.py:17 forms.py:67 forms.py:193 +#: forms.py:68 forms.py:112 forms.py:136 forms.py:306 msgid "Password" msgstr "Wachtwoord" -#: forms.py:18 +#: forms.py:70 msgid "Password confirmation" msgstr "Bevestiging wachtwoord" -#: forms.py:19 +#: forms.py:72 msgid "Enter the same password as above, for verification." msgstr "Vul hetzelfde wachtwoord als hierboven in, ter bevestiging." -#: forms.py:31 -msgid "A user with that username already exists." -msgstr "Een gebruiker met deze gebruikersnaam bestaat al." +#: forms.py:113 +msgid "" +"Raw passwords are not stored, so there is no way to see this user's " +"password, but you can change the password using this " +"form." +msgstr "" +"Wachtwoorden worden niet als tekst opgeslagen, dus je kunt een gebruikers " +"wachtwoord niet zien. Je kunt hem aanpassen via dit " +"formulier." -#: forms.py:37 forms.py:163 forms.py:205 -msgid "The two password fields didn't match." -msgstr "De twee ingevulde wachtwoorden zijn niet gelijk." - -#: forms.py:87 +#: forms.py:139 msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." @@ -81,11 +93,7 @@ msgstr "" "Voer een correcte gebruikersnaam en wachtwoord in. Let op, de velden zijn " "hoofdletter-gevoelig." -#: forms.py:89 -msgid "This account is inactive." -msgstr "Dit account is inactief." - -#: forms.py:96 +#: forms.py:141 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." @@ -93,11 +101,11 @@ msgstr "" "Het lijkt erop dat uw browser geen cookies accepteert. Om in te loggen " "moeten cookies worden geaccepteerd." -#: forms.py:108 -msgid "E-mail" -msgstr "E-mail" +#: forms.py:143 +msgid "This account is inactive." +msgstr "Dit account is inactief." -#: forms.py:117 +#: forms.py:187 msgid "" "That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" @@ -105,103 +113,126 @@ msgstr "" "Dat e-mailadres heeft geen gerelateerd gebruikersaccount. Weet u zeker dat u " "zich heeft geregistreerd?" -#: forms.py:143 -#, python-format -msgid "Password reset on %s" -msgstr "Wachtwoord hersteld op %s" +#: forms.py:189 +msgid "" +"The user account associated with this e-mail address cannot reset the " +"password." +msgstr "" +"De gebruiker gekoppeld aan dit e-mail adres kan het wachtwoord niet resetten." -#: forms.py:151 +#: forms.py:192 +msgid "E-mail" +msgstr "E-mail" + +#: forms.py:249 msgid "New password" msgstr "Nieuw wachtwoord" -#: forms.py:152 +#: forms.py:251 msgid "New password confirmation" msgstr "Nieuw wachtwoord bevestigen" -#: forms.py:177 -msgid "Old password" -msgstr "Oud wachtwoord" - -#: forms.py:185 +#: forms.py:280 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "" "Uw oude wachtwoord is niet correct ingevoerd. Voert u het alstublieft " "opnieuw in." -#: forms.py:194 +#: forms.py:283 +msgid "Old password" +msgstr "Oud wachtwoord" + +#: forms.py:308 msgid "Password (again)" msgstr "Wachtwoord (nogmaals)" -#: models.py:76 models.py:104 +#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355 +#: hashers.py:389 +msgid "algorithm" +msgstr "algoritme" + +#: hashers.py:219 +msgid "iterations" +msgstr "iteraties" + +#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390 +msgid "salt" +msgstr "salt" + +#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391 +msgid "hash" +msgstr "hash" + +#: hashers.py:270 +msgid "work factor" +msgstr "arbeidsfactor" + +#: hashers.py:272 +msgid "checksum" +msgstr "checksum" + +#: models.py:66 models.py:113 msgid "name" msgstr "naam" -#: models.py:78 +#: models.py:68 msgid "codename" msgstr "codenaam" -#: models.py:82 +#: models.py:72 msgid "permission" msgstr "recht" -#: models.py:83 models.py:105 +#: models.py:73 models.py:115 msgid "permissions" msgstr "rechten" -#: models.py:108 +#: models.py:120 msgid "group" msgstr "groep" -#: models.py:109 models.py:216 +#: models.py:121 models.py:250 msgid "groups" msgstr "groepen" -#: models.py:206 +#: models.py:232 msgid "username" msgstr "gebruikersnaam" -#: models.py:206 +#: models.py:233 msgid "" "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters" msgstr "Vereist. 30 tekens of minder. Letters, cijfers en /./+/-/_ tekens." -#: models.py:207 +#: models.py:235 msgid "first name" msgstr "voornaam" -#: models.py:208 +#: models.py:236 msgid "last name" msgstr "achternaam" -#: models.py:209 +#: models.py:237 msgid "e-mail address" msgstr "e-mailadres" -#: models.py:210 +#: models.py:238 msgid "password" msgstr "wachtwoord" -#: models.py:210 -msgid "" -"Use '[algo]$[salt]$[hexdigest]' or use the change " -"password form." -msgstr "" -"Gebruik '[algo]$[salt]$[hexdigest]' of gebruik het wachtwoord wijzigen formulier." - -#: models.py:211 +#: models.py:239 msgid "staff status" msgstr "stafstatus" -#: models.py:211 +#: models.py:240 msgid "Designates whether the user can log into this admin site." msgstr "Bepaalt of de gebruiker kan inloggen op deze beheersite." -#: models.py:212 +#: models.py:242 msgid "active" msgstr "actief" -#: models.py:212 +#: models.py:243 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." @@ -209,11 +240,11 @@ msgstr "" "Bepaalt of deze gebruiker als actief dient te worden behandeld. U kunt dit " "uitvinken in plaats van een gebruiker te verwijderen." -#: models.py:213 +#: models.py:245 msgid "superuser status" msgstr "supergebruikerstatus" -#: models.py:213 +#: models.py:246 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." @@ -221,42 +252,43 @@ msgstr "" "Bepaalt dat deze gebruiker alle rechten heeft, zonder deze expliciet toe te " "wijzen." -#: models.py:214 +#: models.py:248 msgid "last login" msgstr "laatste inlog" -#: models.py:215 +#: models.py:249 msgid "date joined" msgstr "datum toegetreden" -#: models.py:217 +#: models.py:251 msgid "" -"In addition to the permissions manually assigned, this user will also get " -"all permissions granted to each group he/she is in." +"The groups this user belongs to. A user will get all permissions granted to " +"each of his/her group." msgstr "" -"Bovenop de rechten welke handmatig zijn toegekend, krijgt deze gebruiker ook " -"alle rechten van de groepen waar hij of zij deel van uitmaakt." +"De groepen waar deze gebruiker toe behoord. Een gebruiker zal alle rechten " +"krijgen van zijn/haar groepen." -#: models.py:218 +#: models.py:255 msgid "user permissions" msgstr "gebruikersrechten" -#: models.py:222 +#: models.py:260 msgid "user" msgstr "gebruiker" -#: models.py:223 +#: models.py:261 msgid "users" msgstr "gebruikers" -#: models.py:406 -msgid "message" -msgstr "bericht" - -#: views.py:91 +#: views.py:93 msgid "Logged out" msgstr "Afmelden" -#: management/commands/createsuperuser.py:23 +#: management/commands/createsuperuser.py:27 msgid "Enter a valid e-mail address." msgstr "Geef een geldig e-mailadres op." + +#: templates/registration/password_reset_subject.txt:2 +#, python-format +msgid "Password reset on %(site_name)s" +msgstr "Wachtwoord reset voor %(site_name)s" diff --git a/django/contrib/auth/locale/nn/LC_MESSAGES/django.mo b/django/contrib/auth/locale/nn/LC_MESSAGES/django.mo index a032feef800..55dd7253df2 100644 Binary files a/django/contrib/auth/locale/nn/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/nn/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/nn/LC_MESSAGES/django.po b/django/contrib/auth/locale/nn/LC_MESSAGES/django.po index b6da5020f8a..00d204f8828 100644 --- a/django/contrib/auth/locale/nn/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/nn/LC_MESSAGES/django.po @@ -1,77 +1,83 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Jannis Leidel , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:14-0400\n" -"PO-Revision-Date: 2011-03-04 18:41+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Norwegian Nynorsk \n" +"POT-Creation-Date: 2012-03-14 00:15-0700\n" +"PO-Revision-Date: 2012-03-08 12:07+0000\n" +"Last-Translator: Jannis Leidel \n" +"Language-Team: Norwegian Nynorsk (http://www.transifex.net/projects/p/django/" +"language/nn/)\n" +"Language: nn\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: nn\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: admin.py:28 +#: admin.py:41 msgid "Personal info" msgstr "Personleg informasjon" -#: admin.py:29 +#: admin.py:42 msgid "Permissions" msgstr "Løyve" -#: admin.py:30 +#: admin.py:44 msgid "Important dates" msgstr "Viktige datoar" -#: admin.py:31 -msgid "Groups" -msgstr "Grupper" - -#: admin.py:113 +#: admin.py:125 msgid "Password changed successfully." msgstr "Passordet er endra." -#: admin.py:123 +#: admin.py:135 #, python-format msgid "Change password: %s" msgstr "Endre passord: %s" -#: forms.py:14 forms.py:48 forms.py:66 -msgid "Username" -msgstr "Brukarnamn" - -#: forms.py:15 forms.py:49 -msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." -msgstr "Nødvendig. 30 teikn eller færre. Berre bokstavar, tall @/./+/-/_." - -#: forms.py:16 forms.py:50 -msgid "This value may contain only letters, numbers and @/./+/-/_ characters." -msgstr "Feltet kan berre innehalde bokstavar, nummer og @/./+/-/_." - -#: forms.py:17 forms.py:67 forms.py:193 -msgid "Password" -msgstr "Passord" - -#: forms.py:18 -msgid "Password confirmation" -msgstr "Stadfesting av passord" - -#: forms.py:19 -msgid "Enter the same password as above, for verification." -msgstr "Skriv inn det samme passordet som over, for verifisering." - -#: forms.py:31 +#: forms.py:58 msgid "A user with that username already exists." msgstr "Det eksisterar allereie ein brukar med dette brukernamnet." -#: forms.py:37 forms.py:163 forms.py:205 +#: forms.py:59 forms.py:247 forms.py:304 msgid "The two password fields didn't match." msgstr "Dei to passordfelta er ikkje like." -#: forms.py:87 +#: forms.py:61 forms.py:106 forms.py:135 +msgid "Username" +msgstr "Brukarnamn" + +#: forms.py:63 forms.py:107 +msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." +msgstr "Nødvendig. 30 teikn eller færre. Berre bokstavar, tall @/./+/-/_." + +#: forms.py:66 forms.py:110 +msgid "This value may contain only letters, numbers and @/./+/-/_ characters." +msgstr "Feltet kan berre innehalde bokstavar, nummer og @/./+/-/_." + +#: forms.py:68 forms.py:112 forms.py:136 forms.py:306 +msgid "Password" +msgstr "Passord" + +#: forms.py:70 +msgid "Password confirmation" +msgstr "Stadfesting av passord" + +#: forms.py:72 +msgid "Enter the same password as above, for verification." +msgstr "Skriv inn det samme passordet som over, for verifisering." + +#: forms.py:113 +msgid "" +"Raw passwords are not stored, so there is no way to see this user's " +"password, but you can change the password using this " +"form." +msgstr "" + +#: forms.py:139 msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." @@ -79,11 +85,7 @@ msgstr "" "Gje korrekt brukarnamn og passord. Merk at det er forskjell på små og store " "bokstavar." -#: forms.py:89 -msgid "This account is inactive." -msgstr "Denne kontoen er inaktiv." - -#: forms.py:96 +#: forms.py:141 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." @@ -91,11 +93,11 @@ msgstr "" "Nettlesaren din ser ikkje ut til å støtte informasjonskapslar (cookies). " "Informasjonskapslar er nødvendige for å logge inn." -#: forms.py:108 -msgid "E-mail" -msgstr "E-post" +#: forms.py:143 +msgid "This account is inactive." +msgstr "Denne kontoen er inaktiv." -#: forms.py:117 +#: forms.py:187 msgid "" "That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" @@ -103,153 +105,174 @@ msgstr "" "Den oppgitte e-postadressa er ikkje registrert hos oss. Er du sikker på at " "du er registrert?" -#: forms.py:143 -#, python-format -msgid "Password reset on %s" -msgstr "Nullstilling av passord på %s" +#: forms.py:189 +msgid "" +"The user account associated with this e-mail address cannot reset the " +"password." +msgstr "" -#: forms.py:151 +#: forms.py:192 +msgid "E-mail" +msgstr "E-post" + +#: forms.py:249 msgid "New password" msgstr "Nytt passord" -#: forms.py:152 +#: forms.py:251 msgid "New password confirmation" msgstr "Stadfest nytt passord" -#: forms.py:177 -msgid "Old password" -msgstr "Gammalt passord" - -#: forms.py:185 +#: forms.py:280 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "Det gamle passordet er feil. Prøv omatt." -#: forms.py:194 +#: forms.py:283 +msgid "Old password" +msgstr "Gammalt passord" + +#: forms.py:308 msgid "Password (again)" msgstr "Passord (gjenta)" -#: models.py:76 models.py:104 +#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355 +#: hashers.py:389 +msgid "algorithm" +msgstr "" + +#: hashers.py:219 +msgid "iterations" +msgstr "" + +#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390 +msgid "salt" +msgstr "" + +#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391 +msgid "hash" +msgstr "" + +#: hashers.py:270 +msgid "work factor" +msgstr "" + +#: hashers.py:272 +msgid "checksum" +msgstr "" + +#: models.py:66 models.py:113 msgid "name" msgstr "namn" -#: models.py:78 +#: models.py:68 msgid "codename" msgstr "kodenamn" -#: models.py:82 +#: models.py:72 msgid "permission" msgstr "løyve" -#: models.py:83 models.py:105 +#: models.py:73 models.py:115 msgid "permissions" msgstr "løyve" -#: models.py:108 +#: models.py:120 msgid "group" msgstr "gruppe" -#: models.py:109 models.py:216 +#: models.py:121 models.py:250 msgid "groups" msgstr "grupper" -#: models.py:206 +#: models.py:232 msgid "username" msgstr "brukarnamn" -#: models.py:206 +#: models.py:233 msgid "" "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters" msgstr "Nødvendig. 30 teikn eller færre. Berre bokstavar, tall @/./+/-/_." -#: models.py:207 +#: models.py:235 msgid "first name" msgstr "fornamn" -#: models.py:208 +#: models.py:236 msgid "last name" msgstr "etternamn" -#: models.py:209 +#: models.py:237 msgid "e-mail address" msgstr "e-postadresse" -#: models.py:210 +#: models.py:238 msgid "password" msgstr "passord" -#: models.py:210 -msgid "" -"Use '[algo]$[salt]$[hexdigest]' or use the change " -"password form." -msgstr "" -"Bruk '[algo]$[salt]$[hexdigest]' eller endre passord-" -"skjemaet." - -#: models.py:211 +#: models.py:239 msgid "staff status" msgstr "administrasjonsstatus" -#: models.py:211 +#: models.py:240 msgid "Designates whether the user can log into this admin site." msgstr "Angir at brukaren kan logge inn på denne administrasjonssida." -#: models.py:212 +#: models.py:242 msgid "active" msgstr "aktiv" -#: models.py:212 +#: models.py:243 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." msgstr "" "Angir at denne brukaren er aktiv. Avmerk denne i staden for å slette kontoen." -#: models.py:213 +#: models.py:245 msgid "superuser status" msgstr "superbrukar" -#: models.py:213 +#: models.py:246 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." msgstr "Angir at denne brukaren har alle løyve utan å eksplisitt sette dei." -#: models.py:214 +#: models.py:248 msgid "last login" msgstr "siste innlogging" -#: models.py:215 +#: models.py:249 msgid "date joined" msgstr "registrert" -#: models.py:217 +#: models.py:251 msgid "" -"In addition to the permissions manually assigned, this user will also get " -"all permissions granted to each group he/she is in." +"The groups this user belongs to. A user will get all permissions granted to " +"each of his/her group." msgstr "" -"I tillegg til dei løyva som vert angitt manuelt, får brukaren òg løyve til " -"gruppene han/hon er med i." -#: models.py:218 +#: models.py:255 msgid "user permissions" msgstr "Brukerløyve" -#: models.py:222 +#: models.py:260 msgid "user" msgstr "brukar" -#: models.py:223 +#: models.py:261 msgid "users" msgstr "brukarar" -#: models.py:406 -msgid "message" -msgstr "melding" - -#: views.py:91 +#: views.py:93 msgid "Logged out" msgstr "Logga ut" -#: management/commands/createsuperuser.py:23 +#: management/commands/createsuperuser.py:27 msgid "Enter a valid e-mail address." msgstr "Oppgje ei gyldig e-postadresse." + +#: templates/registration/password_reset_subject.txt:2 +#, python-format +msgid "Password reset on %(site_name)s" +msgstr "" diff --git a/django/contrib/auth/locale/pa/LC_MESSAGES/django.mo b/django/contrib/auth/locale/pa/LC_MESSAGES/django.mo index 8b90a680342..d9cb232b791 100644 Binary files a/django/contrib/auth/locale/pa/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/pa/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/pa/LC_MESSAGES/django.po b/django/contrib/auth/locale/pa/LC_MESSAGES/django.po index 49054235db3..4fe32314fcc 100644 --- a/django/contrib/auth/locale/pa/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/pa/LC_MESSAGES/django.po @@ -1,247 +1,272 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Jannis Leidel , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:14-0400\n" -"PO-Revision-Date: 2011-03-04 18:41+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Panjabi (Punjabi) \n" +"POT-Creation-Date: 2012-03-14 00:15-0700\n" +"PO-Revision-Date: 2012-03-08 12:07+0000\n" +"Last-Translator: Jannis Leidel \n" +"Language-Team: Panjabi (Punjabi) (http://www.transifex.net/projects/p/django/" +"language/pa/)\n" +"Language: pa\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: pa\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: admin.py:28 +#: admin.py:41 msgid "Personal info" msgstr "ਨਿੱਜੀ ਜਾਣਕਾਰੀ" -#: admin.py:29 +#: admin.py:42 msgid "Permissions" msgstr "ਅਧਿਕਾਰ" -#: admin.py:30 +#: admin.py:44 msgid "Important dates" msgstr "ਖਾਸ ਮਿਤੀਆਂ" -#: admin.py:31 -msgid "Groups" -msgstr "ਗਰੁੱਪ" - -#: admin.py:113 +#: admin.py:125 msgid "Password changed successfully." msgstr "ਪਾਸਵਰਡ ਠੀਕ ਤਰ੍ਹਾਂ ਬਦਲਿਆ ਗਿਆ ਹੈ।" -#: admin.py:123 +#: admin.py:135 #, python-format msgid "Change password: %s" msgstr "ਪਾਸਵਰਡ ਬਦਲੋ: %s" -#: forms.py:14 forms.py:48 forms.py:66 -msgid "Username" -msgstr "ਯੂਜ਼ਰ ਨਾਂ" - -#: forms.py:15 forms.py:49 -msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." -msgstr "ਲਾਜ਼ਮੀ। ੩੦ ਜਾਂ ਘੱਟ ਅੱਖਰ ਚਾਹੀਦੇ ਹਨ। ਅੱਖਰ, ਅੰਕ @/./+/-/_ ਹੀ।" - -#: forms.py:16 forms.py:50 -msgid "This value may contain only letters, numbers and @/./+/-/_ characters." -msgstr "" - -#: forms.py:17 forms.py:67 forms.py:193 -msgid "Password" -msgstr "ਪਾਸਵਰਡ" - -#: forms.py:18 -msgid "Password confirmation" -msgstr "ਪਾਸਵਰਡ ਪੁਸ਼ਟੀ" - -#: forms.py:19 -msgid "Enter the same password as above, for verification." -msgstr "ਜਾਂਚ ਲਈ, ਉੱਤੇ ਦਿੱਤਾ ਪਾਸਵਰਡ ਹੀ ਦਿਓ।" - -#: forms.py:31 +#: forms.py:58 msgid "A user with that username already exists." msgstr "ਉਸ ਯੂਜ਼ਰ ਨਾਂ ਨਾਲ ਯੂਜ਼ਰ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ।" -#: forms.py:37 forms.py:163 forms.py:205 +#: forms.py:59 forms.py:247 forms.py:304 msgid "The two password fields didn't match." msgstr "ਦੋਵੇਂ ਪਾਸਵਰਡ ਖੇਤਰ ਮਿਲਦੇ ਨਹੀਂ ਹਨ।" -#: forms.py:87 +#: forms.py:61 forms.py:106 forms.py:135 +msgid "Username" +msgstr "ਯੂਜ਼ਰ ਨਾਂ" + +#: forms.py:63 forms.py:107 +msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." +msgstr "ਲਾਜ਼ਮੀ। ੩੦ ਜਾਂ ਘੱਟ ਅੱਖਰ ਚਾਹੀਦੇ ਹਨ। ਅੱਖਰ, ਅੰਕ @/./+/-/_ ਹੀ।" + +#: forms.py:66 forms.py:110 +msgid "This value may contain only letters, numbers and @/./+/-/_ characters." +msgstr "" + +#: forms.py:68 forms.py:112 forms.py:136 forms.py:306 +msgid "Password" +msgstr "ਪਾਸਵਰਡ" + +#: forms.py:70 +msgid "Password confirmation" +msgstr "ਪਾਸਵਰਡ ਪੁਸ਼ਟੀ" + +#: forms.py:72 +msgid "Enter the same password as above, for verification." +msgstr "ਜਾਂਚ ਲਈ, ਉੱਤੇ ਦਿੱਤਾ ਪਾਸਵਰਡ ਹੀ ਦਿਓ।" + +#: forms.py:113 +msgid "" +"Raw passwords are not stored, so there is no way to see this user's " +"password, but you can change the password using this " +"form." +msgstr "" + +#: forms.py:139 msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." msgstr "" "ਠੀਕ ਯੂਜ਼ਰ ਨਾਂ ਤੇ ਪਾਸਵਰਡ ਦਿਉ ਜੀ। ਯਾਦ ਰੱਖੋ ਕਿ ਦੋਵੇਂ ਖੇਤਰਾਂ ਅੱਖਰ ਆਕਾਰ ਪ੍ਰਤੀ ਸੰਵੇਦਨਸ਼ੀਲ ਹਨ।" -#: forms.py:89 -msgid "This account is inactive." -msgstr "ਇਹ ਅਕਾਊਂਟ ਗ਼ੈਰ-ਸਰਗਰਮ ਹੈ।" - -#: forms.py:96 +#: forms.py:141 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." msgstr "ਤੁਹਾਡੇ ਵੈੱਬ ਬਰਾਊਜ਼ਰ ਉੱਤੇ ਕੂਕੀਜ਼ ਚਾਲੂ ਨਹੀਂ ਜਾਪਦੇ ਹਨ। ਲਾਗਇਨ ਕਰਨ ਲਈ ਕੂਕੀਜ਼ ਚਾਹੀਦੇ ਹਨ।" -#: forms.py:108 -msgid "E-mail" -msgstr "ਈਮੇਲ" +#: forms.py:143 +msgid "This account is inactive." +msgstr "ਇਹ ਅਕਾਊਂਟ ਗ਼ੈਰ-ਸਰਗਰਮ ਹੈ।" -#: forms.py:117 +#: forms.py:187 msgid "" "That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" msgstr "" -#: forms.py:143 -#, python-format -msgid "Password reset on %s" -msgstr "%s ਉੱਤੇ ਪਾਸਵਰਡ ਮੁੜ-ਸੈੱਟ" +#: forms.py:189 +msgid "" +"The user account associated with this e-mail address cannot reset the " +"password." +msgstr "" -#: forms.py:151 +#: forms.py:192 +msgid "E-mail" +msgstr "ਈਮੇਲ" + +#: forms.py:249 msgid "New password" msgstr "ਨਵਾਂ ਪਾਸਵਰਡ" -#: forms.py:152 +#: forms.py:251 msgid "New password confirmation" msgstr "ਨਵਾਂ ਪਾਸਵਰਡ ਪੁਸ਼ਟੀ" -#: forms.py:177 -msgid "Old password" -msgstr "ਪੁਰਾਣਾ ਪਾਸਵਰਡ" - -#: forms.py:185 +#: forms.py:280 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "ਤੁਹਾਡਾ ਪੁਰਾਣਾ ਪਾਸਵਰਡ ਗਲਤ ਦਿੱਤਾ ਗਿਆ ਸੀ। ਇਸ ਨੂੰ ਫੇਰ ਦਿਉ ਜੀ।" -#: forms.py:194 +#: forms.py:283 +msgid "Old password" +msgstr "ਪੁਰਾਣਾ ਪਾਸਵਰਡ" + +#: forms.py:308 msgid "Password (again)" msgstr "ਪਾਸਵਰਡ (ਫੇਰ)" -#: models.py:76 models.py:104 +#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355 +#: hashers.py:389 +msgid "algorithm" +msgstr "" + +#: hashers.py:219 +msgid "iterations" +msgstr "" + +#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390 +msgid "salt" +msgstr "" + +#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391 +msgid "hash" +msgstr "" + +#: hashers.py:270 +msgid "work factor" +msgstr "" + +#: hashers.py:272 +msgid "checksum" +msgstr "" + +#: models.py:66 models.py:113 msgid "name" msgstr "ਨਾਂ" -#: models.py:78 +#: models.py:68 msgid "codename" msgstr "ਕੋਡ-ਨਾਂ" -#: models.py:82 +#: models.py:72 msgid "permission" msgstr "ਅਧਿਕਾਰ" -#: models.py:83 models.py:105 +#: models.py:73 models.py:115 msgid "permissions" msgstr "ਅਧਿਕਾਰ" -#: models.py:108 +#: models.py:120 msgid "group" msgstr "ਗਰੁੱਪ" -#: models.py:109 models.py:216 +#: models.py:121 models.py:250 msgid "groups" msgstr "ਗਰੁੱਪ" -#: models.py:206 +#: models.py:232 msgid "username" msgstr "ਯੂਜ਼ਰ ਨਾਂ" -#: models.py:206 +#: models.py:233 msgid "" "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters" msgstr "ਲਾਜ਼ਮੀ। ੩੦ ਜਾਂ ਘੱਟ ਅੱਖਰ ਚਾਹੀਦੇ ਹਨ। ਅੱਖਰ, ਅੰਕ @//+/-/_ ਹੀ।" -#: models.py:207 +#: models.py:235 msgid "first name" msgstr "ਪਹਿਲਾਂ ਨਾਂ" -#: models.py:208 +#: models.py:236 msgid "last name" msgstr "ਆਖਰੀ ਨਾਂ" -#: models.py:209 +#: models.py:237 msgid "e-mail address" msgstr "ਈਮੇਲ ਐਡਰੈੱਸ" -#: models.py:210 +#: models.py:238 msgid "password" msgstr "ਪਾਸਵਰਡ" -#: models.py:210 -msgid "" -"Use '[algo]$[salt]$[hexdigest]' or use the change " -"password form." -msgstr "" -"'[algo]$[salt]$[hexdigest]' ਵਰਤੋਂ ਜਾਂ ਪਾਸਵਰਡ ਬਦਲੋ ਫਾਰਮ " -"ਵਰਤੋਂ।" - -#: models.py:211 +#: models.py:239 msgid "staff status" msgstr "ਸਟਾਫ ਹਾਲਤ" -#: models.py:211 +#: models.py:240 msgid "Designates whether the user can log into this admin site." msgstr "" -#: models.py:212 +#: models.py:242 msgid "active" msgstr "ਸਰਗਰਮ" -#: models.py:212 +#: models.py:243 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." msgstr "" -#: models.py:213 +#: models.py:245 msgid "superuser status" msgstr "ਸੁਪਰਯੂਜ਼ਰ ਹਾਲਤ" -#: models.py:213 +#: models.py:246 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." msgstr "" -#: models.py:214 +#: models.py:248 msgid "last login" msgstr "ਆਖਰੀ ਲਾਗਇਨ" -#: models.py:215 +#: models.py:249 msgid "date joined" msgstr "ਜੁਆਇੰਨ ਕਰਨ ਦੀ ਮਿਤੀ" -#: models.py:217 +#: models.py:251 msgid "" -"In addition to the permissions manually assigned, this user will also get " -"all permissions granted to each group he/she is in." +"The groups this user belongs to. A user will get all permissions granted to " +"each of his/her group." msgstr "" -#: models.py:218 +#: models.py:255 msgid "user permissions" msgstr "ਯੂਜ਼ਰ ਅਧਿਕਾਰ" -#: models.py:222 +#: models.py:260 msgid "user" msgstr "ਯੂਜ਼ਰ" -#: models.py:223 +#: models.py:261 msgid "users" msgstr "ਯੂਜ਼ਰ" -#: models.py:406 -msgid "message" -msgstr "ਸੁਨੇਹਾ" - -#: views.py:91 +#: views.py:93 msgid "Logged out" msgstr "ਲਾਗ ਆਉਟ ਕੀਤਾ" -#: management/commands/createsuperuser.py:23 +#: management/commands/createsuperuser.py:27 msgid "Enter a valid e-mail address." msgstr "ਠੀਕ ਈਮੇਲ ਐਡਰੈੱਸ ਦਿਓ ਜੀ।" + +#: templates/registration/password_reset_subject.txt:2 +#, python-format +msgid "Password reset on %(site_name)s" +msgstr "" diff --git a/django/contrib/auth/locale/pl/LC_MESSAGES/django.mo b/django/contrib/auth/locale/pl/LC_MESSAGES/django.mo index 92a1f08bb62..3b590546d0f 100644 Binary files a/django/contrib/auth/locale/pl/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/pl/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/pl/LC_MESSAGES/django.po b/django/contrib/auth/locale/pl/LC_MESSAGES/django.po index 943897bfab7..3b907c3ca82 100644 --- a/django/contrib/auth/locale/pl/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/pl/LC_MESSAGES/django.po @@ -1,78 +1,86 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# , 2011. +# Jannis Leidel , 2011. +# Karol , 2012. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:14-0400\n" -"PO-Revision-Date: 2011-03-04 18:41+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Polish <>\n" +"POT-Creation-Date: 2012-03-14 00:15-0700\n" +"PO-Revision-Date: 2012-03-08 12:07+0000\n" +"Last-Translator: Karol \n" +"Language-Team: Polish (http://www.transifex.net/projects/p/django/language/" +"pl/)\n" +"Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: pl\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2)\n" -#: admin.py:28 +#: admin.py:41 msgid "Personal info" msgstr "Dane osobowe" -#: admin.py:29 +#: admin.py:42 msgid "Permissions" msgstr "Uprawnienia" -#: admin.py:30 +#: admin.py:44 msgid "Important dates" msgstr "Ważne daty" -#: admin.py:31 -msgid "Groups" -msgstr "Grupy" - -#: admin.py:113 +#: admin.py:125 msgid "Password changed successfully." msgstr "Hasło zostało zmienione pomyślnie." -#: admin.py:123 +#: admin.py:135 #, python-format msgid "Change password: %s" msgstr "Zmień hasło: %s" -#: forms.py:14 forms.py:48 forms.py:66 -msgid "Username" -msgstr "Nazwa użytkownika" - -#: forms.py:15 forms.py:49 -msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." -msgstr "Wymagane. 30 znaków lub mniej. Tylko litery, cyfry i znaki @/./+/-/_." - -#: forms.py:16 forms.py:50 -msgid "This value may contain only letters, numbers and @/./+/-/_ characters." -msgstr "To pole może zawierać tylko litery, cyfry i znaki @/./+/-/_." - -#: forms.py:17 forms.py:67 forms.py:193 -msgid "Password" -msgstr "Hasło" - -#: forms.py:18 -msgid "Password confirmation" -msgstr "Potwierdzenie hasła" - -#: forms.py:19 -msgid "Enter the same password as above, for verification." -msgstr "Podaj powyższe hasło w celu weryfikacji." - -#: forms.py:31 +#: forms.py:58 msgid "A user with that username already exists." msgstr "Użytkownik o tej nazwie już istnieje." -#: forms.py:37 forms.py:163 forms.py:205 +#: forms.py:59 forms.py:247 forms.py:304 msgid "The two password fields didn't match." msgstr "Hasła się nie zgadzają." -#: forms.py:87 +#: forms.py:61 forms.py:106 forms.py:135 +msgid "Username" +msgstr "Nazwa użytkownika" + +#: forms.py:63 forms.py:107 +msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." +msgstr "Wymagane. 30 znaków lub mniej. Tylko litery, cyfry i znaki @/./+/-/_." + +#: forms.py:66 forms.py:110 +msgid "This value may contain only letters, numbers and @/./+/-/_ characters." +msgstr "To pole może zawierać tylko litery, cyfry i znaki @/./+/-/_." + +#: forms.py:68 forms.py:112 forms.py:136 forms.py:306 +msgid "Password" +msgstr "Hasło" + +#: forms.py:70 +msgid "Password confirmation" +msgstr "Potwierdzenie hasła" + +#: forms.py:72 +msgid "Enter the same password as above, for verification." +msgstr "Podaj powyższe hasło w celu weryfikacji." + +#: forms.py:113 +msgid "" +"Raw passwords are not stored, so there is no way to see this user's " +"password, but you can change the password using this " +"form." +msgstr "" + +#: forms.py:139 msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." @@ -80,11 +88,7 @@ msgstr "" "Proszę wpisać poprawną nazwę użytkownika i hasło. Uwaga: wielkość liter ma " "znaczenie." -#: forms.py:89 -msgid "This account is inactive." -msgstr "To konto jest nieaktywne." - -#: forms.py:96 +#: forms.py:141 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." @@ -92,11 +96,11 @@ msgstr "" "Twoja przeglądarka nie chce akceptować ciasteczek. Są one wymagane do " "zalogowania się." -#: forms.py:108 -msgid "E-mail" -msgstr "E-mail" +#: forms.py:143 +msgid "This account is inactive." +msgstr "To konto jest nieaktywne." -#: forms.py:117 +#: forms.py:187 msgid "" "That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" @@ -104,101 +108,125 @@ msgstr "" "Ten adres e-mail nie ma przypisanego konta. Jesteś pewien, że " "zarejestrowałeś się?" -#: forms.py:143 -#, python-format -msgid "Password reset on %s" -msgstr "Hasło zresetowane dla %s" +#: forms.py:189 +msgid "" +"The user account associated with this e-mail address cannot reset the " +"password." +msgstr "" +"Użytkownik, którego konto powiązane jest z tym adresem e-mail nie może " +"zresetować hasła." -#: forms.py:151 +#: forms.py:192 +msgid "E-mail" +msgstr "E-mail" + +#: forms.py:249 msgid "New password" msgstr "Nowe hasło" -#: forms.py:152 +#: forms.py:251 msgid "New password confirmation" -msgstr "Nowe hasło ponownie" +msgstr "Nowe hasło (powtórz)" -#: forms.py:177 -msgid "Old password" -msgstr "Stare hasło" - -#: forms.py:185 +#: forms.py:280 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "Podane stare hasło jest niepoprawne. Proszę podać je jeszcze raz." -#: forms.py:194 +#: forms.py:283 +msgid "Old password" +msgstr "Stare hasło" + +#: forms.py:308 msgid "Password (again)" msgstr "Hasło (powtórz)" -#: models.py:76 models.py:104 +#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355 +#: hashers.py:389 +msgid "algorithm" +msgstr "" + +#: hashers.py:219 +msgid "iterations" +msgstr "" + +#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390 +msgid "salt" +msgstr "" + +#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391 +msgid "hash" +msgstr "" + +#: hashers.py:270 +msgid "work factor" +msgstr "" + +#: hashers.py:272 +msgid "checksum" +msgstr "" + +#: models.py:66 models.py:113 msgid "name" msgstr "nazwa" -#: models.py:78 +#: models.py:68 msgid "codename" msgstr "nazwa kodowa" -#: models.py:82 +#: models.py:72 msgid "permission" msgstr "uprawnienie" -#: models.py:83 models.py:105 +#: models.py:73 models.py:115 msgid "permissions" msgstr "uprawnienia" -#: models.py:108 +#: models.py:120 msgid "group" msgstr "grupa" -#: models.py:109 models.py:216 +#: models.py:121 models.py:250 msgid "groups" msgstr "grupy" -#: models.py:206 +#: models.py:232 msgid "username" msgstr "użytkownik" -#: models.py:206 +#: models.py:233 msgid "" "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters" msgstr "Wymagane. 30 znaków lub mniej. Tylko litery, cyfry i znaki @/./+/-/_." -#: models.py:207 +#: models.py:235 msgid "first name" msgstr "imię" -#: models.py:208 +#: models.py:236 msgid "last name" msgstr "nazwisko" -#: models.py:209 +#: models.py:237 msgid "e-mail address" msgstr "adres e-mail" -#: models.py:210 +#: models.py:238 msgid "password" msgstr "hasło" -#: models.py:210 -msgid "" -"Use '[algo]$[salt]$[hexdigest]' or use the change " -"password form." -msgstr "" -"Użyj '[algo]$[salt]$[hexdigest]' lub formularza zmiany " -"hasła." - -#: models.py:211 +#: models.py:239 msgid "staff status" msgstr "w zespole" -#: models.py:211 +#: models.py:240 msgid "Designates whether the user can log into this admin site." msgstr "Oznacza czy użytkownik może zalogować się do panelu admina." -#: models.py:212 +#: models.py:242 msgid "active" msgstr "aktywny" -#: models.py:212 +#: models.py:243 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." @@ -206,11 +234,11 @@ msgstr "" "Oznacza czy użytkownika należy uważać za aktywnego. Odznacz to, zamiast " "usuwać konta." -#: models.py:213 +#: models.py:245 msgid "superuser status" msgstr "status administratora" -#: models.py:213 +#: models.py:246 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." @@ -218,42 +246,41 @@ msgstr "" "Oznacza, że ten użytkownik ma wszystkie uprawnienia bez jawnego " "przypisywania ich." -#: models.py:214 +#: models.py:248 msgid "last login" msgstr "ostatnio zalogowany" -#: models.py:215 +#: models.py:249 msgid "date joined" msgstr "data przyłączenia" -#: models.py:217 +#: models.py:251 msgid "" -"In addition to the permissions manually assigned, this user will also get " -"all permissions granted to each group he/she is in." +"The groups this user belongs to. A user will get all permissions granted to " +"each of his/her group." msgstr "" -"Oprócz uprawnień przypisanych bezpośrednio użytkownikowi otrzyma on " -"uprawnienia grup, do których należy." -#: models.py:218 +#: models.py:255 msgid "user permissions" msgstr "uprawnienia użytkownika" -#: models.py:222 +#: models.py:260 msgid "user" msgstr "użytkownik" -#: models.py:223 +#: models.py:261 msgid "users" msgstr "użytkownicy" -#: models.py:406 -msgid "message" -msgstr "wiadomość" - -#: views.py:91 +#: views.py:93 msgid "Logged out" msgstr "Wylogowany" -#: management/commands/createsuperuser.py:23 +#: management/commands/createsuperuser.py:27 msgid "Enter a valid e-mail address." msgstr "Wprowadź poprawny adres e-mail." + +#: templates/registration/password_reset_subject.txt:2 +#, python-format +msgid "Password reset on %(site_name)s" +msgstr "Reset hasła dla konta na stronie %(site_name)s" diff --git a/django/contrib/auth/locale/pt/LC_MESSAGES/django.mo b/django/contrib/auth/locale/pt/LC_MESSAGES/django.mo index eaa2b9260d9..ab6f30462a4 100644 Binary files a/django/contrib/auth/locale/pt/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/pt/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/pt/LC_MESSAGES/django.po b/django/contrib/auth/locale/pt/LC_MESSAGES/django.po index d904572ce9e..f7eaadd2ea5 100644 --- a/django/contrib/auth/locale/pt/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/pt/LC_MESSAGES/django.po @@ -1,78 +1,85 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Jannis Leidel , 2011. +# Nuno Mariz , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:14-0400\n" -"PO-Revision-Date: 2011-03-11 10:43+0000\n" -"Last-Translator: nmariz \n" -"Language-Team: Portuguese <>\n" +"POT-Creation-Date: 2012-03-14 00:15-0700\n" +"PO-Revision-Date: 2012-03-08 12:07+0000\n" +"Last-Translator: Nuno Mariz \n" +"Language-Team: Portuguese (http://www.transifex.net/projects/p/django/" +"language/pt/)\n" +"Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: pt\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: admin.py:28 +#: admin.py:41 msgid "Personal info" msgstr "Informação pessoal" -#: admin.py:29 +#: admin.py:42 msgid "Permissions" msgstr "Permissões" -#: admin.py:30 +#: admin.py:44 msgid "Important dates" msgstr "Datas importantes" -#: admin.py:31 -msgid "Groups" -msgstr "Grupos" - -#: admin.py:113 +#: admin.py:125 msgid "Password changed successfully." msgstr "Palavra-passe modificada com sucesso." -#: admin.py:123 +#: admin.py:135 #, python-format msgid "Change password: %s" msgstr "Modificar a palavra-passe: %s" -#: forms.py:14 forms.py:48 forms.py:66 +#: forms.py:58 +msgid "A user with that username already exists." +msgstr "Já existe um utilizador com esse nome." + +#: forms.py:59 forms.py:247 forms.py:304 +msgid "The two password fields didn't match." +msgstr "Os dois campos da palavra-passe não coincidem." + +#: forms.py:61 forms.py:106 forms.py:135 msgid "Username" msgstr "Utilizador" -#: forms.py:15 forms.py:49 +#: forms.py:63 forms.py:107 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." msgstr "" "Obrigatório. 30 carateres ou menos. Apenas letras, dígitos e @/./+/-/_." -#: forms.py:16 forms.py:50 +#: forms.py:66 forms.py:110 msgid "This value may contain only letters, numbers and @/./+/-/_ characters." msgstr "Este valor apenas deverá conter letras, números e carateres @/./+/-/_." -#: forms.py:17 forms.py:67 forms.py:193 +#: forms.py:68 forms.py:112 forms.py:136 forms.py:306 msgid "Password" msgstr "Palavra-passe" -#: forms.py:18 +#: forms.py:70 msgid "Password confirmation" msgstr "Confirmação da palavra-passe" -#: forms.py:19 +#: forms.py:72 msgid "Enter the same password as above, for verification." msgstr "Introduza a palavra-passe como acima, para verificação." -#: forms.py:31 -msgid "A user with that username already exists." -msgstr "Já existe um utilizador com esse nome." +#: forms.py:113 +msgid "" +"Raw passwords are not stored, so there is no way to see this user's " +"password, but you can change the password using this " +"form." +msgstr "" -#: forms.py:37 forms.py:163 forms.py:205 -msgid "The two password fields didn't match." -msgstr "Os dois campos da palavra-passe não coincidem." - -#: forms.py:87 +#: forms.py:139 msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." @@ -80,11 +87,7 @@ msgstr "" "Por favor introduza o utilizador e palavra-passe corretos. Note que ambos os " "casos diferenciam maiúsculas e minúsculas." -#: forms.py:89 -msgid "This account is inactive." -msgstr "Esta conta não está activa." - -#: forms.py:96 +#: forms.py:141 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." @@ -92,11 +95,11 @@ msgstr "" "Aparentemente que o seu browser não está configurado para aceitar cookies. " "Os cookies são necessários para poder entrar." -#: forms.py:108 -msgid "E-mail" -msgstr "E-mail" +#: forms.py:143 +msgid "This account is inactive." +msgstr "Esta conta não está activa." -#: forms.py:117 +#: forms.py:187 msgid "" "That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" @@ -104,105 +107,127 @@ msgstr "" "Esse e-mail não tem nenhuma conta de utilizador associada. Tem a certeza que " "já se registou?" -#: forms.py:143 -#, python-format -msgid "Password reset on %s" -msgstr "Palavra-passe reinicializada em %s" +#: forms.py:189 +msgid "" +"The user account associated with this e-mail address cannot reset the " +"password." +msgstr "" -#: forms.py:151 +#: forms.py:192 +msgid "E-mail" +msgstr "E-mail" + +#: forms.py:249 msgid "New password" msgstr "Nova palavra-passe" -#: forms.py:152 +#: forms.py:251 msgid "New password confirmation" msgstr "Confirmação da nova palavra-passe" -#: forms.py:177 -msgid "Old password" -msgstr "Palavra-passe antiga" - -#: forms.py:185 +#: forms.py:280 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "" "A sua palavra-passe antiga foi introduzida incorretamente. Por favor tente " "novamente." -#: forms.py:194 +#: forms.py:283 +msgid "Old password" +msgstr "Palavra-passe antiga" + +#: forms.py:308 msgid "Password (again)" msgstr "Palavra-passe (novamente)" -#: models.py:76 models.py:104 +#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355 +#: hashers.py:389 +msgid "algorithm" +msgstr "" + +#: hashers.py:219 +msgid "iterations" +msgstr "" + +#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390 +msgid "salt" +msgstr "" + +#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391 +msgid "hash" +msgstr "" + +#: hashers.py:270 +msgid "work factor" +msgstr "" + +#: hashers.py:272 +msgid "checksum" +msgstr "" + +#: models.py:66 models.py:113 msgid "name" msgstr "nome" -#: models.py:78 +#: models.py:68 msgid "codename" msgstr "nome de código" -#: models.py:82 +#: models.py:72 msgid "permission" msgstr "permissão" -#: models.py:83 models.py:105 +#: models.py:73 models.py:115 msgid "permissions" msgstr "permissões" -#: models.py:108 +#: models.py:120 msgid "group" msgstr "grupo" -#: models.py:109 models.py:216 +#: models.py:121 models.py:250 msgid "groups" msgstr "grupos" -#: models.py:206 +#: models.py:232 msgid "username" msgstr "utilizador" -#: models.py:206 +#: models.py:233 msgid "" "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters" msgstr "" "Obrigatório. 30 carateres ou menos. Apenas letras, números e carateres @/./" "+/-/_." -#: models.py:207 +#: models.py:235 msgid "first name" msgstr "primeiro nome" -#: models.py:208 +#: models.py:236 msgid "last name" msgstr "último nome" -#: models.py:209 +#: models.py:237 msgid "e-mail address" msgstr "endereço de e-mail" -#: models.py:210 +#: models.py:238 msgid "password" msgstr "palavra-passe" -#: models.py:210 -msgid "" -"Use '[algo]$[salt]$[hexdigest]' or use the change " -"password form." -msgstr "" -"Use '[algo]$[salt]$[hexdigest]' ou use o formulário de " -"modificação da palavra-passe." - -#: models.py:211 +#: models.py:239 msgid "staff status" msgstr "status de equipa" -#: models.py:211 +#: models.py:240 msgid "Designates whether the user can log into this admin site." msgstr "Define se o utilizador pode usar a administração do site." -#: models.py:212 +#: models.py:242 msgid "active" msgstr "ativo" -#: models.py:212 +#: models.py:243 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." @@ -210,11 +235,11 @@ msgstr "" "Defina se este utilizador deva ser tratado como ativo. Não selecione em vez " "de remover as contas." -#: models.py:213 +#: models.py:245 msgid "superuser status" msgstr "Status de superuser" -#: models.py:213 +#: models.py:246 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." @@ -222,42 +247,41 @@ msgstr "" "Define se este utilizador tem todas as permissões sem explicitamente as " "atribuir." -#: models.py:214 +#: models.py:248 msgid "last login" msgstr "última entrada" -#: models.py:215 +#: models.py:249 msgid "date joined" msgstr "data de registo" -#: models.py:217 +#: models.py:251 msgid "" -"In addition to the permissions manually assigned, this user will also get " -"all permissions granted to each group he/she is in." +"The groups this user belongs to. A user will get all permissions granted to " +"each of his/her group." msgstr "" -"Em adição às permissões definidas manualmente, este utilizador também terá " -"todas as permissões atribuídas a cada grupo a que pertence." -#: models.py:218 +#: models.py:255 msgid "user permissions" msgstr "permissões do utilizador" -#: models.py:222 +#: models.py:260 msgid "user" msgstr "utilizador" -#: models.py:223 +#: models.py:261 msgid "users" msgstr "utilizadores" -#: models.py:406 -msgid "message" -msgstr "mensagem" - -#: views.py:91 +#: views.py:93 msgid "Logged out" msgstr "Saiu" -#: management/commands/createsuperuser.py:23 +#: management/commands/createsuperuser.py:27 msgid "Enter a valid e-mail address." msgstr "Introduza um endereço de e-mail válido." + +#: templates/registration/password_reset_subject.txt:2 +#, python-format +msgid "Password reset on %(site_name)s" +msgstr "" diff --git a/django/contrib/auth/locale/pt_BR/LC_MESSAGES/django.mo b/django/contrib/auth/locale/pt_BR/LC_MESSAGES/django.mo index ecdeeaf7659..82af11ca4b3 100644 Binary files a/django/contrib/auth/locale/pt_BR/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/pt_BR/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/pt_BR/LC_MESSAGES/django.po b/django/contrib/auth/locale/pt_BR/LC_MESSAGES/django.po index 5f80406c4a0..8d18888c798 100644 --- a/django/contrib/auth/locale/pt_BR/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/pt_BR/LC_MESSAGES/django.po @@ -1,80 +1,87 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Guilherme Gondim , 2012. +# Jannis Leidel , 2011. +# Sandro , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:14-0400\n" -"PO-Revision-Date: 2011-03-04 18:41+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Portuguese (Brazilian) \n" +"Language-Team: Portuguese (Brazil) \n" +"Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: pt_BR\n" "Plural-Forms: nplurals=2; plural=(n > 1)\n" -#: admin.py:28 +#: admin.py:41 msgid "Personal info" msgstr "Informações pessoais" -#: admin.py:29 +#: admin.py:42 msgid "Permissions" msgstr "Permissões" -#: admin.py:30 +#: admin.py:44 msgid "Important dates" msgstr "Datas importantes" -#: admin.py:31 -msgid "Groups" -msgstr "Grupos" - -#: admin.py:113 +#: admin.py:125 msgid "Password changed successfully." msgstr "Senha modificada com sucesso." -#: admin.py:123 +#: admin.py:135 #, python-format msgid "Change password: %s" msgstr "Alterar senha: %s" -#: forms.py:14 forms.py:48 forms.py:66 +#: forms.py:58 +msgid "A user with that username already exists." +msgstr "Um usuário com este nome de usuário já existe." + +#: forms.py:59 forms.py:247 forms.py:304 +msgid "The two password fields didn't match." +msgstr "Os dois campos de senha não combinam." + +#: forms.py:61 forms.py:106 forms.py:135 msgid "Username" msgstr "Usuário" -#: forms.py:15 forms.py:49 +#: forms.py:63 forms.py:107 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." msgstr "" "Obrigatório. 30 caracteres ou menos. Somente letras, dígitos e @/./+/-/_." -#: forms.py:16 forms.py:50 +#: forms.py:66 forms.py:110 msgid "This value may contain only letters, numbers and @/./+/-/_ characters." msgstr "" "Este valor deve conter apenas letras, números e os caracteres @/./+/-/_." -#: forms.py:17 forms.py:67 forms.py:193 +#: forms.py:68 forms.py:112 forms.py:136 forms.py:306 msgid "Password" msgstr "Senha" -#: forms.py:18 +#: forms.py:70 msgid "Password confirmation" msgstr "Confirmação de senha" -#: forms.py:19 +#: forms.py:72 msgid "Enter the same password as above, for verification." msgstr "Informe a mesma senha digitada acima, para verificação." -#: forms.py:31 -msgid "A user with that username already exists." -msgstr "Um usuário com este nome de usuário já existe." +#: forms.py:113 +msgid "" +"Raw passwords are not stored, so there is no way to see this user's " +"password, but you can change the password using this " +"form." +msgstr "" -#: forms.py:37 forms.py:163 forms.py:205 -msgid "The two password fields didn't match." -msgstr "Os dois campos de senha não combinam." - -#: forms.py:87 +#: forms.py:139 msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." @@ -82,11 +89,7 @@ msgstr "" "Por favor, entre com um usuário e senha corretos. Note que ambos os campos " "diferenciam maiúsculas e minúsculas." -#: forms.py:89 -msgid "This account is inactive." -msgstr "Esta conta está inativa." - -#: forms.py:96 +#: forms.py:141 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." @@ -94,11 +97,11 @@ msgstr "" "Seu navegador Web não parece estar com os cookies habilitados. Cookies são " "requeridos para acessar." -#: forms.py:108 -msgid "E-mail" -msgstr "E-mail" +#: forms.py:143 +msgid "This account is inactive." +msgstr "Esta conta está inativa." -#: forms.py:117 +#: forms.py:187 msgid "" "That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" @@ -106,104 +109,129 @@ msgstr "" "Este endereço de e-mail não está associado com uma conta de usuário. Você " "tem certeza que está registrado?" -#: forms.py:143 -#, python-format -msgid "Password reset on %s" -msgstr "Recuperar senha em %s" +#: forms.py:189 +msgid "" +"The user account associated with this e-mail address cannot reset the " +"password." +msgstr "" +"A conta de usuário associada a este endereço de e-mail não pode redefinir a " +"senha." -#: forms.py:151 +#: forms.py:192 +msgid "E-mail" +msgstr "E-mail" + +#: forms.py:249 msgid "New password" msgstr "Nova senha" -#: forms.py:152 +#: forms.py:251 msgid "New password confirmation" msgstr "Confirmação da nova senha" -#: forms.py:177 -msgid "Old password" -msgstr "Senha antiga" - -#: forms.py:185 +#: forms.py:280 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "" "A senha antiga foi digitada incorretamente. Por favor, informe a senha " "novamente." -#: forms.py:194 +#: forms.py:283 +msgid "Old password" +msgstr "Senha antiga" + +#: forms.py:308 msgid "Password (again)" msgstr "Senha (novamente)" -#: models.py:76 models.py:104 +#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355 +#: hashers.py:389 +msgid "algorithm" +msgstr "" + +#: hashers.py:219 +msgid "iterations" +msgstr "" + +#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390 +msgid "salt" +msgstr "" + +#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391 +msgid "hash" +msgstr "" + +#: hashers.py:270 +msgid "work factor" +msgstr "" + +#: hashers.py:272 +msgid "checksum" +msgstr "" + +#: models.py:66 models.py:113 msgid "name" msgstr "nome" -#: models.py:78 +#: models.py:68 msgid "codename" msgstr "apelido" -#: models.py:82 +#: models.py:72 msgid "permission" msgstr "permissão" -#: models.py:83 models.py:105 +#: models.py:73 models.py:115 msgid "permissions" msgstr "permissões" -#: models.py:108 +#: models.py:120 msgid "group" msgstr "grupo" -#: models.py:109 models.py:216 +#: models.py:121 models.py:250 msgid "groups" msgstr "grupos" -#: models.py:206 +#: models.py:232 msgid "username" msgstr "usuário" -#: models.py:206 +#: models.py:233 msgid "" "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters" msgstr "" "Obrigatório. 30 caracteres ou menos. Letras, números e os caracteres @/./+/-/" "_" -#: models.py:207 +#: models.py:235 msgid "first name" msgstr "primeiro nome" -#: models.py:208 +#: models.py:236 msgid "last name" msgstr "último nome" -#: models.py:209 +#: models.py:237 msgid "e-mail address" msgstr "endereço de e-mail" -#: models.py:210 +#: models.py:238 msgid "password" msgstr "senha" -#: models.py:210 -msgid "" -"Use '[algo]$[salt]$[hexdigest]' or use the change " -"password form." -msgstr "" -"Use '[algo]$[salt]$[hexdigest]' ou Altere a senha." - -#: models.py:211 +#: models.py:239 msgid "staff status" msgstr "membro da equipe" -#: models.py:211 +#: models.py:240 msgid "Designates whether the user can log into this admin site." msgstr "Indica que usuário consegue acessar este site de administração." -#: models.py:212 +#: models.py:242 msgid "active" msgstr "ativo" -#: models.py:212 +#: models.py:243 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." @@ -211,11 +239,11 @@ msgstr "" "Indica que o usuário será tratado como ativo. Ao invés de excluir contas de " "usuário, desmarque isso." -#: models.py:213 +#: models.py:245 msgid "superuser status" msgstr "status de superusuário" -#: models.py:213 +#: models.py:246 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." @@ -223,42 +251,41 @@ msgstr "" "Indica que este usuário tem todas as permissões sem atribuí-las " "explicitamente." -#: models.py:214 +#: models.py:248 msgid "last login" msgstr "último login" -#: models.py:215 +#: models.py:249 msgid "date joined" msgstr "data de registro" -#: models.py:217 +#: models.py:251 msgid "" -"In addition to the permissions manually assigned, this user will also get " -"all permissions granted to each group he/she is in." +"The groups this user belongs to. A user will get all permissions granted to " +"each of his/her group." msgstr "" -"Em adição às permissões atribuídas manualmente, este usuário também terá " -"todas as permissões dadas a cada grupo que participar." -#: models.py:218 +#: models.py:255 msgid "user permissions" msgstr "permissões do usuário" -#: models.py:222 +#: models.py:260 msgid "user" msgstr "usuário" -#: models.py:223 +#: models.py:261 msgid "users" msgstr "usuários" -#: models.py:406 -msgid "message" -msgstr "mensagem" - -#: views.py:91 +#: views.py:93 msgid "Logged out" msgstr "Sessão encerrada" -#: management/commands/createsuperuser.py:23 +#: management/commands/createsuperuser.py:27 msgid "Enter a valid e-mail address." -msgstr "Informe um endereço de email válido." +msgstr "Informe um endereço de e-mail válido." + +#: templates/registration/password_reset_subject.txt:2 +#, python-format +msgid "Password reset on %(site_name)s" +msgstr "Redefinição de senha em %(site_name)s " diff --git a/django/contrib/auth/locale/ro/LC_MESSAGES/django.mo b/django/contrib/auth/locale/ro/LC_MESSAGES/django.mo index 9fc1d26b5af..8caec47a09d 100644 Binary files a/django/contrib/auth/locale/ro/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/ro/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/ro/LC_MESSAGES/django.po b/django/contrib/auth/locale/ro/LC_MESSAGES/django.po index 4c2d71c7716..bda1ca1f2f1 100644 --- a/django/contrib/auth/locale/ro/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/ro/LC_MESSAGES/django.po @@ -1,80 +1,88 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Daniel Ursache-Dogariu , 2011. +# Denis Darii , 2011. +# Jannis Leidel , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:14-0400\n" -"PO-Revision-Date: 2011-03-11 14:14+0000\n" -"Last-Translator: danniel \n" -"Language-Team: Romanian \n" +"POT-Creation-Date: 2012-03-14 00:15-0700\n" +"PO-Revision-Date: 2012-03-08 12:07+0000\n" +"Last-Translator: Daniel Ursache-Dogariu \n" +"Language-Team: Romanian (http://www.transifex.net/projects/p/django/language/" +"ro/)\n" +"Language: ro\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ro\n" "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?" "2:1))\n" -#: admin.py:28 +#: admin.py:41 msgid "Personal info" msgstr "Informații personale" -#: admin.py:29 +#: admin.py:42 msgid "Permissions" msgstr "Permisiuni" -#: admin.py:30 +#: admin.py:44 msgid "Important dates" msgstr "Date importante" -#: admin.py:31 -msgid "Groups" -msgstr "Grupuri" - -#: admin.py:113 +#: admin.py:125 msgid "Password changed successfully." msgstr "Parolă schimbată cu succes." -#: admin.py:123 +#: admin.py:135 #, python-format msgid "Change password: %s" msgstr "Schimbă parola: %s" -#: forms.py:14 forms.py:48 forms.py:66 +#: forms.py:58 +msgid "A user with that username already exists." +msgstr "Un utilizator cu acest nume de utilizator există deja." + +#: forms.py:59 forms.py:247 forms.py:304 +msgid "The two password fields didn't match." +msgstr "Cele două câmpuri pentru parole nu coincid." + +#: forms.py:61 forms.py:106 forms.py:135 msgid "Username" msgstr "Nume utilizator" -#: forms.py:15 forms.py:49 +#: forms.py:63 forms.py:107 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." msgstr "" "Obligatoriu. 30 de caractere sau mai puține. Numai litere, cifre și @/./+/-/" "_." -#: forms.py:16 forms.py:50 +#: forms.py:66 forms.py:110 msgid "This value may contain only letters, numbers and @/./+/-/_ characters." msgstr "Această valoare poate conține numai litere, cifre şi @/./+/-/_." -#: forms.py:17 forms.py:67 forms.py:193 +#: forms.py:68 forms.py:112 forms.py:136 forms.py:306 msgid "Password" msgstr "Parolă" -#: forms.py:18 +#: forms.py:70 msgid "Password confirmation" msgstr "Confirmare parolă" -#: forms.py:19 +#: forms.py:72 msgid "Enter the same password as above, for verification." msgstr "Introduceți aceeași parolă, pentru verificare." -#: forms.py:31 -msgid "A user with that username already exists." -msgstr "Un utilizator cu acest nume de utilizator există deja." +#: forms.py:113 +msgid "" +"Raw passwords are not stored, so there is no way to see this user's " +"password, but you can change the password using this " +"form." +msgstr "" -#: forms.py:37 forms.py:163 forms.py:205 -msgid "The two password fields didn't match." -msgstr "Cele două câmpuri pentru parole nu coincid." - -#: forms.py:87 +#: forms.py:139 msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." @@ -82,11 +90,7 @@ msgstr "" "Introduceți un nume de utilizator și o parolă corectă. Ambele câmpuri sunt " "sensibile la majuscule." -#: forms.py:89 -msgid "This account is inactive." -msgstr "Acest cont este inactiv." - -#: forms.py:96 +#: forms.py:141 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." @@ -94,11 +98,11 @@ msgstr "" "Navigatorul dumneavoastră nu pare să aibă activat suportul pentru cookies. " "Acesta este necesar pentru autentificare." -#: forms.py:108 -msgid "E-mail" -msgstr "E-mail" +#: forms.py:143 +msgid "This account is inactive." +msgstr "Acest cont este inactiv." -#: forms.py:117 +#: forms.py:187 msgid "" "That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" @@ -106,105 +110,127 @@ msgstr "" "Adresa de e-mail nu are asociat un cont de utilizator. Sigur v-ați " "înregistrat?" -#: forms.py:143 -#, python-format -msgid "Password reset on %s" -msgstr "Parolă resetată pe %s" +#: forms.py:189 +msgid "" +"The user account associated with this e-mail address cannot reset the " +"password." +msgstr "" -#: forms.py:151 +#: forms.py:192 +msgid "E-mail" +msgstr "E-mail" + +#: forms.py:249 msgid "New password" msgstr "Parolă nouă" -#: forms.py:152 +#: forms.py:251 msgid "New password confirmation" msgstr "Confirmarea parolă nouă" -#: forms.py:177 -msgid "Old password" -msgstr "Parolă veche" - -#: forms.py:185 +#: forms.py:280 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "Parola veche a fost introdusă greșit. Introduceți-o din nou." -#: forms.py:194 +#: forms.py:283 +msgid "Old password" +msgstr "Parolă veche" + +#: forms.py:308 msgid "Password (again)" msgstr "Parolă (din nou)" -#: models.py:76 models.py:104 +#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355 +#: hashers.py:389 +msgid "algorithm" +msgstr "" + +#: hashers.py:219 +msgid "iterations" +msgstr "" + +#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390 +msgid "salt" +msgstr "" + +#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391 +msgid "hash" +msgstr "" + +#: hashers.py:270 +msgid "work factor" +msgstr "" + +#: hashers.py:272 +msgid "checksum" +msgstr "" + +#: models.py:66 models.py:113 msgid "name" msgstr "nume" -#: models.py:78 +#: models.py:68 msgid "codename" msgstr "nume de cod" -#: models.py:82 +#: models.py:72 msgid "permission" msgstr "permisiune" -#: models.py:83 models.py:105 +#: models.py:73 models.py:115 msgid "permissions" msgstr "permisiuni" -#: models.py:108 +#: models.py:120 msgid "group" msgstr "grup" -#: models.py:109 models.py:216 +#: models.py:121 models.py:250 msgid "groups" msgstr "grupuri" -#: models.py:206 +#: models.py:232 msgid "username" msgstr "nume utilizator" -#: models.py:206 +#: models.py:233 msgid "" "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters" msgstr "" "Obligatoriu. 30 de caractere sau mai puține. Numai litere, numere și @/./+/-/" "_." -#: models.py:207 +#: models.py:235 msgid "first name" msgstr "Prenume" -#: models.py:208 +#: models.py:236 msgid "last name" msgstr "Nume" -#: models.py:209 +#: models.py:237 msgid "e-mail address" msgstr "adresă email" -#: models.py:210 +#: models.py:238 msgid "password" msgstr "parolă" -#: models.py:210 -msgid "" -"Use '[algo]$[salt]$[hexdigest]' or use the change " -"password form." -msgstr "" -"Folosiți '[algo]$[salt]$[hexdigest]' sau folosiți formularul de schimbare a parolei." - -#: models.py:211 +#: models.py:239 msgid "staff status" msgstr "stare autorizare" -#: models.py:211 +#: models.py:240 msgid "Designates whether the user can log into this admin site." msgstr "" "Marchează dacă utilizatorul se poate autentifica în acest site de " "administrare." -#: models.py:212 +#: models.py:242 msgid "active" msgstr "activ" -#: models.py:212 +#: models.py:243 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." @@ -212,11 +238,11 @@ msgstr "" "Marchează dacă acest utilizator trebuie tratat ca activ sau nu. Deselectați " "în loc de a șterge conturi." -#: models.py:213 +#: models.py:245 msgid "superuser status" msgstr "stare superutilizator" -#: models.py:213 +#: models.py:246 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." @@ -224,42 +250,41 @@ msgstr "" "Marchează daca acest utilizator are toate permisiunile, fără a le mai " "selecta explicit." -#: models.py:214 +#: models.py:248 msgid "last login" msgstr "ultima autentificare" -#: models.py:215 +#: models.py:249 msgid "date joined" msgstr "data înscrierii" -#: models.py:217 +#: models.py:251 msgid "" -"In addition to the permissions manually assigned, this user will also get " -"all permissions granted to each group he/she is in." +"The groups this user belongs to. A user will get all permissions granted to " +"each of his/her group." msgstr "" -"Suplimentar permisiunilor alocate manual, acest utilizator va primi toate " -"permisiunile alocate fiecărui grup din care face parte." -#: models.py:218 +#: models.py:255 msgid "user permissions" msgstr "permisiuni utilizator" -#: models.py:222 +#: models.py:260 msgid "user" msgstr "utilizator" -#: models.py:223 +#: models.py:261 msgid "users" msgstr "utilizatori" -#: models.py:406 -msgid "message" -msgstr "mesaj" - -#: views.py:91 +#: views.py:93 msgid "Logged out" msgstr "Deautentificat" -#: management/commands/createsuperuser.py:23 +#: management/commands/createsuperuser.py:27 msgid "Enter a valid e-mail address." msgstr "Introduceți o adresă de e-mail validă." + +#: templates/registration/password_reset_subject.txt:2 +#, python-format +msgid "Password reset on %(site_name)s" +msgstr "" diff --git a/django/contrib/auth/locale/ru/LC_MESSAGES/django.mo b/django/contrib/auth/locale/ru/LC_MESSAGES/django.mo index a9c7b50ccfe..54926d5de17 100644 Binary files a/django/contrib/auth/locale/ru/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/ru/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/ru/LC_MESSAGES/django.po b/django/contrib/auth/locale/ru/LC_MESSAGES/django.po index 915f81d754f..ee58be1b223 100644 --- a/django/contrib/auth/locale/ru/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/ru/LC_MESSAGES/django.po @@ -1,80 +1,91 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Eugene MechanisM , 2012. +# Jannis Leidel , 2011. +# Алексей Борискин , 2012. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:14-0400\n" -"PO-Revision-Date: 2011-03-04 18:41+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Russian <>\n" +"POT-Creation-Date: 2012-03-14 00:15-0700\n" +"PO-Revision-Date: 2012-03-08 12:07+0000\n" +"Last-Translator: Алексей Борискин \n" +"Language-Team: Russian (http://www.transifex.net/projects/p/django/language/" +"ru/)\n" +"Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ru\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" +"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" -#: admin.py:28 +#: admin.py:41 msgid "Personal info" msgstr "Персональная информация" -#: admin.py:29 +#: admin.py:42 msgid "Permissions" msgstr "Права" -#: admin.py:30 +#: admin.py:44 msgid "Important dates" msgstr "Важные даты" -#: admin.py:31 -msgid "Groups" -msgstr "Группы" - -#: admin.py:113 +#: admin.py:125 msgid "Password changed successfully." msgstr "Пароль успешно изменен." -#: admin.py:123 +#: admin.py:135 #, python-format msgid "Change password: %s" msgstr "Изменение пароля: %s" -#: forms.py:14 forms.py:48 forms.py:66 +#: forms.py:58 +msgid "A user with that username already exists." +msgstr "Пользователь с таким именем уже существует." + +#: forms.py:59 forms.py:247 forms.py:304 +msgid "The two password fields didn't match." +msgstr "Два поля с паролями не совпадают." + +#: forms.py:61 forms.py:106 forms.py:135 msgid "Username" msgstr "Имя пользователя" -#: forms.py:15 forms.py:49 +#: forms.py:63 forms.py:107 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." msgstr "" "Обязательное поле. Введите 30 символов или менее. Используйте только буквы, " "цифры и знаки из набора @/./+/-/_." -#: forms.py:16 forms.py:50 +#: forms.py:66 forms.py:110 msgid "This value may contain only letters, numbers and @/./+/-/_ characters." msgstr "Значение должно состоять только из букв, цифр и знаков @/./+/-/_." -#: forms.py:17 forms.py:67 forms.py:193 +#: forms.py:68 forms.py:112 forms.py:136 forms.py:306 msgid "Password" msgstr "Пароль" -#: forms.py:18 +#: forms.py:70 msgid "Password confirmation" msgstr "Подтверждение пароля" -#: forms.py:19 +#: forms.py:72 msgid "Enter the same password as above, for verification." msgstr "Введите тот же пароль, что и выше, для подтверждения." -#: forms.py:31 -msgid "A user with that username already exists." -msgstr "Пользователь с таким именем уже существует." +#: forms.py:113 +msgid "" +"Raw passwords are not stored, so there is no way to see this user's " +"password, but you can change the password using this " +"form." +msgstr "" +"Пароли не хранятся в открытом виде, поэтому нет возможности увидеть пароль " +"этого пользователя. Но вы можете изменить пароль используя эту форму." -#: forms.py:37 forms.py:163 forms.py:205 -msgid "The two password fields didn't match." -msgstr "Два поля с паролями не совпадают." - -#: forms.py:87 +#: forms.py:139 msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." @@ -82,21 +93,17 @@ msgstr "" "Пожалуйста, введите верные имя пользователя и пароль. Помните, оба поля " "чувствительны к регистру." -#: forms.py:89 -msgid "This account is inactive." -msgstr "Эта учетная запись отключена." - -#: forms.py:96 +#: forms.py:141 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." msgstr "У вашего браузера не включены cookies. Cookies необходимы для входа." -#: forms.py:108 -msgid "E-mail" -msgstr "Адрес электронной почты" +#: forms.py:143 +msgid "This account is inactive." +msgstr "Эта учетная запись отключена." -#: forms.py:117 +#: forms.py:187 msgid "" "That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" @@ -104,104 +111,128 @@ msgstr "" "Этот адрес электронной почты не связан ни с одной учетной записью. Вы " "уверены, что зарегистрированы?" -#: forms.py:143 -#, python-format -msgid "Password reset on %s" -msgstr "Восстановление пароля на %s" +#: forms.py:189 +msgid "" +"The user account associated with this e-mail address cannot reset the " +"password." +msgstr "" +"Аккаунт пользователя ассоциированного с этим e-mail адресом не может " +"сбрасывать пароль." -#: forms.py:151 +#: forms.py:192 +msgid "E-mail" +msgstr "Адрес электронной почты" + +#: forms.py:249 msgid "New password" msgstr "Новый пароль" -#: forms.py:152 +#: forms.py:251 msgid "New password confirmation" msgstr "Подтверждение нового пароля" -#: forms.py:177 -msgid "Old password" -msgstr "Старый пароль" - -#: forms.py:185 +#: forms.py:280 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "Ваш старый пароль введен неправильно. Пожалуйста, введите его снова." -#: forms.py:194 +#: forms.py:283 +msgid "Old password" +msgstr "Старый пароль" + +#: forms.py:308 msgid "Password (again)" msgstr "Пароль (еще раз)" -#: models.py:76 models.py:104 +#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355 +#: hashers.py:389 +msgid "algorithm" +msgstr "алгоритм" + +#: hashers.py:219 +msgid "iterations" +msgstr "итерации" + +#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390 +msgid "salt" +msgstr "соль" + +#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391 +msgid "hash" +msgstr "хэш" + +#: hashers.py:270 +msgid "work factor" +msgstr "рабочий фактор" + +#: hashers.py:272 +msgid "checksum" +msgstr "контрольная сумма" + +#: models.py:66 models.py:113 msgid "name" msgstr "имя" -#: models.py:78 +#: models.py:68 msgid "codename" msgstr "кодовое название" -#: models.py:82 +#: models.py:72 msgid "permission" msgstr "право" -#: models.py:83 models.py:105 +#: models.py:73 models.py:115 msgid "permissions" msgstr "права" -#: models.py:108 +#: models.py:120 msgid "group" msgstr "группа" -#: models.py:109 models.py:216 +#: models.py:121 models.py:250 msgid "groups" msgstr "группы" -#: models.py:206 +#: models.py:232 msgid "username" msgstr "имя пользователя" -#: models.py:206 +#: models.py:233 msgid "" "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters" msgstr "" "Обязательное поле. Введите 30 символов или менее. Используйте только буквы, " "цифры и знаки из набора @/./+/-/_" -#: models.py:207 +#: models.py:235 msgid "first name" msgstr "имя" -#: models.py:208 +#: models.py:236 msgid "last name" msgstr "фамилия" -#: models.py:209 +#: models.py:237 msgid "e-mail address" msgstr "адрес электронной почты" -#: models.py:210 +#: models.py:238 msgid "password" msgstr "пароль" -#: models.py:210 -msgid "" -"Use '[algo]$[salt]$[hexdigest]' or use the change " -"password form." -msgstr "" -"Используйте '[algo]$[salt]$[hexdigest]' или форму для " -"изменения пароля." - -#: models.py:211 +#: models.py:239 msgid "staff status" msgstr "статус персонала" -#: models.py:211 +#: models.py:240 msgid "Designates whether the user can log into this admin site." msgstr "" "Отметьте, если пользователь может входить в административную часть сайта." -#: models.py:212 +#: models.py:242 msgid "active" msgstr "активный" -#: models.py:212 +#: models.py:243 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." @@ -209,52 +240,53 @@ msgstr "" "Отметьте, если пользователь должен считаться активным. Уберите эту отметку " "вместо удаления аккаунта." -#: models.py:213 +#: models.py:245 msgid "superuser status" msgstr "статус суперпользователя" -#: models.py:213 +#: models.py:246 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." msgstr "Указывает, что пользователь имеет все права без явного их назначения." -#: models.py:214 +#: models.py:248 msgid "last login" msgstr "последний вход" -#: models.py:215 +#: models.py:249 msgid "date joined" msgstr "дата регистрации" -#: models.py:217 +#: models.py:251 msgid "" -"In addition to the permissions manually assigned, this user will also get " -"all permissions granted to each group he/she is in." +"The groups this user belongs to. A user will get all permissions granted to " +"each of his/her group." msgstr "" -"В добавление к правам, присвоенным вручную, этот пользователь получит все " -"права групп, к которым он принадлежит." +"Группы, к которым принадлежит пользователь. Пользователь будет иметь все " +"права, указанные в каждой его/её группе." -#: models.py:218 +#: models.py:255 msgid "user permissions" msgstr "права пользователя" -#: models.py:222 +#: models.py:260 msgid "user" msgstr "пользователь" -#: models.py:223 +#: models.py:261 msgid "users" msgstr "пользователи" -#: models.py:406 -msgid "message" -msgstr "сообщение" - -#: views.py:91 +#: views.py:93 msgid "Logged out" msgstr "Не авторизован" -#: management/commands/createsuperuser.py:23 +#: management/commands/createsuperuser.py:27 msgid "Enter a valid e-mail address." msgstr "Введите правильный адрес электронной почты." + +#: templates/registration/password_reset_subject.txt:2 +#, python-format +msgid "Password reset on %(site_name)s" +msgstr "Сброс пароля на %(site_name)s" diff --git a/django/contrib/auth/locale/sk/LC_MESSAGES/django.mo b/django/contrib/auth/locale/sk/LC_MESSAGES/django.mo index aa4ea3768c5..4214d4b4e77 100644 Binary files a/django/contrib/auth/locale/sk/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/sk/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/sk/LC_MESSAGES/django.po b/django/contrib/auth/locale/sk/LC_MESSAGES/django.po index 4e289b19161..3b6f3600a45 100644 --- a/django/contrib/auth/locale/sk/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/sk/LC_MESSAGES/django.po @@ -1,77 +1,84 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Jannis Leidel , 2011. +# Marian Andre , 2012. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:14-0400\n" -"PO-Revision-Date: 2011-03-04 18:41+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Slovak \n" +"POT-Creation-Date: 2012-03-14 00:15-0700\n" +"PO-Revision-Date: 2012-03-08 12:07+0000\n" +"Last-Translator: Marian Andre \n" +"Language-Team: Slovak (http://www.transifex.net/projects/p/django/language/" +"sk/)\n" +"Language: sk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: sk\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n" -#: admin.py:28 +#: admin.py:41 msgid "Personal info" msgstr "Osobné údaje" -#: admin.py:29 +#: admin.py:42 msgid "Permissions" msgstr "Práva" -#: admin.py:30 +#: admin.py:44 msgid "Important dates" msgstr "Dôležité dátumy" -#: admin.py:31 -msgid "Groups" -msgstr "Skupiny" - -#: admin.py:113 +#: admin.py:125 msgid "Password changed successfully." msgstr "Heslo úspešne zmenené." -#: admin.py:123 +#: admin.py:135 #, python-format msgid "Change password: %s" msgstr "Zmeniť heslo: %s" -#: forms.py:14 forms.py:48 forms.py:66 -msgid "Username" -msgstr "Používateľské meno" - -#: forms.py:15 forms.py:49 -msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." -msgstr "Povinné. 30 znakov alebo menej. Iba písmená, čísla a @/./+/-/_." - -#: forms.py:16 forms.py:50 -msgid "This value may contain only letters, numbers and @/./+/-/_ characters." -msgstr "Táto hodnota môže obsahovať len písmená, číslice a znaky @/./+/-/_." - -#: forms.py:17 forms.py:67 forms.py:193 -msgid "Password" -msgstr "Heslo" - -#: forms.py:18 -msgid "Password confirmation" -msgstr "Potvrdenie hesla" - -#: forms.py:19 -msgid "Enter the same password as above, for verification." -msgstr "Kvôli overeniu zadajte rovnaké heslo ako vyššie." - -#: forms.py:31 +#: forms.py:58 msgid "A user with that username already exists." msgstr "Používateľ s takým používateľským menom už existuje." -#: forms.py:37 forms.py:163 forms.py:205 +#: forms.py:59 forms.py:247 forms.py:304 msgid "The two password fields didn't match." msgstr "Heslo a jeho potvrdenie sa nezhodujú." -#: forms.py:87 +#: forms.py:61 forms.py:106 forms.py:135 +msgid "Username" +msgstr "Používateľské meno" + +#: forms.py:63 forms.py:107 +msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." +msgstr "Povinné. 30 znakov alebo menej. Iba písmená, čísla a @/./+/-/_." + +#: forms.py:66 forms.py:110 +msgid "This value may contain only letters, numbers and @/./+/-/_ characters." +msgstr "Táto hodnota môže obsahovať len písmená, číslice a znaky @/./+/-/_." + +#: forms.py:68 forms.py:112 forms.py:136 forms.py:306 +msgid "Password" +msgstr "Heslo" + +#: forms.py:70 +msgid "Password confirmation" +msgstr "Potvrdenie hesla" + +#: forms.py:72 +msgid "Enter the same password as above, for verification." +msgstr "Kvôli overeniu zadajte rovnaké heslo ako vyššie." + +#: forms.py:113 +msgid "" +"Raw passwords are not stored, so there is no way to see this user's " +"password, but you can change the password using this " +"form." +msgstr "" + +#: forms.py:139 msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." @@ -79,22 +86,18 @@ msgstr "" "Prosím, zadajte správne používateľské meno a heslo. Rešpektujte malé a veľké " "písmená." -#: forms.py:89 -msgid "This account is inactive." -msgstr "Tento účet je neaktívny." - -#: forms.py:96 +#: forms.py:141 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." msgstr "" "Váš prehliadač nemá povolené cookies. Cookies sú potrebné pre prihlásenie." -#: forms.py:108 -msgid "E-mail" -msgstr "E-mail" +#: forms.py:143 +msgid "This account is inactive." +msgstr "Tento účet je neaktívny." -#: forms.py:117 +#: forms.py:187 msgid "" "That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" @@ -102,113 +105,136 @@ msgstr "" "Táto e-mail adresa nemá priradený žiadny používateľský účet. Ste si istý, že " "ste sa zaregistrovali?" -#: forms.py:143 -#, python-format -msgid "Password reset on %s" -msgstr "Obnovenie hesla na %s" +#: forms.py:189 +msgid "" +"The user account associated with this e-mail address cannot reset the " +"password." +msgstr "" +"Používateľský účet spojený s touto e-mailovou adresu nemôže obnoviť heslo." -#: forms.py:151 +#: forms.py:192 +msgid "E-mail" +msgstr "E-mail" + +#: forms.py:249 msgid "New password" msgstr "Nové heslo" -#: forms.py:152 +#: forms.py:251 msgid "New password confirmation" msgstr "Potvrdenie nového hesla" -#: forms.py:177 -msgid "Old password" -msgstr "Staré heslo" - -#: forms.py:185 +#: forms.py:280 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "Nezadali ste správne svoje staré heslo. Napíšte ho znovu, prosím." -#: forms.py:194 +#: forms.py:283 +msgid "Old password" +msgstr "Staré heslo" + +#: forms.py:308 msgid "Password (again)" msgstr "Heslo (znova)" -#: models.py:76 models.py:104 +#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355 +#: hashers.py:389 +msgid "algorithm" +msgstr "" + +#: hashers.py:219 +msgid "iterations" +msgstr "" + +#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390 +msgid "salt" +msgstr "" + +#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391 +msgid "hash" +msgstr "" + +#: hashers.py:270 +msgid "work factor" +msgstr "" + +#: hashers.py:272 +msgid "checksum" +msgstr "" + +#: models.py:66 models.py:113 msgid "name" msgstr "meno" -#: models.py:78 +#: models.py:68 msgid "codename" msgstr "kódové meno" -#: models.py:82 +#: models.py:72 msgid "permission" msgstr "oprávnenie" -#: models.py:83 models.py:105 +#: models.py:73 models.py:115 msgid "permissions" msgstr "oprávnenia" -#: models.py:108 +#: models.py:120 msgid "group" msgstr "skupina" -#: models.py:109 models.py:216 +#: models.py:121 models.py:250 msgid "groups" msgstr "skupiny" -#: models.py:206 +#: models.py:232 msgid "username" msgstr "používateľské meno" -#: models.py:206 +#: models.py:233 msgid "" "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters" msgstr "" "Povinné. 30 znakov alebo menej. Len písmená, číslice a znaky @/./+/-/_." -#: models.py:207 +#: models.py:235 msgid "first name" msgstr "krstné meno" -#: models.py:208 +#: models.py:236 msgid "last name" msgstr "priezvisko" -#: models.py:209 +#: models.py:237 msgid "e-mail address" msgstr "e-mailová adresa" -#: models.py:210 +#: models.py:238 msgid "password" msgstr "heslo" -#: models.py:210 -msgid "" -"Use '[algo]$[salt]$[hexdigest]' or use the change " -"password form." -msgstr "" -"Použite '[algo]$[salt]$[hexdigest]' alebo formulár na " -"zmenu hesla." - -#: models.py:211 +#: models.py:239 msgid "staff status" msgstr "postavenie zamestnanca" -#: models.py:211 +#: models.py:240 msgid "Designates whether the user can log into this admin site." msgstr "Určuje, či sa používateľ môže prihlásiť do správy stránok." -#: models.py:212 +#: models.py:242 msgid "active" msgstr "aktívny" -#: models.py:212 +#: models.py:243 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." msgstr "" "Určuje, či je účet aktívny. Odškrtnite, ak chcete vypnúť používateľský účet." -#: models.py:213 +#: models.py:245 msgid "superuser status" msgstr "status superpoužívateľa" -#: models.py:213 +#: models.py:246 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." @@ -216,42 +242,41 @@ msgstr "" "Určuje, či používateľ získava automaticky všetky práva aj bez priameho " "priradenia." -#: models.py:214 +#: models.py:248 msgid "last login" msgstr "naposledy prihlásený" -#: models.py:215 +#: models.py:249 msgid "date joined" msgstr "dátum registrácie" -#: models.py:217 +#: models.py:251 msgid "" -"In addition to the permissions manually assigned, this user will also get " -"all permissions granted to each group he/she is in." +"The groups this user belongs to. A user will get all permissions granted to " +"each of his/her group." msgstr "" -"Okrem ručne zadaných práv bude mať používateľ aj všetky práva prislúchajúce " -"skupinám, v ktorých sa nachádza." -#: models.py:218 +#: models.py:255 msgid "user permissions" msgstr "používateľské oprávnenia" -#: models.py:222 +#: models.py:260 msgid "user" msgstr "používateľ" -#: models.py:223 +#: models.py:261 msgid "users" msgstr "používatelia" -#: models.py:406 -msgid "message" -msgstr "správa" - -#: views.py:91 +#: views.py:93 msgid "Logged out" msgstr "Odhlásený" -#: management/commands/createsuperuser.py:23 +#: management/commands/createsuperuser.py:27 msgid "Enter a valid e-mail address." msgstr "Zadajte platnú e-mailovú adresu." + +#: templates/registration/password_reset_subject.txt:2 +#, python-format +msgid "Password reset on %(site_name)s" +msgstr "Obnovenie hesla pre %(site_name)s " diff --git a/django/contrib/auth/locale/sl/LC_MESSAGES/django.mo b/django/contrib/auth/locale/sl/LC_MESSAGES/django.mo index d961b396796..bf17013714e 100644 Binary files a/django/contrib/auth/locale/sl/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/sl/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/sl/LC_MESSAGES/django.po b/django/contrib/auth/locale/sl/LC_MESSAGES/django.po index 774b91e1f5a..02203a907f3 100644 --- a/django/contrib/auth/locale/sl/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/sl/LC_MESSAGES/django.po @@ -1,81 +1,91 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Jannis Leidel , 2011. +# , 2011, 2012. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:14-0400\n" -"PO-Revision-Date: 2011-03-04 18:41+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Slovenian \n" +"POT-Creation-Date: 2012-03-14 00:15-0700\n" +"PO-Revision-Date: 2012-03-08 12:07+0000\n" +"Last-Translator: zejn \n" +"Language-Team: Slovenian (http://www.transifex.net/projects/p/django/" +"language/sl/)\n" +"Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: sl\n" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" "%100==4 ? 2 : 3)\n" -#: admin.py:28 +#: admin.py:41 msgid "Personal info" msgstr "Osebni podatki" -#: admin.py:29 +#: admin.py:42 msgid "Permissions" msgstr "Dovoljenja" -#: admin.py:30 +#: admin.py:44 msgid "Important dates" msgstr "Pomembni datumi" -#: admin.py:31 -msgid "Groups" -msgstr "Skupine" - -#: admin.py:113 +#: admin.py:125 msgid "Password changed successfully." msgstr "Geslo je bilo uspešno spremenjeno." -#: admin.py:123 +#: admin.py:135 #, python-format msgid "Change password: %s" msgstr "Spremeni geslo: %s" -#: forms.py:14 forms.py:48 forms.py:66 +#: forms.py:58 +msgid "A user with that username already exists." +msgstr "Uporabnik s tem uporabniškim imenom že obstaja." + +#: forms.py:59 forms.py:247 forms.py:304 +msgid "The two password fields didn't match." +msgstr "Gesli se ne ujemata." + +#: forms.py:61 forms.py:106 forms.py:135 msgid "Username" msgstr "Uporabniško ime" -#: forms.py:15 forms.py:49 +#: forms.py:63 forms.py:107 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." msgstr "" "Zahtevano. 30 znakov ali manj. Samo alfanumerični znaki ali naslednji znaki " "@/./+/-/_." -#: forms.py:16 forms.py:50 +#: forms.py:66 forms.py:110 msgid "This value may contain only letters, numbers and @/./+/-/_ characters." msgstr "" "Ta vrednost sme vsebovati le črke, števila ali kateri znak izmed @/./+/-/_." -#: forms.py:17 forms.py:67 forms.py:193 +#: forms.py:68 forms.py:112 forms.py:136 forms.py:306 msgid "Password" msgstr "Geslo" -#: forms.py:18 +#: forms.py:70 msgid "Password confirmation" msgstr "Potrditev gesla" -#: forms.py:19 +#: forms.py:72 msgid "Enter the same password as above, for verification." msgstr "Vpišite enako geslo kot zgoraj, da se izognete tipkarskim napakam." -#: forms.py:31 -msgid "A user with that username already exists." -msgstr "Uporabnik s tem uporabniškim imenom že obstaja." +#: forms.py:113 +msgid "" +"Raw passwords are not stored, so there is no way to see this user's " +"password, but you can change the password using this " +"form." +msgstr "" +"Gesla se ne shranjujejo v berljivi obliki, zato ne morete videti gesla tega " +"uporabnika, lahko pa geslo spremenite s pomočjo tega " +"obrazca." -#: forms.py:37 forms.py:163 forms.py:205 -msgid "The two password fields didn't match." -msgstr "Gesli se ne ujemata." - -#: forms.py:87 +#: forms.py:139 msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." @@ -83,11 +93,7 @@ msgstr "" "Prosimo, vnesite veljavno uporabniško ime in geslo. Opomba: obe polji " "upoštevata velikost črk." -#: forms.py:89 -msgid "This account is inactive." -msgstr "Ta uporabniški račun ni aktiven." - -#: forms.py:96 +#: forms.py:141 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." @@ -95,11 +101,11 @@ msgstr "" "Izgleda, da vaš brskalnik nima omogočenih piškotkov. Piškotki so potrebni za " "prijavo." -#: forms.py:108 -msgid "E-mail" -msgstr "E-poštni naslov" +#: forms.py:143 +msgid "This account is inactive." +msgstr "Ta uporabniški račun ni aktiven." -#: forms.py:117 +#: forms.py:187 msgid "" "That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" @@ -107,103 +113,125 @@ msgstr "" "Tega e-mail naslova ni mogoče pripisati nobenemu uporabniku. Ali ste " "prepričani, da ste registrirani?" -#: forms.py:143 -#, python-format -msgid "Password reset on %s" -msgstr "Ponastavitev gesla za %s" +#: forms.py:189 +msgid "" +"The user account associated with this e-mail address cannot reset the " +"password." +msgstr "Uporabnik s tem e-poštnim naslovom ne more ponastaviti gesla." -#: forms.py:151 +#: forms.py:192 +msgid "E-mail" +msgstr "E-poštni naslov" + +#: forms.py:249 msgid "New password" msgstr "Novo geslo" -#: forms.py:152 +#: forms.py:251 msgid "New password confirmation" msgstr "Potrditev novega gesla" -#: forms.py:177 -msgid "Old password" -msgstr "Staro geslo" - -#: forms.py:185 +#: forms.py:280 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "Vaše staro geslo ni pravilno. Prosim, poskusite ponovno." -#: forms.py:194 +#: forms.py:283 +msgid "Old password" +msgstr "Staro geslo" + +#: forms.py:308 msgid "Password (again)" msgstr "Geslo (ponovno)" -#: models.py:76 models.py:104 +#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355 +#: hashers.py:389 +msgid "algorithm" +msgstr "algoritem" + +#: hashers.py:219 +msgid "iterations" +msgstr "iteracij" + +#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390 +msgid "salt" +msgstr "naključna vrednost" + +#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391 +msgid "hash" +msgstr "zgoščena vsota" + +#: hashers.py:270 +msgid "work factor" +msgstr "faktor obremenitve" + +#: hashers.py:272 +msgid "checksum" +msgstr "preverjevalna vsota" + +#: models.py:66 models.py:113 msgid "name" msgstr "ime" -#: models.py:78 +#: models.py:68 msgid "codename" msgstr "kodno ime" -#: models.py:82 +#: models.py:72 msgid "permission" msgstr "dovoljenje" -#: models.py:83 models.py:105 +#: models.py:73 models.py:115 msgid "permissions" msgstr "dovoljenja" -#: models.py:108 +#: models.py:120 msgid "group" msgstr "skupina" -#: models.py:109 models.py:216 +#: models.py:121 models.py:250 msgid "groups" msgstr "skupine" -#: models.py:206 +#: models.py:232 msgid "username" msgstr "uporabniško ime" -#: models.py:206 +#: models.py:233 msgid "" "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters" msgstr "" "Zahtevano. 30 znakov ali manj. Samo alfanumerični znaki in kateri znak izmed " "@/./+/-/_" -#: models.py:207 +#: models.py:235 msgid "first name" msgstr "ime" -#: models.py:208 +#: models.py:236 msgid "last name" msgstr "priimek" -#: models.py:209 +#: models.py:237 msgid "e-mail address" msgstr "e-mail naslov" -#: models.py:210 +#: models.py:238 msgid "password" msgstr "geslo" -#: models.py:210 -msgid "" -"Use '[algo]$[salt]$[hexdigest]' or use the change " -"password form." -msgstr "" -"Uporabite '[algo]$[salt]$[hexdigest]' ali obrazec za " -"spremembo gesla." - -#: models.py:211 +#: models.py:239 msgid "staff status" msgstr "status osebja" -#: models.py:211 +#: models.py:240 msgid "Designates whether the user can log into this admin site." msgstr "Določi, če se sme uporabnik prijaviti v to administracijsko stran." -#: models.py:212 +#: models.py:242 msgid "active" msgstr "aktiven" -#: models.py:212 +#: models.py:243 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." @@ -211,11 +239,11 @@ msgstr "" "Določi, če se uporabnik smatra za aktivega. Odstranite to možnost namesto da " "brišete račune." -#: models.py:213 +#: models.py:245 msgid "superuser status" msgstr "status superuporabnika" -#: models.py:213 +#: models.py:246 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." @@ -223,42 +251,43 @@ msgstr "" "Uporabnik bo imel vse pravice brez da bi mu morali posamično dodeljevati " "pravice." -#: models.py:214 +#: models.py:248 msgid "last login" msgstr "zadnja prijava" -#: models.py:215 +#: models.py:249 msgid "date joined" msgstr "registriran od" -#: models.py:217 +#: models.py:251 msgid "" -"In addition to the permissions manually assigned, this user will also get " -"all permissions granted to each group he/she is in." +"The groups this user belongs to. A user will get all permissions granted to " +"each of his/her group." msgstr "" -"Poleg ročno določenih dovoljenj bo ta uporabnik dobil tudi vsa dovoljenja, " -"ki pripadajo skupinam, katerih član je." +"Skupine, katerih član je ta uporabnik. Uporabnik pridobi vse pravice, " +"povezane z vsako skupino." -#: models.py:218 +#: models.py:255 msgid "user permissions" msgstr "uporabniška dovoljenja" -#: models.py:222 +#: models.py:260 msgid "user" msgstr "uporabnik" -#: models.py:223 +#: models.py:261 msgid "users" msgstr "uporabniki" -#: models.py:406 -msgid "message" -msgstr "sporočilo" - -#: views.py:91 +#: views.py:93 msgid "Logged out" msgstr "Odjavljen" -#: management/commands/createsuperuser.py:23 +#: management/commands/createsuperuser.py:27 msgid "Enter a valid e-mail address." msgstr "Vnesite veljaven e-mail." + +#: templates/registration/password_reset_subject.txt:2 +#, python-format +msgid "Password reset on %(site_name)s" +msgstr "Geslo na %(site_name)s je bilo ponastavljeno." diff --git a/django/contrib/auth/locale/sq/LC_MESSAGES/django.mo b/django/contrib/auth/locale/sq/LC_MESSAGES/django.mo index ea791c1b0fe..c6d99aeba86 100644 Binary files a/django/contrib/auth/locale/sq/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/sq/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/sq/LC_MESSAGES/django.po b/django/contrib/auth/locale/sq/LC_MESSAGES/django.po index 916f280a315..d8617969221 100644 --- a/django/contrib/auth/locale/sq/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/sq/LC_MESSAGES/django.po @@ -1,80 +1,86 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Besnik , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:14-0400\n" -"PO-Revision-Date: 2011-03-04 18:41+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Albanian \n" +"POT-Creation-Date: 2012-03-14 00:15-0700\n" +"PO-Revision-Date: 2012-03-08 12:07+0000\n" +"Last-Translator: Jannis Leidel \n" +"Language-Team: Albanian (http://www.transifex.net/projects/p/django/language/" +"sq/)\n" +"Language: sq\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: sq\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: admin.py:28 +#: admin.py:41 msgid "Personal info" msgstr "Të dhëna personale" -#: admin.py:29 +#: admin.py:42 msgid "Permissions" msgstr "Leje" -#: admin.py:30 +#: admin.py:44 msgid "Important dates" msgstr "Të dhëna të rëndësishme" -#: admin.py:31 -msgid "Groups" -msgstr "Grupe" - -#: admin.py:113 +#: admin.py:125 msgid "Password changed successfully." msgstr "Fjalëkalimi u ndryshua me sukses." -#: admin.py:123 +#: admin.py:135 #, python-format msgid "Change password: %s" msgstr "Ndryshoni fjalëkalimin: %s" -#: forms.py:14 forms.py:48 forms.py:66 +#: forms.py:58 +msgid "A user with that username already exists." +msgstr "Ka tashmë një emër të tillë përdoruesi." + +#: forms.py:59 forms.py:247 forms.py:304 +msgid "The two password fields didn't match." +msgstr "Dy fushat për fjalëkalim nuk u përputhën." + +#: forms.py:61 forms.py:106 forms.py:135 msgid "Username" msgstr "Emër përdoruesi" -#: forms.py:15 forms.py:49 +#: forms.py:63 forms.py:107 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." msgstr "" "E domosdoshme. 30 ose më pak shenja. Vetëm shkronja, shifra dhe shenjat @/./" "+/-/_ ." -#: forms.py:16 forms.py:50 +#: forms.py:66 forms.py:110 msgid "This value may contain only letters, numbers and @/./+/-/_ characters." msgstr "" "Kjo vlerë mund të përmbajë vetëm shkronja, numra dhe shenja si @/./+/-/_ ." -#: forms.py:17 forms.py:67 forms.py:193 +#: forms.py:68 forms.py:112 forms.py:136 forms.py:306 msgid "Password" msgstr "Fjalëkalim" -#: forms.py:18 +#: forms.py:70 msgid "Password confirmation" msgstr "Ripohim fjalëkalimi" -#: forms.py:19 +#: forms.py:72 msgid "Enter the same password as above, for verification." msgstr "Jepni të njëjtin fjalëkalim si më sipër, për verifikim." -#: forms.py:31 -msgid "A user with that username already exists." -msgstr "Ka tashmë një emër të tillë përdoruesi." +#: forms.py:113 +msgid "" +"Raw passwords are not stored, so there is no way to see this user's " +"password, but you can change the password using this " +"form." +msgstr "" -#: forms.py:37 forms.py:163 forms.py:205 -msgid "The two password fields didn't match." -msgstr "Dy fushat për fjalëkalim nuk u përputhën." - -#: forms.py:87 +#: forms.py:139 msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." @@ -82,11 +88,7 @@ msgstr "" "Ju lutem, jepni një emër përdoruesi dhe fjalëkalim të saktë. Mbani parasysh " "që për të dyja fushat luan rol shkrimi me të madhe apo me të vogël." -#: forms.py:89 -msgid "This account is inactive." -msgstr "Kjo llogari nuk është aktive." - -#: forms.py:96 +#: forms.py:141 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." @@ -94,11 +96,11 @@ msgstr "" "Shfletuesi juaj Web nuk duket se i ka të aktivizuara \"cookie\"-t. \"Cookie" "\"-t janë të domosdoshme për hyrjen." -#: forms.py:108 -msgid "E-mail" -msgstr "E-mail" +#: forms.py:143 +msgid "This account is inactive." +msgstr "Kjo llogari nuk është aktive." -#: forms.py:117 +#: forms.py:187 msgid "" "That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" @@ -106,102 +108,124 @@ msgstr "" "Kësaj adrese e-mail nuk i përshoqërohet ndonjë llogari përdoruesi. Jeni i " "sigurt se jeni regjistruar?" -#: forms.py:143 -#, python-format -msgid "Password reset on %s" -msgstr "Ricaktim fjalëkalimi më %s" +#: forms.py:189 +msgid "" +"The user account associated with this e-mail address cannot reset the " +"password." +msgstr "" -#: forms.py:151 +#: forms.py:192 +msgid "E-mail" +msgstr "E-mail" + +#: forms.py:249 msgid "New password" msgstr "Fjalëkalim i ri" -#: forms.py:152 +#: forms.py:251 msgid "New password confirmation" msgstr "Ripohim fjalëkalimi të ri" -#: forms.py:177 -msgid "Old password" -msgstr "Fjalëkalim i vjetër" - -#: forms.py:185 +#: forms.py:280 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "Fjalëkalimi juaj i vjetër u dha pasaktësisht. Ju lutem, jepeni sërish." -#: forms.py:194 +#: forms.py:283 +msgid "Old password" +msgstr "Fjalëkalim i vjetër" + +#: forms.py:308 msgid "Password (again)" msgstr "Fjalëkalim (sërish)" -#: models.py:76 models.py:104 +#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355 +#: hashers.py:389 +msgid "algorithm" +msgstr "" + +#: hashers.py:219 +msgid "iterations" +msgstr "" + +#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390 +msgid "salt" +msgstr "" + +#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391 +msgid "hash" +msgstr "" + +#: hashers.py:270 +msgid "work factor" +msgstr "" + +#: hashers.py:272 +msgid "checksum" +msgstr "" + +#: models.py:66 models.py:113 msgid "name" msgstr "emër" -#: models.py:78 +#: models.py:68 msgid "codename" msgstr "emër i koduar" -#: models.py:82 +#: models.py:72 msgid "permission" msgstr "leje" -#: models.py:83 models.py:105 +#: models.py:73 models.py:115 msgid "permissions" msgstr "leje" -#: models.py:108 +#: models.py:120 msgid "group" msgstr "grup" -#: models.py:109 models.py:216 +#: models.py:121 models.py:250 msgid "groups" msgstr "grupe" -#: models.py:206 +#: models.py:232 msgid "username" msgstr "emër përdoruesi" -#: models.py:206 +#: models.py:233 msgid "" "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters" msgstr "" "E domosdoshme. 30 ose më pak shenja. Shkronja, numra dhe shenjat @/./+/-/_" -#: models.py:207 +#: models.py:235 msgid "first name" msgstr "emër" -#: models.py:208 +#: models.py:236 msgid "last name" msgstr "mbiemër" -#: models.py:209 +#: models.py:237 msgid "e-mail address" msgstr "adresë e-mail" -#: models.py:210 +#: models.py:238 msgid "password" msgstr "fjalëkalim" -#: models.py:210 -msgid "" -"Use '[algo]$[salt]$[hexdigest]' or use the change " -"password form." -msgstr "" -"Përdorni '[algo]$[salt]$[hexdigest]' ose përdorni formularin për ndërrim fjalëkalimi." - -#: models.py:211 +#: models.py:239 msgid "staff status" msgstr "vend në ekip" -#: models.py:211 +#: models.py:240 msgid "Designates whether the user can log into this admin site." msgstr "Përcakton nëse mund të hyjë ose jo përdoruesi te ky site administrimi." -#: models.py:212 +#: models.py:242 msgid "active" msgstr "veprues" -#: models.py:212 +#: models.py:243 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." @@ -209,53 +233,52 @@ msgstr "" "Përcakton nëse ky përdorues do të duhej trajtuar si aktiv. Çpërzgjidhni " "këtë, në vend se të fshihni llogarira." -#: models.py:213 +#: models.py:245 msgid "superuser status" msgstr "gjendje superpërdoruesi" -#: models.py:213 +#: models.py:246 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." msgstr "" "Përcakton që ky përdorues ka krejt lejet, pa ia akorduar ato shprehimisht." -#: models.py:214 +#: models.py:248 msgid "last login" msgstr "hyrja e fundit" -#: models.py:215 +#: models.py:249 msgid "date joined" msgstr "datë anëtarësimi" -#: models.py:217 +#: models.py:251 msgid "" -"In addition to the permissions manually assigned, this user will also get " -"all permissions granted to each group he/she is in." +"The groups this user belongs to. A user will get all permissions granted to " +"each of his/her group." msgstr "" -"Si shtesë e lejeve të dhëna dorazi, ky përdorues do të marrë gjithashtu " -"krejt lejet e akorduara për secilin grup ku ai/ajo bën pjesë." -#: models.py:218 +#: models.py:255 msgid "user permissions" msgstr "leje përdoruesi" -#: models.py:222 +#: models.py:260 msgid "user" msgstr "përdorues" -#: models.py:223 +#: models.py:261 msgid "users" msgstr "përdoruesa" -#: models.py:406 -msgid "message" -msgstr "mesazh" - -#: views.py:91 +#: views.py:93 msgid "Logged out" msgstr "I dalë" -#: management/commands/createsuperuser.py:23 +#: management/commands/createsuperuser.py:27 msgid "Enter a valid e-mail address." msgstr "Jepni një adresë e-mail të vlefshme." + +#: templates/registration/password_reset_subject.txt:2 +#, python-format +msgid "Password reset on %(site_name)s" +msgstr "" diff --git a/django/contrib/auth/locale/sr/LC_MESSAGES/django.mo b/django/contrib/auth/locale/sr/LC_MESSAGES/django.mo index 1047d19daf9..eaf12d45d8c 100644 Binary files a/django/contrib/auth/locale/sr/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/sr/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/sr/LC_MESSAGES/django.po b/django/contrib/auth/locale/sr/LC_MESSAGES/django.po index d9708b6d88c..c8027911d66 100644 --- a/django/contrib/auth/locale/sr/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/sr/LC_MESSAGES/django.po @@ -1,80 +1,89 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Jannis Leidel , 2011. +# Janos Guljas , 2011, 2012. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:14-0400\n" -"PO-Revision-Date: 2011-03-04 18:41+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Serbian \n" +"POT-Creation-Date: 2012-03-14 00:15-0700\n" +"PO-Revision-Date: 2012-03-08 12:07+0000\n" +"Last-Translator: Janos Guljas \n" +"Language-Team: Serbian (http://www.transifex.net/projects/p/django/language/" +"sr/)\n" +"Language: sr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: sr\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" +"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" -#: admin.py:28 +#: admin.py:41 msgid "Personal info" msgstr "Лични подаци" -#: admin.py:29 +#: admin.py:42 msgid "Permissions" msgstr "Дозволе" -#: admin.py:30 +#: admin.py:44 msgid "Important dates" msgstr "Важни датуми" -#: admin.py:31 -msgid "Groups" -msgstr "Групе" - -#: admin.py:113 +#: admin.py:125 msgid "Password changed successfully." msgstr "Лозинка успешно измењена." -#: admin.py:123 +#: admin.py:135 #, python-format msgid "Change password: %s" msgstr "Измени лозинку: %s" -#: forms.py:14 forms.py:48 forms.py:66 +#: forms.py:58 +msgid "A user with that username already exists." +msgstr "Корисник са тим корисничким именом већ постоји." + +#: forms.py:59 forms.py:247 forms.py:304 +msgid "The two password fields didn't match." +msgstr "Два поља за лозинке се нису поклопила." + +#: forms.py:61 forms.py:106 forms.py:135 msgid "Username" msgstr "Корисник" -#: forms.py:15 forms.py:49 +#: forms.py:63 forms.py:107 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." msgstr "" "Неопходно. Највише 30 словних места. Само алфанумерички знаци (слова, бројке " "и @/./+/-/_)." -#: forms.py:16 forms.py:50 +#: forms.py:66 forms.py:110 msgid "This value may contain only letters, numbers and @/./+/-/_ characters." msgstr "Ова вредност може садржати само слова, бројке и @/./+/-/_." -#: forms.py:17 forms.py:67 forms.py:193 +#: forms.py:68 forms.py:112 forms.py:136 forms.py:306 msgid "Password" msgstr "Лозинка" -#: forms.py:18 +#: forms.py:70 msgid "Password confirmation" msgstr "Потврда лозинке" -#: forms.py:19 +#: forms.py:72 msgid "Enter the same password as above, for verification." msgstr "Ради провере тачности поново унесите лозинку коју сте унели горе." -#: forms.py:31 -msgid "A user with that username already exists." -msgstr "Корисник са тим корисничким именом већ постоји." +#: forms.py:113 +msgid "" +"Raw passwords are not stored, so there is no way to see this user's " +"password, but you can change the password using this " +"form." +msgstr "" +"Лозинке у изворном облику се не чувају, тако да се не могу видети, али се " +"могу променити овде." -#: forms.py:37 forms.py:163 forms.py:205 -msgid "The two password fields didn't match." -msgstr "Два поља за лозинке се нису поклопила." - -#: forms.py:87 +#: forms.py:139 msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." @@ -82,11 +91,7 @@ msgstr "" "Унесите тачно корисничко име и лозинку. Пазите на разлику између малих и " "великих слова у оба поља." -#: forms.py:89 -msgid "This account is inactive." -msgstr "Овај налог је неактиван." - -#: forms.py:96 +#: forms.py:141 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." @@ -94,11 +99,11 @@ msgstr "" "Изгледа да су колачићи искључени у вашем браузеру. Они морају бити укључени " "да би сте се пријавили." -#: forms.py:108 -msgid "E-mail" -msgstr "Имејл адреса" +#: forms.py:143 +msgid "This account is inactive." +msgstr "Овај налог је неактиван." -#: forms.py:117 +#: forms.py:187 msgid "" "That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" @@ -106,104 +111,126 @@ msgstr "" "Та имејл адреса није у вези ни са једним налогом. Да ли сте сигурни да сте " "се већ регистровали?" -#: forms.py:143 -#, python-format -msgid "Password reset on %s" -msgstr "Ресетовање лозинке на %s" +#: forms.py:189 +msgid "" +"The user account associated with this e-mail address cannot reset the " +"password." +msgstr "Корисник са овом имејл адресом није у могућности да ресетује лозинку." -#: forms.py:151 +#: forms.py:192 +msgid "E-mail" +msgstr "Имејл адреса" + +#: forms.py:249 msgid "New password" msgstr "Нова лозинка" -#: forms.py:152 +#: forms.py:251 msgid "New password confirmation" msgstr "Потврда нове лозинке" -#: forms.py:177 -msgid "Old password" -msgstr "Стара лозинка" - -#: forms.py:185 +#: forms.py:280 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "Ваша стара лознка није правилно унесена. Унесите је поново." -#: forms.py:194 +#: forms.py:283 +msgid "Old password" +msgstr "Стара лозинка" + +#: forms.py:308 msgid "Password (again)" msgstr "Лозинка (поновите)" -#: models.py:76 models.py:104 +#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355 +#: hashers.py:389 +msgid "algorithm" +msgstr "алгоритам" + +#: hashers.py:219 +msgid "iterations" +msgstr "итерације" + +#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390 +msgid "salt" +msgstr "зачин" + +#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391 +msgid "hash" +msgstr "хеш" + +#: hashers.py:270 +msgid "work factor" +msgstr "фактор рада" + +#: hashers.py:272 +msgid "checksum" +msgstr "сума за проверу" + +#: models.py:66 models.py:113 msgid "name" msgstr "име" -#: models.py:78 +#: models.py:68 msgid "codename" msgstr "шифра дозволе" -#: models.py:82 +#: models.py:72 msgid "permission" msgstr "дозвола" -#: models.py:83 models.py:105 +#: models.py:73 models.py:115 msgid "permissions" msgstr "дозволе" -#: models.py:108 +#: models.py:120 msgid "group" msgstr "група" -#: models.py:109 models.py:216 +#: models.py:121 models.py:250 msgid "groups" msgstr "групе" -#: models.py:206 +#: models.py:232 msgid "username" msgstr "корисничко име" -#: models.py:206 +#: models.py:233 msgid "" "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters" msgstr "" "Неопходно. Највише 30 словних места. Само алфанумерички знаци (слова, бројке " "и @/./+/-/_)." -#: models.py:207 +#: models.py:235 msgid "first name" msgstr "име" -#: models.py:208 +#: models.py:236 msgid "last name" msgstr "презиме" -#: models.py:209 +#: models.py:237 msgid "e-mail address" msgstr "имејл адреса" -#: models.py:210 +#: models.py:238 msgid "password" msgstr "лозинка" -#: models.py:210 -msgid "" -"Use '[algo]$[salt]$[hexdigest]' or use the change " -"password form." -msgstr "" -"Користите '[algo]$[salt]$[hexdigest]' или формулар за " -"унос лозинке." - -#: models.py:211 +#: models.py:239 msgid "staff status" msgstr "статус члана посаде" -#: models.py:211 +#: models.py:240 msgid "Designates whether the user can log into this admin site." msgstr "" "Означава да ли корисник може да се пријави на овај сајт за администрацију." -#: models.py:212 +#: models.py:242 msgid "active" msgstr "активан" -#: models.py:212 +#: models.py:243 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." @@ -211,53 +238,54 @@ msgstr "" "Означава да ли се корисник сматра активним. Деселектујте ово уместо да " "бришете налог." -#: models.py:213 +#: models.py:245 msgid "superuser status" msgstr "статус администратора" -#: models.py:213 +#: models.py:246 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." msgstr "" "Означава да ли корисник има све дозволе без додељивања појединачних дозвола." -#: models.py:214 +#: models.py:248 msgid "last login" msgstr "последња пријава" -#: models.py:215 +#: models.py:249 msgid "date joined" msgstr "датум регистрације" -#: models.py:217 +#: models.py:251 msgid "" -"In addition to the permissions manually assigned, this user will also get " -"all permissions granted to each group he/she is in." +"The groups this user belongs to. A user will get all permissions granted to " +"each of his/her group." msgstr "" -"Поред ручно додељених дозвола, овај корисник ће имати и дозволе додељене " -"гурпама којима припада." +"Групе којима корисник припада. Корисник ће добити све дозволе група у којим " +"се налази." -#: models.py:218 +#: models.py:255 msgid "user permissions" msgstr "корисничке дозволе" -#: models.py:222 +#: models.py:260 msgid "user" msgstr "корисник" -#: models.py:223 +#: models.py:261 msgid "users" msgstr "корисници" -#: models.py:406 -msgid "message" -msgstr "порука" - -#: views.py:91 +#: views.py:93 msgid "Logged out" msgstr "Одјављен" -#: management/commands/createsuperuser.py:23 +#: management/commands/createsuperuser.py:27 msgid "Enter a valid e-mail address." msgstr "Унесите важећу имејл адресу." + +#: templates/registration/password_reset_subject.txt:2 +#, python-format +msgid "Password reset on %(site_name)s" +msgstr "Ресетовање лозинке на сајту %(site_name)s" diff --git a/django/contrib/auth/locale/sr_Latn/LC_MESSAGES/django.mo b/django/contrib/auth/locale/sr_Latn/LC_MESSAGES/django.mo index 2de8ce110c7..173030899d1 100644 Binary files a/django/contrib/auth/locale/sr_Latn/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/sr_Latn/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/sr_Latn/LC_MESSAGES/django.po b/django/contrib/auth/locale/sr_Latn/LC_MESSAGES/django.po index 52e566873f4..5bd1d90beb9 100644 --- a/django/contrib/auth/locale/sr_Latn/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/sr_Latn/LC_MESSAGES/django.po @@ -4,77 +4,80 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:14-0400\n" +"POT-Creation-Date: 2012-03-14 00:15-0700\n" "PO-Revision-Date: 2011-03-04 18:41+0000\n" "Last-Translator: Jannis \n" "Language-Team: Serbian (Latin) \n" +"Language: sr@latin\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: sr@latin\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" +"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" -#: admin.py:28 +#: admin.py:41 msgid "Personal info" msgstr "Lični podaci" -#: admin.py:29 +#: admin.py:42 msgid "Permissions" msgstr "Dozvole" -#: admin.py:30 +#: admin.py:44 msgid "Important dates" msgstr "Važni datumi" -#: admin.py:31 -msgid "Groups" -msgstr "Grupe" - -#: admin.py:113 +#: admin.py:125 msgid "Password changed successfully." msgstr "Lozinka uspešno izmenjena." -#: admin.py:123 +#: admin.py:135 #, python-format msgid "Change password: %s" msgstr "Izmeni lozinku: %s" -#: forms.py:14 forms.py:48 forms.py:66 +#: forms.py:58 +msgid "A user with that username already exists." +msgstr "Korisnik sa tim korisničkim imenom već postoji." + +#: forms.py:59 forms.py:247 forms.py:304 +msgid "The two password fields didn't match." +msgstr "Dva polja za lozinke se nisu poklopila." + +#: forms.py:61 forms.py:106 forms.py:135 msgid "Username" msgstr "Korisnik" -#: forms.py:15 forms.py:49 +#: forms.py:63 forms.py:107 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." msgstr "" "Neophodno. Najviše 30 slovnih mesta. Samo alfanumerički znaci (slova, brojke " "i @/./+/-/_)." -#: forms.py:16 forms.py:50 +#: forms.py:66 forms.py:110 msgid "This value may contain only letters, numbers and @/./+/-/_ characters." msgstr "Ova vrednost može sadržati samo slova, brojke i @/./+/-/_." -#: forms.py:17 forms.py:67 forms.py:193 +#: forms.py:68 forms.py:112 forms.py:136 forms.py:306 msgid "Password" msgstr "Lozinka" -#: forms.py:18 +#: forms.py:70 msgid "Password confirmation" msgstr "Potvrda lozinke" -#: forms.py:19 +#: forms.py:72 msgid "Enter the same password as above, for verification." msgstr "Radi provere tačnosti ponovo unesite lozinku koju ste uneli gore." -#: forms.py:31 -msgid "A user with that username already exists." -msgstr "Korisnik sa tim korisničkim imenom već postoji." +#: forms.py:113 +msgid "" +"Raw passwords are not stored, so there is no way to see this user's " +"password, but you can change the password using this " +"form." +msgstr "" -#: forms.py:37 forms.py:163 forms.py:205 -msgid "The two password fields didn't match." -msgstr "Dva polja za lozinke se nisu poklopila." - -#: forms.py:87 +#: forms.py:139 msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." @@ -82,11 +85,7 @@ msgstr "" "Unesite tačno korisničko ime i lozinku. Pazite na razliku između malih i " "velikih slova u oba polja." -#: forms.py:89 -msgid "This account is inactive." -msgstr "Ovaj nalog je neaktivan." - -#: forms.py:96 +#: forms.py:141 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." @@ -94,11 +93,11 @@ msgstr "" "Izgleda da su kolačići isključeni u vašem brauzeru. Oni moraju biti " "uključeni da bi ste se prijavili." -#: forms.py:108 -msgid "E-mail" -msgstr "Imejl adresa" +#: forms.py:143 +msgid "This account is inactive." +msgstr "Ovaj nalog je neaktivan." -#: forms.py:117 +#: forms.py:187 msgid "" "That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" @@ -106,104 +105,126 @@ msgstr "" "Ta imejl adresa nije u vezi ni sa jednim nalogom. Da li ste sigurni da ste " "se već registrovali?" -#: forms.py:143 -#, python-format -msgid "Password reset on %s" -msgstr "Resetovanje lozinke na %s" +#: forms.py:189 +msgid "" +"The user account associated with this e-mail address cannot reset the " +"password." +msgstr "" -#: forms.py:151 +#: forms.py:192 +msgid "E-mail" +msgstr "Imejl adresa" + +#: forms.py:249 msgid "New password" msgstr "Nova lozinka" -#: forms.py:152 +#: forms.py:251 msgid "New password confirmation" msgstr "Potvrda nove lozinke" -#: forms.py:177 -msgid "Old password" -msgstr "Stara lozinka" - -#: forms.py:185 +#: forms.py:280 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "Vaša stara loznka nije pravilno unesena. Unesite je ponovo." -#: forms.py:194 +#: forms.py:283 +msgid "Old password" +msgstr "Stara lozinka" + +#: forms.py:308 msgid "Password (again)" msgstr "Lozinka (ponovite)" -#: models.py:76 models.py:104 +#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355 +#: hashers.py:389 +msgid "algorithm" +msgstr "" + +#: hashers.py:219 +msgid "iterations" +msgstr "" + +#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390 +msgid "salt" +msgstr "" + +#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391 +msgid "hash" +msgstr "" + +#: hashers.py:270 +msgid "work factor" +msgstr "" + +#: hashers.py:272 +msgid "checksum" +msgstr "" + +#: models.py:66 models.py:113 msgid "name" msgstr "ime" -#: models.py:78 +#: models.py:68 msgid "codename" msgstr "šifra dozvole" -#: models.py:82 +#: models.py:72 msgid "permission" msgstr "dozvola" -#: models.py:83 models.py:105 +#: models.py:73 models.py:115 msgid "permissions" msgstr "dozvole" -#: models.py:108 +#: models.py:120 msgid "group" msgstr "grupa" -#: models.py:109 models.py:216 +#: models.py:121 models.py:250 msgid "groups" msgstr "grupe" -#: models.py:206 +#: models.py:232 msgid "username" msgstr "korisničko ime" -#: models.py:206 +#: models.py:233 msgid "" "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters" msgstr "" "Neophodno. Najviše 30 slovnih mesta. Samo alfanumerički znaci (slova, brojke " "i @/./+/-/_)." -#: models.py:207 +#: models.py:235 msgid "first name" msgstr "ime" -#: models.py:208 +#: models.py:236 msgid "last name" msgstr "prezime" -#: models.py:209 +#: models.py:237 msgid "e-mail address" msgstr "imejl adresa" -#: models.py:210 +#: models.py:238 msgid "password" msgstr "lozinka" -#: models.py:210 -msgid "" -"Use '[algo]$[salt]$[hexdigest]' or use the change " -"password form." -msgstr "" -"Koristite '[algo]$[salt]$[hexdigest]' ili formular za " -"unos lozinke." - -#: models.py:211 +#: models.py:239 msgid "staff status" msgstr "status člana posade" -#: models.py:211 +#: models.py:240 msgid "Designates whether the user can log into this admin site." msgstr "" "Označava da li korisnik može da se prijavi na ovaj sajt za administraciju." -#: models.py:212 +#: models.py:242 msgid "active" msgstr "aktivan" -#: models.py:212 +#: models.py:243 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." @@ -211,11 +232,11 @@ msgstr "" "Označava da li se korisnik smatra aktivnim. Deselektujte ovo umesto da " "brišete nalog." -#: models.py:213 +#: models.py:245 msgid "superuser status" msgstr "status administratora" -#: models.py:213 +#: models.py:246 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." @@ -223,42 +244,44 @@ msgstr "" "Označava da li korisnik ima sve dozvole bez dodeljivanja pojedinačnih " "dozvola." -#: models.py:214 +#: models.py:248 msgid "last login" msgstr "poslednja prijava" -#: models.py:215 +#: models.py:249 msgid "date joined" msgstr "datum registracije" -#: models.py:217 +#: models.py:251 +#, fuzzy msgid "" -"In addition to the permissions manually assigned, this user will also get " -"all permissions granted to each group he/she is in." +"The groups this user belongs to. A user will get all permissions granted to " +"each of his/her group." msgstr "" "Pored ručno dodeljenih dozvola, ovaj korisnik će imati i dozvole dodeljene " "gurpama kojima pripada." -#: models.py:218 +#: models.py:255 msgid "user permissions" msgstr "korisničke dozvole" -#: models.py:222 +#: models.py:260 msgid "user" msgstr "korisnik" -#: models.py:223 +#: models.py:261 msgid "users" msgstr "korisnici" -#: models.py:406 -msgid "message" -msgstr "poruka" - -#: views.py:91 +#: views.py:93 msgid "Logged out" msgstr "Odjavljen" -#: management/commands/createsuperuser.py:23 +#: management/commands/createsuperuser.py:27 msgid "Enter a valid e-mail address." msgstr "Unesite važeću imejl adresu." + +#: templates/registration/password_reset_subject.txt:2 +#, fuzzy, python-format +msgid "Password reset on %(site_name)s" +msgstr "Resetovanje lozinke na %s" diff --git a/django/contrib/auth/locale/sv/LC_MESSAGES/django.mo b/django/contrib/auth/locale/sv/LC_MESSAGES/django.mo index fae64846912..fbefcd4b548 100644 Binary files a/django/contrib/auth/locale/sv/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/sv/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/sv/LC_MESSAGES/django.po b/django/contrib/auth/locale/sv/LC_MESSAGES/django.po index c0b580d5401..3b0f38c5153 100644 --- a/django/contrib/auth/locale/sv/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/sv/LC_MESSAGES/django.po @@ -1,79 +1,90 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Andreas Pelme , 2011, 2012. +# Jannis Leidel , 2011. +# Samuel Linde , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:14-0400\n" -"PO-Revision-Date: 2011-03-04 18:41+0000\n" -"Last-Translator: samuellinde \n" -"Language-Team: Swedish <>\n" +"POT-Creation-Date: 2012-03-14 00:15-0700\n" +"PO-Revision-Date: 2012-03-08 12:07+0000\n" +"Last-Translator: Andreas Pelme \n" +"Language-Team: Swedish (http://www.transifex.net/projects/p/django/language/" +"sv/)\n" +"Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: sv\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: admin.py:28 +#: admin.py:41 msgid "Personal info" msgstr "Personlig information" -#: admin.py:29 +#: admin.py:42 msgid "Permissions" msgstr "Rättigheter" -#: admin.py:30 +#: admin.py:44 msgid "Important dates" msgstr "Viktiga datum" -#: admin.py:31 -msgid "Groups" -msgstr "Grupper" - -#: admin.py:113 +#: admin.py:125 msgid "Password changed successfully." msgstr "Lösenordet ändrades." -#: admin.py:123 +#: admin.py:135 #, python-format msgid "Change password: %s" msgstr "Ändra lösenord: %s" -#: forms.py:14 forms.py:48 forms.py:66 +#: forms.py:58 +msgid "A user with that username already exists." +msgstr "En användare med det användarnamnet finns redan." + +#: forms.py:59 forms.py:247 forms.py:304 +msgid "The two password fields didn't match." +msgstr "De två lösenordsfälten stämde inte överens." + +#: forms.py:61 forms.py:106 forms.py:135 msgid "Username" msgstr "Användarnamn" -#: forms.py:15 forms.py:49 +#: forms.py:63 forms.py:107 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." msgstr "" "Obligatoriskt. 30 tecken eller färre. Endast bokstäver, siffror och @/./+/-/" "_." -#: forms.py:16 forms.py:50 +#: forms.py:66 forms.py:110 msgid "This value may contain only letters, numbers and @/./+/-/_ characters." msgstr "Detta värde får endast innehålla bokstäver, siffror och @/./+/-/_." -#: forms.py:17 forms.py:67 forms.py:193 +#: forms.py:68 forms.py:112 forms.py:136 forms.py:306 msgid "Password" msgstr "Lösenord" -#: forms.py:18 +#: forms.py:70 msgid "Password confirmation" msgstr "Lösenordsbekräftelse" -#: forms.py:19 +#: forms.py:72 msgid "Enter the same password as above, for verification." msgstr "Fyll i samma lösenord som ovan för verifiering." -#: forms.py:31 -msgid "A user with that username already exists." -msgstr "En användare med det användarnamnet finns redan." +#: forms.py:113 +msgid "" +"Raw passwords are not stored, so there is no way to see this user's " +"password, but you can change the password using this " +"form." +msgstr "" +"Klartextlösenord lagras inte, så det är inte möjligt att se denna användares " +"lösenord, men du kan ändra lösenordet med detta " +"formulär." -#: forms.py:37 forms.py:163 forms.py:205 -msgid "The two password fields didn't match." -msgstr "De två lösenordsfälten stämde inte överens." - -#: forms.py:87 +#: forms.py:139 msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." @@ -81,11 +92,7 @@ msgstr "" "Var god ange ett korrekt användarnamn och lösenord. Tänk på att skilja " "mellan gemener och versaler." -#: forms.py:89 -msgid "This account is inactive." -msgstr "Detta konto är inaktivt." - -#: forms.py:96 +#: forms.py:141 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." @@ -93,11 +100,11 @@ msgstr "" "Din webbläsare verkar inte tillåta cookies. Cookies behövs för att kunna " "logga in." -#: forms.py:108 -msgid "E-mail" -msgstr "E-postadress" +#: forms.py:143 +msgid "This account is inactive." +msgstr "Detta konto är inaktivt." -#: forms.py:117 +#: forms.py:187 msgid "" "That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" @@ -105,101 +112,123 @@ msgstr "" "Den e-postadressen är inte associerad med något användarkonto. Är du säker " "på att du har registrerat dig?" -#: forms.py:143 -#, python-format -msgid "Password reset on %s" -msgstr "Lösenord nollställt för %s" +#: forms.py:189 +msgid "" +"The user account associated with this e-mail address cannot reset the " +"password." +msgstr "Användarkontot med denna e-postadress kan inte återställa lösenordet." -#: forms.py:151 +#: forms.py:192 +msgid "E-mail" +msgstr "E-postadress" + +#: forms.py:249 msgid "New password" msgstr "Nytt lösenord" -#: forms.py:152 +#: forms.py:251 msgid "New password confirmation" msgstr "Bekräfta nytt lösenord" -#: forms.py:177 -msgid "Old password" -msgstr "Gammalt lösenord" - -#: forms.py:185 +#: forms.py:280 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "Ditt gamla lösenord var felaktigt ifyllt. Var vänlig fyll i det igen." -#: forms.py:194 +#: forms.py:283 +msgid "Old password" +msgstr "Gammalt lösenord" + +#: forms.py:308 msgid "Password (again)" msgstr "Lösenord (igen)" -#: models.py:76 models.py:104 +#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355 +#: hashers.py:389 +msgid "algorithm" +msgstr "algoritm" + +#: hashers.py:219 +msgid "iterations" +msgstr "iterationer" + +#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390 +msgid "salt" +msgstr "salt" + +#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391 +msgid "hash" +msgstr "hash" + +#: hashers.py:270 +msgid "work factor" +msgstr "arbetsfaktor" + +#: hashers.py:272 +msgid "checksum" +msgstr "kontrollsumma" + +#: models.py:66 models.py:113 msgid "name" msgstr "namn" -#: models.py:78 +#: models.py:68 msgid "codename" msgstr "kodnamn" -#: models.py:82 +#: models.py:72 msgid "permission" msgstr "rättighet" -#: models.py:83 models.py:105 +#: models.py:73 models.py:115 msgid "permissions" msgstr "rättigheter" -#: models.py:108 +#: models.py:120 msgid "group" msgstr "grupp" -#: models.py:109 models.py:216 +#: models.py:121 models.py:250 msgid "groups" msgstr "grupper" -#: models.py:206 +#: models.py:232 msgid "username" msgstr "användarnamn" -#: models.py:206 +#: models.py:233 msgid "" "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters" msgstr "Obligatorisk. 30 tecken eller färre. Bokstäver, siffror och @/./+/-/_." -#: models.py:207 +#: models.py:235 msgid "first name" msgstr "förnamn" -#: models.py:208 +#: models.py:236 msgid "last name" msgstr "efternamn" -#: models.py:209 +#: models.py:237 msgid "e-mail address" msgstr "e-postadress" -#: models.py:210 +#: models.py:238 msgid "password" msgstr "lösenord" -#: models.py:210 -msgid "" -"Use '[algo]$[salt]$[hexdigest]' or use the change " -"password form." -msgstr "" -"Använd '[algo]$[salt]$[hexdigest]' eller använd Ändra " -"lösenord-formuläret." - -#: models.py:211 +#: models.py:239 msgid "staff status" msgstr "personalstatus" -#: models.py:211 +#: models.py:240 msgid "Designates whether the user can log into this admin site." msgstr "Avgör om användaren kan logga in på denna adminsida." -#: models.py:212 +#: models.py:242 msgid "active" msgstr "aktiv" -#: models.py:212 +#: models.py:243 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." @@ -207,11 +236,11 @@ msgstr "" "Anger om användaren skall betraktas som aktiv. Avmarkera detta istället för " "att ta bort konton." -#: models.py:213 +#: models.py:245 msgid "superuser status" msgstr "superanvändare" -#: models.py:213 +#: models.py:246 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." @@ -219,42 +248,43 @@ msgstr "" "Anger att denna användare har alla rättigheter utan att uttryckligen " "tilldela dem." -#: models.py:214 +#: models.py:248 msgid "last login" msgstr "senaste inloggning" -#: models.py:215 +#: models.py:249 msgid "date joined" msgstr "registreringsdatum" -#: models.py:217 +#: models.py:251 msgid "" -"In addition to the permissions manually assigned, this user will also get " -"all permissions granted to each group he/she is in." +"The groups this user belongs to. A user will get all permissions granted to " +"each of his/her group." msgstr "" -"Förutom de rättigheterna som utdelas manuellt så kommer användaren dessutom " -"få samma rättigheter som de grupper där han/hon är medlem." +"De grupper som användaren är medlem i. En användare får tillgång till alla " +"rättigheter som hans/hennes grupper har." -#: models.py:218 +#: models.py:255 msgid "user permissions" msgstr "användarättigheter" -#: models.py:222 +#: models.py:260 msgid "user" msgstr "användare" -#: models.py:223 +#: models.py:261 msgid "users" msgstr "användare" -#: models.py:406 -msgid "message" -msgstr "meddelande" - -#: views.py:91 +#: views.py:93 msgid "Logged out" msgstr "Utloggad" -#: management/commands/createsuperuser.py:23 +#: management/commands/createsuperuser.py:27 msgid "Enter a valid e-mail address." msgstr "Fyll i en giltig e-postadress." + +#: templates/registration/password_reset_subject.txt:2 +#, python-format +msgid "Password reset on %(site_name)s" +msgstr "Lösenord återställt på %(site_name)s" diff --git a/django/contrib/auth/locale/ta/LC_MESSAGES/django.mo b/django/contrib/auth/locale/ta/LC_MESSAGES/django.mo index 8d474ef754f..a47a5c3cb68 100644 Binary files a/django/contrib/auth/locale/ta/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/ta/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/ta/LC_MESSAGES/django.po b/django/contrib/auth/locale/ta/LC_MESSAGES/django.po index 0422439fccc..555ea7d1385 100644 --- a/django/contrib/auth/locale/ta/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/ta/LC_MESSAGES/django.po @@ -1,77 +1,83 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Jannis Leidel , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:14-0400\n" -"PO-Revision-Date: 2011-03-04 18:41+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Tamil \n" +"POT-Creation-Date: 2012-03-14 00:15-0700\n" +"PO-Revision-Date: 2012-03-08 12:07+0000\n" +"Last-Translator: Jannis Leidel \n" +"Language-Team: Tamil (http://www.transifex.net/projects/p/django/language/" +"ta/)\n" +"Language: ta\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ta\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: admin.py:28 +#: admin.py:41 msgid "Personal info" msgstr "தனிப்பட்ட விவரம்" -#: admin.py:29 +#: admin.py:42 msgid "Permissions" msgstr "அனுமதிகள்" -#: admin.py:30 +#: admin.py:44 msgid "Important dates" msgstr "முக்கியமான தேதிகள்" -#: admin.py:31 -msgid "Groups" -msgstr "குழுக்கள்" - -#: admin.py:113 +#: admin.py:125 msgid "Password changed successfully." msgstr "" -#: admin.py:123 +#: admin.py:135 #, python-format msgid "Change password: %s" msgstr "" -#: forms.py:14 forms.py:48 forms.py:66 -msgid "Username" -msgstr "பயனர்ப்பெயர்" - -#: forms.py:15 forms.py:49 -msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." -msgstr "" - -#: forms.py:16 forms.py:50 -msgid "This value may contain only letters, numbers and @/./+/-/_ characters." -msgstr "" - -#: forms.py:17 forms.py:67 forms.py:193 -msgid "Password" -msgstr "கடவுச்சொல்" - -#: forms.py:18 -msgid "Password confirmation" -msgstr "" - -#: forms.py:19 -msgid "Enter the same password as above, for verification." -msgstr "மேலே அதே கடவுச்சொல்லை உள்ளிடவும், சரிபார்ப்பதற்காக ." - -#: forms.py:31 +#: forms.py:58 msgid "A user with that username already exists." msgstr "" -#: forms.py:37 forms.py:163 forms.py:205 +#: forms.py:59 forms.py:247 forms.py:304 msgid "The two password fields didn't match." msgstr "" -#: forms.py:87 +#: forms.py:61 forms.py:106 forms.py:135 +msgid "Username" +msgstr "பயனர்ப்பெயர்" + +#: forms.py:63 forms.py:107 +msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." +msgstr "" + +#: forms.py:66 forms.py:110 +msgid "This value may contain only letters, numbers and @/./+/-/_ characters." +msgstr "" + +#: forms.py:68 forms.py:112 forms.py:136 forms.py:306 +msgid "Password" +msgstr "கடவுச்சொல்" + +#: forms.py:70 +msgid "Password confirmation" +msgstr "" + +#: forms.py:72 +msgid "Enter the same password as above, for verification." +msgstr "மேலே அதே கடவுச்சொல்லை உள்ளிடவும், சரிபார்ப்பதற்காக ." + +#: forms.py:113 +msgid "" +"Raw passwords are not stored, so there is no way to see this user's " +"password, but you can change the password using this " +"form." +msgstr "" + +#: forms.py:139 msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." @@ -79,169 +85,190 @@ msgstr "" "தயவுசெய்து சரியான பயனர்ப்பெயர் மற்றும் கடவுச்சொல்லை உள்ளிடவும். இரண்டும் எழுத்துவகையைச் " "சார்ந்தது." -#: forms.py:89 -msgid "This account is inactive." -msgstr "இந்த கணக்கு செயல்பட துவங்கவில்லை" - -#: forms.py:96 +#: forms.py:141 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." msgstr "" " உங்கள் இணைய உலாவியில் குக்கிகள் செயலாக்கம் பெறவில்லை. உள்நுழைவதற்கு குக்கிகள் அவசியம்." -#: forms.py:108 -msgid "E-mail" -msgstr "" +#: forms.py:143 +msgid "This account is inactive." +msgstr "இந்த கணக்கு செயல்பட துவங்கவில்லை" -#: forms.py:117 +#: forms.py:187 msgid "" "That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" msgstr "" -#: forms.py:143 -#, python-format -msgid "Password reset on %s" +#: forms.py:189 +msgid "" +"The user account associated with this e-mail address cannot reset the " +"password." msgstr "" -#: forms.py:151 +#: forms.py:192 +msgid "E-mail" +msgstr "" + +#: forms.py:249 msgid "New password" msgstr "" -#: forms.py:152 +#: forms.py:251 msgid "New password confirmation" msgstr "" -#: forms.py:177 -msgid "Old password" -msgstr "" - -#: forms.py:185 +#: forms.py:280 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "" -#: forms.py:194 +#: forms.py:283 +msgid "Old password" +msgstr "" + +#: forms.py:308 msgid "Password (again)" msgstr "கடவுச்சொல்(மறுபடியும்)" -#: models.py:76 models.py:104 +#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355 +#: hashers.py:389 +msgid "algorithm" +msgstr "" + +#: hashers.py:219 +msgid "iterations" +msgstr "" + +#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390 +msgid "salt" +msgstr "" + +#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391 +msgid "hash" +msgstr "" + +#: hashers.py:270 +msgid "work factor" +msgstr "" + +#: hashers.py:272 +msgid "checksum" +msgstr "" + +#: models.py:66 models.py:113 msgid "name" msgstr "பெயர்" -#: models.py:78 +#: models.py:68 msgid "codename" msgstr "குறிமுறை பெயர்" -#: models.py:82 +#: models.py:72 msgid "permission" msgstr "அனுமதி" -#: models.py:83 models.py:105 +#: models.py:73 models.py:115 msgid "permissions" msgstr "அனுமதிகள்" -#: models.py:108 +#: models.py:120 msgid "group" msgstr "குழு" -#: models.py:109 models.py:216 +#: models.py:121 models.py:250 msgid "groups" msgstr "குழுக்கள்" -#: models.py:206 +#: models.py:232 msgid "username" msgstr "பயனர் பெயர்" -#: models.py:206 +#: models.py:233 msgid "" "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters" msgstr "" -#: models.py:207 +#: models.py:235 msgid "first name" msgstr "முதல் பெயர்" -#: models.py:208 +#: models.py:236 msgid "last name" msgstr "கடைசி பெயர்" -#: models.py:209 +#: models.py:237 msgid "e-mail address" msgstr "மின்னஞ்சல் முகவரி" -#: models.py:210 +#: models.py:238 msgid "password" msgstr "கடவுச்சொல்" -#: models.py:210 -msgid "" -"Use '[algo]$[salt]$[hexdigest]' or use the change " -"password form." -msgstr "" - -#: models.py:211 +#: models.py:239 msgid "staff status" msgstr "பணியாளர் நிலை" -#: models.py:211 +#: models.py:240 msgid "Designates whether the user can log into this admin site." msgstr "பயனர், 'மேலாளலர்' பக்கத்தில் நுழைவதை முடிவு செய்கிறது" -#: models.py:212 +#: models.py:242 msgid "active" msgstr "செயல்படும்" -#: models.py:212 +#: models.py:243 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." msgstr "" -#: models.py:213 +#: models.py:245 msgid "superuser status" msgstr "மேலாளர் இருப்பு நிலை" -#: models.py:213 +#: models.py:246 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." msgstr "இந்த பயனருக்கு எல்லா அங்கீகாரங்களும் வழங்கப்படவில்லை." -#: models.py:214 +#: models.py:248 msgid "last login" msgstr "கடைசி உள்நுழைவு" -#: models.py:215 +#: models.py:249 msgid "date joined" msgstr "சேர்ந்த தேதி" -#: models.py:217 +#: models.py:251 msgid "" -"In addition to the permissions manually assigned, this user will also get " -"all permissions granted to each group he/she is in." -msgstr "பயனர் தனது அனுமதிகளோடு ,தான் உள்ள குழுவினது அனுமதிகளையும் பெறுவார்." +"The groups this user belongs to. A user will get all permissions granted to " +"each of his/her group." +msgstr "" -#: models.py:218 +#: models.py:255 msgid "user permissions" msgstr "பயனர் அனுமதிகள்" -#: models.py:222 +#: models.py:260 msgid "user" msgstr "பயனர்" -#: models.py:223 +#: models.py:261 msgid "users" msgstr "பயனர்கள்" -#: models.py:406 -msgid "message" -msgstr "செய்தி" - -#: views.py:91 +#: views.py:93 msgid "Logged out" msgstr "வெளியே வந்துவீட்டீர்" -#: management/commands/createsuperuser.py:23 +#: management/commands/createsuperuser.py:27 msgid "Enter a valid e-mail address." msgstr "முறையான e முகவரிகள் மட்டும் எழுதவும்" + +#: templates/registration/password_reset_subject.txt:2 +#, python-format +msgid "Password reset on %(site_name)s" +msgstr "" diff --git a/django/contrib/auth/locale/te/LC_MESSAGES/django.mo b/django/contrib/auth/locale/te/LC_MESSAGES/django.mo index cf69bc4c2d6..f77ac1e5b82 100644 Binary files a/django/contrib/auth/locale/te/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/te/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/te/LC_MESSAGES/django.po b/django/contrib/auth/locale/te/LC_MESSAGES/django.po index fc766993b36..7daa0a87817 100644 --- a/django/contrib/auth/locale/te/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/te/LC_MESSAGES/django.po @@ -1,244 +1,273 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Jannis Leidel , 2011. +# , 2011. +# Veeven , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:14-0400\n" -"PO-Revision-Date: 2011-03-14 14:58+0000\n" -"Last-Translator: veeven \n" -"Language-Team: Telugu <>\n" +"POT-Creation-Date: 2012-03-14 00:15-0700\n" +"PO-Revision-Date: 2012-03-08 12:07+0000\n" +"Last-Translator: bhaskar teja yerneni \n" +"Language-Team: Telugu (http://www.transifex.net/projects/p/django/language/" +"te/)\n" +"Language: te\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: te\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: admin.py:28 +#: admin.py:41 msgid "Personal info" msgstr "వ్యక్తిగత సమాచారం " -#: admin.py:29 +#: admin.py:42 msgid "Permissions" msgstr "అనుమతులు" -#: admin.py:30 +#: admin.py:44 msgid "Important dates" msgstr "ముఖ్యమైన తేదీలు" -#: admin.py:31 -msgid "Groups" -msgstr "గుంపులు" - -#: admin.py:113 +#: admin.py:125 msgid "Password changed successfully." msgstr "సంకేతపదాన్ని విజయవంతంగా మార్చారు." -#: admin.py:123 +#: admin.py:135 #, python-format msgid "Change password: %s" msgstr "సంకేతపదాన్ని మార్చుకోండి: %s" -#: forms.py:14 forms.py:48 forms.py:66 -msgid "Username" -msgstr "వాడుకరిపేరు" - -#: forms.py:15 forms.py:49 -msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." -msgstr "" - -#: forms.py:16 forms.py:50 -msgid "This value may contain only letters, numbers and @/./+/-/_ characters." -msgstr "" - -#: forms.py:17 forms.py:67 forms.py:193 -msgid "Password" -msgstr "సంకేతపదం" - -#: forms.py:18 -msgid "Password confirmation" -msgstr "సంకేపదపు నిర్ధారణ" - -#: forms.py:19 -msgid "Enter the same password as above, for verification." -msgstr "ఇందాక ఇచ్చిన అనుమతిపదం మళ్ళీ ఇవ్వండి పరిశీలన కోసము" - -#: forms.py:31 +#: forms.py:58 msgid "A user with that username already exists." msgstr "ఈ నామముతొ ఇంకొ వినియొగదారి ఉన్నరు" -#: forms.py:37 forms.py:163 forms.py:205 +#: forms.py:59 forms.py:247 forms.py:304 msgid "The two password fields didn't match." msgstr "ఈ రెండు అనుమతి పదాలు అసమానమైనంగ ఉన్నాయి" -#: forms.py:87 +#: forms.py:61 forms.py:106 forms.py:135 +msgid "Username" +msgstr "వాడుకరిపేరు" + +#: forms.py:63 forms.py:107 +msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." +msgstr "" + +#: forms.py:66 forms.py:110 +msgid "This value may contain only letters, numbers and @/./+/-/_ characters." +msgstr "" + +#: forms.py:68 forms.py:112 forms.py:136 forms.py:306 +msgid "Password" +msgstr "సంకేతపదం" + +#: forms.py:70 +msgid "Password confirmation" +msgstr "సంకేపదపు నిర్ధారణ" + +#: forms.py:72 +msgid "Enter the same password as above, for verification." +msgstr "ఇందాక ఇచ్చిన అనుమతిపదం మళ్ళీ ఇవ్వండి పరిశీలన కోసము" + +#: forms.py:113 +msgid "" +"Raw passwords are not stored, so there is no way to see this user's " +"password, but you can change the password using this " +"form." +msgstr "" + +#: forms.py:139 msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." msgstr "దయచేసి సరైన వినియొగదారి నామము అనుమతి పదం ఇవ్వండి" -#: forms.py:89 -msgid "This account is inactive." -msgstr "" - -#: forms.py:96 +#: forms.py:141 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." msgstr "" -#: forms.py:108 -msgid "E-mail" -msgstr "ఇటపా అడ్రస్ " +#: forms.py:143 +msgid "This account is inactive." +msgstr "ఈ ఖాతా అచేతనమైనది" -#: forms.py:117 +#: forms.py:187 msgid "" "That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" msgstr "" -#: forms.py:143 -#, python-format -msgid "Password reset on %s" -msgstr "%sపై అనుమతి పదం తిరిగి మార్చు " +#: forms.py:189 +msgid "" +"The user account associated with this e-mail address cannot reset the " +"password." +msgstr "" -#: forms.py:151 +#: forms.py:192 +msgid "E-mail" +msgstr "ఇటపా అడ్రస్ " + +#: forms.py:249 msgid "New password" msgstr "కొత్త సంకేతపదం" -#: forms.py:152 +#: forms.py:251 msgid "New password confirmation" msgstr "కొత్త సంకేతపదపు నిర్ధారణ" -#: forms.py:177 -msgid "Old password" -msgstr "పాత సంకేతపదం" - -#: forms.py:185 +#: forms.py:280 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "" -#: forms.py:194 +#: forms.py:283 +msgid "Old password" +msgstr "పాత సంకేతపదం" + +#: forms.py:308 msgid "Password (again)" msgstr "సంకేతపదం (మళ్ళీ)" -#: models.py:76 models.py:104 +#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355 +#: hashers.py:389 +msgid "algorithm" +msgstr "" + +#: hashers.py:219 +msgid "iterations" +msgstr "" + +#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390 +msgid "salt" +msgstr "" + +#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391 +msgid "hash" +msgstr "" + +#: hashers.py:270 +msgid "work factor" +msgstr "" + +#: hashers.py:272 +msgid "checksum" +msgstr "" + +#: models.py:66 models.py:113 msgid "name" msgstr "పేరు" -#: models.py:78 +#: models.py:68 msgid "codename" msgstr "సంహితనామము" -#: models.py:82 +#: models.py:72 msgid "permission" msgstr "అనుమతి" -#: models.py:83 models.py:105 +#: models.py:73 models.py:115 msgid "permissions" msgstr "అనుమతులు" -#: models.py:108 +#: models.py:120 msgid "group" msgstr "గుంపు" -#: models.py:109 models.py:216 +#: models.py:121 models.py:250 msgid "groups" msgstr "గుంపులు" -#: models.py:206 +#: models.py:232 msgid "username" msgstr "వాడుకరిపేరు" -#: models.py:206 +#: models.py:233 msgid "" "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters" msgstr "" -#: models.py:207 +#: models.py:235 msgid "first name" msgstr "మొదటి పేరు" -#: models.py:208 +#: models.py:236 msgid "last name" msgstr "ఇంటి పేరు" -#: models.py:209 +#: models.py:237 msgid "e-mail address" msgstr "ఇటపా" -#: models.py:210 +#: models.py:238 msgid "password" msgstr "సంకేతపదం" -#: models.py:210 -msgid "" -"Use '[algo]$[salt]$[hexdigest]' or use the change " -"password form." -msgstr "" - -#: models.py:211 +#: models.py:239 msgid "staff status" msgstr "ఉద్యోగస్తుల స్థితి" -#: models.py:211 +#: models.py:240 msgid "Designates whether the user can log into this admin site." msgstr "" -#: models.py:212 +#: models.py:242 msgid "active" msgstr "క్రియాశీలం" -#: models.py:212 +#: models.py:243 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." msgstr "" -#: models.py:213 +#: models.py:245 msgid "superuser status" msgstr "" -#: models.py:213 +#: models.py:246 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." msgstr "" -#: models.py:214 +#: models.py:248 msgid "last login" msgstr "చివరి ప్రవేశం" -#: models.py:215 +#: models.py:249 msgid "date joined" msgstr "చేరిన తేదీ" -#: models.py:217 +#: models.py:251 msgid "" -"In addition to the permissions manually assigned, this user will also get " -"all permissions granted to each group he/she is in." +"The groups this user belongs to. A user will get all permissions granted to " +"each of his/her group." msgstr "" -#: models.py:218 +#: models.py:255 msgid "user permissions" msgstr "వాడుకరి అనుమతులు" -#: models.py:222 +#: models.py:260 msgid "user" msgstr "వాడుకరి" -#: models.py:223 +#: models.py:261 msgid "users" msgstr "వాడుకరులు" -#: models.py:406 -msgid "message" -msgstr "సందేశం" - -#: views.py:91 +#: views.py:93 msgid "Logged out" msgstr "నిష్క్రమించారు" -#: management/commands/createsuperuser.py:23 +#: management/commands/createsuperuser.py:27 msgid "Enter a valid e-mail address." msgstr "సరైన ఇటపా ఇవ్వండి" + +#: templates/registration/password_reset_subject.txt:2 +#, python-format +msgid "Password reset on %(site_name)s" +msgstr "" diff --git a/django/contrib/auth/locale/th/LC_MESSAGES/django.mo b/django/contrib/auth/locale/th/LC_MESSAGES/django.mo index 604955d0a82..100c0aee058 100644 Binary files a/django/contrib/auth/locale/th/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/th/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/th/LC_MESSAGES/django.po b/django/contrib/auth/locale/th/LC_MESSAGES/django.po index bb5e510347e..ddbd95d99e6 100644 --- a/django/contrib/auth/locale/th/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/th/LC_MESSAGES/django.po @@ -1,246 +1,275 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Jannis Leidel , 2011. +# Kowit Charoenratchatabhan , 2012. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:14-0400\n" -"PO-Revision-Date: 2011-03-04 18:41+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Thai <>\n" +"POT-Creation-Date: 2012-03-14 00:15-0700\n" +"PO-Revision-Date: 2012-03-09 04:27+0000\n" +"Last-Translator: Kowit Charoenratchatabhan \n" +"Language-Team: Thai (http://www.transifex.net/projects/p/django/language/" +"th/)\n" +"Language: th\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: th\n" "Plural-Forms: nplurals=1; plural=0\n" -#: admin.py:28 +#: admin.py:41 msgid "Personal info" msgstr "ข้อมูลส่วนตัว" -#: admin.py:29 +#: admin.py:42 msgid "Permissions" msgstr "สิทธิ์" -#: admin.py:30 +#: admin.py:44 msgid "Important dates" msgstr "วันที่ที่สำคัญ" -#: admin.py:31 -msgid "Groups" -msgstr "กลุ่ม" - -#: admin.py:113 +#: admin.py:125 msgid "Password changed successfully." msgstr "เปลี่ยนรหัสผ่านสำเร็จแล้ว" -#: admin.py:123 +#: admin.py:135 #, python-format msgid "Change password: %s" msgstr "เปลี่ยนรหัสผ่าน: %s " -#: forms.py:14 forms.py:48 forms.py:66 -msgid "Username" -msgstr "ชื่อผู้ใช้" - -#: forms.py:15 forms.py:49 -msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." -msgstr "" - -#: forms.py:16 forms.py:50 -msgid "This value may contain only letters, numbers and @/./+/-/_ characters." -msgstr "" - -#: forms.py:17 forms.py:67 forms.py:193 -msgid "Password" -msgstr "รหัสผ่าน" - -#: forms.py:18 -msgid "Password confirmation" -msgstr "ยืนยันรหัสผ่าน" - -#: forms.py:19 -msgid "Enter the same password as above, for verification." -msgstr "ใส่รหัสผ่านเหมือนด้านบน เพื่อตรวจสอบความถูกต้อง" - -#: forms.py:31 +#: forms.py:58 msgid "A user with that username already exists." msgstr "ชื่อผู้ใช้นั้นได้ถูกใช้ไปแล้ว" -#: forms.py:37 forms.py:163 forms.py:205 +#: forms.py:59 forms.py:247 forms.py:304 msgid "The two password fields didn't match." msgstr "รหัสผ่านไม่ตรงกัน" -#: forms.py:87 +#: forms.py:61 forms.py:106 forms.py:135 +msgid "Username" +msgstr "ชื่อผู้ใช้" + +#: forms.py:63 forms.py:107 +msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." +msgstr "" +"จำเป็น ต้องการไม่เกิน 30 ตัวอักษร ต้องเป็นตัวอักษรตัวเลขและเครื่องหมาย @/./+/-/_ เท่านั้น" + +#: forms.py:66 forms.py:110 +msgid "This value may contain only letters, numbers and @/./+/-/_ characters." +msgstr "ค่านี้ต้องเป็นตัวอักษรตัวเลขและเครื่องหมาย @/./+/-/_ เท่านั้น" + +#: forms.py:68 forms.py:112 forms.py:136 forms.py:306 +msgid "Password" +msgstr "รหัสผ่าน" + +#: forms.py:70 +msgid "Password confirmation" +msgstr "ยืนยันรหัสผ่าน" + +#: forms.py:72 +msgid "Enter the same password as above, for verification." +msgstr "ใส่รหัสผ่านเหมือนด้านบน เพื่อตรวจสอบความถูกต้อง" + +#: forms.py:113 +msgid "" +"Raw passwords are not stored, so there is no way to see this user's " +"password, but you can change the password using this " +"form." +msgstr "" +"รหัสผ่านที่ดิบจะไม่เก็บไว้ เพื่อไม่ให้มีวิธีการดูรหัสผ่านของผู้ใช้นี้ แต่คุณสามารถเปลี่ยนรหัสผ่านโดยใช้ แบบฟอร์มนี้ ." + +#: forms.py:139 msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." msgstr "กรุณาใส่ชื่อผู้ใช้และรหัสผ่านให้ถูกต้อง มีการแยกแยะตัวพิมพ์ใหญ่-เล็ก" -#: forms.py:89 -msgid "This account is inactive." -msgstr "บัญชีนี้ไม่ทำงาน" - -#: forms.py:96 +#: forms.py:141 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." msgstr "เว็บเบราเซอร์ของคุณไม่สามารถใช้งานระบบคุกกี้ได้ จำเป็นต้องใช้ระบบคุกกี้ในการเข้าสู่ระบบ" -#: forms.py:108 -msgid "E-mail" -msgstr "อีเมล" +#: forms.py:143 +msgid "This account is inactive." +msgstr "บัญชีนี้ไม่ทำงาน" -#: forms.py:117 +#: forms.py:187 msgid "" "That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" msgstr "อีเมลนี้ไม่ตรงกับบัญชีใดๆในระบบ คุณแน่ใจหรือว่าคุณได้ลงทะเบียนแล้ว" -#: forms.py:143 -#, python-format -msgid "Password reset on %s" -msgstr "ตั้งค่ารหัสผ่านใหม่บน %s" +#: forms.py:189 +msgid "" +"The user account associated with this e-mail address cannot reset the " +"password." +msgstr "บัญชีผู้ใช้ที่เกี่ยวข้องกับที่อยู่อีเมล์นี้ไม่สามารถตั้งค่ารหัสผ่าน" -#: forms.py:151 +#: forms.py:192 +msgid "E-mail" +msgstr "อีเมล" + +#: forms.py:249 msgid "New password" msgstr "รหัสผ่านใหม่" -#: forms.py:152 +#: forms.py:251 msgid "New password confirmation" msgstr "ยืนยันการตั้งรหัสผ่านใหม่" -#: forms.py:177 -msgid "Old password" -msgstr "รหัสผ่านเก่า" - -#: forms.py:185 +#: forms.py:280 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "ใส่รหัสผ่านเก่าผิด กรุณาใส่รหัสผ่านอีกครั้ง" -#: forms.py:194 +#: forms.py:283 +msgid "Old password" +msgstr "รหัสผ่านเก่า" + +#: forms.py:308 msgid "Password (again)" msgstr "รหัสผ่าน (อีกครั้ง)" -#: models.py:76 models.py:104 +#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355 +#: hashers.py:389 +msgid "algorithm" +msgstr "algorithm" + +#: hashers.py:219 +msgid "iterations" +msgstr "iterations" + +#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390 +msgid "salt" +msgstr "salt" + +#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391 +msgid "hash" +msgstr "hash" + +#: hashers.py:270 +msgid "work factor" +msgstr "ปัจจัยการทำงาน" + +#: hashers.py:272 +msgid "checksum" +msgstr "checksum" + +#: models.py:66 models.py:113 msgid "name" msgstr "ชื่อ" -#: models.py:78 +#: models.py:68 msgid "codename" msgstr "รหัสชื่อ" -#: models.py:82 +#: models.py:72 msgid "permission" msgstr "สิทธิ์" -#: models.py:83 models.py:105 +#: models.py:73 models.py:115 msgid "permissions" msgstr "สิทธิ์" -#: models.py:108 +#: models.py:120 msgid "group" msgstr "กลุ่ม" -#: models.py:109 models.py:216 +#: models.py:121 models.py:250 msgid "groups" msgstr "กลุ่ม" -#: models.py:206 +#: models.py:232 msgid "username" msgstr "ชื่อผู้ใช้" -#: models.py:206 +#: models.py:233 msgid "" "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters" -msgstr "" +msgstr "จำเป็น ต้องการไม่เกิน 30 ตัวอักษร ต้องเป็นตัวอักษรตัวเลขและตัวอักษร @/./+/-/_" -#: models.py:207 +#: models.py:235 msgid "first name" msgstr "ชื่อ" -#: models.py:208 +#: models.py:236 msgid "last name" msgstr "นามสกุล" -#: models.py:209 +#: models.py:237 msgid "e-mail address" msgstr "อีเมล" -#: models.py:210 +#: models.py:238 msgid "password" msgstr "รหัสผ่าน" -#: models.py:210 -msgid "" -"Use '[algo]$[salt]$[hexdigest]' or use the change " -"password form." -msgstr "" -"ใช้ '[algo]$[salt]$[hexdigest]'หรือใช้ แบบฟอร์มเปลี่ยนรหัสผ่าน " -"." - -#: models.py:211 +#: models.py:239 msgid "staff status" msgstr "สถานะของพนักงาน" -#: models.py:211 +#: models.py:240 msgid "Designates whether the user can log into this admin site." msgstr "กำหนดผู้ที่จะเข้ามาใช้งานในส่วนของผู้ดูแลระบบ" -#: models.py:212 +#: models.py:242 msgid "active" msgstr "ใช้งานได้" -#: models.py:212 +#: models.py:243 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." msgstr "กำหนดให้ผู้ใช้มีสถานะที่สามารถเข้ามาใช้งานได้ เลือกออกแทนที่จะลบชื่อผู้ใช้ทิ้งไป " -#: models.py:213 +#: models.py:245 msgid "superuser status" msgstr "สถานะผู้ใช้พิเศษ" -#: models.py:213 +#: models.py:246 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." msgstr "กำหนดสิทธิ์ทุกอย่างให้ผู้ใช้ โดยไม่ต้องการมอบหมายอย่างเป็นทางการ" -#: models.py:214 +#: models.py:248 msgid "last login" msgstr "เข้าสู่ระบบครั้งสุดท้าย" -#: models.py:215 +#: models.py:249 msgid "date joined" msgstr "วันที่เข้าร่วม" -#: models.py:217 +#: models.py:251 msgid "" -"In addition to the permissions manually assigned, this user will also get " -"all permissions granted to each group he/she is in." -msgstr "ด้วยสิทธิ์ที่ได้รับ ผู้ใช้นี้ยังได้รับสิทธิ์ให้ใช้อำนาจได้กับกลุ่มของตนเองอีกด้วย" +"The groups this user belongs to. A user will get all permissions granted to " +"each of his/her group." +msgstr "กลุ่มที่ผู้ใช้อยู่ ผู้ใช้จะได้รับสิทธิ์ทั้งหมดที่กลุ่มของเขาได้รับ" -#: models.py:218 +#: models.py:255 msgid "user permissions" msgstr "สิทธิ์ของผู้ใช้" -#: models.py:222 +#: models.py:260 msgid "user" msgstr "ผู้ใช้" -#: models.py:223 +#: models.py:261 msgid "users" msgstr "ผู้ใช้" -#: models.py:406 -msgid "message" -msgstr "ข้อความ" - -#: views.py:91 +#: views.py:93 msgid "Logged out" msgstr "ออกจากระบบ" -#: management/commands/createsuperuser.py:23 +#: management/commands/createsuperuser.py:27 msgid "Enter a valid e-mail address." msgstr "กรุณาใส่อีเมลที่ถูกต้อง" + +#: templates/registration/password_reset_subject.txt:2 +#, python-format +msgid "Password reset on %(site_name)s" +msgstr "รีเซ็ตรหัสผ่านบน %(site_name)s" diff --git a/django/contrib/auth/locale/tr/LC_MESSAGES/django.mo b/django/contrib/auth/locale/tr/LC_MESSAGES/django.mo index 9f29116a695..adbb0228ccd 100644 Binary files a/django/contrib/auth/locale/tr/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/tr/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/tr/LC_MESSAGES/django.po b/django/contrib/auth/locale/tr/LC_MESSAGES/django.po index 1aa99f21d43..eb515f5161f 100644 --- a/django/contrib/auth/locale/tr/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/tr/LC_MESSAGES/django.po @@ -1,79 +1,91 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Jannis Leidel , 2011. +# Metin Amiroff , 2012. +# Murat Çorlu , 2012. +# Ozan , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:14-0400\n" -"PO-Revision-Date: 2011-03-04 18:41+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Turkish \n" +"POT-Creation-Date: 2012-03-14 00:15-0700\n" +"PO-Revision-Date: 2012-03-10 14:44+0000\n" +"Last-Translator: Metin Amiroff \n" +"Language-Team: Turkish (http://www.transifex.net/projects/p/django/language/" +"tr/)\n" +"Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: tr\n" "Plural-Forms: nplurals=1; plural=0\n" -#: admin.py:28 +#: admin.py:41 msgid "Personal info" msgstr "Kişisel bilgiler" -#: admin.py:29 +#: admin.py:42 msgid "Permissions" msgstr "İzinler" -#: admin.py:30 +#: admin.py:44 msgid "Important dates" msgstr "Önemli tarihler" -#: admin.py:31 -msgid "Groups" -msgstr "Gruplar" - -#: admin.py:113 +#: admin.py:125 msgid "Password changed successfully." msgstr "Şifre başarı ile değiştirildi." -#: admin.py:123 +#: admin.py:135 #, python-format msgid "Change password: %s" msgstr "Şifre değiştir: %s" -#: forms.py:14 forms.py:48 forms.py:66 +#: forms.py:58 +msgid "A user with that username already exists." +msgstr "Bu isimde bir kullanıcı zaten mevcuttur." + +#: forms.py:59 forms.py:247 forms.py:304 +msgid "The two password fields didn't match." +msgstr "İki şifre alanı uyuşmuyor." + +#: forms.py:61 forms.py:106 forms.py:135 msgid "Username" msgstr "Kullanıcı adı" -#: forms.py:15 forms.py:49 +#: forms.py:63 forms.py:107 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." msgstr "" "Zorunlu alan. 30 karakter ya da az olmalı. Harf, rakam ve @/./+/-/_ " "karakterleri kullanılabilir." -#: forms.py:16 forms.py:50 +#: forms.py:66 forms.py:110 msgid "This value may contain only letters, numbers and @/./+/-/_ characters." msgstr "Bu değer sadece harf, rakam ve @/./+/-/_ karakterlerini içerebilir." -#: forms.py:17 forms.py:67 forms.py:193 +#: forms.py:68 forms.py:112 forms.py:136 forms.py:306 msgid "Password" msgstr "Şifre" -#: forms.py:18 +#: forms.py:70 msgid "Password confirmation" msgstr "Şifre onayı" -#: forms.py:19 +#: forms.py:72 msgid "Enter the same password as above, for verification." msgstr "Onaylamak için, yukarıdaki şifrenin aynısını girin." -#: forms.py:31 -msgid "A user with that username already exists." -msgstr "Bu isimde bir kullanıcı zaten mevcuttur." +#: forms.py:113 +msgid "" +"Raw passwords are not stored, so there is no way to see this user's " +"password, but you can change the password using this " +"form." +msgstr "" +"Ham şifreler saklanmadığından kullanıcıların şifrelerini görmenin yolu " +"yoktur, fakat buradaki form aracılığıyla şifreyi " +"değiştirebilirsiniz." -#: forms.py:37 forms.py:163 forms.py:205 -msgid "The two password fields didn't match." -msgstr "İki şifre alanı uyuşmuyor." - -#: forms.py:87 +#: forms.py:139 msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." @@ -81,11 +93,7 @@ msgstr "" "Lütfen geçerli bir kullanıcı adı ve şifre girin. Tüm alanlar büyük/küçük " "harf duyarlıdır." -#: forms.py:89 -msgid "This account is inactive." -msgstr "Bu hesap aktif değil." - -#: forms.py:96 +#: forms.py:141 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." @@ -93,11 +101,11 @@ msgstr "" "Web tarayıcınızın çerezleri desteklemediği görülüyor. Çerezler giriş için " "gerekli." -#: forms.py:108 -msgid "E-mail" -msgstr "E-posta adresi" +#: forms.py:143 +msgid "This account is inactive." +msgstr "Bu hesap aktif değil." -#: forms.py:117 +#: forms.py:187 msgid "" "That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" @@ -105,103 +113,125 @@ msgstr "" "Bu e-posta hesabıyla ilişkili kullanıcı bulunmuyor. Kayıtlı olduğunuzdan " "emin misiniz?" -#: forms.py:143 -#, python-format -msgid "Password reset on %s" -msgstr "%s sitesindeki hesabınızın şifresinin sıfırlanması" +#: forms.py:189 +msgid "" +"The user account associated with this e-mail address cannot reset the " +"password." +msgstr "BU e-posta adresi ile ilişkilendirilmiş hesabın parolası resetlenemez." -#: forms.py:151 +#: forms.py:192 +msgid "E-mail" +msgstr "E-posta adresi" + +#: forms.py:249 msgid "New password" msgstr "Yeni şifre" -#: forms.py:152 +#: forms.py:251 msgid "New password confirmation" msgstr "Yeni şifre tekrarı" -#: forms.py:177 -msgid "Old password" -msgstr "Eski şifre" - -#: forms.py:185 +#: forms.py:280 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "Eski şifreniz hatalı. Lütfen tekrar girin." -#: forms.py:194 +#: forms.py:283 +msgid "Old password" +msgstr "Eski şifre" + +#: forms.py:308 msgid "Password (again)" msgstr "Şifre (tekrar)" -#: models.py:76 models.py:104 +#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355 +#: hashers.py:389 +msgid "algorithm" +msgstr "algoritma" + +#: hashers.py:219 +msgid "iterations" +msgstr "iterasyonlar" + +#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390 +msgid "salt" +msgstr "tuz" + +#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391 +msgid "hash" +msgstr "hash" + +#: hashers.py:270 +msgid "work factor" +msgstr "iş faktörü" + +#: hashers.py:272 +msgid "checksum" +msgstr "sağlama" + +#: models.py:66 models.py:113 msgid "name" msgstr "isim" -#: models.py:78 +#: models.py:68 msgid "codename" msgstr "takma ad" -#: models.py:82 +#: models.py:72 msgid "permission" msgstr "izin" -#: models.py:83 models.py:105 +#: models.py:73 models.py:115 msgid "permissions" msgstr "izinler" -#: models.py:108 +#: models.py:120 msgid "group" msgstr "grup" -#: models.py:109 models.py:216 +#: models.py:121 models.py:250 msgid "groups" msgstr "gruplar" -#: models.py:206 +#: models.py:232 msgid "username" msgstr "kullanıcı adı" -#: models.py:206 +#: models.py:233 msgid "" "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters" msgstr "" "Zorunlu alan. 30 karakter ya da az olmalı. Harf, rakam ve @/./+/-/_ " "karakterleri kullanılabilir" -#: models.py:207 +#: models.py:235 msgid "first name" msgstr "isim" -#: models.py:208 +#: models.py:236 msgid "last name" msgstr "soyisim" -#: models.py:209 +#: models.py:237 msgid "e-mail address" msgstr "e-posta adresi" -#: models.py:210 +#: models.py:238 msgid "password" msgstr "şifre" -#: models.py:210 -msgid "" -"Use '[algo]$[salt]$[hexdigest]' or use the change " -"password form." -msgstr "" -"'[algo]$[salt]$[hexdigest]' yazın ya da şifre\n" -"değiştir formunu kullanın." - -#: models.py:211 +#: models.py:239 msgid "staff status" msgstr "yönetici" -#: models.py:211 +#: models.py:240 msgid "Designates whether the user can log into this admin site." msgstr "Kullanıcının yönetim (admin) paneline girip giremeyeceğini belirler." -#: models.py:212 +#: models.py:242 msgid "active" msgstr "aktif" -#: models.py:212 +#: models.py:243 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." @@ -209,11 +239,11 @@ msgstr "" "Kullanıcının aktif olup olmadığını belirler. Kullanıcı hesabını silmek " "yerine bu işareti kaldırın." -#: models.py:213 +#: models.py:245 msgid "superuser status" msgstr "süper kullanıcı" -#: models.py:213 +#: models.py:246 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." @@ -221,42 +251,43 @@ msgstr "" "Kullanıcıya ayrı ayrı izin atamasına gerek kalmadan tüm hakların verilip " "verilmeyeceğini belirler." -#: models.py:214 +#: models.py:248 msgid "last login" msgstr "son ziyaret" -#: models.py:215 +#: models.py:249 msgid "date joined" msgstr "kayıt tarihi" -#: models.py:217 +#: models.py:251 msgid "" -"In addition to the permissions manually assigned, this user will also get " -"all permissions granted to each group he/she is in." +"The groups this user belongs to. A user will get all permissions granted to " +"each of his/her group." msgstr "" -"Özel olarak atanmış hakların yanı sıra, kullanıcı, üyesi olduğu grupların " -"haklarını da alır." +"Bu kullanıcının bağlı olduğu gruplar. Bir kullanıcı bağlı bulunduğu gruba " +"atanan tüm yetkilere sahip olur." -#: models.py:218 +#: models.py:255 msgid "user permissions" msgstr "kullanıcı izinleri" -#: models.py:222 +#: models.py:260 msgid "user" msgstr "kullanıcı" -#: models.py:223 +#: models.py:261 msgid "users" msgstr "kullanıcılar" -#: models.py:406 -msgid "message" -msgstr "mesaj" - -#: views.py:91 +#: views.py:93 msgid "Logged out" msgstr "Çıkış yapıldı" -#: management/commands/createsuperuser.py:23 +#: management/commands/createsuperuser.py:27 msgid "Enter a valid e-mail address." msgstr "Geçerli bir e-posta adresi girin." + +#: templates/registration/password_reset_subject.txt:2 +#, python-format +msgid "Password reset on %(site_name)s" +msgstr "Parola resetlemesi %(site_name)s" diff --git a/django/contrib/auth/locale/uk/LC_MESSAGES/django.mo b/django/contrib/auth/locale/uk/LC_MESSAGES/django.mo index a72313b5bb5..a4d966671ff 100644 Binary files a/django/contrib/auth/locale/uk/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/uk/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/uk/LC_MESSAGES/django.po b/django/contrib/auth/locale/uk/LC_MESSAGES/django.po index 975f454cab0..805dcfd1cd7 100644 --- a/django/contrib/auth/locale/uk/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/uk/LC_MESSAGES/django.po @@ -1,82 +1,92 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Jannis Leidel , 2011. +# Sergey Lysach , 2011, 2012. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:14-0400\n" -"PO-Revision-Date: 2011-03-04 18:41+0000\n" -"Last-Translator: sergikoff \n" -"Language-Team: Ukrainian <>\n" +"POT-Creation-Date: 2012-03-14 00:15-0700\n" +"PO-Revision-Date: 2012-03-11 16:52+0000\n" +"Last-Translator: Sergey Lysach \n" +"Language-Team: Ukrainian (http://www.transifex.net/projects/p/django/" +"language/uk/)\n" +"Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: uk\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" +"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" -#: admin.py:28 +#: admin.py:41 msgid "Personal info" msgstr "Персональна інформація" -#: admin.py:29 +#: admin.py:42 msgid "Permissions" msgstr "Дозволи" -#: admin.py:30 +#: admin.py:44 msgid "Important dates" msgstr "Важливі дати" -#: admin.py:31 -msgid "Groups" -msgstr "Групи" - -#: admin.py:113 +#: admin.py:125 msgid "Password changed successfully." msgstr "Пароль успішно змінено." -#: admin.py:123 +#: admin.py:135 #, python-format msgid "Change password: %s" msgstr "Змінити пароль: %s" -#: forms.py:14 forms.py:48 forms.py:66 +#: forms.py:58 +msgid "A user with that username already exists." +msgstr "Користувач з таким ім'ям вже існує." + +#: forms.py:59 forms.py:247 forms.py:304 +msgid "The two password fields didn't match." +msgstr "Паролі у двох полях не співпадають." + +#: forms.py:61 forms.py:106 forms.py:135 msgid "Username" msgstr "Користувач" -#: forms.py:15 forms.py:49 +#: forms.py:63 forms.py:107 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." msgstr "" "Обов'язкове поле. 30 або менше символів . Тільки букви, цифри, а також " "символи: @/./+/-/_" -#: forms.py:16 forms.py:50 +#: forms.py:66 forms.py:110 msgid "This value may contain only letters, numbers and @/./+/-/_ characters." msgstr "" "Значення цього поля може складатися лише з літер, цифр, а також з символів: " "@/./+/-/_" -#: forms.py:17 forms.py:67 forms.py:193 +#: forms.py:68 forms.py:112 forms.py:136 forms.py:306 msgid "Password" msgstr "Пароль" -#: forms.py:18 +#: forms.py:70 msgid "Password confirmation" msgstr "Підтвердження паролю" -#: forms.py:19 +#: forms.py:72 msgid "Enter the same password as above, for verification." msgstr "Повторіть пароль для перевірки." -#: forms.py:31 -msgid "A user with that username already exists." -msgstr "Користувач з таким ім'ям вже існує." +#: forms.py:113 +msgid "" +"Raw passwords are not stored, so there is no way to see this user's " +"password, but you can change the password using this " +"form." +msgstr "" +"Паролі не зберігаються у відкритому вигляді, тому не має можливості " +"переглянути пароль цього користувача, але ви можете змінити пароль за " +"допомогою цієї форми." -#: forms.py:37 forms.py:163 forms.py:205 -msgid "The two password fields didn't match." -msgstr "Паролі у двох полях не співпадають." - -#: forms.py:87 +#: forms.py:139 msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." @@ -84,11 +94,7 @@ msgstr "" "Будь-ласка введіть правильне ім'я та пароль. Зауважте, що обидва поля " "розрізняють великі і маленькі літери." -#: forms.py:89 -msgid "This account is inactive." -msgstr "Цей запис користувача не активний." - -#: forms.py:96 +#: forms.py:141 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." @@ -96,11 +102,11 @@ msgstr "" "Схоже, що у вашому браузері на увімкнені cookies. Cookies необхідні для " "входу." -#: forms.py:108 -msgid "E-mail" -msgstr "E-mail" +#: forms.py:143 +msgid "This account is inactive." +msgstr "Цей запис користувача не активний." -#: forms.py:117 +#: forms.py:187 msgid "" "That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" @@ -108,61 +114,93 @@ msgstr "" "Ця e-mail адреса не пов'язана з користувацьким запитом. Ви впевнені, що ви " "реєструвалися?" -#: forms.py:143 -#, python-format -msgid "Password reset on %s" -msgstr "Пароль перевстановлено %s" +#: forms.py:189 +msgid "" +"The user account associated with this e-mail address cannot reset the " +"password." +msgstr "" +"Акаунт користувача, пов'язаний з цією адресою електронної пошти не може " +"скидувати пароль." -#: forms.py:151 +#: forms.py:192 +msgid "E-mail" +msgstr "E-mail" + +#: forms.py:249 msgid "New password" msgstr "Новий пароль" -#: forms.py:152 +#: forms.py:251 msgid "New password confirmation" msgstr "Новий пароль (підтвердження):" -#: forms.py:177 -msgid "Old password" -msgstr "Старий пароль" - -#: forms.py:185 +#: forms.py:280 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "" "Старий пароль було введено неправильно. Будь ласка, введіть його знову." -#: forms.py:194 +#: forms.py:283 +msgid "Old password" +msgstr "Старий пароль" + +#: forms.py:308 msgid "Password (again)" msgstr "Зміна пароля" -#: models.py:76 models.py:104 +#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355 +#: hashers.py:389 +msgid "algorithm" +msgstr "алгоритм" + +#: hashers.py:219 +msgid "iterations" +msgstr "ітерації" + +#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390 +msgid "salt" +msgstr "сіль" + +#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391 +msgid "hash" +msgstr "хеш" + +#: hashers.py:270 +msgid "work factor" +msgstr "робочий фактор" + +#: hashers.py:272 +msgid "checksum" +msgstr "контрольна сума" + +#: models.py:66 models.py:113 msgid "name" msgstr "ім'я" -#: models.py:78 +#: models.py:68 msgid "codename" msgstr "код" -#: models.py:82 +#: models.py:72 msgid "permission" msgstr "дозвіл" -#: models.py:83 models.py:105 +#: models.py:73 models.py:115 msgid "permissions" msgstr "дозволи" -#: models.py:108 +#: models.py:120 msgid "group" msgstr "група" -#: models.py:109 models.py:216 +#: models.py:121 models.py:250 msgid "groups" msgstr "групи" -#: models.py:206 +#: models.py:232 msgid "username" msgstr "ім'я користувача" -#: models.py:206 +#: models.py:233 msgid "" "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters" msgstr "" @@ -170,43 +208,35 @@ msgstr "" "Обов'язкове поле. 30 або менше символів. Тільки букви, цифри, а також " "символи: @/./+/-/_" -#: models.py:207 +#: models.py:235 msgid "first name" msgstr "ім'я" -#: models.py:208 +#: models.py:236 msgid "last name" msgstr "прізвище" -#: models.py:209 +#: models.py:237 msgid "e-mail address" msgstr "e-mail адреса" -#: models.py:210 +#: models.py:238 msgid "password" msgstr "пароль" -#: models.py:210 -msgid "" -"Use '[algo]$[salt]$[hexdigest]' or use the change " -"password form." -msgstr "" -"Використайте '[algo]$[salt]$[hexdigest]' або використайте форму зміни паролю." - -#: models.py:211 +#: models.py:239 msgid "staff status" msgstr "статус персоналу" -#: models.py:211 +#: models.py:240 msgid "Designates whether the user can log into this admin site." msgstr "Визначає, чи може користувач увійти до цього сайту адміністрування." -#: models.py:212 +#: models.py:242 msgid "active" msgstr "активний" -#: models.py:212 +#: models.py:243 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." @@ -214,52 +244,53 @@ msgstr "" "Визначає, чи можна цього користувача вважати діючим. Заберіть галочку, " "замість відалення запису користувача." -#: models.py:213 +#: models.py:245 msgid "superuser status" msgstr "статус суперкористувача" -#: models.py:213 +#: models.py:246 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." msgstr "Визначає, що цей користувач має всі дозволи без їх точного зазначення." -#: models.py:214 +#: models.py:248 msgid "last login" msgstr "останній вхід" -#: models.py:215 +#: models.py:249 msgid "date joined" msgstr "дата приєднання" -#: models.py:217 +#: models.py:251 msgid "" -"In addition to the permissions manually assigned, this user will also get " -"all permissions granted to each group he/she is in." +"The groups this user belongs to. A user will get all permissions granted to " +"each of his/her group." msgstr "" -"На додаток до прав, які призначені вручну, цей користувач також отримує усі " -"права, що має група, в якій він знаходиться." +"Групи, до котрих належить користувач. Користувач отримає всі дозволи, що " +"вказані в кожній з його/її груп." -#: models.py:218 +#: models.py:255 msgid "user permissions" msgstr "дозволи користувача" -#: models.py:222 +#: models.py:260 msgid "user" msgstr "користувач" -#: models.py:223 +#: models.py:261 msgid "users" msgstr "користувачі" -#: models.py:406 -msgid "message" -msgstr "повідомлення" - -#: views.py:91 +#: views.py:93 msgid "Logged out" msgstr "Вихід" -#: management/commands/createsuperuser.py:23 +#: management/commands/createsuperuser.py:27 msgid "Enter a valid e-mail address." msgstr "Уведіть коректну e-mail адресу." + +#: templates/registration/password_reset_subject.txt:2 +#, python-format +msgid "Password reset on %(site_name)s" +msgstr "Скидання пароля на %(site_name)s" diff --git a/django/contrib/auth/locale/ur/LC_MESSAGES/django.mo b/django/contrib/auth/locale/ur/LC_MESSAGES/django.mo index c5a531aadfc..7d0563c25b3 100644 Binary files a/django/contrib/auth/locale/ur/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/ur/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/ur/LC_MESSAGES/django.po b/django/contrib/auth/locale/ur/LC_MESSAGES/django.po index 4880809f054..a6f1624187b 100644 --- a/django/contrib/auth/locale/ur/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/ur/LC_MESSAGES/django.po @@ -1,244 +1,272 @@ # This file is distributed under the same license as the Django package. # +# Translators: msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:14-0400\n" -"PO-Revision-Date: 2011-03-15 15:34+0000\n" +"POT-Creation-Date: 2012-03-14 00:15-0700\n" +"PO-Revision-Date: 2011-01-19 15:33+0000\n" "Last-Translator: Django team\n" -"Language-Team: Urdu \n" +"Language-Team: Urdu (http://www.transifex.net/projects/p/django/language/" +"ur/)\n" +"Language: ur\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ur\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: admin.py:28 +#: admin.py:41 msgid "Personal info" msgstr "" -#: admin.py:29 +#: admin.py:42 msgid "Permissions" msgstr "" -#: admin.py:30 +#: admin.py:44 msgid "Important dates" msgstr "" -#: admin.py:31 -msgid "Groups" -msgstr "" - -#: admin.py:113 +#: admin.py:125 msgid "Password changed successfully." msgstr "" -#: admin.py:123 +#: admin.py:135 #, python-format msgid "Change password: %s" msgstr "" -#: forms.py:14 forms.py:48 forms.py:66 -msgid "Username" -msgstr "" - -#: forms.py:15 forms.py:49 -msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." -msgstr "" - -#: forms.py:16 forms.py:50 -msgid "This value may contain only letters, numbers and @/./+/-/_ characters." -msgstr "" - -#: forms.py:17 forms.py:67 forms.py:193 -msgid "Password" -msgstr "" - -#: forms.py:18 -msgid "Password confirmation" -msgstr "" - -#: forms.py:19 -msgid "Enter the same password as above, for verification." -msgstr "" - -#: forms.py:31 +#: forms.py:58 msgid "A user with that username already exists." msgstr "" -#: forms.py:37 forms.py:163 forms.py:205 +#: forms.py:59 forms.py:247 forms.py:304 msgid "The two password fields didn't match." msgstr "" -#: forms.py:87 +#: forms.py:61 forms.py:106 forms.py:135 +msgid "Username" +msgstr "" + +#: forms.py:63 forms.py:107 +msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." +msgstr "" + +#: forms.py:66 forms.py:110 +msgid "This value may contain only letters, numbers and @/./+/-/_ characters." +msgstr "" + +#: forms.py:68 forms.py:112 forms.py:136 forms.py:306 +msgid "Password" +msgstr "لفظ اجازت" + +#: forms.py:70 +msgid "Password confirmation" +msgstr "" + +#: forms.py:72 +msgid "Enter the same password as above, for verification." +msgstr "توثیق کے لئے ویسا ہی لفظ اجازت درج کریں جیسا اوپر کیا۔" + +#: forms.py:113 +msgid "" +"Raw passwords are not stored, so there is no way to see this user's " +"password, but you can change the password using this " +"form." +msgstr "" + +#: forms.py:139 msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." msgstr "" +"براہ کرم درست نام صارف اور لفظ اجازت درج کریں۔ یاد رھے دونوں خانے چھوٹے بڑے " +"حروف کی شناخت کے لئے حساس ھیں۔" -#: forms.py:89 -msgid "This account is inactive." -msgstr "" - -#: forms.py:96 +#: forms.py:141 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." msgstr "" -#: forms.py:108 -msgid "E-mail" +#: forms.py:143 +msgid "This account is inactive." msgstr "" -#: forms.py:117 +#: forms.py:187 msgid "" "That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" msgstr "" -#: forms.py:143 -#, python-format -msgid "Password reset on %s" +#: forms.py:189 +msgid "" +"The user account associated with this e-mail address cannot reset the " +"password." msgstr "" -#: forms.py:151 +#: forms.py:192 +msgid "E-mail" +msgstr "" + +#: forms.py:249 msgid "New password" -msgstr "" +msgstr "نیا لفظ اجازت" -#: forms.py:152 +#: forms.py:251 msgid "New password confirmation" msgstr "" -#: forms.py:177 -msgid "Old password" -msgstr "" - -#: forms.py:185 +#: forms.py:280 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "" -#: forms.py:194 +#: forms.py:283 +msgid "Old password" +msgstr "پرانا لفظ اجازت" + +#: forms.py:308 msgid "Password (again)" +msgstr "لفظ اجازت (دوبارہ)" + +#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355 +#: hashers.py:389 +msgid "algorithm" msgstr "" -#: models.py:76 models.py:104 +#: hashers.py:219 +msgid "iterations" +msgstr "" + +#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390 +msgid "salt" +msgstr "" + +#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391 +msgid "hash" +msgstr "" + +#: hashers.py:270 +msgid "work factor" +msgstr "" + +#: hashers.py:272 +msgid "checksum" +msgstr "" + +#: models.py:66 models.py:113 msgid "name" msgstr "" -#: models.py:78 +#: models.py:68 msgid "codename" msgstr "" -#: models.py:82 +#: models.py:72 msgid "permission" msgstr "" -#: models.py:83 models.py:105 +#: models.py:73 models.py:115 msgid "permissions" msgstr "" -#: models.py:108 +#: models.py:120 msgid "group" msgstr "" -#: models.py:109 models.py:216 +#: models.py:121 models.py:250 msgid "groups" msgstr "" -#: models.py:206 +#: models.py:232 msgid "username" msgstr "" -#: models.py:206 +#: models.py:233 msgid "" "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters" msgstr "" -#: models.py:207 +#: models.py:235 msgid "first name" msgstr "" -#: models.py:208 +#: models.py:236 msgid "last name" msgstr "" -#: models.py:209 +#: models.py:237 msgid "e-mail address" msgstr "" -#: models.py:210 +#: models.py:238 msgid "password" msgstr "" -#: models.py:210 -msgid "" -"Use '[algo]$[salt]$[hexdigest]' or use the change " -"password form." -msgstr "" - -#: models.py:211 +#: models.py:239 msgid "staff status" msgstr "" -#: models.py:211 +#: models.py:240 msgid "Designates whether the user can log into this admin site." msgstr "" -#: models.py:212 +#: models.py:242 msgid "active" msgstr "" -#: models.py:212 +#: models.py:243 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." msgstr "" -#: models.py:213 +#: models.py:245 msgid "superuser status" msgstr "" -#: models.py:213 +#: models.py:246 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." msgstr "" -#: models.py:214 +#: models.py:248 msgid "last login" msgstr "" -#: models.py:215 +#: models.py:249 msgid "date joined" msgstr "" -#: models.py:217 +#: models.py:251 msgid "" -"In addition to the permissions manually assigned, this user will also get " -"all permissions granted to each group he/she is in." +"The groups this user belongs to. A user will get all permissions granted to " +"each of his/her group." msgstr "" -#: models.py:218 +#: models.py:255 msgid "user permissions" msgstr "" -#: models.py:222 +#: models.py:260 msgid "user" msgstr "" -#: models.py:223 +#: models.py:261 msgid "users" msgstr "" -#: models.py:406 -msgid "message" -msgstr "" - -#: views.py:91 +#: views.py:93 msgid "Logged out" msgstr "" -#: management/commands/createsuperuser.py:23 +#: management/commands/createsuperuser.py:27 msgid "Enter a valid e-mail address." +msgstr "برقی خط کا درست پتہ درج کریں۔" + +#: templates/registration/password_reset_subject.txt:2 +#, python-format +msgid "Password reset on %(site_name)s" msgstr "" diff --git a/django/contrib/auth/locale/vi/LC_MESSAGES/django.mo b/django/contrib/auth/locale/vi/LC_MESSAGES/django.mo index 23b23e6e963..4403ddb902e 100644 Binary files a/django/contrib/auth/locale/vi/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/vi/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/vi/LC_MESSAGES/django.po b/django/contrib/auth/locale/vi/LC_MESSAGES/django.po index 930093b4c4c..88c3f8d800a 100644 --- a/django/contrib/auth/locale/vi/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/vi/LC_MESSAGES/django.po @@ -1,98 +1,101 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Jannis Leidel , 2011. +# Tran , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:14-0400\n" -"PO-Revision-Date: 2011-03-10 21:56+0000\n" -"Last-Translator: greenfire \n" -"Language-Team: Vietnamese \n" +"POT-Creation-Date: 2012-03-14 00:15-0700\n" +"PO-Revision-Date: 2012-03-08 12:07+0000\n" +"Last-Translator: Tran \n" +"Language-Team: Vietnamese (http://www.transifex.net/projects/p/django/" +"language/vi/)\n" +"Language: vi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: vi\n" "Plural-Forms: nplurals=1; plural=0\n" -#: admin.py:28 +#: admin.py:41 msgid "Personal info" msgstr "Thông tin cá nhân" -#: admin.py:29 +#: admin.py:42 msgid "Permissions" msgstr "Quyền" -#: admin.py:30 +#: admin.py:44 msgid "Important dates" msgstr "Những ngày quan trọng" -#: admin.py:31 -msgid "Groups" -msgstr "Các nhóm" - -#: admin.py:113 +#: admin.py:125 msgid "Password changed successfully." msgstr "Mật khẩu thay đổi thành công" -#: admin.py:123 +#: admin.py:135 #, python-format msgid "Change password: %s" msgstr "Thay đổi mật khẩu: %s" -#: forms.py:14 forms.py:48 forms.py:66 -msgid "Username" -msgstr "Tên đăng nhập" - -#: forms.py:15 forms.py:49 -msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." -msgstr "Yêu cầu. 30 ký tự hoặc ít hơn. Chỉ là chữ cái, chữ số và @/./+/-/_." - -#: forms.py:16 forms.py:50 -msgid "This value may contain only letters, numbers and @/./+/-/_ characters." -msgstr "Giá trị này có thể chứa chữ cái, số và ký tự @/./+/-/_." - -#: forms.py:17 forms.py:67 forms.py:193 -msgid "Password" -msgstr "Mật khẩu" - -#: forms.py:18 -msgid "Password confirmation" -msgstr "Xác nhận mật khẩu" - -#: forms.py:19 -msgid "Enter the same password as above, for verification." -msgstr "Nhập dãy mật mã trên để xác minh lại" - -#: forms.py:31 +#: forms.py:58 msgid "A user with that username already exists." msgstr "Tên đăng nhập đã được sử dụng" -#: forms.py:37 forms.py:163 forms.py:205 +#: forms.py:59 forms.py:247 forms.py:304 msgid "The two password fields didn't match." msgstr "Hai trường mật khẩu không giống nhau" -#: forms.py:87 +#: forms.py:61 forms.py:106 forms.py:135 +msgid "Username" +msgstr "Tên đăng nhập" + +#: forms.py:63 forms.py:107 +msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." +msgstr "Yêu cầu. 30 ký tự hoặc ít hơn. Chỉ là chữ cái, chữ số và @/./+/-/_." + +#: forms.py:66 forms.py:110 +msgid "This value may contain only letters, numbers and @/./+/-/_ characters." +msgstr "Giá trị này có thể chứa chữ cái, số và ký tự @/./+/-/_." + +#: forms.py:68 forms.py:112 forms.py:136 forms.py:306 +msgid "Password" +msgstr "Mật khẩu" + +#: forms.py:70 +msgid "Password confirmation" +msgstr "Xác nhận mật khẩu" + +#: forms.py:72 +msgid "Enter the same password as above, for verification." +msgstr "Nhập dãy mật mã trên để xác minh lại" + +#: forms.py:113 +msgid "" +"Raw passwords are not stored, so there is no way to see this user's " +"password, but you can change the password using this " +"form." +msgstr "" + +#: forms.py:139 msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." msgstr "Hãy nhập đúng tên đăng nhập và mật khẩu. Chú ý chữ hoa, chữ thường." -#: forms.py:89 -msgid "This account is inactive." -msgstr "Tài khoản này chưa được kích hoạt." - -#: forms.py:96 +#: forms.py:141 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." msgstr "" "Trình duyệt web của bạn không bật cookie. Cookies được yêu cầu để đăng nhập" -#: forms.py:108 -msgid "E-mail" -msgstr "E-mail" +#: forms.py:143 +msgid "This account is inactive." +msgstr "Tài khoản này chưa được kích hoạt." -#: forms.py:117 +#: forms.py:187 msgid "" "That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" @@ -100,152 +103,173 @@ msgstr "" "Không tìm thấy địa chỉ email này trong các tài khoản đã có. Bạn có chắc là " "đã đăng kí không?" -#: forms.py:143 -#, python-format -msgid "Password reset on %s" -msgstr "Đặt lại mật khẩu trên %s" +#: forms.py:189 +msgid "" +"The user account associated with this e-mail address cannot reset the " +"password." +msgstr "" -#: forms.py:151 +#: forms.py:192 +msgid "E-mail" +msgstr "E-mail" + +#: forms.py:249 msgid "New password" msgstr "Mật khẩu mới" -#: forms.py:152 +#: forms.py:251 msgid "New password confirmation" msgstr "Xác nhận mật khẩu mới" -#: forms.py:177 -msgid "Old password" -msgstr "Mật khẩu cũ" - -#: forms.py:185 +#: forms.py:280 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "Mật khẩu cũ không chính xác. Hãy nhập lại lần nữa" -#: forms.py:194 +#: forms.py:283 +msgid "Old password" +msgstr "Mật khẩu cũ" + +#: forms.py:308 msgid "Password (again)" msgstr "Nhập lại mật khẩu" -#: models.py:76 models.py:104 +#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355 +#: hashers.py:389 +msgid "algorithm" +msgstr "" + +#: hashers.py:219 +msgid "iterations" +msgstr "" + +#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390 +msgid "salt" +msgstr "" + +#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391 +msgid "hash" +msgstr "" + +#: hashers.py:270 +msgid "work factor" +msgstr "" + +#: hashers.py:272 +msgid "checksum" +msgstr "" + +#: models.py:66 models.py:113 msgid "name" msgstr "Tên" -#: models.py:78 +#: models.py:68 msgid "codename" msgstr "tên mã" -#: models.py:82 +#: models.py:72 msgid "permission" msgstr "cho phép" -#: models.py:83 models.py:105 +#: models.py:73 models.py:115 msgid "permissions" msgstr "cho phép" -#: models.py:108 +#: models.py:120 msgid "group" msgstr "Nhóm" -#: models.py:109 models.py:216 +#: models.py:121 models.py:250 msgid "groups" msgstr "Các nhóm" -#: models.py:206 +#: models.py:232 msgid "username" msgstr "Tên đăng nhập" -#: models.py:206 +#: models.py:233 msgid "" "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters" msgstr "Yêu cầu. 30 ký tự hoặc ít hơn. Chữ cái, số và ký tự @/./+/-/_" -#: models.py:207 +#: models.py:235 msgid "first name" msgstr "Tên" -#: models.py:208 +#: models.py:236 msgid "last name" msgstr "Họ" -#: models.py:209 +#: models.py:237 msgid "e-mail address" msgstr "Địa chỉ email" -#: models.py:210 +#: models.py:238 msgid "password" msgstr "Mật khẩu" -#: models.py:210 -msgid "" -"Use '[algo]$[salt]$[hexdigest]' or use the change " -"password form." -msgstr "" -"Sử dụng '[algo]$[salt]$[hexdigest]' hoặc sử dụng thay " -"đổi form mật khẩu ." - -#: models.py:211 +#: models.py:239 msgid "staff status" msgstr "tình trạng nhân viên" -#: models.py:211 +#: models.py:240 msgid "Designates whether the user can log into this admin site." msgstr "Chỉ định người dùng nào được phép truy cập vào trang admin." -#: models.py:212 +#: models.py:242 msgid "active" msgstr "Kích hoạt" -#: models.py:212 +#: models.py:243 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." msgstr "" -#: models.py:213 +#: models.py:245 msgid "superuser status" msgstr "" -#: models.py:213 +#: models.py:246 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." msgstr "" -#: models.py:214 +#: models.py:248 msgid "last login" msgstr "Lần cuối đăng nhập" -#: models.py:215 +#: models.py:249 msgid "date joined" msgstr "Ngày tham gia" -#: models.py:217 +#: models.py:251 msgid "" -"In addition to the permissions manually assigned, this user will also get " -"all permissions granted to each group he/she is in." +"The groups this user belongs to. A user will get all permissions granted to " +"each of his/her group." msgstr "" -"Bên cạnh các quyền đã mặc định khi đăng kí, người dùng sẽ được cấp thêm các " -"quyền của các nhóm mà người đó tham gia vào." -#: models.py:218 +#: models.py:255 msgid "user permissions" msgstr "quyền của người sử dụng" -#: models.py:222 +#: models.py:260 msgid "user" msgstr "Người dùng" -#: models.py:223 +#: models.py:261 msgid "users" msgstr "người sử dụng" -#: models.py:406 -msgid "message" -msgstr "Tin nhắn" - -#: views.py:91 +#: views.py:93 msgid "Logged out" msgstr "Đã thoát" -#: management/commands/createsuperuser.py:23 +#: management/commands/createsuperuser.py:27 msgid "Enter a valid e-mail address." msgstr "Hãy nhập địa chỉ email hợp lệ." + +#: templates/registration/password_reset_subject.txt:2 +#, python-format +msgid "Password reset on %(site_name)s" +msgstr "" diff --git a/django/contrib/auth/locale/zh_CN/LC_MESSAGES/django.mo b/django/contrib/auth/locale/zh_CN/LC_MESSAGES/django.mo index 324bcb3cfc6..3065001d9f5 100644 Binary files a/django/contrib/auth/locale/zh_CN/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/zh_CN/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/zh_CN/LC_MESSAGES/django.po b/django/contrib/auth/locale/zh_CN/LC_MESSAGES/django.po index 1eff7162144..c4658eb5dc4 100644 --- a/django/contrib/auth/locale/zh_CN/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/zh_CN/LC_MESSAGES/django.po @@ -1,246 +1,273 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Jannis Leidel , 2011. +# Lele Long , 2011. +# Ziang Song , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:14-0400\n" -"PO-Revision-Date: 2011-03-04 18:41+0000\n" -"Last-Translator: schemacs \n" -"Language-Team: Chinese (China) \n" +"POT-Creation-Date: 2012-03-14 00:15-0700\n" +"PO-Revision-Date: 2012-03-08 12:07+0000\n" +"Last-Translator: Ziang Song \n" +"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/django/" +"language/zh_CN/)\n" +"Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0\n" -#: admin.py:28 +#: admin.py:41 msgid "Personal info" msgstr "个人信息" -#: admin.py:29 +#: admin.py:42 msgid "Permissions" msgstr "权限" -#: admin.py:30 +#: admin.py:44 msgid "Important dates" msgstr "重要日期" -#: admin.py:31 -msgid "Groups" -msgstr "组" - -#: admin.py:113 +#: admin.py:125 msgid "Password changed successfully." msgstr "密码修改成功。" -#: admin.py:123 +#: admin.py:135 #, python-format msgid "Change password: %s" msgstr "修改密码：%s" -#: forms.py:14 forms.py:48 forms.py:66 -msgid "Username" -msgstr "用户名" - -#: forms.py:15 forms.py:49 -msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." -msgstr "必填。不多于30个字符。只能用字母、数字和字符 @/./+/-/_ 。" - -#: forms.py:16 forms.py:50 -msgid "This value may contain only letters, numbers and @/./+/-/_ characters." -msgstr "该值只能包含字母、数字和字符@/./+/-/_ 。" - -#: forms.py:17 forms.py:67 forms.py:193 -msgid "Password" -msgstr "密码" - -#: forms.py:18 -msgid "Password confirmation" -msgstr "密码确认" - -#: forms.py:19 -msgid "Enter the same password as above, for verification." -msgstr "为了校验，输入与上面相同的密码。" - -#: forms.py:31 +#: forms.py:58 msgid "A user with that username already exists." msgstr "已存在一位使用该名字的用户。" -#: forms.py:37 forms.py:163 forms.py:205 +#: forms.py:59 forms.py:247 forms.py:304 msgid "The two password fields didn't match." msgstr "两个密码字段不一致。" -#: forms.py:87 +#: forms.py:61 forms.py:106 forms.py:135 +msgid "Username" +msgstr "用户名" + +#: forms.py:63 forms.py:107 +msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." +msgstr "必填。不多于30个字符。只能用字母、数字和字符 @/./+/-/_ 。" + +#: forms.py:66 forms.py:110 +msgid "This value may contain only letters, numbers and @/./+/-/_ characters." +msgstr "该值只能包含字母、数字和字符@/./+/-/_ 。" + +#: forms.py:68 forms.py:112 forms.py:136 forms.py:306 +msgid "Password" +msgstr "密码" + +#: forms.py:70 +msgid "Password confirmation" +msgstr "密码确认" + +#: forms.py:72 +msgid "Enter the same password as above, for verification." +msgstr "为了校验，输入与上面相同的密码。" + +#: forms.py:113 +msgid "" +"Raw passwords are not stored, so there is no way to see this user's " +"password, but you can change the password using this " +"form." +msgstr "" + +#: forms.py:139 msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." msgstr "请输入正确的用户名和密码。请注意两者都是大小写敏感的。" -#: forms.py:89 -msgid "This account is inactive." -msgstr "该帐号未激活。" - -#: forms.py:96 +#: forms.py:141 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." msgstr "你的浏览器好象不允许使用cookie。登录需要使用启用cookie。" -#: forms.py:108 -msgid "E-mail" -msgstr "E-mail" +#: forms.py:143 +msgid "This account is inactive." +msgstr "该帐号未激活。" -#: forms.py:117 +#: forms.py:187 msgid "" "That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" msgstr "该电子邮件地址没有关联任何用户帐号。你确定已经注册过了？" -#: forms.py:143 -#, python-format -msgid "Password reset on %s" -msgstr "密码重设于 %s" +#: forms.py:189 +msgid "" +"The user account associated with this e-mail address cannot reset the " +"password." +msgstr "和这封电子邮件相关的账户不能重置密码。" -#: forms.py:151 +#: forms.py:192 +msgid "E-mail" +msgstr "E-mail" + +#: forms.py:249 msgid "New password" msgstr "新密码" -#: forms.py:152 +#: forms.py:251 msgid "New password confirmation" msgstr "新密码确认" -#: forms.py:177 -msgid "Old password" -msgstr "旧密码" - -#: forms.py:185 +#: forms.py:280 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "你的旧密码不正确。请重新输入。" -#: forms.py:194 +#: forms.py:283 +msgid "Old password" +msgstr "旧密码" + +#: forms.py:308 msgid "Password (again)" msgstr "密码(重复)" -#: models.py:76 models.py:104 +#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355 +#: hashers.py:389 +msgid "algorithm" +msgstr "" + +#: hashers.py:219 +msgid "iterations" +msgstr "" + +#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390 +msgid "salt" +msgstr "" + +#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391 +msgid "hash" +msgstr "" + +#: hashers.py:270 +msgid "work factor" +msgstr "" + +#: hashers.py:272 +msgid "checksum" +msgstr "" + +#: models.py:66 models.py:113 msgid "name" msgstr "名称" -#: models.py:78 +#: models.py:68 msgid "codename" msgstr "代码名称" -#: models.py:82 +#: models.py:72 msgid "permission" msgstr "权限" -#: models.py:83 models.py:105 +#: models.py:73 models.py:115 msgid "permissions" msgstr "权限" -#: models.py:108 +#: models.py:120 msgid "group" msgstr "组" -#: models.py:109 models.py:216 +#: models.py:121 models.py:250 msgid "groups" msgstr "组" -#: models.py:206 +#: models.py:232 msgid "username" msgstr "用户名" -#: models.py:206 +#: models.py:233 msgid "" "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters" msgstr "必填。不多于30个字符。只能用字母、数字和字符 @/./+/-/_ 。" -#: models.py:207 +#: models.py:235 msgid "first name" msgstr "名字" -#: models.py:208 +#: models.py:236 msgid "last name" msgstr "姓氏" -#: models.py:209 +#: models.py:237 msgid "e-mail address" msgstr "e-mail 地址" -#: models.py:210 +#: models.py:238 msgid "password" msgstr "密码" -#: models.py:210 -msgid "" -"Use '[algo]$[salt]$[hexdigest]' or use the change " -"password form." -msgstr "" -"使用 '[algo]$[salt]$[hexdigest]' 或使用 修改密码表单" - -#: models.py:211 +#: models.py:239 msgid "staff status" msgstr "职员状态" -#: models.py:211 +#: models.py:240 msgid "Designates whether the user can log into this admin site." msgstr "指明用户是否可以登录到这个管理站点。" -#: models.py:212 +#: models.py:242 msgid "active" msgstr "有效" -#: models.py:212 +#: models.py:243 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." msgstr "指明用户是否被认为活跃的。以反选代替删除帐号。" -#: models.py:213 +#: models.py:245 msgid "superuser status" msgstr "超级用户状态" -#: models.py:213 +#: models.py:246 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." msgstr "指明该用户缺省拥有所有权限。" -#: models.py:214 +#: models.py:248 msgid "last login" msgstr "上次登录" -#: models.py:215 +#: models.py:249 msgid "date joined" msgstr "加入日期" -#: models.py:217 +#: models.py:251 msgid "" -"In addition to the permissions manually assigned, this user will also get " -"all permissions granted to each group he/she is in." -msgstr "除了手工设置权限以外，用户也会从其所在组获得赋予该组的所有权限。" +"The groups this user belongs to. A user will get all permissions granted to " +"each of his/her group." +msgstr "" -#: models.py:218 +#: models.py:255 msgid "user permissions" msgstr "用户权限" -#: models.py:222 +#: models.py:260 msgid "user" msgstr "用户" -#: models.py:223 +#: models.py:261 msgid "users" msgstr "用户" -#: models.py:406 -msgid "message" -msgstr "消息" - -#: views.py:91 +#: views.py:93 msgid "Logged out" msgstr "退出登录" -#: management/commands/createsuperuser.py:23 +#: management/commands/createsuperuser.py:27 msgid "Enter a valid e-mail address." msgstr "输入一个有效的 e-mail 地址。" + +#: templates/registration/password_reset_subject.txt:2 +#, python-format +msgid "Password reset on %(site_name)s" +msgstr "重置 %(site_name)s 的密码" diff --git a/django/contrib/auth/locale/zh_TW/LC_MESSAGES/django.mo b/django/contrib/auth/locale/zh_TW/LC_MESSAGES/django.mo index 70783cea488..c95b0dd5804 100644 Binary files a/django/contrib/auth/locale/zh_TW/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/zh_TW/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/zh_TW/LC_MESSAGES/django.po b/django/contrib/auth/locale/zh_TW/LC_MESSAGES/django.po index b2ac3d23d2f..09a1b63165f 100644 --- a/django/contrib/auth/locale/zh_TW/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/zh_TW/LC_MESSAGES/django.po @@ -1,245 +1,272 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Jannis Leidel , 2011. +# tcc , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:14-0400\n" -"PO-Revision-Date: 2011-03-04 18:41+0000\n" +"POT-Creation-Date: 2012-03-14 00:15-0700\n" +"PO-Revision-Date: 2012-03-08 12:07+0000\n" "Last-Translator: tcc \n" -"Language-Team: Chinese (Taiwan) \n" +"Language-Team: Chinese (Taiwan) (http://www.transifex.net/projects/p/django/" +"language/zh_TW/)\n" +"Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: zh_TW\n" "Plural-Forms: nplurals=1; plural=0\n" -#: admin.py:28 +#: admin.py:41 msgid "Personal info" msgstr "個人資訊" -#: admin.py:29 +#: admin.py:42 msgid "Permissions" msgstr "權限" -#: admin.py:30 +#: admin.py:44 msgid "Important dates" msgstr "重要日期" -#: admin.py:31 -msgid "Groups" -msgstr "群組" - -#: admin.py:113 +#: admin.py:125 msgid "Password changed successfully." msgstr "密碼修改成功" -#: admin.py:123 +#: admin.py:135 #, python-format msgid "Change password: %s" msgstr "密碼變更: %s" -#: forms.py:14 forms.py:48 forms.py:66 -msgid "Username" -msgstr "使用者名稱" - -#: forms.py:15 forms.py:49 -msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." -msgstr "必要的。30 個字或更少, 只包含字母、數字和 @/./+/-/_。" - -#: forms.py:16 forms.py:50 -msgid "This value may contain only letters, numbers and @/./+/-/_ characters." -msgstr "這資料值只能包含字母、數字和 @/./+/-/_ 字元。" - -#: forms.py:17 forms.py:67 forms.py:193 -msgid "Password" -msgstr "密碼" - -#: forms.py:18 -msgid "Password confirmation" -msgstr "密碼確認" - -#: forms.py:19 -msgid "Enter the same password as above, for verification." -msgstr "為檢查用，請輸入與上面相同的密碼。" - -#: forms.py:31 +#: forms.py:58 msgid "A user with that username already exists." msgstr "一個相同名稱的使用者已經存在。" -#: forms.py:37 forms.py:163 forms.py:205 +#: forms.py:59 forms.py:247 forms.py:304 msgid "The two password fields didn't match." msgstr "兩個密碼欄位不同。" -#: forms.py:87 +#: forms.py:61 forms.py:106 forms.py:135 +msgid "Username" +msgstr "使用者名稱" + +#: forms.py:63 forms.py:107 +msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." +msgstr "必要的。30 個字或更少, 只包含字母、數字和 @/./+/-/_。" + +#: forms.py:66 forms.py:110 +msgid "This value may contain only letters, numbers and @/./+/-/_ characters." +msgstr "這資料值只能包含字母、數字和 @/./+/-/_ 字元。" + +#: forms.py:68 forms.py:112 forms.py:136 forms.py:306 +msgid "Password" +msgstr "密碼" + +#: forms.py:70 +msgid "Password confirmation" +msgstr "密碼確認" + +#: forms.py:72 +msgid "Enter the same password as above, for verification." +msgstr "為檢查用，請輸入與上面相同的密碼。" + +#: forms.py:113 +msgid "" +"Raw passwords are not stored, so there is no way to see this user's " +"password, but you can change the password using this " +"form." +msgstr "" + +#: forms.py:139 msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." msgstr "請輸入有效的使用者名稱與密碼。請注意兩個欄位都有分大小寫" -#: forms.py:89 -msgid "This account is inactive." -msgstr "這個帳戶未啟用" - -#: forms.py:96 +#: forms.py:141 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." msgstr "你的Web瀏覽器好像不允許使用cookie。登入時需要使用cookie。" -#: forms.py:108 -msgid "E-mail" -msgstr "電子信箱" +#: forms.py:143 +msgid "This account is inactive." +msgstr "這個帳戶未啟用" -#: forms.py:117 +#: forms.py:187 msgid "" "That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" msgstr "這個電子郵件地址沒有和任何使用者帳號有關聯。你確定你已經註冊了？" -#: forms.py:143 -#, python-format -msgid "Password reset on %s" -msgstr "密碼重設在 %s" +#: forms.py:189 +msgid "" +"The user account associated with this e-mail address cannot reset the " +"password." +msgstr "" -#: forms.py:151 +#: forms.py:192 +msgid "E-mail" +msgstr "電子信箱" + +#: forms.py:249 msgid "New password" msgstr "新密碼" -#: forms.py:152 +#: forms.py:251 msgid "New password confirmation" msgstr "新密碼確認" -#: forms.py:177 -msgid "Old password" -msgstr "舊密碼" - -#: forms.py:185 +#: forms.py:280 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "你的舊密碼不正確。請重新輸入。" -#: forms.py:194 +#: forms.py:283 +msgid "Old password" +msgstr "舊密碼" + +#: forms.py:308 msgid "Password (again)" msgstr "密碼(重複)" -#: models.py:76 models.py:104 +#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355 +#: hashers.py:389 +msgid "algorithm" +msgstr "" + +#: hashers.py:219 +msgid "iterations" +msgstr "" + +#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390 +msgid "salt" +msgstr "" + +#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391 +msgid "hash" +msgstr "" + +#: hashers.py:270 +msgid "work factor" +msgstr "" + +#: hashers.py:272 +msgid "checksum" +msgstr "" + +#: models.py:66 models.py:113 msgid "name" msgstr "名稱" -#: models.py:78 +#: models.py:68 msgid "codename" msgstr "代碼" -#: models.py:82 +#: models.py:72 msgid "permission" msgstr "權限" -#: models.py:83 models.py:105 +#: models.py:73 models.py:115 msgid "permissions" msgstr "權限" -#: models.py:108 +#: models.py:120 msgid "group" msgstr "群組" -#: models.py:109 models.py:216 +#: models.py:121 models.py:250 msgid "groups" msgstr "群組" -#: models.py:206 +#: models.py:232 msgid "username" msgstr "使用者名稱" -#: models.py:206 +#: models.py:233 msgid "" "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters" msgstr "必要的。30 個字或更少, 只包含字母、數字和 @/./+/-/_。" -#: models.py:207 +#: models.py:235 msgid "first name" msgstr "名字" -#: models.py:208 +#: models.py:236 msgid "last name" msgstr "姓氏" -#: models.py:209 +#: models.py:237 msgid "e-mail address" msgstr "電子郵件地址" -#: models.py:210 +#: models.py:238 msgid "password" msgstr "密碼" -#: models.py:210 -msgid "" -"Use '[algo]$[salt]$[hexdigest]' or use the change " -"password form." -msgstr "" -"使用 '[algo]$[salt]$[hexdigest]' 或是 修改密碼表單." - -#: models.py:211 +#: models.py:239 msgid "staff status" msgstr "工作人員狀態" -#: models.py:211 +#: models.py:240 msgid "Designates whether the user can log into this admin site." msgstr "指定是否使用者可以登入此管理網站。" -#: models.py:212 +#: models.py:242 msgid "active" msgstr "有效" -#: models.py:212 +#: models.py:243 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." msgstr "指定使用者是否有效。請取消選擇而不是刪除帳號。" -#: models.py:213 +#: models.py:245 msgid "superuser status" msgstr "超級使用者狀態" -#: models.py:213 +#: models.py:246 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." msgstr "指定是否使用者可以登入到這個管理網站" -#: models.py:214 +#: models.py:248 msgid "last login" msgstr "上次登入" -#: models.py:215 +#: models.py:249 msgid "date joined" msgstr "加入日期" -#: models.py:217 +#: models.py:251 msgid "" -"In addition to the permissions manually assigned, this user will also get " -"all permissions granted to each group he/she is in." -msgstr "除了手動指定的權限之外，這個使用者也會得到其群組擁有的所有權限。" +"The groups this user belongs to. A user will get all permissions granted to " +"each of his/her group." +msgstr "" -#: models.py:218 +#: models.py:255 msgid "user permissions" msgstr "使用者權限" -#: models.py:222 +#: models.py:260 msgid "user" msgstr "使用者" -#: models.py:223 +#: models.py:261 msgid "users" msgstr "使用者" -#: models.py:406 -msgid "message" -msgstr "訊息" - -#: views.py:91 +#: views.py:93 msgid "Logged out" msgstr "登出" -#: management/commands/createsuperuser.py:23 +#: management/commands/createsuperuser.py:27 msgid "Enter a valid e-mail address." msgstr "輸入有效的電子郵件地址。" + +#: templates/registration/password_reset_subject.txt:2 +#, python-format +msgid "Password reset on %(site_name)s" +msgstr ""