diff options
39 files changed, 2126 insertions, 1358 deletions
diff --git a/django/conf/locale/bn/LC_MESSAGES/django.mo b/django/conf/locale/bn/LC_MESSAGES/django.mo Binary files differindex 14e21598bc..b4d427d19c 100644 --- a/django/conf/locale/bn/LC_MESSAGES/django.mo +++ b/django/conf/locale/bn/LC_MESSAGES/django.mo diff --git a/django/conf/locale/bn/LC_MESSAGES/django.po b/django/conf/locale/bn/LC_MESSAGES/django.po index 9ec8ed0283..948497c6dd 100644 --- a/django/conf/locale/bn/LC_MESSAGES/django.po +++ b/django/conf/locale/bn/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Django CVS\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-15 12:41-0600\n" +"POT-Creation-Date: 2005-11-22 15:44-0600\n" "PO-Revision-Date: 2005-11-12 20:05+0530\n" "Last-Translator: Baishampayan Ghose <b.ghose@gnu.org.in>\n" "Language-Team: Ankur Bangla <core@bengalinux.org>\n" @@ -507,6 +507,38 @@ msgstr "নভে." msgid "Dec." msgstr "ডিসে." +#: utils/timesince.py:12 +msgid "year" +msgid_plural "years" +msgstr[0] "" +msgstr[1] "" + +#: utils/timesince.py:13 +msgid "month" +msgid_plural "months" +msgstr[0] "" +msgstr[1] "" + +#: utils/timesince.py:14 +#, fuzzy +msgid "day" +msgid_plural "days" +msgstr[0] "মে" +msgstr[1] "মে" + +#: utils/timesince.py:15 +msgid "hour" +msgid_plural "hours" +msgstr[0] "" +msgstr[1] "" + +#: utils/timesince.py:16 +#, fuzzy +msgid "minute" +msgid_plural "minutes" +msgstr[0] "স্থান" +msgstr[1] "স্থান" + #: models/core.py:7 msgid "domain name" msgstr "ক্ষেত্র নাম" @@ -612,8 +644,8 @@ msgid "password" msgstr "পাসওয়ার্ড" #: models/auth.py:37 -msgid "Use an MD5 hash -- not the raw password." -msgstr "একটি MD5 হ্যাশ ব্যাবহার করুন -- পরিস্কার পাসওয়ার্ড না যেন।" +msgid "Use '[algo]$[salt]$[hexdigest]" +msgstr "" #: models/auth.py:38 msgid "staff status" @@ -658,7 +690,7 @@ msgstr "ব্যক্তিগত তথ্য" msgid "Important dates" msgstr "গুরুত্বপূর্ণ তারিখ" -#: models/auth.py:195 +#: models/auth.py:216 msgid "Message" msgstr "বার্তা" @@ -739,71 +771,71 @@ msgstr "" msgid "Simplified Chinese" msgstr "সরলীকৃত চীনা" -#: core/validators.py:59 +#: core/validators.py:62 msgid "This value must contain only letters, numbers and underscores." msgstr "এই মানটি শুধু মাত্র অক্ষর, অংক, এবং আন্ডারস্কোর (_) হতে পারবে।" -#: core/validators.py:63 +#: core/validators.py:66 msgid "This value must contain only letters, numbers, underscores and slashes." msgstr "এই মানটি শুধু মাত্র অক্ষর, অংক, আন্ডারস্কোর (_) এবং স্ল্যাশ হতে পারবে।" -#: core/validators.py:71 +#: core/validators.py:74 msgid "Uppercase letters are not allowed here." msgstr "বড় হাতের অক্ষর এখানে ঢোকাতে পারবেন না।" -#: core/validators.py:75 +#: core/validators.py:78 msgid "Lowercase letters are not allowed here." msgstr "ছোটহাতের অক্ষর এখানে ঢোকাতে পারবেন না।" -#: core/validators.py:82 +#: core/validators.py:85 msgid "Enter only digits separated by commas." msgstr "কমা দ্বারা আলাদা করে শুধু মাত্র অংক ঢোকান।" -#: core/validators.py:94 +#: core/validators.py:97 msgid "Enter valid e-mail addresses separated by commas." msgstr "কমা দ্বারা আলাদা করে বৈধ ই-মেল ঠিকানা ঢোকান।" -#: core/validators.py:98 +#: core/validators.py:101 msgid "Please enter a valid IP address." msgstr "দয়া করে একটি বৈধ IP ঠিকানা ঢোকান।" -#: core/validators.py:102 +#: core/validators.py:105 msgid "Empty values are not allowed here." msgstr "ফাঁকা মান এখানে ঢোকাতে পারবেন না।" -#: core/validators.py:106 +#: core/validators.py:109 msgid "Non-numeric characters aren't allowed here." msgstr "অংক বিহীন অক্ষর এখানে ঢোকাতে পারবেন না।" -#: core/validators.py:110 +#: core/validators.py:113 msgid "This value can't be comprised solely of digits." msgstr "এই মানটি শুধু মাত্র অংকের দ্বারা গঠিত হতে পারে না।" -#: core/validators.py:115 +#: core/validators.py:118 msgid "Enter a whole number." msgstr "একটি গোটা সংখ্যা ঢোকান।" -#: core/validators.py:119 +#: core/validators.py:122 msgid "Only alphabetical characters are allowed here." msgstr "এখানে শুধু মাত্র অক্ষর ঢোকাতে পারবেন ।" -#: core/validators.py:123 +#: core/validators.py:126 msgid "Enter a valid date in YYYY-MM-DD format." msgstr "YYYY-MM-DD ফরম্যাটে একটি বৈধ তারিখ ঢোকান।" -#: core/validators.py:127 +#: core/validators.py:130 msgid "Enter a valid time in HH:MM format." msgstr "HH:MM ফরম্যাটে একটি বৈধ সময় ঢোকান।" -#: core/validators.py:131 +#: core/validators.py:134 msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format." msgstr "YYYY-MM-DD.HH:MM ফরম্যাটে একটি বৈধ তারিখ/সময় ঢোকান।" -#: core/validators.py:135 +#: core/validators.py:138 msgid "Enter a valid e-mail address." msgstr "একটি বৈধ ই-মেল ঠিকানা ঢোকান।" -#: core/validators.py:147 +#: core/validators.py:150 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." @@ -811,26 +843,26 @@ msgstr "" "একটি বৈধ চিত্র আপলোড করুন। যে ফাইল আপনি আপলোড করলেন তা হয় একটি চিত্র নয় অথবা " "একটি খারাপ চিত্র।" -#: core/validators.py:154 +#: core/validators.py:157 #, python-format msgid "The URL %s does not point to a valid image." msgstr "%s ইউ.আর.এল-এ একটি বৈধ চিত্র নেই।" -#: core/validators.py:158 +#: core/validators.py:161 #, python-format msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid." msgstr "ফোন নম্বর XXX-XXX-XXXX ফরম্যাটে অবশ্যই হতে হবে। \"%s\" অবৈধ।" -#: core/validators.py:166 +#: core/validators.py:169 #, python-format msgid "The URL %s does not point to a valid QuickTime video." msgstr "%s ইউ.আর.এল-এ একটি বৈধ QuickTime ভিডিও পাওয়া গেল না।" -#: core/validators.py:170 +#: core/validators.py:173 msgid "A valid URL is required." msgstr "একটি বৈধ ইউ.আর.এল জরুরি।" -#: core/validators.py:184 +#: core/validators.py:187 #, python-format msgid "" "Valid HTML is required. Specific errors are:\n" @@ -839,69 +871,69 @@ msgstr "" "বৈধ এইচটিএমএল প্রয়োজনীয়। ত্রুটিগুল হল:\n" "%s" -#: core/validators.py:191 +#: core/validators.py:194 #, python-format msgid "Badly formed XML: %s" msgstr "খারাপভাবে গঠিত এক্সএমএল: %s" -#: core/validators.py:201 +#: core/validators.py:204 #, python-format msgid "Invalid URL: %s" msgstr "অবৈধ ইউ.আর.এল: %s" -#: core/validators.py:205 core/validators.py:207 +#: core/validators.py:208 core/validators.py:210 #, python-format msgid "The URL %s is a broken link." msgstr "ইউ.আর.এল %s একটি ভাঙা সংযোগ।" -#: core/validators.py:213 +#: core/validators.py:216 msgid "Enter a valid U.S. state abbreviation." msgstr "একটি বৈধ U S. রাজ্য abbreviation ঢোকান।" -#: core/validators.py:228 +#: core/validators.py:231 #, python-format msgid "Watch your mouth! The word %s is not allowed here." msgid_plural "Watch your mouth! The words %s are not allowed here." msgstr[0] "মুখ সামলে! %s এখানে ব্যাবহার করতে পারবেন না।" msgstr[1] "মুখ সামলে! %s এখানে ব্যাবহার করতে পারবেন না।" -#: core/validators.py:235 +#: core/validators.py:238 #, python-format msgid "This field must match the '%s' field." msgstr "এই ক্ষেত্রটি '%s' ক্ষেত্রের সঙ্গে অবশ্যই মিলতে হবে।" -#: core/validators.py:254 +#: core/validators.py:257 msgid "Please enter something for at least one field." msgstr "দয়া করে অন্তত এক ক্ষেত্রেতে কিছু জিনিষ ঢোকান।" -#: core/validators.py:263 core/validators.py:274 +#: core/validators.py:266 core/validators.py:277 msgid "Please enter both fields or leave them both empty." msgstr "দয়া করে উভয় ক্ষেত্রে ঢোকান অথবা তাদেরকে উভয় ফাঁকা ছেড়ে চলে যান।" -#: core/validators.py:281 +#: core/validators.py:284 #, python-format msgid "This field must be given if %(field)s is %(value)s" msgstr "এই ক্ষেত্রেটি অবশ্যই দেওয়া হবে যদি %(field)s %(value)s হয়" -#: core/validators.py:293 +#: core/validators.py:296 #, python-format msgid "This field must be given if %(field)s is not %(value)s" msgstr "এই ক্ষেত্রেটি অবশ্যই দেওয়া হবে যদি %(field)s %(value)s না হয়" -#: core/validators.py:312 +#: core/validators.py:315 msgid "Duplicate values are not allowed." msgstr "নকল মান অনুমতি দেওয়া হল না।" -#: core/validators.py:335 +#: core/validators.py:338 #, python-format msgid "This value must be a power of %s." msgstr "এই মানটি %sএর একটি গুন অবশ্যই হতে হবে।" -#: core/validators.py:346 +#: core/validators.py:349 msgid "Please enter a valid decimal number." msgstr "দয়া করে একটি বৈধ দশমিক সংখ্যা ঢোকান।" -#: core/validators.py:348 +#: core/validators.py:351 #, python-format msgid "Please enter a valid decimal number with at most %s total digit." msgid_plural "" @@ -909,7 +941,7 @@ msgid_plural "" msgstr[0] "দয়া করে একটি বৈধ দশমিক সংখ্যা ঢোকান যার অক্ষরের সংখ্যা %s থেকে কম হবে।" msgstr[1] "দয়া করে একটি বৈধ দশমিক সংখ্যা ঢোকান যার অক্ষরের সংখ্যা %s থেকে কম হবে।" -#: core/validators.py:351 +#: core/validators.py:354 #, python-format msgid "Please enter a valid decimal number with at most %s decimal place." msgid_plural "" @@ -917,37 +949,37 @@ msgid_plural "" msgstr[0] "দয়া করে একটি বৈধ দশমিক সংখ্যা ঢোকান যার দশমিক স্থান %s থেকে কম হবে।" msgstr[1] "দয়া করে একটি বৈধ দশমিক সংখ্যা ঢোকান যার দশমিক স্থান %s থেকে কম হবে।" -#: core/validators.py:361 +#: core/validators.py:364 #, python-format msgid "Make sure your uploaded file is at least %s bytes big." msgstr "আাপনার আপলোড করা ফাইল যেন অন্তত %s বাইট বড় হয় তা নিশ্চিত করুন।" -#: core/validators.py:362 +#: core/validators.py:365 #, python-format msgid "Make sure your uploaded file is at most %s bytes big." msgstr "আাপনার আপলোড করা ফাইল যেন %s বাইটের থেকে বড় না হয় তা নিশ্চিত করুন।" -#: core/validators.py:375 +#: core/validators.py:378 msgid "The format for this field is wrong." msgstr "এই ক্ষেত্রের জন্য ফরম্যাটটি ভূল।" -#: core/validators.py:390 +#: core/validators.py:393 msgid "This field is invalid." msgstr "এই ক্ষেত্রেটি অবৈধ।" -#: core/validators.py:425 +#: core/validators.py:428 #, python-format msgid "Could not retrieve anything from %s." msgstr "%s থেকে কোন কিছু গ্রহন করতে পারলাম না।" -#: core/validators.py:428 +#: core/validators.py:431 #, python-format msgid "" "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'." msgstr "" "ইউ.আর.এল %(url)s অবৈধ Content-Type শিরোনাম নিয়ে '%(contenttype)s ফিরে আসল।" -#: core/validators.py:461 +#: core/validators.py:464 #, python-format msgid "" "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with " @@ -956,7 +988,7 @@ msgstr "" "দয়া করে লাইন %(line)s থেকে খোলা %(tag)s বন্ধ করুন। (\"%(start)s\"এর সঙ্গে লাইন " "আরম্ভ।)" -#: core/validators.py:465 +#: core/validators.py:468 #, python-format msgid "" "Some text starting on line %(line)s is not allowed in that context. (Line " @@ -965,7 +997,7 @@ msgstr "" "লাইন %(line)s এই প্রসঙ্গে কিছু শব্দ লেখার অনুমতি দেওয়া গেল না। (\"%(start)s\"এর " "সঙ্গে লাইন আরম্ভ।)" -#: core/validators.py:470 +#: core/validators.py:473 #, python-format msgid "" "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%" @@ -973,7 +1005,7 @@ msgid "" msgstr "" "লাইন %(line)s\"%(attr)s\"একটি অবৈধ বৈশিষ্ট্য। (\"%(start)s\"এর সঙ্গে লাইন আরম্ভ।)" -#: core/validators.py:475 +#: core/validators.py:478 #, python-format msgid "" "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%" @@ -982,7 +1014,7 @@ msgstr "" " %(line)s লাইনে \"<%(tag)s>\" একটি অবৈধ ট্যাগ। (\"%(start)s\"এর সঙ্গে লাইন " "আরম্ভ।)" -#: core/validators.py:479 +#: core/validators.py:482 #, python-format msgid "" "A tag on line %(line)s is missing one or more required attributes. (Line " @@ -991,7 +1023,7 @@ msgstr "" "লাইন %(line)s একটি ট্যাগে এক অথবা আরও বেশি প্রয়োজনীয় বিশিষ্ট্যাবলী নেই। (\"%" "(start)s\"এর সঙ্গে লাইন আরম্ভ।)" -#: core/validators.py:484 +#: core/validators.py:487 #, python-format msgid "" "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line " @@ -1010,3 +1042,6 @@ msgid "" msgstr "" "একের চেয়ে বেশি নির্বাচন করতে \"Control\" অথবা ম্যাক-এ \"Command\" চেপে ধরে " "রাখুন।" + +#~ msgid "Use an MD5 hash -- not the raw password." +#~ msgstr "একটি MD5 হ্যাশ ব্যাবহার করুন -- পরিস্কার পাসওয়ার্ড না যেন।" diff --git a/django/conf/locale/cs/LC_MESSAGES/django.mo b/django/conf/locale/cs/LC_MESSAGES/django.mo Binary files differindex 744e04dcb9..9f1e643a38 100644 --- a/django/conf/locale/cs/LC_MESSAGES/django.mo +++ b/django/conf/locale/cs/LC_MESSAGES/django.mo diff --git a/django/conf/locale/cs/LC_MESSAGES/django.po b/django/conf/locale/cs/LC_MESSAGES/django.po index dd61899cd4..a5d73d367a 100644 --- a/django/conf/locale/cs/LC_MESSAGES/django.po +++ b/django/conf/locale/cs/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Django Czech translation\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-15 12:40-0600\n" +"POT-Creation-Date: 2005-11-22 15:44-0600\n" "PO-Revision-Date: 2005-11-14 15:34+0100\n" "Last-Translator: Radek Svarz <translate@svarz.cz>\n" "Language-Team: Czech\n" @@ -512,6 +512,43 @@ msgstr "List." msgid "Dec." msgstr "Pros." +#: utils/timesince.py:12 +msgid "year" +msgid_plural "years" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: utils/timesince.py:13 +msgid "month" +msgid_plural "months" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: utils/timesince.py:14 +#, fuzzy +msgid "day" +msgid_plural "days" +msgstr[0] "Květen" +msgstr[1] "Květen" +msgstr[2] "Květen" + +#: utils/timesince.py:15 +msgid "hour" +msgid_plural "hours" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: utils/timesince.py:16 +#, fuzzy +msgid "minute" +msgid_plural "minutes" +msgstr[0] "web" +msgstr[1] "web" +msgstr[2] "web" + #: models/core.py:7 msgid "domain name" msgstr "jméno domény" @@ -617,8 +654,8 @@ msgid "password" msgstr "heslo" #: models/auth.py:37 -msgid "Use an MD5 hash -- not the raw password." -msgstr "Použije se MD5 hash -- ne čisté heslo." +msgid "Use '[algo]$[salt]$[hexdigest]" +msgstr "" #: models/auth.py:38 #, fuzzy @@ -665,7 +702,7 @@ msgstr "Osobní informace" msgid "Important dates" msgstr "Důležitá data" -#: models/auth.py:195 +#: models/auth.py:216 msgid "Message" msgstr "Zpráva" @@ -746,72 +783,72 @@ msgstr "Švédsky" msgid "Simplified Chinese" msgstr "Jednoduchá čínština" -#: core/validators.py:59 +#: core/validators.py:62 msgid "This value must contain only letters, numbers and underscores." msgstr "Tato hodnota musí obsahovat pouze znaky, čísla nebo podtržítka." -#: core/validators.py:63 +#: core/validators.py:66 msgid "This value must contain only letters, numbers, underscores and slashes." msgstr "" "Tato hodnota musí obsahovat pouze znaky, čísla, podtržítka nebo lomítka." -#: core/validators.py:71 +#: core/validators.py:74 msgid "Uppercase letters are not allowed here." msgstr "Velká písmena zde nejsou povolená." -#: core/validators.py:75 +#: core/validators.py:78 msgid "Lowercase letters are not allowed here." msgstr "Malá písmena zde nejsou povolená." -#: core/validators.py:82 +#: core/validators.py:85 msgid "Enter only digits separated by commas." msgstr "Vložte pouze cifry oddělené čárkami." -#: core/validators.py:94 +#: core/validators.py:97 msgid "Enter valid e-mail addresses separated by commas." msgstr "Vložte platné e-mailové adresy oddělené čárkami." -#: core/validators.py:98 +#: core/validators.py:101 msgid "Please enter a valid IP address." msgstr "Prosíme, zadejte platnou IP adresu." -#: core/validators.py:102 +#: core/validators.py:105 msgid "Empty values are not allowed here." msgstr "Zde nejsou povolené prázdné hodnoty." -#: core/validators.py:106 +#: core/validators.py:109 msgid "Non-numeric characters aren't allowed here." msgstr "Znaky, které nejsou čísla, nejsou zde povoleny." -#: core/validators.py:110 +#: core/validators.py:113 msgid "This value can't be comprised solely of digits." msgstr "Tato hodnota nemůže být složená pouze z cifer." -#: core/validators.py:115 +#: core/validators.py:118 msgid "Enter a whole number." msgstr "Vložte celé číslo." -#: core/validators.py:119 +#: core/validators.py:122 msgid "Only alphabetical characters are allowed here." msgstr "Zde jsou povoleny pouze alfanumerické znaky." -#: core/validators.py:123 +#: core/validators.py:126 msgid "Enter a valid date in YYYY-MM-DD format." msgstr "Vložte platné datum ve formátu RRRR-MM-DD." -#: core/validators.py:127 +#: core/validators.py:130 msgid "Enter a valid time in HH:MM format." msgstr "Vložte platný čas ve formátu HH:MM." -#: core/validators.py:131 +#: core/validators.py:134 msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format." msgstr "Vložte platné datum a čas ve formátu RRRR-MM-DD HH:MM." -#: core/validators.py:135 +#: core/validators.py:138 msgid "Enter a valid e-mail address." msgstr "Vložte platnou e-mailovou adresu." -#: core/validators.py:147 +#: core/validators.py:150 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." @@ -819,26 +856,26 @@ msgstr "" "Nahrajte na server platný obrázek. Soubor, který jste nahrál(a) nebyl " "obrázek, nebo byl porušen." -#: core/validators.py:154 +#: core/validators.py:157 #, python-format msgid "The URL %s does not point to a valid image." msgstr "URL %s neukazuje na platný obrázek." -#: core/validators.py:158 +#: core/validators.py:161 #, python-format msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid." msgstr "Telefonní čísla musí být ve formátu XXX-XXX-XXXX. \"%s\" není platné." -#: core/validators.py:166 +#: core/validators.py:169 #, python-format msgid "The URL %s does not point to a valid QuickTime video." msgstr "URL %s neodkazuje na platné video ve formátu QuickTime." -#: core/validators.py:170 +#: core/validators.py:173 msgid "A valid URL is required." msgstr "Je vyžadováno platné URL." -#: core/validators.py:184 +#: core/validators.py:187 #, python-format msgid "" "Valid HTML is required. Specific errors are:\n" @@ -847,26 +884,26 @@ msgstr "" "Je vyžadováno platné HTML. Konkrétní chyby jsou:\n" "%s" -#: core/validators.py:191 +#: core/validators.py:194 #, python-format msgid "Badly formed XML: %s" msgstr "Špatně formované XML: %s" -#: core/validators.py:201 +#: core/validators.py:204 #, python-format msgid "Invalid URL: %s" msgstr "Neplatné URL: %s" -#: core/validators.py:205 core/validators.py:207 +#: core/validators.py:208 core/validators.py:210 #, python-format msgid "The URL %s is a broken link." msgstr "Odkaz na URL %s je rozbitý." -#: core/validators.py:213 +#: core/validators.py:216 msgid "Enter a valid U.S. state abbreviation." msgstr "Vložte platnou zkraku U.S. státu." -#: core/validators.py:228 +#: core/validators.py:231 #, python-format msgid "Watch your mouth! The word %s is not allowed here." msgid_plural "Watch your mouth! The words %s are not allowed here." @@ -874,43 +911,43 @@ msgstr[0] "Mluvte slušně! Slovo %s zde není přípustné." msgstr[1] "Mluvte slušně! Slova %s zde nejsou přípustná." msgstr[2] "Mluvte slušně! Slova %s zde nejsou přípustná." -#: core/validators.py:235 +#: core/validators.py:238 #, python-format msgid "This field must match the '%s' field." msgstr "Toto pole se musí shodovat s polem '%s'." -#: core/validators.py:254 +#: core/validators.py:257 msgid "Please enter something for at least one field." msgstr "Prosíme, vložte něco alespoň pro jedno pole." -#: core/validators.py:263 core/validators.py:274 +#: core/validators.py:266 core/validators.py:277 msgid "Please enter both fields or leave them both empty." msgstr "Prosíme, vložte obě pole, nebo je nechte obě prázdná." -#: core/validators.py:281 +#: core/validators.py:284 #, python-format msgid "This field must be given if %(field)s is %(value)s" msgstr "Toto pole musí být vyplněno, když %(field)s má %(value)s" -#: core/validators.py:293 +#: core/validators.py:296 #, python-format msgid "This field must be given if %(field)s is not %(value)s" msgstr "Toto pole musí být vyplněno, když %(field)s nemá %(value)s" -#: core/validators.py:312 +#: core/validators.py:315 msgid "Duplicate values are not allowed." msgstr "Duplikátní hodnoty nejsou povolené." -#: core/validators.py:335 +#: core/validators.py:338 #, python-format msgid "This value must be a power of %s." msgstr "Tato hodnota musí být mocninou %s." -#: core/validators.py:346 +#: core/validators.py:349 msgid "Please enter a valid decimal number." msgstr "Prosíme, vložte platné číslo." -#: core/validators.py:348 +#: core/validators.py:351 #, python-format msgid "Please enter a valid decimal number with at most %s total digit." msgid_plural "" @@ -919,7 +956,7 @@ msgstr[0] "Prosíme, vložte platné číslo s nejvíce %s cifrou celkem." msgstr[1] "Prosíme, vložte platné číslo s nejvíce %s ciframi celkem." msgstr[2] "Prosíme, vložte platné číslo s nejvíce %s ciframi celkem." -#: core/validators.py:351 +#: core/validators.py:354 #, python-format msgid "Please enter a valid decimal number with at most %s decimal place." msgid_plural "" @@ -933,36 +970,36 @@ msgstr[2] "" "Prosíme, vložte platné číslo s nejvíce %s ciframi za desetinnou čárkou " "celkem." -#: core/validators.py:361 +#: core/validators.py:364 #, python-format msgid "Make sure your uploaded file is at least %s bytes big." msgstr "Ujistěte se, že posílaný soubor je velký nejméně %s bytů." -#: core/validators.py:362 +#: core/validators.py:365 #, python-format msgid "Make sure your uploaded file is at most %s bytes big." msgstr "Ujistěte se, že posílaný soubor je velký nejvíce %s bytů." -#: core/validators.py:375 +#: core/validators.py:378 msgid "The format for this field is wrong." msgstr "Formát pro toto pole je špatný." -#: core/validators.py:390 +#: core/validators.py:393 msgid "This field is invalid." msgstr "Toto pole není platné." -#: core/validators.py:425 +#: core/validators.py:428 #, python-format msgid "Could not retrieve anything from %s." msgstr "Nemohl jsem získat nic z %s." -#: core/validators.py:428 +#: core/validators.py:431 #, python-format msgid "" "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'." msgstr "URL %(url)s vrátilo neplatnou hlavičku Content-Type '%(contenttype)s'." -#: core/validators.py:461 +#: core/validators.py:464 #, python-format msgid "" "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with " @@ -971,7 +1008,7 @@ msgstr "" "Prosíme, zavřete nezavřenou značku %(tag)s z řádky %(line)s. (Řádka začíná s " "\"%(start)s\".)" -#: core/validators.py:465 +#: core/validators.py:468 #, python-format msgid "" "Some text starting on line %(line)s is not allowed in that context. (Line " @@ -980,7 +1017,7 @@ msgstr "" "Nějaký text začínající na řádce %(line)s není povolen v tomto kontextu. " "(Řádka začíná s \"%(start)s\".)" -#: core/validators.py:470 +#: core/validators.py:473 #, python-format msgid "" "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%" @@ -989,7 +1026,7 @@ msgstr "" "\"%(attr)s\" na řádce %(line)s je neplatný atribut. (Řádka začíná s \"%" "(start)s\".)" -#: core/validators.py:475 +#: core/validators.py:478 #, python-format msgid "" "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%" @@ -998,7 +1035,7 @@ msgstr "" "\"<%(tag)s>\" na řádce %(line)s je neplatná značka. (Řádka začíná s \"%" "(start)s\".)" -#: core/validators.py:479 +#: core/validators.py:482 #, python-format msgid "" "A tag on line %(line)s is missing one or more required attributes. (Line " @@ -1007,7 +1044,7 @@ msgstr "" "Značce na řádce %(line)s schází jeden nebo více požadovaných atributů. " "(Řádka začíná s \"%(start)s\".)" -#: core/validators.py:484 +#: core/validators.py:487 #, python-format msgid "" "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line " @@ -1026,3 +1063,6 @@ msgid "" msgstr "" "Podržte \"Control\", nebo \"Command\" na Macu pro vybrání více jak jedné " "položky." + +#~ msgid "Use an MD5 hash -- not the raw password." +#~ msgstr "Použije se MD5 hash -- ne čisté heslo." diff --git a/django/conf/locale/cy/LC_MESSAGES/django.mo b/django/conf/locale/cy/LC_MESSAGES/django.mo Binary files differindex 775b574955..5f6dba1cd4 100644 --- a/django/conf/locale/cy/LC_MESSAGES/django.mo +++ b/django/conf/locale/cy/LC_MESSAGES/django.mo diff --git a/django/conf/locale/cy/LC_MESSAGES/django.po b/django/conf/locale/cy/LC_MESSAGES/django.po index 5544083292..cd2d339a7a 100644 --- a/django/conf/locale/cy/LC_MESSAGES/django.po +++ b/django/conf/locale/cy/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-15 12:40-0600\n" +"POT-Creation-Date: 2005-11-22 15:44-0600\n" "PO-Revision-Date: 2005-11-05 HO:MI+ZONE\n" "Last-Translator: Jason Davies <jason@jasondavies.com>\n" "Language-Team: Cymraeg <cy@li.org>\n" @@ -509,6 +509,38 @@ msgstr "Tach." msgid "Dec." msgstr "Rhag." +#: utils/timesince.py:12 +msgid "year" +msgid_plural "years" +msgstr[0] "" +msgstr[1] "" + +#: utils/timesince.py:13 +msgid "month" +msgid_plural "months" +msgstr[0] "" +msgstr[1] "" + +#: utils/timesince.py:14 +#, fuzzy +msgid "day" +msgid_plural "days" +msgstr[0] "Mai" +msgstr[1] "Mai" + +#: utils/timesince.py:15 +msgid "hour" +msgid_plural "hours" +msgstr[0] "" +msgstr[1] "" + +#: utils/timesince.py:16 +#, fuzzy +msgid "minute" +msgid_plural "minutes" +msgstr[0] "safle" +msgstr[1] "safle" + #: models/core.py:7 msgid "domain name" msgstr "parth-enw" @@ -614,8 +646,8 @@ msgid "password" msgstr "cyfrinair" #: models/auth.py:37 -msgid "Use an MD5 hash -- not the raw password." -msgstr "Defnyddiwch stwnsh MD5 -- nid y gyfrinair crai." +msgid "Use '[algo]$[salt]$[hexdigest]" +msgstr "" #: models/auth.py:38 msgid "staff status" @@ -661,7 +693,7 @@ msgstr "Gwybodaeth personol" msgid "Important dates" msgstr "Dyddiadau pwysig" -#: models/auth.py:195 +#: models/auth.py:216 msgid "Message" msgstr "Neges" @@ -742,74 +774,74 @@ msgstr "" msgid "Simplified Chinese" msgstr "Tsieinëeg Symledig" -#: core/validators.py:59 +#: core/validators.py:62 msgid "This value must contain only letters, numbers and underscores." msgstr "Rhaid i'r werth yma cynnwys lythrennau, rhifau ac tanlinellau yn unig." -#: core/validators.py:63 +#: core/validators.py:66 #, fuzzy msgid "This value must contain only letters, numbers, underscores and slashes." msgstr "" "Rhaid i'r werth yma cynnwys lythrennau, rhifau, tanlinellau ac slaesau yn " "unig." -#: core/validators.py:71 +#: core/validators.py:74 msgid "Uppercase letters are not allowed here." msgstr "Ni chaniateir priflythrennau yma." -#: core/validators.py:75 +#: core/validators.py:78 msgid "Lowercase letters are not allowed here." msgstr "Ni chaniateir lythrennau bach yma." -#: core/validators.py:82 +#: core/validators.py:85 msgid "Enter only digits separated by commas." msgstr "Rhowch digidau gwahanu gyda atalnodau yn unig." -#: core/validators.py:94 +#: core/validators.py:97 msgid "Enter valid e-mail addresses separated by commas." msgstr "Rhowch cyfeiriad e-bost dilys gwahanu gyda atalnodau." -#: core/validators.py:98 +#: core/validators.py:101 msgid "Please enter a valid IP address." msgstr "Rhowch cyfeiriad IP dilys, os gwelwch yn dda." -#: core/validators.py:102 +#: core/validators.py:105 msgid "Empty values are not allowed here." msgstr "Ni chaniateir gwerthau gwag yma." -#: core/validators.py:106 +#: core/validators.py:109 msgid "Non-numeric characters aren't allowed here." msgstr "Ni chaniateir nodau anrhifol yma." -#: core/validators.py:110 +#: core/validators.py:113 msgid "This value can't be comprised solely of digits." msgstr "Ni gellir y werth yma" -#: core/validators.py:115 +#: core/validators.py:118 msgid "Enter a whole number." msgstr "Rhowch rhif cyfan." -#: core/validators.py:119 +#: core/validators.py:122 msgid "Only alphabetical characters are allowed here." msgstr "Caniateir nodau gwyddorol un unig yma." -#: core/validators.py:123 +#: core/validators.py:126 msgid "Enter a valid date in YYYY-MM-DD format." msgstr "Rhowch dyddiad dilys mewn fformat YYYY-MM-DD." -#: core/validators.py:127 +#: core/validators.py:130 msgid "Enter a valid time in HH:MM format." msgstr "Rhowch amser ddilys mewn fformat HH:MM." -#: core/validators.py:131 +#: core/validators.py:134 msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format." msgstr "Rhowch dyddiad/amser ddilys mewn fformat YYYY-MM-DD HH:MM." -#: core/validators.py:135 +#: core/validators.py:138 msgid "Enter a valid e-mail address." msgstr "Rhowch cyfeiriad e-bost ddilys." -#: core/validators.py:147 +#: core/validators.py:150 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." @@ -817,26 +849,26 @@ msgstr "" "Llwythwch delwedd dilys. Doedd y delwedd a llwythwyd dim yn ddelwedd dilys, " "neu roedd o'n ddelwedd llwgr." -#: core/validators.py:154 +#: core/validators.py:157 #, python-format msgid "The URL %s does not point to a valid image." msgstr "Dydy'r URL %s dim yn pwyntio at delwedd dilys." -#: core/validators.py:158 +#: core/validators.py:161 #, python-format msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid." msgstr "Rhaid rifau ffon bod mewn fformat XXX-XXX-XXXX. Mae \"%s\" yn annilys." -#: core/validators.py:166 +#: core/validators.py:169 #, python-format msgid "The URL %s does not point to a valid QuickTime video." msgstr "Dydy'r URL %s dim yn pwyntio at fideo Quicktime dilys." -#: core/validators.py:170 +#: core/validators.py:173 msgid "A valid URL is required." msgstr "Mae URL dilys yn ofynnol." -#: core/validators.py:184 +#: core/validators.py:187 #, python-format msgid "" "Valid HTML is required. Specific errors are:\n" @@ -845,69 +877,69 @@ msgstr "" "Mae HTML dilys yn ofynnol. Gwallau penodol yw:\n" "%s" -#: core/validators.py:191 +#: core/validators.py:194 #, python-format msgid "Badly formed XML: %s" msgstr "XML wedi ffurfio'n wael: %s" -#: core/validators.py:201 +#: core/validators.py:204 #, python-format msgid "Invalid URL: %s" msgstr "URL annilys: %s" -#: core/validators.py:205 core/validators.py:207 +#: core/validators.py:208 core/validators.py:210 #, python-format msgid "The URL %s is a broken link." msgstr "Mae'r URL %s yn gyswllt toredig." -#: core/validators.py:213 +#: core/validators.py:216 msgid "Enter a valid U.S. state abbreviation." msgstr "Rhowch talfyriad dalaith U.S. dilys." -#: core/validators.py:228 +#: core/validators.py:231 #, python-format msgid "Watch your mouth! The word %s is not allowed here." msgid_plural "Watch your mouth! The words %s are not allowed here." msgstr[0] "Gwyliwch eich ceg! Ni chaniateir y gair %s yma." msgstr[1] "Gwyliwch eich ceg! Ni chaniateir y geiriau %s yma." -#: core/validators.py:235 +#: core/validators.py:238 #, python-format msgid "This field must match the '%s' field." msgstr "Rhaid i'r faes yma cydweddu'r faes '%s'." -#: core/validators.py:254 +#: core/validators.py:257 msgid "Please enter something for at least one field." msgstr "Rhowch rhywbeth am un maes o leiaf, os gwelwch yn dda." -#: core/validators.py:263 core/validators.py:274 +#: core/validators.py:266 core/validators.py:277 msgid "Please enter both fields or leave them both empty." msgstr "Llenwch y ddwy faes, neu gadewch nhw'n wag, os gwelwch yn dda." -#: core/validators.py:281 +#: core/validators.py:284 #, python-format msgid "This field must be given if %(field)s is %(value)s" msgstr "Rhaid roi'r faes yma os mae %(field)s yn %(value)s" -#: core/validators.py:293 +#: core/validators.py:296 #, python-format msgid "This field must be given if %(field)s is not %(value)s" msgstr "Rhaid roi'r faes yma os mae %(field)s dim yn %(value)s" -#: core/validators.py:312 +#: core/validators.py:315 msgid "Duplicate values are not allowed." msgstr "Ni chaniateir gwerthau ddyblyg." -#: core/validators.py:335 +#: core/validators.py:338 #, python-format msgid "This value must be a power of %s." msgstr "Rhaid i'r gwerth yma fod yn bŵer o %s." -#: core/validators.py:346 +#: core/validators.py:349 msgid "Please enter a valid decimal number." msgstr "Rhowch rhif degol dilys, os gwelwch yn dda." -#: core/validators.py:348 +#: core/validators.py:351 #, python-format msgid "Please enter a valid decimal number with at most %s total digit." msgid_plural "" @@ -915,7 +947,7 @@ msgid_plural "" msgstr[0] "Rhowch rhif degol dilys gyda cyfanswm %s digidau o fwyaf." msgstr[1] "Rhowch rhif degol dilys gyda cyfanswm %s digid o fwyaf." -#: core/validators.py:351 +#: core/validators.py:354 #, python-format msgid "Please enter a valid decimal number with at most %s decimal place." msgid_plural "" @@ -925,37 +957,37 @@ msgstr[0] "" msgstr[1] "" "Rhowch rif degol dilydd gyda o fwyaf %s lleoedd degol, os gwelwch yn dda." -#: core/validators.py:361 +#: core/validators.py:364 #, python-format msgid "Make sure your uploaded file is at least %s bytes big." msgstr "Sicrhewch bod yr ffeil a llwythwyd yn o leiaf %s beit." -#: core/validators.py:362 +#: core/validators.py:365 #, python-format msgid "Make sure your uploaded file is at most %s bytes big." msgstr "Sicrhewch bod yr ffeil a llwythwyd yn %s beit o fwyaf." -#: core/validators.py:375 +#: core/validators.py:378 msgid "The format for this field is wrong." msgstr "Mae'r fformat i'r faes yma yn anghywir." -#: core/validators.py:390 +#: core/validators.py:393 msgid "This field is invalid." msgstr "Mae'r faes yma yn annilydd." -#: core/validators.py:425 +#: core/validators.py:428 #, python-format msgid "Could not retrieve anything from %s." msgstr "Ni gellir adalw unrhywbeth o %s." -#: core/validators.py:428 +#: core/validators.py:431 #, python-format msgid "" "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'." msgstr "" "Dychwelodd yr URL %(url)s y pennawd Content-Type annilys '%(contenttype)s'." -#: core/validators.py:461 +#: core/validators.py:464 #, python-format msgid "" "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with " @@ -964,7 +996,7 @@ msgstr "" "Caewch y tag anghaedig %(tag)s o linell %(line)s. (Linell yn ddechrau â \"%" "(start)s\".)" -#: core/validators.py:465 +#: core/validators.py:468 #, python-format msgid "" "Some text starting on line %(line)s is not allowed in that context. (Line " @@ -973,7 +1005,7 @@ msgstr "" "Ni chaniateir rhai o'r destun ar linell %(line)s yn y gyd-destun yna. " "(Linell yn ddechrau â \"%(start)s\".)" -#: core/validators.py:470 +#: core/validators.py:473 #, python-format msgid "" "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%" @@ -982,7 +1014,7 @@ msgstr "" "Mae \"%(attr)s\" ar lein %(line)s yn priodoledd annilydd. (Linell yn " "ddechrau â \"%(start)s\".)" -#: core/validators.py:475 +#: core/validators.py:478 #, python-format msgid "" "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%" @@ -991,7 +1023,7 @@ msgstr "" "Mae \"<%(tag)s>\" ar lein %(line)s yn tag annilydd. (Linell yn ddechrau â \"%" "(start)s\".)" -#: core/validators.py:479 +#: core/validators.py:482 #, python-format msgid "" "A tag on line %(line)s is missing one or more required attributes. (Line " @@ -1000,7 +1032,7 @@ msgstr "" "Mae tag ar lein %(line)s yn eisiau un new fwy priodoleddau gofynnol. (Linell " "yn ddechrau â \"%(start)s\".)" -#: core/validators.py:484 +#: core/validators.py:487 #, python-format msgid "" "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line " @@ -1018,3 +1050,6 @@ msgid "" " Hold down \"Control\", or \"Command\" on a Mac, to select more than one." msgstr "" "Gafaelwch lawr \"Control\", neu \"Command\" ar Fac, i ddewis mwy nag un." + +#~ msgid "Use an MD5 hash -- not the raw password." +#~ msgstr "Defnyddiwch stwnsh MD5 -- nid y gyfrinair crai." diff --git a/django/conf/locale/da/LC_MESSAGES/django.mo b/django/conf/locale/da/LC_MESSAGES/django.mo Binary files differindex 8fbe645ff2..c467726c25 100644 --- a/django/conf/locale/da/LC_MESSAGES/django.mo +++ b/django/conf/locale/da/LC_MESSAGES/django.mo diff --git a/django/conf/locale/da/LC_MESSAGES/django.po b/django/conf/locale/da/LC_MESSAGES/django.po index 8197e48f6d..5035891af3 100644 --- a/django/conf/locale/da/LC_MESSAGES/django.po +++ b/django/conf/locale/da/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-15 12:41-0600\n" +"POT-Creation-Date: 2005-11-22 15:44-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Morten Bagai <m@bagai.com>\n" "Language-Team: Danish\n" @@ -513,6 +513,38 @@ msgstr "Nov." msgid "Dec." msgstr "Dec." +#: utils/timesince.py:12 +msgid "year" +msgid_plural "years" +msgstr[0] "" +msgstr[1] "" + +#: utils/timesince.py:13 +msgid "month" +msgid_plural "months" +msgstr[0] "" +msgstr[1] "" + +#: utils/timesince.py:14 +#, fuzzy +msgid "day" +msgid_plural "days" +msgstr[0] "Maj" +msgstr[1] "Maj" + +#: utils/timesince.py:15 +msgid "hour" +msgid_plural "hours" +msgstr[0] "" +msgstr[1] "" + +#: utils/timesince.py:16 +#, fuzzy +msgid "minute" +msgid_plural "minutes" +msgstr[0] "side" +msgstr[1] "side" + #: models/core.py:7 msgid "domain name" msgstr "domænenavn" @@ -618,8 +650,8 @@ msgid "password" msgstr "adgangskode" #: models/auth.py:37 -msgid "Use an MD5 hash -- not the raw password." -msgstr "Brug et MD5 hash -- ikke adgangskoden i klartekst" +msgid "Use '[algo]$[salt]$[hexdigest]" +msgstr "" #: models/auth.py:38 msgid "staff status" @@ -665,7 +697,7 @@ msgstr "Personlig information" msgid "Important dates" msgstr "Vigtige datoer" -#: models/auth.py:195 +#: models/auth.py:216 msgid "Message" msgstr "Meddelelse" @@ -746,72 +778,72 @@ msgstr "Svensk" msgid "Simplified Chinese" msgstr "Simpel Kinesisk" -#: core/validators.py:59 +#: core/validators.py:62 msgid "This value must contain only letters, numbers and underscores." msgstr "Dette felt må kun indeholde bogstaver, tal og understreger." -#: core/validators.py:63 +#: core/validators.py:66 msgid "This value must contain only letters, numbers, underscores and slashes." msgstr "" "Dette felt må kun indeholde bogstaver, tal, understreger og skråstreger." -#: core/validators.py:71 +#: core/validators.py:74 msgid "Uppercase letters are not allowed here." msgstr "Store bogstaver er ikke tilladt her" -#: core/validators.py:75 +#: core/validators.py:78 msgid "Lowercase letters are not allowed here." msgstr "Små bogstaver er ikke tilladt her" -#: core/validators.py:82 +#: core/validators.py:85 msgid "Enter only digits separated by commas." msgstr "Indtast kun tal adskilt af kommaer." -#: core/validators.py:94 +#: core/validators.py:97 msgid "Enter valid e-mail addresses separated by commas." msgstr "Indtast gyldige email-adresser adskilt af kommaer" -#: core/validators.py:98 +#: core/validators.py:101 msgid "Please enter a valid IP address." msgstr "Venlist indtast en gyldig email-adresse." -#: core/validators.py:102 +#: core/validators.py:105 msgid "Empty values are not allowed here." msgstr "Dette felt kan ikke være tomt." -#: core/validators.py:106 +#: core/validators.py:109 msgid "Non-numeric characters aren't allowed here." msgstr "Der må kun være tal her" -#: core/validators.py:110 +#: core/validators.py:113 msgid "This value can't be comprised solely of digits." msgstr "Denne værdi kan ikke kun bestå af tal." -#: core/validators.py:115 +#: core/validators.py:118 msgid "Enter a whole number." msgstr "Indtast et heltal." -#: core/validators.py:119 +#: core/validators.py:122 msgid "Only alphabetical characters are allowed here." msgstr "Her er kun bogstaver tilladt." -#: core/validators.py:123 +#: core/validators.py:126 msgid "Enter a valid date in YYYY-MM-DD format." msgstr "Indtast en dato i ÅÅÅÅ-MM-DD format." -#: core/validators.py:127 +#: core/validators.py:130 msgid "Enter a valid time in HH:MM format." msgstr "Indtast tid i TT:MM format." -#: core/validators.py:131 +#: core/validators.py:134 msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format." msgstr "Indtast dato og tid i ÅÅÅÅ-MM-DD TT:MM format." -#: core/validators.py:135 +#: core/validators.py:138 msgid "Enter a valid e-mail address." msgstr "Indtast en gyldig email-adresse." -#: core/validators.py:147 +#: core/validators.py:150 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." @@ -819,27 +851,27 @@ msgstr "" "Upload en billed-fil. Filen du uploadede var enten ikke et billede eller en " "ødelagt billed-fil" -#: core/validators.py:154 +#: core/validators.py:157 #, python-format msgid "The URL %s does not point to a valid image." msgstr "URLen %s viser ikke til en gyldig billed-fil" -#: core/validators.py:158 +#: core/validators.py:161 #, python-format msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid." msgstr "" "Telefonnumre skal være i XXX-XXX-XXXX formatet. \"%s\" er ikke godkjent." -#: core/validators.py:166 +#: core/validators.py:169 #, python-format msgid "The URL %s does not point to a valid QuickTime video." msgstr "URLen %s viser ikke til en gyldig QuickTime-film." -#: core/validators.py:170 +#: core/validators.py:173 msgid "A valid URL is required." msgstr "En gyldig URL er påkrævet" -#: core/validators.py:184 +#: core/validators.py:187 #, python-format msgid "" "Valid HTML is required. Specific errors are:\n" @@ -848,69 +880,69 @@ msgstr "" "Gyldig HTML er påkrævet. Fejlene er:\n" "%s" -#: core/validators.py:191 +#: core/validators.py:194 #, python-format msgid "Badly formed XML: %s" msgstr "Ugyldig XML: %s" -#: core/validators.py:201 +#: core/validators.py:204 #, python-format msgid "Invalid URL: %s" msgstr "Ugyldig URL: %s" -#: core/validators.py:205 core/validators.py:207 +#: core/validators.py:208 core/validators.py:210 #, python-format msgid "The URL %s is a broken link." msgstr "Denne URL %s linker ikke til en gyldig side eller fil" -#: core/validators.py:213 +#: core/validators.py:216 msgid "Enter a valid U.S. state abbreviation." msgstr "Indtast en gyldig amerikansk statsforkortelse" -#: core/validators.py:228 +#: core/validators.py:231 #, python-format msgid "Watch your mouth! The word %s is not allowed here." msgid_plural "Watch your mouth! The words %s are not allowed here." msgstr[0] "Var din mund! Ordet %s er ikke tilladt her." msgstr[1] "Var din mund! Ordene %s er ikke tilladt her." -#: core/validators.py:235 +#: core/validators.py:238 #, python-format msgid "This field must match the '%s' field." msgstr "Dette felt skal matche '%s' feltet." -#: core/validators.py:254 +#: core/validators.py:257 msgid "Please enter something for at least one field." msgstr "Indtast venligst noget i mindst et felt" -#: core/validators.py:263 core/validators.py:274 +#: core/validators.py:266 core/validators.py:277 msgid "Please enter both fields or leave them both empty." msgstr "Udfyld begge felter, eller lad dem begge være blanke" -#: core/validators.py:281 +#: core/validators.py:284 #, python-format msgid "This field must be given if %(field)s is %(value)s" msgstr "Dette felt skal udfyldes, hvis %(field)s er lig %(value)s" -#: core/validators.py:293 +#: core/validators.py:296 #, python-format msgid "This field must be given if %(field)s is not %(value)s" msgstr "Dette felt skal udfyldes, hvis %(field)s ikke er lig %(value)s" -#: core/validators.py:312 +#: core/validators.py:315 msgid "Duplicate values are not allowed." msgstr "Duplikate værdier er ikke tilladt her" -#: core/validators.py:335 +#: core/validators.py:338 #, python-format msgid "This value must be a power of %s." msgstr "Denne værdi skal være en potens af %s." -#: core/validators.py:346 +#: core/validators.py:349 msgid "Please enter a valid decimal number." msgstr "Indtast venligst et gyldigt decimaltal." -#: core/validators.py:348 +#: core/validators.py:351 #, fuzzy, python-format msgid "Please enter a valid decimal number with at most %s total digit." msgid_plural "" @@ -918,7 +950,7 @@ msgid_plural "" msgstr[0] "Indtast en gyldig decimal med max %s tal ialt" msgstr[1] "Indtast en gyldig decimal med max %s tal ialt" -#: core/validators.py:351 +#: core/validators.py:354 #, python-format msgid "Please enter a valid decimal number with at most %s decimal place." msgid_plural "" @@ -926,37 +958,37 @@ msgid_plural "" msgstr[0] "Indtast en gyldig decimal med max %s tal efter kommaet" msgstr[1] "Indtast en gyldig decimal med max %s tal efter kommaet" -#: core/validators.py:361 +#: core/validators.py:364 #, python-format msgid "Make sure your uploaded file is at least %s bytes big." msgstr "Tjek at den uploadede fil er mindst % bytes." -#: core/validators.py:362 +#: core/validators.py:365 #, python-format msgid "Make sure your uploaded file is at most %s bytes big." msgstr "Tjek at den uploadede file er max %s bytes." -#: core/validators.py:375 +#: core/validators.py:378 msgid "The format for this field is wrong." msgstr "Formatet i dette feltet er feil." -#: core/validators.py:390 +#: core/validators.py:393 msgid "This field is invalid." msgstr "Dette felt er ugyldigt." -#: core/validators.py:425 +#: core/validators.py:428 #, python-format msgid "Could not retrieve anything from %s." msgstr "Kunne ikke finde noget i %s." -#: core/validators.py:428 +#: core/validators.py:431 #, python-format msgid "" "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'." msgstr "" "URLen %(url)s returnerede ikke en godkendt Content-Type '%(contenttype)s'." -#: core/validators.py:461 +#: core/validators.py:464 #, python-format msgid "" "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with " @@ -964,7 +996,7 @@ msgid "" msgstr "" "Luk venligst %(tag)s på linje %(line)s. (Linjen starer med \"%(start)s\".)" -#: core/validators.py:465 +#: core/validators.py:468 #, python-format msgid "" "Some text starting on line %(line)s is not allowed in that context. (Line " @@ -973,7 +1005,7 @@ msgstr "" "En del af teksten som starter på linje %(line)s er ikke tilladt. (Linjen " "starter med \"%(start)s\".)" -#: core/validators.py:470 +#: core/validators.py:473 #, python-format msgid "" "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%" @@ -982,7 +1014,7 @@ msgstr "" "\"%(attr)s\" på linje %(line)s er ikke en gyldig attribut. (Linjen starter " "med \"%(start)s\".)" -#: core/validators.py:475 +#: core/validators.py:478 #, python-format msgid "" "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%" @@ -991,7 +1023,7 @@ msgstr "" "\"<%(tag)s>\" på linje %(line)s er ikke et gyldigt tag. (Linjen starter med " "\"%(start)s\".)" -#: core/validators.py:479 +#: core/validators.py:482 #, python-format msgid "" "A tag on line %(line)s is missing one or more required attributes. (Line " @@ -1000,7 +1032,7 @@ msgstr "" "Et tag på linje %(line)s mangler en obligatorisk attribut. (Linjen starter " "med \"%(start)s\".)" -#: core/validators.py:484 +#: core/validators.py:487 #, python-format msgid "" "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line " @@ -1019,5 +1051,8 @@ msgid "" msgstr "" "Hold \"Kontrol\", eller \"Æbletasten\" på Mac, nede for at vælge mere end en." +#~ msgid "Use an MD5 hash -- not the raw password." +#~ msgstr "Brug et MD5 hash -- ikke adgangskoden i klartekst" + #~ msgid "Traditional Chinese" #~ msgstr "Traditionel Kinesisk" diff --git a/django/conf/locale/de/LC_MESSAGES/django.mo b/django/conf/locale/de/LC_MESSAGES/django.mo Binary files differindex decd502157..2f4d9b38af 100644 --- a/django/conf/locale/de/LC_MESSAGES/django.mo +++ b/django/conf/locale/de/LC_MESSAGES/django.mo diff --git a/django/conf/locale/de/LC_MESSAGES/django.po b/django/conf/locale/de/LC_MESSAGES/django.po index 51444acfb8..30fe328b6e 100644 --- a/django/conf/locale/de/LC_MESSAGES/django.po +++ b/django/conf/locale/de/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Django 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-15 12:40-0600\n" +"POT-Creation-Date: 2005-11-22 15:44-0600\n" "PO-Revision-Date: 2005-11-06 13:54+0100\n" "Last-Translator: Lukas Kolbe <lucky@knup.de>\n" "Language-Team: \n" @@ -512,6 +512,36 @@ msgstr "Nov." msgid "Dec." msgstr "Dez." +#: utils/timesince.py:12 +msgid "year" +msgid_plural "years" +msgstr[0] "Jahr" +msgstr[1] "Jahre" + +#: utils/timesince.py:13 +msgid "month" +msgid_plural "months" +msgstr[0] "Monat" +msgstr[1] "Monate" + +#: utils/timesince.py:14 +msgid "day" +msgid_plural "days" +msgstr[0] "Tag" +msgstr[1] "Tage" + +#: utils/timesince.py:15 +msgid "hour" +msgid_plural "hours" +msgstr[0] "" +msgstr[1] "" + +#: utils/timesince.py:16 +msgid "minute" +msgid_plural "minutes" +msgstr[0] "Minute" +msgstr[1] "Minuten" + #: models/core.py:7 msgid "domain name" msgstr "Domainname" @@ -617,8 +647,8 @@ msgid "password" msgstr "Kennwort" #: models/auth.py:37 -msgid "Use an MD5 hash -- not the raw password." -msgstr "Nicht das Kennwort selber eintragen, sondern dessen MD5 signatur." +msgid "Use '[algo]$[salt]$[hexdigest]" +msgstr "Im Format '[algo]$[salt]$[hexdigest]" #: models/auth.py:38 msgid "staff status" @@ -665,7 +695,7 @@ msgstr "Persnliche Infos" msgid "Important dates" msgstr "Wichtige Daten" -#: models/auth.py:195 +#: models/auth.py:216 msgid "Message" msgstr "Mitteilung" @@ -745,75 +775,75 @@ msgstr "Schwedisch" msgid "Simplified Chinese" msgstr "vereinfachtes Chinesisch" -#: core/validators.py:59 +#: core/validators.py:62 msgid "This value must contain only letters, numbers and underscores." msgstr "Dieser Wert darf nur Buchstaben, Ziffern und Unterstriche enthalten." -#: core/validators.py:63 +#: core/validators.py:66 msgid "This value must contain only letters, numbers, underscores and slashes." msgstr "" "Dieser Wert darf nur Buchstaben, Ziffern, Unterstriche und Schrgstriche " "enthalten." -#: core/validators.py:71 +#: core/validators.py:74 msgid "Uppercase letters are not allowed here." msgstr "Grobuchstaben sind hier nicht erlaubt." -#: core/validators.py:75 +#: core/validators.py:78 msgid "Lowercase letters are not allowed here." msgstr "Kleinbuchstaben sind hier nicht erlaubt." -#: core/validators.py:82 +#: core/validators.py:85 msgid "Enter only digits separated by commas." msgstr "Hier sind nur durch Komma getrennte Ziffern erlaubt." -#: core/validators.py:94 +#: core/validators.py:97 msgid "Enter valid e-mail addresses separated by commas." msgstr "Bitte mit Komma getrennte, gltige eMail-Adressen eingeben." -#: core/validators.py:98 +#: core/validators.py:101 msgid "Please enter a valid IP address." msgstr "Bitte eine gltige IP-Adresse eingeben." -#: core/validators.py:102 +#: core/validators.py:105 msgid "Empty values are not allowed here." msgstr "Dieses Feld darf nicht leer sein." -#: core/validators.py:106 +#: core/validators.py:109 msgid "Non-numeric characters aren't allowed here." msgstr "Nichtnumerische Zeichen sind hier nicht erlaubt." -#: core/validators.py:110 +#: core/validators.py:113 msgid "This value can't be comprised solely of digits." msgstr "Dieser Wert darf nicht nur aus Ziffern bestehen." -#: core/validators.py:115 +#: core/validators.py:118 msgid "Enter a whole number." msgstr "Bitte eine ganze Zahl eingeben." -#: core/validators.py:119 +#: core/validators.py:122 msgid "Only alphabetical characters are allowed here." msgstr "Nur alphabetische Zeichen sind hier erlaubt." -#: core/validators.py:123 +#: core/validators.py:126 msgid "Enter a valid date in YYYY-MM-DD format." msgstr "Bitte ein gltiges Datum im Format JJJJ-MM-TT eingeben." -#: core/validators.py:127 +#: core/validators.py:130 msgid "Enter a valid time in HH:MM format." msgstr "Bitte eine gltige Zeit im Format SS:MM eingeben." -#: core/validators.py:131 +#: core/validators.py:134 msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format." msgstr "" "Bitte eine gltige Datums- und Zeitangabe im Format JJJJ-MM-TT SS:MM " "eingeben." -#: core/validators.py:135 +#: core/validators.py:138 msgid "Enter a valid e-mail address." msgstr "Bitte eine gltige eMail-Adresse eingeben" -#: core/validators.py:147 +#: core/validators.py:150 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." @@ -821,27 +851,27 @@ msgstr "" "Bitte ein Bild hochladen. Die Datei, die hochgeladen wurde, ist kein Bild " "oder ist defekt." -#: core/validators.py:154 +#: core/validators.py:157 #, python-format msgid "The URL %s does not point to a valid image." msgstr "Die URL %s zeigt nicht auf ein gltiges Bild." -#: core/validators.py:158 +#: core/validators.py:161 #, python-format msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid." msgstr "" "Telefonnummern mssen im Format XXX-XXX-XXXX sein. \"%s\" ist ungltig." -#: core/validators.py:166 +#: core/validators.py:169 #, python-format msgid "The URL %s does not point to a valid QuickTime video." msgstr "Die URL %s zeigt nicht auf ein gltiges QuickTime video." -#: core/validators.py:170 +#: core/validators.py:173 msgid "A valid URL is required." msgstr "Eine gltige URL ist hier verlangt." -#: core/validators.py:184 +#: core/validators.py:187 #, python-format msgid "" "Valid HTML is required. Specific errors are:\n" @@ -850,71 +880,71 @@ msgstr "" "Bitte gltiges HTML eingeben. Fehler sind:\n" "%s" -#: core/validators.py:191 +#: core/validators.py:194 #, python-format msgid "Badly formed XML: %s" msgstr "Ungltiges XML: %s" -#: core/validators.py:201 +#: core/validators.py:204 #, python-format msgid "Invalid URL: %s" msgstr "Ungltige URL: %s" -#: core/validators.py:205 core/validators.py:207 +#: core/validators.py:208 core/validators.py:210 #, python-format msgid "The URL %s is a broken link." msgstr "Die URL %s funktioniert nicht." -#: core/validators.py:213 +#: core/validators.py:216 msgid "Enter a valid U.S. state abbreviation." msgstr "Bitte eine gltige Abkrzung fr einen US-Staat eingeben." -#: core/validators.py:228 +#: core/validators.py:231 #, python-format msgid "Watch your mouth! The word %s is not allowed here." msgid_plural "Watch your mouth! The words %s are not allowed here." msgstr[0] "Keine Schimpfworte! Das Wort %s ist hier nicht gern gesehen!" msgstr[1] "Keine Schimpfworte! Die Wrter %s sind hier nicht gern gesehen!" -#: core/validators.py:235 +#: core/validators.py:238 #, python-format msgid "This field must match the '%s' field." msgstr "Dieses Feld muss zum Feld '%s' passen." -#: core/validators.py:254 +#: core/validators.py:257 msgid "Please enter something for at least one field." msgstr "Bitte mindestens eines der Felder ausfllen." -#: core/validators.py:263 core/validators.py:274 +#: core/validators.py:266 core/validators.py:277 msgid "Please enter both fields or leave them both empty." msgstr "Bitte entweder beide Felder ausfllen, oder beide leer lassen." -#: core/validators.py:281 +#: core/validators.py:284 #, python-format msgid "This field must be given if %(field)s is %(value)s" msgstr "" "Dieses Feld muss gefllt sein, wenn Feld %(field)s den Wert %(value)s hat." -#: core/validators.py:293 +#: core/validators.py:296 #, python-format msgid "This field must be given if %(field)s is not %(value)s" msgstr "" "Dieses Feld muss gefllt sein, wenn Feld %(field)s nicht %(value)s ist." -#: core/validators.py:312 +#: core/validators.py:315 msgid "Duplicate values are not allowed." msgstr "Doppelte Werte sind hier nicht erlaubt." -#: core/validators.py:335 +#: core/validators.py:338 #, python-format msgid "This value must be a power of %s." msgstr "Dieser Wert muss eine Potenz von %s sein." -#: core/validators.py:346 +#: core/validators.py:349 msgid "Please enter a valid decimal number." msgstr "Bitte eine gltige Dezimalzahl eingeben." -#: core/validators.py:348 +#: core/validators.py:351 #, python-format msgid "Please enter a valid decimal number with at most %s total digit." msgid_plural "" @@ -922,7 +952,7 @@ msgid_plural "" msgstr[0] "Bitte eine gltige Dezimalzahl mit maximal %s Ziffer eingeben." msgstr[1] "Bitte eine gltige Dezimalzahl mit maximal %s Ziffern eingeben." -#: core/validators.py:351 +#: core/validators.py:354 #, python-format msgid "Please enter a valid decimal number with at most %s decimal place." msgid_plural "" @@ -932,39 +962,39 @@ msgstr[0] "" msgstr[1] "" "Bitte eine gltige Dezimalzahl mit maximal %s Dezimalstellen eingeben." -#: core/validators.py:361 +#: core/validators.py:364 #, python-format msgid "Make sure your uploaded file is at least %s bytes big." msgstr "" "Bitte sicherstellen, da die hochgeladene Datei mindestens %s Bytes gross " "ist." -#: core/validators.py:362 +#: core/validators.py:365 #, python-format msgid "Make sure your uploaded file is at most %s bytes big." msgstr "" "Bitte sicherstellen, da die hochgeladene Datei maximal %s Bytes gross ist." -#: core/validators.py:375 +#: core/validators.py:378 msgid "The format for this field is wrong." msgstr "Das Format fr dieses Feld ist falsch." -#: core/validators.py:390 +#: core/validators.py:393 msgid "This field is invalid." msgstr "Dieses Feld ist ungltig." -#: core/validators.py:425 +#: core/validators.py:428 #, python-format msgid "Could not retrieve anything from %s." msgstr "Konnte nichts von %s empfangen." -#: core/validators.py:428 +#: core/validators.py:431 #, python-format msgid "" "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'." msgstr "Die URL %(url)s lieferte den falschen Content-Type '%(contenttype)s'." -#: core/validators.py:461 +#: core/validators.py:464 #, python-format msgid "" "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with " @@ -973,7 +1003,7 @@ msgstr "" "Bitte das ungeschlossene %(tag)s Tag in Zeile %(line)s schlieen. Die Zeile " "beginnt mit \"%(start)s\"." -#: core/validators.py:465 +#: core/validators.py:468 #, python-format msgid "" "Some text starting on line %(line)s is not allowed in that context. (Line " @@ -982,7 +1012,7 @@ msgstr "" "In Zeile %(line)s ist Text, der nicht in dem Kontext erlaubt ist. Die Zeile " "beginnt mit \"%(start)s\"." -#: core/validators.py:470 +#: core/validators.py:473 #, python-format msgid "" "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%" @@ -991,7 +1021,7 @@ msgstr "" "Das Attribute %(attr)s in Zeile %(line)s ist ungltig. Die Zeile beginnt mit " "\"%(start)s\"." -#: core/validators.py:475 +#: core/validators.py:478 #, python-format msgid "" "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%" @@ -1000,7 +1030,7 @@ msgstr "" "<%(tag)s> in Zeile %(line)s ist ungltig. Die Zeile beginnt mit \"%(start)s" "\"." -#: core/validators.py:479 +#: core/validators.py:482 #, python-format msgid "" "A tag on line %(line)s is missing one or more required attributes. (Line " @@ -1009,7 +1039,7 @@ msgstr "" "Ein Tag in Zeile %(line)s hat eines oder mehrere Pflichtattribute nicht. Die " "Zeile beginnt mit \"%(start)s\"." -#: core/validators.py:484 +#: core/validators.py:487 #, python-format msgid "" "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line " @@ -1028,3 +1058,4 @@ msgid "" msgstr "" " Um mehr als eine Selektion zu treffen, \"Strg\", oder auf dem Mac \"Command" "\", beim Klicken gedrckt halten." + diff --git a/django/conf/locale/en/LC_MESSAGES/django.mo b/django/conf/locale/en/LC_MESSAGES/django.mo Binary files differindex 3d48f0fd09..f1ef3dea8f 100644 --- a/django/conf/locale/en/LC_MESSAGES/django.mo +++ b/django/conf/locale/en/LC_MESSAGES/django.mo diff --git a/django/conf/locale/en/LC_MESSAGES/django.po b/django/conf/locale/en/LC_MESSAGES/django.po index 1fe02130be..d55d024198 100644 --- a/django/conf/locale/en/LC_MESSAGES/django.po +++ b/django/conf/locale/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-15 12:40-0600\n" +"POT-Creation-Date: 2005-11-22 15:43-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -486,6 +486,36 @@ msgstr "" msgid "Dec." msgstr "" +#: utils/timesince.py:12 +msgid "year" +msgid_plural "years" +msgstr[0] "" +msgstr[1] "" + +#: utils/timesince.py:13 +msgid "month" +msgid_plural "months" +msgstr[0] "" +msgstr[1] "" + +#: utils/timesince.py:14 +msgid "day" +msgid_plural "days" +msgstr[0] "" +msgstr[1] "" + +#: utils/timesince.py:15 +msgid "hour" +msgid_plural "hours" +msgstr[0] "" +msgstr[1] "" + +#: utils/timesince.py:16 +msgid "minute" +msgid_plural "minutes" +msgstr[0] "" +msgstr[1] "" + #: models/core.py:7 msgid "domain name" msgstr "" @@ -591,7 +621,7 @@ msgid "password" msgstr "" #: models/auth.py:37 -msgid "Use an MD5 hash -- not the raw password." +msgid "Use '[algo]$[salt]$[hexdigest]" msgstr "" #: models/auth.py:38 @@ -636,7 +666,7 @@ msgstr "" msgid "Important dates" msgstr "" -#: models/auth.py:195 +#: models/auth.py:216 msgid "Message" msgstr "" @@ -716,165 +746,165 @@ msgstr "" msgid "Simplified Chinese" msgstr "" -#: core/validators.py:59 +#: core/validators.py:62 msgid "This value must contain only letters, numbers and underscores." msgstr "" -#: core/validators.py:63 +#: core/validators.py:66 msgid "This value must contain only letters, numbers, underscores and slashes." msgstr "" -#: core/validators.py:71 +#: core/validators.py:74 msgid "Uppercase letters are not allowed here." msgstr "" -#: core/validators.py:75 +#: core/validators.py:78 msgid "Lowercase letters are not allowed here." msgstr "" -#: core/validators.py:82 +#: core/validators.py:85 msgid "Enter only digits separated by commas." msgstr "" -#: core/validators.py:94 +#: core/validators.py:97 msgid "Enter valid e-mail addresses separated by commas." msgstr "" -#: core/validators.py:98 +#: core/validators.py:101 msgid "Please enter a valid IP address." msgstr "" -#: core/validators.py:102 +#: core/validators.py:105 msgid "Empty values are not allowed here." msgstr "" -#: core/validators.py:106 +#: core/validators.py:109 msgid "Non-numeric characters aren't allowed here." msgstr "" -#: core/validators.py:110 +#: core/validators.py:113 msgid "This value can't be comprised solely of digits." msgstr "" -#: core/validators.py:115 +#: core/validators.py:118 msgid "Enter a whole number." msgstr "" -#: core/validators.py:119 +#: core/validators.py:122 msgid "Only alphabetical characters are allowed here." msgstr "" -#: core/validators.py:123 +#: core/validators.py:126 msgid "Enter a valid date in YYYY-MM-DD format." msgstr "" -#: core/validators.py:127 +#: core/validators.py:130 msgid "Enter a valid time in HH:MM format." msgstr "" -#: core/validators.py:131 +#: core/validators.py:134 msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format." msgstr "" -#: core/validators.py:135 +#: core/validators.py:138 msgid "Enter a valid e-mail address." msgstr "" -#: core/validators.py:147 +#: core/validators.py:150 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: core/validators.py:154 +#: core/validators.py:157 #, python-format msgid "The URL %s does not point to a valid image." msgstr "" -#: core/validators.py:158 +#: core/validators.py:161 #, python-format msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid." msgstr "" -#: core/validators.py:166 +#: core/validators.py:169 #, python-format msgid "The URL %s does not point to a valid QuickTime video." msgstr "" -#: core/validators.py:170 +#: core/validators.py:173 msgid "A valid URL is required." msgstr "" -#: core/validators.py:184 +#: core/validators.py:187 #, python-format msgid "" "Valid HTML is required. Specific errors are:\n" "%s" msgstr "" -#: core/validators.py:191 +#: core/validators.py:194 #, python-format msgid "Badly formed XML: %s" msgstr "" -#: core/validators.py:201 +#: core/validators.py:204 #, python-format msgid "Invalid URL: %s" msgstr "" -#: core/validators.py:205 core/validators.py:207 +#: core/validators.py:208 core/validators.py:210 #, python-format msgid "The URL %s is a broken link." msgstr "" -#: core/validators.py:213 +#: core/validators.py:216 msgid "Enter a valid U.S. state abbreviation." msgstr "" -#: core/validators.py:228 +#: core/validators.py:231 #, python-format msgid "Watch your mouth! The word %s is not allowed here." msgid_plural "Watch your mouth! The words %s are not allowed here." msgstr[0] "" msgstr[1] "" -#: core/validators.py:235 +#: core/validators.py:238 #, python-format msgid "This field must match the '%s' field." msgstr "" -#: core/validators.py:254 +#: core/validators.py:257 msgid "Please enter something for at least one field." msgstr "" -#: core/validators.py:263 core/validators.py:274 +#: core/validators.py:266 core/validators.py:277 msgid "Please enter both fields or leave them both empty." msgstr "" -#: core/validators.py:281 +#: core/validators.py:284 #, python-format msgid "This field must be given if %(field)s is %(value)s" msgstr "" -#: core/validators.py:293 +#: core/validators.py:296 #, python-format msgid "This field must be given if %(field)s is not %(value)s" msgstr "" -#: core/validators.py:312 +#: core/validators.py:315 msgid "Duplicate values are not allowed." msgstr "" -#: core/validators.py:335 +#: core/validators.py:338 #, python-format msgid "This value must be a power of %s." msgstr "" -#: core/validators.py:346 +#: core/validators.py:349 msgid "Please enter a valid decimal number." msgstr "" -#: core/validators.py:348 +#: core/validators.py:351 #, python-format msgid "Please enter a valid decimal number with at most %s total digit." msgid_plural "" @@ -882,7 +912,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: core/validators.py:351 +#: core/validators.py:354 #, python-format msgid "Please enter a valid decimal number with at most %s decimal place." msgid_plural "" @@ -890,71 +920,71 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: core/validators.py:361 +#: core/validators.py:364 #, python-format msgid "Make sure your uploaded file is at least %s bytes big." msgstr "" -#: core/validators.py:362 +#: core/validators.py:365 #, python-format msgid "Make sure your uploaded file is at most %s bytes big." msgstr "" -#: core/validators.py:375 +#: core/validators.py:378 msgid "The format for this field is wrong." msgstr "" -#: core/validators.py:390 +#: core/validators.py:393 msgid "This field is invalid." msgstr "" -#: core/validators.py:425 +#: core/validators.py:428 #, python-format msgid "Could not retrieve anything from %s." msgstr "" -#: core/validators.py:428 +#: core/validators.py:431 #, python-format msgid "" "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'." msgstr "" -#: core/validators.py:461 +#: core/validators.py:464 #, python-format msgid "" "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with " "\"%(start)s\".)" msgstr "" -#: core/validators.py:465 +#: core/validators.py:468 #, python-format msgid "" "Some text starting on line %(line)s is not allowed in that context. (Line " "starts with \"%(start)s\".)" msgstr "" -#: core/validators.py:470 +#: core/validators.py:473 #, python-format msgid "" "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%" "(start)s\".)" msgstr "" -#: core/validators.py:475 +#: core/validators.py:478 #, python-format msgid "" "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%" "(start)s\".)" msgstr "" -#: core/validators.py:479 +#: core/validators.py:482 #, python-format msgid "" "A tag on line %(line)s is missing one or more required attributes. (Line " "starts with \"%(start)s\".)" msgstr "" -#: core/validators.py:484 +#: core/validators.py:487 #, python-format msgid "" "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line " diff --git a/django/conf/locale/es/LC_MESSAGES/django.mo b/django/conf/locale/es/LC_MESSAGES/django.mo Binary files differindex a8fe0475b8..5efbe07b17 100644 --- a/django/conf/locale/es/LC_MESSAGES/django.mo +++ b/django/conf/locale/es/LC_MESSAGES/django.mo diff --git a/django/conf/locale/es/LC_MESSAGES/django.po b/django/conf/locale/es/LC_MESSAGES/django.po index 27547d34e7..beaa2572f6 100644 --- a/django/conf/locale/es/LC_MESSAGES/django.po +++ b/django/conf/locale/es/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-15 12:40-0600\n" +"POT-Creation-Date: 2005-11-22 15:44-0600\n" "PO-Revision-Date: 2005-10-04 20:59GMT\n" "Last-Translator: Ricardo Javier Crdenes Medina <ricardo.cardenes@gmail." "com>\n" @@ -505,6 +505,36 @@ msgstr "" msgid "Dec." msgstr "" +#: utils/timesince.py:12 +msgid "year" +msgid_plural "years" +msgstr[0] "" +msgstr[1] "" + +#: utils/timesince.py:13 +msgid "month" +msgid_plural "months" +msgstr[0] "" +msgstr[1] "" + +#: utils/timesince.py:14 +msgid "day" +msgid_plural "days" +msgstr[0] "" +msgstr[1] "" + +#: utils/timesince.py:15 +msgid "hour" +msgid_plural "hours" +msgstr[0] "" +msgstr[1] "" + +#: utils/timesince.py:16 +msgid "minute" +msgid_plural "minutes" +msgstr[0] "" +msgstr[1] "" + #: models/core.py:7 msgid "domain name" msgstr "" @@ -614,7 +644,7 @@ msgid "password" msgstr "Clave:" #: models/auth.py:37 -msgid "Use an MD5 hash -- not the raw password." +msgid "Use '[algo]$[salt]$[hexdigest]" msgstr "" #: models/auth.py:38 @@ -660,7 +690,7 @@ msgstr "" msgid "Important dates" msgstr "" -#: models/auth.py:195 +#: models/auth.py:216 msgid "Message" msgstr "" @@ -740,167 +770,167 @@ msgstr "" msgid "Simplified Chinese" msgstr "" -#: core/validators.py:59 +#: core/validators.py:62 msgid "This value must contain only letters, numbers and underscores." msgstr "Este valor debe contener slo letras, nmeros y guin bajo." -#: core/validators.py:63 +#: core/validators.py:66 #, fuzzy msgid "This value must contain only letters, numbers, underscores and slashes." msgstr "Este valor debe contener slo letras, nmeros y guin bajo." -#: core/validators.py:71 +#: core/validators.py:74 msgid "Uppercase letters are not allowed here." msgstr "" -#: core/validators.py:75 +#: core/validators.py:78 msgid "Lowercase letters are not allowed here." msgstr "" -#: core/validators.py:82 +#: core/validators.py:85 msgid "Enter only digits separated by commas." msgstr "" -#: core/validators.py:94 +#: core/validators.py:97 msgid "Enter valid e-mail addresses separated by commas." msgstr "" -#: core/validators.py:98 +#: core/validators.py:101 msgid "Please enter a valid IP address." msgstr "" -#: core/validators.py:102 +#: core/validators.py:105 msgid "Empty values are not allowed here." msgstr "" -#: core/validators.py:106 +#: core/validators.py:109 msgid "Non-numeric characters aren't allowed here." msgstr "" -#: core/validators.py:110 +#: core/validators.py:113 msgid "This value can't be comprised solely of digits." msgstr "" -#: core/validators.py:115 +#: core/validators.py:118 msgid "Enter a whole number." msgstr "" -#: core/validators.py:119 +#: core/validators.py:122 msgid "Only alphabetical characters are allowed here." msgstr "" -#: core/validators.py:123 +#: core/validators.py:126 msgid "Enter a valid date in YYYY-MM-DD format." msgstr "" -#: core/validators.py:127 +#: core/validators.py:130 msgid "Enter a valid time in HH:MM format." msgstr "" -#: core/validators.py:131 +#: core/validators.py:134 msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format." msgstr "" -#: core/validators.py:135 +#: core/validators.py:138 #, fuzzy msgid "Enter a valid e-mail address." msgstr "Direccin de correo:" -#: core/validators.py:147 +#: core/validators.py:150 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: core/validators.py:154 +#: core/validators.py:157 #, python-format msgid "The URL %s does not point to a valid image." msgstr "" -#: core/validators.py:158 +#: core/validators.py:161 #, python-format msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid." msgstr "" -#: core/validators.py:166 +#: core/validators.py:169 #, python-format msgid "The URL %s does not point to a valid QuickTime video." msgstr "" -#: core/validators.py:170 +#: core/validators.py:173 msgid "A valid URL is required." msgstr "" -#: core/validators.py:184 +#: core/validators.py:187 #, python-format msgid "" "Valid HTML is required. Specific errors are:\n" "%s" msgstr "" -#: core/validators.py:191 +#: core/validators.py:194 #, python-format msgid "Badly formed XML: %s" msgstr "" -#: core/validators.py:201 +#: core/validators.py:204 #, python-format msgid "Invalid URL: %s" msgstr "" -#: core/validators.py:205 core/validators.py:207 +#: core/validators.py:208 core/validators.py:210 #, python-format msgid "The URL %s is a broken link." msgstr "" -#: core/validators.py:213 +#: core/validators.py:216 msgid "Enter a valid U.S. state abbreviation." msgstr "" -#: core/validators.py:228 +#: core/validators.py:231 #, python-format msgid "Watch your mouth! The word %s is not allowed here." msgid_plural "Watch your mouth! The words %s are not allowed here." msgstr[0] "" msgstr[1] "" -#: core/validators.py:235 +#: core/validators.py:238 #, python-format msgid "This field must match the '%s' field." msgstr "" -#: core/validators.py:254 +#: core/validators.py:257 msgid "Please enter something for at least one field." msgstr "" -#: core/validators.py:263 core/validators.py:274 +#: core/validators.py:266 core/validators.py:277 msgid "Please enter both fields or leave them both empty." msgstr "" -#: core/validators.py:281 +#: core/validators.py:284 #, python-format msgid "This field must be given if %(field)s is %(value)s" msgstr "" -#: core/validators.py:293 +#: core/validators.py:296 #, python-format msgid "This field must be given if %(field)s is not %(value)s" msgstr "" -#: core/validators.py:312 +#: core/validators.py:315 msgid "Duplicate values are not allowed." msgstr "" -#: core/validators.py:335 +#: core/validators.py:338 #, python-format msgid "This value must be a power of %s." msgstr "" -#: core/validators.py:346 +#: core/validators.py:349 msgid "Please enter a valid decimal number." msgstr "" -#: core/validators.py:348 +#: core/validators.py:351 #, python-format msgid "Please enter a valid decimal number with at most %s total digit." msgid_plural "" @@ -908,7 +938,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: core/validators.py:351 +#: core/validators.py:354 #, python-format msgid "Please enter a valid decimal number with at most %s decimal place." msgid_plural "" @@ -916,71 +946,71 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: core/validators.py:361 +#: core/validators.py:364 #, python-format msgid "Make sure your uploaded file is at least %s bytes big." msgstr "" -#: core/validators.py:362 +#: core/validators.py:365 #, python-format msgid "Make sure your uploaded file is at most %s bytes big." msgstr "" -#: core/validators.py:375 +#: core/validators.py:378 msgid "The format for this field is wrong." msgstr "" -#: core/validators.py:390 +#: core/validators.py:393 msgid "This field is invalid." msgstr "" -#: core/validators.py:425 +#: core/validators.py:428 #, python-format msgid "Could not retrieve anything from %s." msgstr "" -#: core/validators.py:428 +#: core/validators.py:431 #, python-format msgid "" "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'." msgstr "" -#: core/validators.py:461 +#: core/validators.py:464 #, python-format msgid "" "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with " "\"%(start)s\".)" msgstr "" -#: core/validators.py:465 +#: core/validators.py:468 #, python-format msgid "" "Some text starting on line %(line)s is not allowed in that context. (Line " "starts with \"%(start)s\".)" msgstr "" -#: core/validators.py:470 +#: core/validators.py:473 #, python-format msgid "" "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%" "(start)s\".)" msgstr "" -#: core/validators.py:475 +#: core/validators.py:478 #, python-format msgid "" "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%" "(start)s\".)" msgstr "" -#: core/validators.py:479 +#: core/validators.py:482 #, python-format msgid "" "A tag on line %(line)s is missing one or more required attributes. (Line " "starts with \"%(start)s\".)" msgstr "" -#: core/validators.py:484 +#: core/validators.py:487 #, python-format msgid "" "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line " diff --git a/django/conf/locale/fr/LC_MESSAGES/django.mo b/django/conf/locale/fr/LC_MESSAGES/django.mo Binary files differindex f18a72d890..9652aab688 100644 --- a/django/conf/locale/fr/LC_MESSAGES/django.mo +++ b/django/conf/locale/fr/LC_MESSAGES/django.mo diff --git a/django/conf/locale/fr/LC_MESSAGES/django.po b/django/conf/locale/fr/LC_MESSAGES/django.po index 1996f4d879..0f39835106 100644 --- a/django/conf/locale/fr/LC_MESSAGES/django.po +++ b/django/conf/locale/fr/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-03 12:26+0100\n" +"POT-Creation-Date: 2005-11-22 15:44-0600\n" "PO-Revision-Date: 2005-10-18 12:27+0200\n" "Last-Translator: Laurent Rahuel <laurent.rahuel@gmail.com>\n" "Language-Team: franais <fr@li.org>\n" @@ -15,6 +15,34 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" +#: contrib/admin/models/admin.py:6 +msgid "action time" +msgstr "heure de l'action" + +#: contrib/admin/models/admin.py:9 +msgid "object id" +msgstr "id de l'objet" + +#: contrib/admin/models/admin.py:10 +msgid "object repr" +msgstr "repr de l'objet" + +#: contrib/admin/models/admin.py:11 +msgid "action flag" +msgstr "drapeau de l'action" + +#: contrib/admin/models/admin.py:12 +msgid "change message" +msgstr "message de modification" + +#: contrib/admin/models/admin.py:15 +msgid "log entry" +msgstr "entre de log" + +#: contrib/admin/models/admin.py:16 +msgid "log entries" +msgstr "entres de log" + #: contrib/admin/templates/admin/object_history.html:5 #: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/base.html:29 @@ -286,33 +314,103 @@ msgstr "Merci d'utiliser notre site!" msgid "The %(site_name)s team" msgstr "L'quipe %(site_name)s" -#: contrib/admin/models/admin.py:6 -msgid "action time" -msgstr "heure de l'action" +#: contrib/redirects/models/redirects.py:7 +msgid "redirect from" +msgstr "redirig depuis" -#: contrib/admin/models/admin.py:9 -msgid "object id" -msgstr "id de l'objet" +#: contrib/redirects/models/redirects.py:8 +msgid "" +"This should be an absolute path, excluding the domain name. Example: '/" +"events/search/'." +msgstr "" +"Ceci doit tre un chemin absolu, sans nom de domaine. Par exemple: '/events/" +"search/'." -#: contrib/admin/models/admin.py:10 -msgid "object repr" -msgstr "repr de l'objet" +#: contrib/redirects/models/redirects.py:9 +msgid "redirect to" +msgstr "redirig vers" -#: contrib/admin/models/admin.py:11 -msgid "action flag" -msgstr "drapeau de l'action" +#: contrib/redirects/models/redirects.py:10 +msgid "" +"This can be either an absolute path (as above) or a full URL starting with " +"'http://'." +msgstr "" +"Ceci peut tre soit un chemin absolu (voir ci-dessus) soit une URL complte " +"dbutant par 'http://'." -#: contrib/admin/models/admin.py:12 -msgid "change message" -msgstr "message de modification" +#: contrib/redirects/models/redirects.py:12 +msgid "redirect" +msgstr "redirection" -#: contrib/admin/models/admin.py:15 -msgid "log entry" -msgstr "entre de log" +#: contrib/redirects/models/redirects.py:13 +msgid "redirects" +msgstr "redirections" -#: contrib/admin/models/admin.py:16 -msgid "log entries" -msgstr "entres de log" +#: contrib/flatpages/models/flatpages.py:6 +msgid "URL" +msgstr "URL" + +#: contrib/flatpages/models/flatpages.py:7 +msgid "" +"Example: '/about/contact/'. Make sure to have leading and trailing slashes." +msgstr "" +"Par exemple : '/about/contact/'. Vrifiez la prsence du caractre '/' en " +"dbut et en fin de chaine." + +#: contrib/flatpages/models/flatpages.py:8 +msgid "title" +msgstr "titre" + +#: contrib/flatpages/models/flatpages.py:9 +msgid "content" +msgstr "contenu" + +#: contrib/flatpages/models/flatpages.py:10 +msgid "enable comments" +msgstr "autoriser les commentaires" + +#: contrib/flatpages/models/flatpages.py:11 +msgid "template name" +msgstr "nom du template" + +#: contrib/flatpages/models/flatpages.py:12 +#, fuzzy +msgid "" +"Example: 'flatpages/contact_page'. If this isn't provided, the system will " +"use 'flatpages/default'." +msgstr "" +"Par exemple: 'flatfiles/contact_page'. Sans dfinition, le systme utilisera " +"'flatfiles/default'." + +#: contrib/flatpages/models/flatpages.py:13 +msgid "registration required" +msgstr "enregistrement requis" + +#: contrib/flatpages/models/flatpages.py:13 +msgid "If this is checked, only logged-in users will be able to view the page." +msgstr "" +"Si coch, seuls les utilisateurs connects auront la possibilit de voir " +"cette page." + +#: contrib/flatpages/models/flatpages.py:17 +msgid "flat page" +msgstr "page plat" + +#: contrib/flatpages/models/flatpages.py:18 +msgid "flat pages" +msgstr "pages plat" + +#: utils/translation.py:335 +msgid "DATE_FORMAT" +msgstr "" + +#: utils/translation.py:336 +msgid "DATETIME_FORMAT" +msgstr "" + +#: utils/translation.py:337 +msgid "TIME_FORMAT" +msgstr "" #: utils/dates.py:6 msgid "Monday" @@ -418,152 +516,99 @@ msgstr "Nov." msgid "Dec." msgstr "Dc." -#: models/core.py:5 +#: utils/timesince.py:12 +msgid "year" +msgid_plural "years" +msgstr[0] "" +msgstr[1] "" + +#: utils/timesince.py:13 +msgid "month" +msgid_plural "months" +msgstr[0] "" +msgstr[1] "" + +#: utils/timesince.py:14 +#, fuzzy +msgid "day" +msgid_plural "days" +msgstr[0] "Mai" +msgstr[1] "Mai" + +#: utils/timesince.py:15 +msgid "hour" +msgid_plural "hours" +msgstr[0] "" +msgstr[1] "" + +#: utils/timesince.py:16 +#, fuzzy +msgid "minute" +msgid_plural "minutes" +msgstr[0] "site" +msgstr[1] "site" + +#: models/core.py:7 msgid "domain name" msgstr "nom de domaine" -#: models/core.py:6 +#: models/core.py:8 msgid "display name" msgstr "nom afficher" -#: models/core.py:8 +#: models/core.py:10 msgid "site" msgstr "site" -#: models/core.py:9 +#: models/core.py:11 msgid "sites" msgstr "sites" -#: models/core.py:22 +#: models/core.py:28 msgid "label" msgstr "intitul" -#: models/core.py:23 models/core.py:34 models/auth.py:6 models/auth.py:19 +#: models/core.py:29 models/core.py:40 models/auth.py:6 models/auth.py:19 msgid "name" msgstr "nom" -#: models/core.py:25 +#: models/core.py:31 msgid "package" msgstr "paquetage" -#: models/core.py:26 +#: models/core.py:32 msgid "packages" msgstr "paquetages" -#: models/core.py:36 +#: models/core.py:42 msgid "python module name" msgstr "nom du module python" -#: models/core.py:38 +#: models/core.py:44 msgid "content type" msgstr "type de contenu" -#: models/core.py:39 +#: models/core.py:45 msgid "content types" msgstr "types de contenu" -#: models/core.py:62 -msgid "redirect from" -msgstr "redirig depuis" - -#: models/core.py:63 -msgid "" -"This should be an absolute path, excluding the domain name. Example: '/" -"events/search/'." -msgstr "" -"Ceci doit tre un chemin absolu, sans nom de domaine. Par exemple: '/events/" -"search/'." - -#: models/core.py:64 -msgid "redirect to" -msgstr "redirig vers" - -#: models/core.py:65 -msgid "" -"This can be either an absolute path (as above) or a full URL starting with " -"'http://'." -msgstr "" -"Ceci peut tre soit un chemin absolu (voir ci-dessus) soit une URL complte " -"dbutant par 'http://'." - #: models/core.py:67 -msgid "redirect" -msgstr "redirection" - -#: models/core.py:68 -msgid "redirects" -msgstr "redirections" - -#: models/core.py:81 -msgid "URL" -msgstr "URL" - -#: models/core.py:82 -msgid "" -"Example: '/about/contact/'. Make sure to have leading and trailing slashes." -msgstr "" -"Par exemple : '/about/contact/'. Vrifiez la prsence du caractre '/' en " -"dbut et en fin de chaine." - -#: models/core.py:83 -msgid "title" -msgstr "titre" - -#: models/core.py:84 -msgid "content" -msgstr "contenu" - -#: models/core.py:85 -msgid "enable comments" -msgstr "autoriser les commentaires" - -#: models/core.py:86 -msgid "template name" -msgstr "nom du template" - -#: models/core.py:87 -msgid "" -"Example: 'flatfiles/contact_page'. If this isn't provided, the system will " -"use 'flatfiles/default'." -msgstr "" -"Par exemple: 'flatfiles/contact_page'. Sans dfinition, le systme utilisera " -"'flatfiles/default'." - -#: models/core.py:88 -msgid "registration required" -msgstr "enregistrement requis" - -#: models/core.py:88 -msgid "If this is checked, only logged-in users will be able to view the page." -msgstr "" -"Si coch, seuls les utilisateurs connects auront la possibilit de voir " -"cette page." - -#: models/core.py:92 -msgid "flat page" -msgstr "page plat" - -#: models/core.py:93 -msgid "flat pages" -msgstr "pages plat" - -#: models/core.py:114 msgid "session key" msgstr "cl de session" -#: models/core.py:115 +#: models/core.py:68 msgid "session data" msgstr "donne de session" -#: models/core.py:116 +#: models/core.py:69 msgid "expire date" msgstr "date d'expiration" -#: models/core.py:118 +#: models/core.py:71 msgid "session" msgstr "session" -#: models/core.py:119 +#: models/core.py:72 msgid "sessions" msgstr "sessions" @@ -608,8 +653,8 @@ msgid "password" msgstr "mot de passe" #: models/auth.py:37 -msgid "Use an MD5 hash -- not the raw password." -msgstr "Utilisez une chaine crypte MD5 -- pas un mot de passe en clair." +msgid "Use '[algo]$[salt]$[hexdigest]" +msgstr "" #: models/auth.py:38 msgid "staff status" @@ -656,124 +701,157 @@ msgstr "Information personnelle" msgid "Important dates" msgstr "Dates importantes" -#: models/auth.py:182 +#: models/auth.py:216 msgid "Message" msgstr "Message" +#: conf/global_settings.py:36 +msgid "Bengali" +msgstr "" + #: conf/global_settings.py:37 msgid "Czech" msgstr "Tchque" #: conf/global_settings.py:38 +msgid "Welsh" +msgstr "" + +#: conf/global_settings.py:39 +#, fuzzy +msgid "Danish" +msgstr "Espagnol" + +#: conf/global_settings.py:40 msgid "German" msgstr "Allemand" -#: conf/global_settings.py:39 +#: conf/global_settings.py:41 msgid "English" msgstr "Anglais" -#: conf/global_settings.py:40 +#: conf/global_settings.py:42 msgid "Spanish" msgstr "Espagnol" -#: conf/global_settings.py:41 +#: conf/global_settings.py:43 msgid "French" msgstr "Franais" -#: conf/global_settings.py:42 +#: conf/global_settings.py:44 msgid "Galician" msgstr "Galicien" -#: conf/global_settings.py:43 +#: conf/global_settings.py:45 +msgid "Icelandic" +msgstr "" + +#: conf/global_settings.py:46 #, fuzzy msgid "Italian" msgstr "Italien" -#: conf/global_settings.py:44 +#: conf/global_settings.py:47 +msgid "Norwegian" +msgstr "" + +#: conf/global_settings.py:48 msgid "Brazilian" msgstr "Brsilien" -#: conf/global_settings.py:45 +#: conf/global_settings.py:49 +msgid "Romanian" +msgstr "" + +#: conf/global_settings.py:50 msgid "Russian" msgstr "Russe" -#: conf/global_settings.py:46 +#: conf/global_settings.py:51 +msgid "Slovak" +msgstr "" + +#: conf/global_settings.py:52 #, fuzzy msgid "Serbian" msgstr "Serbe" -#: conf/global_settings.py:47 -msgid "Traditional Chinese" -msgstr "Chinois traditionnel" +#: conf/global_settings.py:53 +msgid "Swedish" +msgstr "" -#: core/validators.py:58 +#: conf/global_settings.py:54 +msgid "Simplified Chinese" +msgstr "" + +#: core/validators.py:62 msgid "This value must contain only letters, numbers and underscores." msgstr "" "Ce champ ne doit contenir que des lettres, des nombres et des sous-tirets." -#: core/validators.py:62 +#: core/validators.py:66 msgid "This value must contain only letters, numbers, underscores and slashes." msgstr "" "Ce champ ne doit contenir que des lettres, des nombres, des sous-tirets et " "des '/'." -#: core/validators.py:70 +#: core/validators.py:74 msgid "Uppercase letters are not allowed here." msgstr "Les lettres majuscules ne sont pas autorises ici." -#: core/validators.py:74 +#: core/validators.py:78 msgid "Lowercase letters are not allowed here." msgstr "Les lettres minuscules ne sont pas autorises ici." -#: core/validators.py:81 +#: core/validators.py:85 msgid "Enter only digits separated by commas." msgstr "Seulement des chiffres ([0-9]), spars par des virgules." -#: core/validators.py:93 +#: core/validators.py:97 msgid "Enter valid e-mail addresses separated by commas." msgstr "Entrez des adresses de courriel valides spares par des virgules." -#: core/validators.py:100 +#: core/validators.py:101 msgid "Please enter a valid IP address." msgstr "Entrez une adresse IP valide." -#: core/validators.py:104 +#: core/validators.py:105 msgid "Empty values are not allowed here." msgstr "Vous ne pouvez pas laisser ce champ vide." -#: core/validators.py:108 +#: core/validators.py:109 msgid "Non-numeric characters aren't allowed here." msgstr "Les caractres non numriques ne sont pas autoriss ici." -#: core/validators.py:112 +#: core/validators.py:113 msgid "This value can't be comprised solely of digits." msgstr "Cette valeur ne peut contenir que des chiffres [0-9]." -#: core/validators.py:117 +#: core/validators.py:118 msgid "Enter a whole number." msgstr "Entrez un nombre entier." -#: core/validators.py:121 +#: core/validators.py:122 msgid "Only alphabetical characters are allowed here." msgstr "Seules les lettres de l'alphabet sont autorises ici." -#: core/validators.py:125 +#: core/validators.py:126 msgid "Enter a valid date in YYYY-MM-DD format." msgstr "Entrez une date valide au format AAAA-MM-JJ." -#: core/validators.py:129 +#: core/validators.py:130 msgid "Enter a valid time in HH:MM format." msgstr "Entrez une heure valide au format HH:MM." -#: core/validators.py:133 +#: core/validators.py:134 msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format." msgstr "Entrez une date et une heure valide au format AAAA-MM-JJ HH:MM." -#: core/validators.py:137 +#: core/validators.py:138 msgid "Enter a valid e-mail address." msgstr "Entrez une adresse de courriel valide." -#: core/validators.py:149 +#: core/validators.py:150 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." @@ -781,28 +859,28 @@ msgstr "" "Envoyez une image valide. Le fichier que vous avez transfer n'est pas une " "image ou bien est une image corrompue." -#: core/validators.py:156 +#: core/validators.py:157 #, python-format msgid "The URL %s does not point to a valid image." msgstr "L'URL %s ne pointe pas vers une image valide." -#: core/validators.py:160 +#: core/validators.py:161 #, python-format msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid." msgstr "" "Les numros de tlphone doivent tre au format XX XX XX XX XX. \"%s\" est " "incorrect." -#: core/validators.py:168 +#: core/validators.py:169 #, python-format msgid "The URL %s does not point to a valid QuickTime video." msgstr "L'URL %s ne pointe pas vers une vido QuickTime valide." -#: core/validators.py:172 +#: core/validators.py:173 msgid "A valid URL is required." msgstr "Une URL valide est requise." -#: core/validators.py:186 +#: core/validators.py:187 #, python-format msgid "" "Valid HTML is required. Specific errors are:\n" @@ -811,69 +889,69 @@ msgstr "" "Du HTML valide est requis. Les erreurs spcifiques sont:\n" "%s" -#: core/validators.py:193 +#: core/validators.py:194 #, python-format msgid "Badly formed XML: %s" msgstr "XML mal form: %s" -#: core/validators.py:203 +#: core/validators.py:204 #, python-format msgid "Invalid URL: %s" msgstr "URL invalide: %s" -#: core/validators.py:205 +#: core/validators.py:208 core/validators.py:210 #, python-format msgid "The URL %s is a broken link." msgstr "L'URL %s est un lien cass." -#: core/validators.py:211 +#: core/validators.py:216 msgid "Enter a valid U.S. state abbreviation." msgstr "Entrez une abrviation d'tat amricain valide." -#: core/validators.py:226 +#: core/validators.py:231 #, python-format msgid "Watch your mouth! The word %s is not allowed here." msgid_plural "Watch your mouth! The words %s are not allowed here." msgstr[0] "Attention votre langage,! Le mot %s n'est pas autoris ici." msgstr[1] "Attention votre langage,! Les mots %s ne sont pas autoriss ici." -#: core/validators.py:233 +#: core/validators.py:238 #, python-format msgid "This field must match the '%s' field." msgstr "Ce champ doit correspondre au champ '%s'." -#: core/validators.py:252 +#: core/validators.py:257 msgid "Please enter something for at least one field." msgstr "S'il vous plat, saisissez au moins une valeur dans un des champs." -#: core/validators.py:261 core/validators.py:272 +#: core/validators.py:266 core/validators.py:277 msgid "Please enter both fields or leave them both empty." msgstr "S'il vous plat, renseignez chaque champ ou laissez les deux vides." -#: core/validators.py:279 +#: core/validators.py:284 #, python-format msgid "This field must be given if %(field)s is %(value)s" msgstr "Ce champ doit tre renseign si %(field)s vaut %(value)s" -#: core/validators.py:291 +#: core/validators.py:296 #, python-format msgid "This field must be given if %(field)s is not %(value)s" msgstr "Ce champ doit tre renseign si %(field)s ne vaut pas %(value)s" -#: core/validators.py:310 +#: core/validators.py:315 msgid "Duplicate values are not allowed." msgstr "Des valeurs identiques ne sont pas autorises." -#: core/validators.py:333 +#: core/validators.py:338 #, python-format msgid "This value must be a power of %s." msgstr "Cette valeur doit tre une puissance de %s." -#: core/validators.py:344 +#: core/validators.py:349 msgid "Please enter a valid decimal number." msgstr "S'il vous plat, saisissez un nombre dcimal valide." -#: core/validators.py:346 +#: core/validators.py:351 #, python-format msgid "Please enter a valid decimal number with at most %s total digit." msgid_plural "" @@ -883,7 +961,7 @@ msgstr[0] "" msgstr[1] "" "S'il vous plat, saisissez un nombre dcimal valide avec au plus %s chiffres." -#: core/validators.py:349 +#: core/validators.py:354 #, python-format msgid "Please enter a valid decimal number with at most %s decimal place." msgid_plural "" @@ -893,32 +971,32 @@ msgstr[0] "" msgstr[1] "" "S'il vous plat, saisissez un nombre dcimal valide avec au plus %s dcimales" -#: core/validators.py:359 +#: core/validators.py:364 #, python-format msgid "Make sure your uploaded file is at least %s bytes big." msgstr "" "Vrifiez que le fichier transfr fait au moins une taille de %s octets." -#: core/validators.py:360 +#: core/validators.py:365 #, python-format msgid "Make sure your uploaded file is at most %s bytes big." msgstr "" "Vrifiez que le fichier transfr fait au plus une taille de %s octets." -#: core/validators.py:373 +#: core/validators.py:378 msgid "The format for this field is wrong." msgstr "Le format de ce champ est mauvais." -#: core/validators.py:388 +#: core/validators.py:393 msgid "This field is invalid." msgstr "Ce champ est invalide." -#: core/validators.py:423 +#: core/validators.py:428 #, python-format msgid "Could not retrieve anything from %s." msgstr "Impossible de rcuprer quoi que ce soit depuis %s." -#: core/validators.py:426 +#: core/validators.py:431 #, python-format msgid "" "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'." @@ -926,7 +1004,7 @@ msgstr "" "L'entte Content-Type '%(contenttype)s', renvoye par l'url %(url)s n'est " "pas valide." -#: core/validators.py:459 +#: core/validators.py:464 #, python-format msgid "" "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with " @@ -935,7 +1013,7 @@ msgstr "" "Veuillez fermer le tag %(tag)s de la ligne %(line)s. (La ligne dbutant par " "\"%(start)s\".)" -#: core/validators.py:463 +#: core/validators.py:468 #, python-format msgid "" "Some text starting on line %(line)s is not allowed in that context. (Line " @@ -944,7 +1022,7 @@ msgstr "" "Du texte commenant la ligne %(line)s n'est pas autoris dans ce contexte. " "(Ligne dbutant par \"%(start)s\".)" -#: core/validators.py:468 +#: core/validators.py:473 #, python-format msgid "" "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%" @@ -953,7 +1031,7 @@ msgstr "" "\"%(attr)s\" ligne %(line)s n'est pas un attribut valide. (Ligne dbutant " "par \"%(start)s\".)" -#: core/validators.py:473 +#: core/validators.py:478 #, python-format msgid "" "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%" @@ -962,7 +1040,7 @@ msgstr "" "\"<%(tag)s>\" ligne %(line)s n'est pas un tag valide. (Ligne dbutant par \"%" "(start)s\".)" -#: core/validators.py:477 +#: core/validators.py:482 #, python-format msgid "" "A tag on line %(line)s is missing one or more required attributes. (Line " @@ -971,7 +1049,7 @@ msgstr "" "Un tag, ou un ou plusieurs attributs, de la ligne %(line)s est manquant. " "(Ligne dbutant par \"%(start)s\".)" -#: core/validators.py:482 +#: core/validators.py:487 #, python-format msgid "" "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line " @@ -980,16 +1058,22 @@ msgstr "" "La valeur de l'attribut \"%(attr)s\" de la ligne %(line)s n'est pas valide. " "(Ligne dbutant par \"%(start)s\".)" -#: core/meta/fields.py:95 +#: core/meta/fields.py:111 msgid " Separate multiple IDs with commas." msgstr "Sparez les ID par des virgules." -#: core/meta/fields.py:98 +#: core/meta/fields.py:114 msgid "" " Hold down \"Control\", or \"Command\" on a Mac, to select more than one." msgstr "" "Maintenez \"Control\", or \"Command\" sur un Mac, pour en slectionner plus " "d'une." +#~ msgid "Use an MD5 hash -- not the raw password." +#~ msgstr "Utilisez une chaine crypte MD5 -- pas un mot de passe en clair." + +#~ msgid "Traditional Chinese" +#~ msgstr "Chinois traditionnel" + #~ msgid "Messages" #~ msgstr "Messages" diff --git a/django/conf/locale/gl/LC_MESSAGES/django.mo b/django/conf/locale/gl/LC_MESSAGES/django.mo Binary files differindex b9611236d8..0d07a8cf1d 100644 --- a/django/conf/locale/gl/LC_MESSAGES/django.mo +++ b/django/conf/locale/gl/LC_MESSAGES/django.mo diff --git a/django/conf/locale/gl/LC_MESSAGES/django.po b/django/conf/locale/gl/LC_MESSAGES/django.po index e9c8e3b99a..abb01c9527 100644 --- a/django/conf/locale/gl/LC_MESSAGES/django.po +++ b/django/conf/locale/gl/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-15 12:40-0600\n" +"POT-Creation-Date: 2005-11-22 15:43-0600\n" "PO-Revision-Date: 2005-10-16 14:29+0100\n" "Last-Translator: Afonso Fernández Nogueira <fonzzo.django@gmail.com>\n" "Language-Team: Galego\n" @@ -504,6 +504,36 @@ msgstr "" msgid "Dec." msgstr "" +#: utils/timesince.py:12 +msgid "year" +msgid_plural "years" +msgstr[0] "" +msgstr[1] "" + +#: utils/timesince.py:13 +msgid "month" +msgid_plural "months" +msgstr[0] "" +msgstr[1] "" + +#: utils/timesince.py:14 +msgid "day" +msgid_plural "days" +msgstr[0] "" +msgstr[1] "" + +#: utils/timesince.py:15 +msgid "hour" +msgid_plural "hours" +msgstr[0] "" +msgstr[1] "" + +#: utils/timesince.py:16 +msgid "minute" +msgid_plural "minutes" +msgstr[0] "" +msgstr[1] "" + #: models/core.py:7 msgid "domain name" msgstr "" @@ -613,7 +643,7 @@ msgid "password" msgstr "Contrasinal:" #: models/auth.py:37 -msgid "Use an MD5 hash -- not the raw password." +msgid "Use '[algo]$[salt]$[hexdigest]" msgstr "" #: models/auth.py:38 @@ -659,7 +689,7 @@ msgstr "" msgid "Important dates" msgstr "" -#: models/auth.py:195 +#: models/auth.py:216 msgid "Message" msgstr "" @@ -739,167 +769,167 @@ msgstr "" msgid "Simplified Chinese" msgstr "" -#: core/validators.py:59 +#: core/validators.py:62 msgid "This value must contain only letters, numbers and underscores." msgstr "Este valor soamente pode conter letras, números e guións baixos (_)." -#: core/validators.py:63 +#: core/validators.py:66 #, fuzzy msgid "This value must contain only letters, numbers, underscores and slashes." msgstr "Este valor soamente pode conter letras, números e guións baixos (_)." -#: core/validators.py:71 +#: core/validators.py:74 msgid "Uppercase letters are not allowed here." msgstr "" -#: core/validators.py:75 +#: core/validators.py:78 msgid "Lowercase letters are not allowed here." msgstr "" -#: core/validators.py:82 +#: core/validators.py:85 msgid "Enter only digits separated by commas." msgstr "" -#: core/validators.py:94 +#: core/validators.py:97 msgid "Enter valid e-mail addresses separated by commas." msgstr "" -#: core/validators.py:98 +#: core/validators.py:101 msgid "Please enter a valid IP address." msgstr "" -#: core/validators.py:102 +#: core/validators.py:105 msgid "Empty values are not allowed here." msgstr "" -#: core/validators.py:106 +#: core/validators.py:109 msgid "Non-numeric characters aren't allowed here." msgstr "" -#: core/validators.py:110 +#: core/validators.py:113 msgid "This value can't be comprised solely of digits." msgstr "" -#: core/validators.py:115 +#: core/validators.py:118 msgid "Enter a whole number." msgstr "" -#: core/validators.py:119 +#: core/validators.py:122 msgid "Only alphabetical characters are allowed here." msgstr "" -#: core/validators.py:123 +#: core/validators.py:126 msgid "Enter a valid date in YYYY-MM-DD format." msgstr "" -#: core/validators.py:127 +#: core/validators.py:130 msgid "Enter a valid time in HH:MM format." msgstr "" -#: core/validators.py:131 +#: core/validators.py:134 msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format." msgstr "" -#: core/validators.py:135 +#: core/validators.py:138 #, fuzzy msgid "Enter a valid e-mail address." msgstr "Enderezo de correo electrónico:" -#: core/validators.py:147 +#: core/validators.py:150 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: core/validators.py:154 +#: core/validators.py:157 #, python-format msgid "The URL %s does not point to a valid image." msgstr "" -#: core/validators.py:158 +#: core/validators.py:161 #, python-format msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid." msgstr "" -#: core/validators.py:166 +#: core/validators.py:169 #, python-format msgid "The URL %s does not point to a valid QuickTime video." msgstr "" -#: core/validators.py:170 +#: core/validators.py:173 msgid "A valid URL is required." msgstr "" -#: core/validators.py:184 +#: core/validators.py:187 #, python-format msgid "" "Valid HTML is required. Specific errors are:\n" "%s" msgstr "" -#: core/validators.py:191 +#: core/validators.py:194 #, python-format msgid "Badly formed XML: %s" msgstr "" -#: core/validators.py:201 +#: core/validators.py:204 #, python-format msgid "Invalid URL: %s" msgstr "" -#: core/validators.py:205 core/validators.py:207 +#: core/validators.py:208 core/validators.py:210 #, python-format msgid "The URL %s is a broken link." msgstr "" -#: core/validators.py:213 +#: core/validators.py:216 msgid "Enter a valid U.S. state abbreviation." msgstr "" -#: core/validators.py:228 +#: core/validators.py:231 #, python-format msgid "Watch your mouth! The word %s is not allowed here." msgid_plural "Watch your mouth! The words %s are not allowed here." msgstr[0] "" msgstr[1] "" -#: core/validators.py:235 +#: core/validators.py:238 #, python-format msgid "This field must match the '%s' field." msgstr "" -#: core/validators.py:254 +#: core/validators.py:257 msgid "Please enter something for at least one field." msgstr "" -#: core/validators.py:263 core/validators.py:274 +#: core/validators.py:266 core/validators.py:277 msgid "Please enter both fields or leave them both empty." msgstr "" -#: core/validators.py:281 +#: core/validators.py:284 #, python-format msgid "This field must be given if %(field)s is %(value)s" msgstr "" -#: core/validators.py:293 +#: core/validators.py:296 #, python-format msgid "This field must be given if %(field)s is not %(value)s" msgstr "" -#: core/validators.py:312 +#: core/validators.py:315 msgid "Duplicate values are not allowed." msgstr "" -#: core/validators.py:335 +#: core/validators.py:338 #, python-format msgid "This value must be a power of %s." msgstr "" -#: core/validators.py:346 +#: core/validators.py:349 msgid "Please enter a valid decimal number." msgstr "" -#: core/validators.py:348 +#: core/validators.py:351 #, python-format msgid "Please enter a valid decimal number with at most %s total digit." msgid_plural "" @@ -907,7 +937,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: core/validators.py:351 +#: core/validators.py:354 #, python-format msgid "Please enter a valid decimal number with at most %s decimal place." msgid_plural "" @@ -915,71 +945,71 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: core/validators.py:361 +#: core/validators.py:364 #, python-format msgid "Make sure your uploaded file is at least %s bytes big." msgstr "" -#: core/validators.py:362 +#: core/validators.py:365 #, python-format msgid "Make sure your uploaded file is at most %s bytes big." msgstr "" -#: core/validators.py:375 +#: core/validators.py:378 msgid "The format for this field is wrong." msgstr "" -#: core/validators.py:390 +#: core/validators.py:393 msgid "This field is invalid." msgstr "" -#: core/validators.py:425 +#: core/validators.py:428 #, python-format msgid "Could not retrieve anything from %s." msgstr "" -#: core/validators.py:428 +#: core/validators.py:431 #, python-format msgid "" "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'." msgstr "" -#: core/validators.py:461 +#: core/validators.py:464 #, python-format msgid "" "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with " "\"%(start)s\".)" msgstr "" -#: core/validators.py:465 +#: core/validators.py:468 #, python-format msgid "" "Some text starting on line %(line)s is not allowed in that context. (Line " "starts with \"%(start)s\".)" msgstr "" -#: core/validators.py:470 +#: core/validators.py:473 #, python-format msgid "" "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%" "(start)s\".)" msgstr "" -#: core/validators.py:475 +#: core/validators.py:478 #, python-format msgid "" "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%" "(start)s\".)" msgstr "" -#: core/validators.py:479 +#: core/validators.py:482 #, python-format msgid "" "A tag on line %(line)s is missing one or more required attributes. (Line " "starts with \"%(start)s\".)" msgstr "" -#: core/validators.py:484 +#: core/validators.py:487 #, python-format msgid "" "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line " diff --git a/django/conf/locale/is/LC_MESSAGES/django.mo b/django/conf/locale/is/LC_MESSAGES/django.mo Binary files differindex 0c8f34dde2..cdaff5aa42 100644 --- a/django/conf/locale/is/LC_MESSAGES/django.mo +++ b/django/conf/locale/is/LC_MESSAGES/django.mo diff --git a/django/conf/locale/is/LC_MESSAGES/django.po b/django/conf/locale/is/LC_MESSAGES/django.po index 6c9491ac58..f3d30d093a 100644 --- a/django/conf/locale/is/LC_MESSAGES/django.po +++ b/django/conf/locale/is/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Django 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-15 12:41-0600\n" +"POT-Creation-Date: 2005-11-22 15:44-0600\n" "PO-Revision-Date: 2005-11-13 18:08-0000\n" "Last-Translator: Dagur Páll Ammendrup <dagurp@gmail.com>\n" "Language-Team: <dagurp@gmail.com>\n" @@ -510,6 +510,38 @@ msgstr "nóv." msgid "Dec." msgstr "des." +#: utils/timesince.py:12 +msgid "year" +msgid_plural "years" +msgstr[0] "" +msgstr[1] "" + +#: utils/timesince.py:13 +msgid "month" +msgid_plural "months" +msgstr[0] "" +msgstr[1] "" + +#: utils/timesince.py:14 +#, fuzzy +msgid "day" +msgid_plural "days" +msgstr[0] "maí" +msgstr[1] "maí" + +#: utils/timesince.py:15 +msgid "hour" +msgid_plural "hours" +msgstr[0] "" +msgstr[1] "" + +#: utils/timesince.py:16 +#, fuzzy +msgid "minute" +msgid_plural "minutes" +msgstr[0] "vefur" +msgstr[1] "vefur" + #: models/core.py:7 msgid "domain name" msgstr "lén" @@ -615,8 +647,8 @@ msgid "password" msgstr "lykilorð" #: models/auth.py:37 -msgid "Use an MD5 hash -- not the raw password." -msgstr "Notaðu MD5 hakk -- ekki hrátt lykilorðið" +msgid "Use '[algo]$[salt]$[hexdigest]" +msgstr "" #: models/auth.py:38 msgid "staff status" @@ -663,7 +695,7 @@ msgstr "Persónuupplýsingar" msgid "Important dates" msgstr "Mikilvægar dagsetningar" -#: models/auth.py:195 +#: models/auth.py:216 msgid "Message" msgstr "Skilaboð" @@ -744,72 +776,72 @@ msgstr "" msgid "Simplified Chinese" msgstr "Einfölduð Kínverska " -#: core/validators.py:59 +#: core/validators.py:62 msgid "This value must contain only letters, numbers and underscores." msgstr "Þetta gildi má einungis innihalda stafi, tölur og undirstrik." -#: core/validators.py:63 +#: core/validators.py:66 msgid "This value must contain only letters, numbers, underscores and slashes." msgstr "" "Þetta gildi má einungis innihalda stafi, tölur, undirstrik og skástrik." -#: core/validators.py:71 +#: core/validators.py:74 msgid "Uppercase letters are not allowed here." msgstr "Hástafir eru ekki leyfðir hér." -#: core/validators.py:75 +#: core/validators.py:78 msgid "Lowercase letters are not allowed here." msgstr "Lágstafir eru ekki leyfðir hér." -#: core/validators.py:82 +#: core/validators.py:85 msgid "Enter only digits separated by commas." msgstr "Skrifaðu einungis tölur aðskildar með kommum." -#: core/validators.py:94 +#: core/validators.py:97 msgid "Enter valid e-mail addresses separated by commas." msgstr "Skrifaðu gild póstföng aðskilin með kommum." -#: core/validators.py:98 +#: core/validators.py:101 msgid "Please enter a valid IP address." msgstr "Vinsamlegast skrifaðu gilda IP tölu." -#: core/validators.py:102 +#: core/validators.py:105 msgid "Empty values are not allowed here." msgstr "Tóm gildi eru ekki leyfð hér." -#: core/validators.py:106 +#: core/validators.py:109 msgid "Non-numeric characters aren't allowed here." msgstr "Aðeins tölustafir eru leyfðir hér." -#: core/validators.py:110 +#: core/validators.py:113 msgid "This value can't be comprised solely of digits." msgstr "Þetta gildi verður að vera samsett úr fleiru en tölustöfum." -#: core/validators.py:115 +#: core/validators.py:118 msgid "Enter a whole number." msgstr "Settu inn heila tölu." -#: core/validators.py:119 +#: core/validators.py:122 msgid "Only alphabetical characters are allowed here." msgstr "Einungis bókstafir eru leyfðir hér." -#: core/validators.py:123 +#: core/validators.py:126 msgid "Enter a valid date in YYYY-MM-DD format." msgstr "Skrifaðu gilda dagsetningu á YYYY-MM-DD forminu." -#: core/validators.py:127 +#: core/validators.py:130 msgid "Enter a valid time in HH:MM format." msgstr "Skrifaðu gildan tíma á HH:MM forminu." -#: core/validators.py:131 +#: core/validators.py:134 msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format." msgstr "Skrifaðu gilda dagsetningu/tíma á YYYY-MM-DD HH:MM forminu." -#: core/validators.py:135 +#: core/validators.py:138 msgid "Enter a valid e-mail address." msgstr "Skrifaðu gilt tölvupóstfang." -#: core/validators.py:147 +#: core/validators.py:150 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." @@ -817,26 +849,26 @@ msgstr "" "Hladdu upp gilda myndskrá. Skráin sem þú hlóðst upp var annað hvort ekki " "mynd eða gölluð mynd." -#: core/validators.py:154 +#: core/validators.py:157 #, python-format msgid "The URL %s does not point to a valid image." msgstr "Veffangið %s bendir ekki á gilda mynd." -#: core/validators.py:158 +#: core/validators.py:161 #, python-format msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid." msgstr "Símanúmer verða að vera á XXX-XXX-XXXX forminu. \"%s\" er ógilt." -#: core/validators.py:166 +#: core/validators.py:169 #, python-format msgid "The URL %s does not point to a valid QuickTime video." msgstr "Veffangið %s bendir ekki á gilt QuickTime myndskeið." -#: core/validators.py:170 +#: core/validators.py:173 msgid "A valid URL is required." msgstr "Gilds veffangs er krafist" -#: core/validators.py:184 +#: core/validators.py:187 #, python-format msgid "" "Valid HTML is required. Specific errors are:\n" @@ -845,69 +877,69 @@ msgstr "" "Gilt HTML er nauðsynlegt. Sérstakar villur:\n" "%s" -#: core/validators.py:191 +#: core/validators.py:194 #, python-format msgid "Badly formed XML: %s" msgstr "Illa formað XML: %s" -#: core/validators.py:201 +#: core/validators.py:204 #, python-format msgid "Invalid URL: %s" msgstr "Ógilt veffang: %s" -#: core/validators.py:205 core/validators.py:207 +#: core/validators.py:208 core/validators.py:210 #, python-format msgid "The URL %s is a broken link." msgstr "Veffangið %s er brotinn hlekkur." -#: core/validators.py:213 +#: core/validators.py:216 msgid "Enter a valid U.S. state abbreviation." msgstr "Skrifaðu gilda styttingu á bandarísku fylkisnafni." -#: core/validators.py:228 +#: core/validators.py:231 #, python-format msgid "Watch your mouth! The word %s is not allowed here." msgid_plural "Watch your mouth! The words %s are not allowed here." msgstr[0] "Passaðu orðbragðið! Orðið %s er ekki leyft hér." msgstr[1] "Passaðu orðbragðið! Orðin %s eru ekki leyfð hér." -#: core/validators.py:235 +#: core/validators.py:238 #, python-format msgid "This field must match the '%s' field." msgstr "Þessi reitur verður að passa við '%s' reitinn." -#: core/validators.py:254 +#: core/validators.py:257 msgid "Please enter something for at least one field." msgstr "Vinsamlegast fylltu út einn reit að minnsta kosti." -#: core/validators.py:263 core/validators.py:274 +#: core/validators.py:266 core/validators.py:277 msgid "Please enter both fields or leave them both empty." msgstr "Vinsamlegast fylltu út í báða reitina eða skildu þá eftir tóma." -#: core/validators.py:281 +#: core/validators.py:284 #, python-format msgid "This field must be given if %(field)s is %(value)s" msgstr "Þessi reitur á að vera óútfylltur ef %(field)s er %(value)s" -#: core/validators.py:293 +#: core/validators.py:296 #, python-format msgid "This field must be given if %(field)s is not %(value)s" msgstr "Þessi reitur verður að vera útfylltur ef %(field)s er ekki %(value)s" -#: core/validators.py:312 +#: core/validators.py:315 msgid "Duplicate values are not allowed." msgstr "Endurtekin gildi eru ekki leyfð." -#: core/validators.py:335 +#: core/validators.py:338 #, python-format msgid "This value must be a power of %s." msgstr "Þessi reitur verður að vera veldi af %s." -#: core/validators.py:346 +#: core/validators.py:349 msgid "Please enter a valid decimal number." msgstr "Vinsamlegast settu inn gilda tugatölu." -#: core/validators.py:348 +#: core/validators.py:351 #, python-format msgid "Please enter a valid decimal number with at most %s total digit." msgid_plural "" @@ -915,7 +947,7 @@ msgid_plural "" msgstr[0] "Vinsamlegast skrifaðu gilda tugatölu með %s tugastaf í mesta lagi." msgstr[1] "Vinsamlegast skrifaðu gilda tugatölu með %s tugastafi í mesta lagi." -#: core/validators.py:351 +#: core/validators.py:354 #, python-format msgid "Please enter a valid decimal number with at most %s decimal place." msgid_plural "" @@ -923,38 +955,38 @@ msgid_plural "" msgstr[0] "Vinsamlegast skrifaðu gilda tugatölu með %s tugasæti í mesta lagi." msgstr[1] "Vinsamlegast skrifaðu gilda tugatölu með %s tugasæti í mesta lagi." -#: core/validators.py:361 +#: core/validators.py:364 #, python-format msgid "Make sure your uploaded file is at least %s bytes big." msgstr "" "Gakktu úr skugga um að upphlaðin skrá sé að minnsta kosti %s bæti að stærð." -#: core/validators.py:362 +#: core/validators.py:365 #, python-format msgid "Make sure your uploaded file is at most %s bytes big." msgstr "" "Gakktu úr skugga um að upphlaðin skrá sé í mesta lagi %s bæti að stærð." -#: core/validators.py:375 +#: core/validators.py:378 msgid "The format for this field is wrong." msgstr "Sniðið á þessum reit í rangt." -#: core/validators.py:390 +#: core/validators.py:393 msgid "This field is invalid." msgstr "Þessi reitur er ótækur." -#: core/validators.py:425 +#: core/validators.py:428 #, python-format msgid "Could not retrieve anything from %s." msgstr "Gat engu náð úr %s." -#: core/validators.py:428 +#: core/validators.py:431 #, python-format msgid "" "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'." msgstr "Veffangið %(url)s skilaði ótæka efnistagishausnum '%(contenttype)s'." -#: core/validators.py:461 +#: core/validators.py:464 #, python-format msgid "" "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with " @@ -963,7 +995,7 @@ msgstr "" "Vinsamlegast lokaðu opna %(tag)s taginu sem byrjar á línu %(line)s (línan " "hefst á \"%(start)s\")." -#: core/validators.py:465 +#: core/validators.py:468 #, python-format msgid "" "Some text starting on line %(line)s is not allowed in that context. (Line " @@ -972,7 +1004,7 @@ msgstr "" "Texti sem hefst á línu %(line)s er ekki leyfður í því samhengi. (Line starts " "with \"%(start)s\".)" -#: core/validators.py:470 +#: core/validators.py:473 #, python-format msgid "" "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%" @@ -980,7 +1012,7 @@ msgid "" msgstr "" "\"%(attr)s\" á línu %(line)s er ótækt eigindi (línan hefst á \"%(start)s\")." -#: core/validators.py:475 +#: core/validators.py:478 #, python-format msgid "" "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%" @@ -988,7 +1020,7 @@ msgid "" msgstr "" "\"<%(tag)s>\" á línu %(line)s er ótækt tag (línan hefst á \"%(start)s\"." -#: core/validators.py:479 +#: core/validators.py:482 #, python-format msgid "" "A tag on line %(line)s is missing one or more required attributes. (Line " @@ -997,7 +1029,7 @@ msgstr "" "Tag á línu %(line)s vantar eitt eða fleiri nauðsynleg eigindi (línan hefst á " "\"%(start)s\")." -#: core/validators.py:484 +#: core/validators.py:487 #, python-format msgid "" "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line " @@ -1016,3 +1048,6 @@ msgid "" msgstr "" "Haltu niðri \"Control\", eða \"Command\" á Mac til þess að velja fleira en " "eitt." + +#~ msgid "Use an MD5 hash -- not the raw password." +#~ msgstr "Notaðu MD5 hakk -- ekki hrátt lykilorðið" diff --git a/django/conf/locale/it/LC_MESSAGES/django.mo b/django/conf/locale/it/LC_MESSAGES/django.mo Binary files differindex cac3321286..b4cdd7908e 100644 --- a/django/conf/locale/it/LC_MESSAGES/django.mo +++ b/django/conf/locale/it/LC_MESSAGES/django.mo diff --git a/django/conf/locale/it/LC_MESSAGES/django.po b/django/conf/locale/it/LC_MESSAGES/django.po index 32089bdf19..18e5aac0db 100644 --- a/django/conf/locale/it/LC_MESSAGES/django.po +++ b/django/conf/locale/it/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-15 12:40-0600\n" +"POT-Creation-Date: 2005-11-22 15:44-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -510,6 +510,38 @@ msgstr "Nov." msgid "Dec." msgstr "Dic." +#: utils/timesince.py:12 +msgid "year" +msgid_plural "years" +msgstr[0] "" +msgstr[1] "" + +#: utils/timesince.py:13 +msgid "month" +msgid_plural "months" +msgstr[0] "" +msgstr[1] "" + +#: utils/timesince.py:14 +#, fuzzy +msgid "day" +msgid_plural "days" +msgstr[0] "Maggio" +msgstr[1] "Maggio" + +#: utils/timesince.py:15 +msgid "hour" +msgid_plural "hours" +msgstr[0] "" +msgstr[1] "" + +#: utils/timesince.py:16 +#, fuzzy +msgid "minute" +msgid_plural "minutes" +msgstr[0] "sito" +msgstr[1] "sito" + #: models/core.py:7 msgid "domain name" msgstr "nome a dominio" @@ -615,8 +647,8 @@ msgid "password" msgstr "password" #: models/auth.py:37 -msgid "Use an MD5 hash -- not the raw password." -msgstr "Usare il codice di controllo MD5 -- non la password." +msgid "Use '[algo]$[salt]$[hexdigest]" +msgstr "" #: models/auth.py:38 msgid "staff status" @@ -662,7 +694,7 @@ msgstr "Informazioni personali" msgid "Important dates" msgstr "Date importanti" -#: models/auth.py:195 +#: models/auth.py:216 msgid "Message" msgstr "Messaggio" @@ -744,99 +776,99 @@ msgstr "" msgid "Simplified Chinese" msgstr "" -#: core/validators.py:59 +#: core/validators.py:62 msgid "This value must contain only letters, numbers and underscores." msgstr "Sono ammesse solo lettere, numeri e sottolineature ('_')." -#: core/validators.py:63 +#: core/validators.py:66 msgid "This value must contain only letters, numbers, underscores and slashes." msgstr "Sono ammesse solo lettere, numeri, sottolineature ('_') e barre ('/')." -#: core/validators.py:71 +#: core/validators.py:74 msgid "Uppercase letters are not allowed here." msgstr "Non sono ammesse lettere maiuscole." -#: core/validators.py:75 +#: core/validators.py:78 msgid "Lowercase letters are not allowed here." msgstr "Non sono ammesse lettere minuscole." -#: core/validators.py:82 +#: core/validators.py:85 msgid "Enter only digits separated by commas." msgstr "Inserire solo numeri separati da virgole." -#: core/validators.py:94 +#: core/validators.py:97 msgid "Enter valid e-mail addresses separated by commas." msgstr "Inserire indirizzi e-mail validi separati da virgole." -#: core/validators.py:98 +#: core/validators.py:101 msgid "Please enter a valid IP address." msgstr "Inserire un indirizzo IP valido." -#: core/validators.py:102 +#: core/validators.py:105 msgid "Empty values are not allowed here." msgstr "E' necessario inserire un valore." -#: core/validators.py:106 +#: core/validators.py:109 msgid "Non-numeric characters aren't allowed here." msgstr "Sono ammessi soltanto caratteri alfabetici." -#: core/validators.py:110 +#: core/validators.py:113 msgid "This value can't be comprised solely of digits." msgstr "Il valore non pu essere composto solo da cifre." -#: core/validators.py:115 +#: core/validators.py:118 msgid "Enter a whole number." msgstr "Inserire un numero." -#: core/validators.py:119 +#: core/validators.py:122 msgid "Only alphabetical characters are allowed here." msgstr "Sono ammessi solo caratteri alfabetici." -#: core/validators.py:123 +#: core/validators.py:126 msgid "Enter a valid date in YYYY-MM-DD format." msgstr "Inserire un data valida in formato YYYY-MM-DD." -#: core/validators.py:127 +#: core/validators.py:130 msgid "Enter a valid time in HH:MM format." msgstr "Inserire un orario valido in formato HH:MM." -#: core/validators.py:131 +#: core/validators.py:134 msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format." msgstr "Inserire una data/ora in formato YYYY-MM-DD HH:MM." -#: core/validators.py:135 +#: core/validators.py:138 msgid "Enter a valid e-mail address." msgstr "Inserire un indirizzo e-mail valido." -#: core/validators.py:147 +#: core/validators.py:150 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" "Caricare un'immagine valida. Il file inserito non un'immagine o corrotto." -#: core/validators.py:154 +#: core/validators.py:157 #, python-format msgid "The URL %s does not point to a valid image." msgstr "L'URL %s non punta ad un'immagine valida." -#: core/validators.py:158 +#: core/validators.py:161 #, python-format msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid." msgstr "" "I numeri di telefono devono essere in formato XXX-XXX-XXXX. \"%s\" non " "valido." -#: core/validators.py:166 +#: core/validators.py:169 #, python-format msgid "The URL %s does not point to a valid QuickTime video." msgstr "L'URL %s non punta ad un video QuickTime valido." -#: core/validators.py:170 +#: core/validators.py:173 msgid "A valid URL is required." msgstr "Inserire un URL valido." -#: core/validators.py:184 +#: core/validators.py:187 #, python-format msgid "" "Valid HTML is required. Specific errors are:\n" @@ -845,69 +877,69 @@ msgstr "" "E' richiesto HTML valido. Gli errori sono i seguenti:\n" "%s" -#: core/validators.py:191 +#: core/validators.py:194 #, python-format msgid "Badly formed XML: %s" msgstr "XML malformato: %s" -#: core/validators.py:201 +#: core/validators.py:204 #, python-format msgid "Invalid URL: %s" msgstr "URL non valida: %s" -#: core/validators.py:205 core/validators.py:207 +#: core/validators.py:208 core/validators.py:210 #, python-format msgid "The URL %s is a broken link." msgstr "L'URL %s un link rotto." -#: core/validators.py:213 +#: core/validators.py:216 msgid "Enter a valid U.S. state abbreviation." msgstr "Inserire un nome di stato americano abbreviato valido." -#: core/validators.py:228 +#: core/validators.py:231 #, python-format msgid "Watch your mouth! The word %s is not allowed here." msgid_plural "Watch your mouth! The words %s are not allowed here." msgstr[0] "Attenzione! La parola %s non ammessa qui." msgstr[1] "Attenzione! Le parole %s non sono ammesse qui." -#: core/validators.py:235 +#: core/validators.py:238 #, python-format msgid "This field must match the '%s' field." msgstr "Questo campo deve corrispondere al campo '%s'." -#: core/validators.py:254 +#: core/validators.py:257 msgid "Please enter something for at least one field." msgstr "Inserire almeno un campo." -#: core/validators.py:263 core/validators.py:274 +#: core/validators.py:266 core/validators.py:277 msgid "Please enter both fields or leave them both empty." msgstr "Inserire entrambi i campi o lasciarli entrambi vuoti." -#: core/validators.py:281 +#: core/validators.py:284 #, python-format msgid "This field must be given if %(field)s is %(value)s" msgstr "Il campo obbligatorio se %(field)s %(value)s" -#: core/validators.py:293 +#: core/validators.py:296 #, python-format msgid "This field must be given if %(field)s is not %(value)s" msgstr "Il campo non pu essere valorizzato se %(field)s non %(value)s" -#: core/validators.py:312 +#: core/validators.py:315 msgid "Duplicate values are not allowed." msgstr "Non sono ammessi valori duplicati." -#: core/validators.py:335 +#: core/validators.py:338 #, python-format msgid "This value must be a power of %s." msgstr "Il valore deve essere una potenza di %s." -#: core/validators.py:346 +#: core/validators.py:349 msgid "Please enter a valid decimal number." msgstr "Inserire un numero decimale valido." -#: core/validators.py:348 +#: core/validators.py:351 #, python-format msgid "Please enter a valid decimal number with at most %s total digit." msgid_plural "" @@ -915,7 +947,7 @@ msgid_plural "" msgstr[0] "Inserire un numero decimale con non pi di %s cifre totali." msgstr[1] "" -#: core/validators.py:351 +#: core/validators.py:354 #, python-format msgid "Please enter a valid decimal number with at most %s decimal place." msgid_plural "" @@ -923,30 +955,30 @@ msgid_plural "" msgstr[0] "Inserire un decimale con non pi di %s cifre decimali." msgstr[1] "" -#: core/validators.py:361 +#: core/validators.py:364 #, python-format msgid "Make sure your uploaded file is at least %s bytes big." msgstr "Verifica che il file inserito sia almeno di %s byte." -#: core/validators.py:362 +#: core/validators.py:365 #, python-format msgid "Make sure your uploaded file is at most %s bytes big." msgstr "Verifica che il file inserito sia al massimo %d byte." -#: core/validators.py:375 +#: core/validators.py:378 msgid "The format for this field is wrong." msgstr "Formato del file non valido." -#: core/validators.py:390 +#: core/validators.py:393 msgid "This field is invalid." msgstr "Il campo non valido." -#: core/validators.py:425 +#: core/validators.py:428 #, python-format msgid "Could not retrieve anything from %s." msgstr "Impossibile recuperare alcunch da %s." -#: core/validators.py:428 +#: core/validators.py:431 #, python-format msgid "" "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'." @@ -954,7 +986,7 @@ msgstr "" "L'URL %(url)s restituisce un Content-Type header non valido '%(contenttype)" "s'." -#: core/validators.py:461 +#: core/validators.py:464 #, python-format msgid "" "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with " @@ -963,7 +995,7 @@ msgstr "" "Il tag %(tag)s alla linea %(line)s non chiuso. (La linea comincia con \"%" "(start)s\".)" -#: core/validators.py:465 +#: core/validators.py:468 #, python-format msgid "" "Some text starting on line %(line)s is not allowed in that context. (Line " @@ -972,7 +1004,7 @@ msgstr "" "Il testo che comincia a linea %(line)s non e' ammesso in questo contesto. " "(La linea comincia con \"%(start)s\".)" -#: core/validators.py:470 +#: core/validators.py:473 #, python-format msgid "" "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%" @@ -981,7 +1013,7 @@ msgstr "" "\"%(attr)s\" alla linea %(line)s un attributo invalido. (La linea comincia " "con \"%(start)s\".)" -#: core/validators.py:475 +#: core/validators.py:478 #, python-format msgid "" "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%" @@ -990,7 +1022,7 @@ msgstr "" "\"<%(tag)s>\" alla linea %(line)s tag non valido. (La linea comincia con \"%" "(start)s\".)" -#: core/validators.py:479 +#: core/validators.py:482 #, python-format msgid "" "A tag on line %(line)s is missing one or more required attributes. (Line " @@ -999,7 +1031,7 @@ msgstr "" "Un tag alla linea %(line)s manca di uno o pi attributi richiesti. (La linea " "comincia con \"%(start)s\".)" -#: core/validators.py:484 +#: core/validators.py:487 #, python-format msgid "" "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line " @@ -1017,6 +1049,9 @@ msgid "" " Hold down \"Control\", or \"Command\" on a Mac, to select more than one." msgstr " Premi \"Control\", o \"Command\" su Mac, per selezionarne pi di uno." +#~ msgid "Use an MD5 hash -- not the raw password." +#~ msgstr "Usare il codice di controllo MD5 -- non la password." + #~ msgid "Itialian" #~ msgstr "Italiano" diff --git a/django/conf/locale/no/LC_MESSAGES/django.mo b/django/conf/locale/no/LC_MESSAGES/django.mo Binary files differindex 10165e229b..0f29a5f8c3 100644 --- a/django/conf/locale/no/LC_MESSAGES/django.mo +++ b/django/conf/locale/no/LC_MESSAGES/django.mo diff --git a/django/conf/locale/no/LC_MESSAGES/django.po b/django/conf/locale/no/LC_MESSAGES/django.po index 308411a794..a613a677c1 100644 --- a/django/conf/locale/no/LC_MESSAGES/django.po +++ b/django/conf/locale/no/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-15 12:40-0600\n" +"POT-Creation-Date: 2005-11-22 15:44-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Espen Grndhaug <espen@grindhaug.org>\n" "Language-Team: Norwegian\n" @@ -511,6 +511,38 @@ msgstr "Nov." msgid "Dec." msgstr "Des." +#: utils/timesince.py:12 +msgid "year" +msgid_plural "years" +msgstr[0] "" +msgstr[1] "" + +#: utils/timesince.py:13 +msgid "month" +msgid_plural "months" +msgstr[0] "" +msgstr[1] "" + +#: utils/timesince.py:14 +#, fuzzy +msgid "day" +msgid_plural "days" +msgstr[0] "Mai" +msgstr[1] "Mai" + +#: utils/timesince.py:15 +msgid "hour" +msgid_plural "hours" +msgstr[0] "" +msgstr[1] "" + +#: utils/timesince.py:16 +#, fuzzy +msgid "minute" +msgid_plural "minutes" +msgstr[0] "side" +msgstr[1] "side" + #: models/core.py:7 msgid "domain name" msgstr "domene navn" @@ -616,8 +648,8 @@ msgid "password" msgstr "passord" #: models/auth.py:37 -msgid "Use an MD5 hash -- not the raw password." -msgstr "Bruk en MD5 nøkkel -- ikke passordet i ren tekst" +msgid "Use '[algo]$[salt]$[hexdigest]" +msgstr "" #: models/auth.py:38 msgid "staff status" @@ -663,7 +695,7 @@ msgstr "Personlig informasjon" msgid "Important dates" msgstr "Viktige datoer" -#: models/auth.py:195 +#: models/auth.py:216 msgid "Message" msgstr "Meldinger" @@ -743,73 +775,73 @@ msgstr "Svensk" msgid "Simplified Chinese" msgstr "Simplifisert Kinesisk" -#: core/validators.py:59 +#: core/validators.py:62 msgid "This value must contain only letters, numbers and underscores." msgstr "Dette feltet må bare inneholde bokstaver, nummer og understreker." -#: core/validators.py:63 +#: core/validators.py:66 msgid "This value must contain only letters, numbers, underscores and slashes." msgstr "" "Dette feltet må bare inneholde bokstaver, nummer, understreker og " "skråstreker." -#: core/validators.py:71 +#: core/validators.py:74 msgid "Uppercase letters are not allowed here." msgstr "Tor skrift er ikke tillatt her." -#: core/validators.py:75 +#: core/validators.py:78 msgid "Lowercase letters are not allowed here." msgstr "Små bokstaver er ikke tillatt her." -#: core/validators.py:82 +#: core/validators.py:85 msgid "Enter only digits separated by commas." msgstr "Skriv inn bare tall, skilt med kommaer." -#: core/validators.py:94 +#: core/validators.py:97 msgid "Enter valid e-mail addresses separated by commas." msgstr "Skriv inn e-post adresser skilt med kommaer." -#: core/validators.py:98 +#: core/validators.py:101 msgid "Please enter a valid IP address." msgstr "Vennligst skriv inn en godkjent IP adresse." -#: core/validators.py:102 +#: core/validators.py:105 msgid "Empty values are not allowed here." msgstr "Dette felte kan ikke være tomt." -#: core/validators.py:106 +#: core/validators.py:109 msgid "Non-numeric characters aren't allowed here." msgstr "Det er bare tall som kan stå i dette feltet." -#: core/validators.py:110 +#: core/validators.py:113 msgid "This value can't be comprised solely of digits." msgstr "Dette feltet kan ikke bare bestå av nummer." -#: core/validators.py:115 +#: core/validators.py:118 msgid "Enter a whole number." msgstr "Skriv inn et helt nummer." -#: core/validators.py:119 +#: core/validators.py:122 msgid "Only alphabetical characters are allowed here." msgstr "Bare alfabetiske bokstaber er tillatt her." -#: core/validators.py:123 +#: core/validators.py:126 msgid "Enter a valid date in YYYY-MM-DD format." msgstr "Skriv inn en dato i ÅÅÅÅ-MM-DD formatet." -#: core/validators.py:127 +#: core/validators.py:130 msgid "Enter a valid time in HH:MM format." msgstr "Skriv inn tiden i TT:MM formatet." -#: core/validators.py:131 +#: core/validators.py:134 msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format." msgstr "Skriv inn dato og tid i ÅÅÅÅ-MM-DD TT:MM formatet." -#: core/validators.py:135 +#: core/validators.py:138 msgid "Enter a valid e-mail address." msgstr "Skriv inn en godkjent e-post adresse." -#: core/validators.py:147 +#: core/validators.py:150 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." @@ -817,27 +849,27 @@ msgstr "" "Lastopp et bilde. Filen du lastet opp var ikke et bilde, eller så var det et " "ødelagt bilde" -#: core/validators.py:154 +#: core/validators.py:157 #, python-format msgid "The URL %s does not point to a valid image." msgstr "Internettadressen %s peker ikke til et godkjent bilde." -#: core/validators.py:158 +#: core/validators.py:161 #, python-format msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid." msgstr "" "Telefon nummeret må være i XXX-XXX-XXXX formatet. \"%s\" er ikke godkjent." -#: core/validators.py:166 +#: core/validators.py:169 #, python-format msgid "The URL %s does not point to a valid QuickTime video." msgstr "Internettadressen %s peker ikke til en godkjent QuickTime film." -#: core/validators.py:170 +#: core/validators.py:173 msgid "A valid URL is required." msgstr "En godkjent internettadresse er påbudt." -#: core/validators.py:184 +#: core/validators.py:187 #, python-format msgid "" "Valid HTML is required. Specific errors are:\n" @@ -846,69 +878,69 @@ msgstr "" "Godkjent HTML er påbudt. Feilene var:\n" "%s" -#: core/validators.py:191 +#: core/validators.py:194 #, python-format msgid "Badly formed XML: %s" msgstr "Ikke godkjent XML: %s" -#: core/validators.py:201 +#: core/validators.py:204 #, python-format msgid "Invalid URL: %s" msgstr "Ikke godkjent internettadresse: %s" -#: core/validators.py:205 core/validators.py:207 +#: core/validators.py:208 core/validators.py:210 #, python-format msgid "The URL %s is a broken link." msgstr "Internettadresse fører til en side som ikke virker." -#: core/validators.py:213 +#: core/validators.py:216 msgid "Enter a valid U.S. state abbreviation." msgstr "Skriv inn en godkjent amerikansk stats forkortelse." -#: core/validators.py:228 +#: core/validators.py:231 #, python-format msgid "Watch your mouth! The word %s is not allowed here." msgid_plural "Watch your mouth! The words %s are not allowed here." msgstr[0] "Pass munnen din! Ordet %s er ikke tillatt her." msgstr[1] "Pass munnen din! Ordene %s er ikke tillatt her." -#: core/validators.py:235 +#: core/validators.py:238 #, python-format msgid "This field must match the '%s' field." msgstr "Dette felte må være det samme som i '%s' feltet." -#: core/validators.py:254 +#: core/validators.py:257 msgid "Please enter something for at least one field." msgstr "Vennligst skriv inn noe i minst et felt." -#: core/validators.py:263 core/validators.py:274 +#: core/validators.py:266 core/validators.py:277 msgid "Please enter both fields or leave them both empty." msgstr "Vennligst skriv inn noe i begge felta, eller la dem stå blanke." -#: core/validators.py:281 +#: core/validators.py:284 #, python-format msgid "This field must be given if %(field)s is %(value)s" msgstr "Dette feltet må bare brukes vist %(field)s er lik %(value)s" -#: core/validators.py:293 +#: core/validators.py:296 #, python-format msgid "This field must be given if %(field)s is not %(value)s" msgstr "Dette feltet må bare brukes vist %(field)s ikke er lik %(value)s" -#: core/validators.py:312 +#: core/validators.py:315 msgid "Duplicate values are not allowed." msgstr "Like verdier er ikke tillatt." -#: core/validators.py:335 +#: core/validators.py:338 #, python-format msgid "This value must be a power of %s." msgstr "Denne verdien må være 'power' av %s." -#: core/validators.py:346 +#: core/validators.py:349 msgid "Please enter a valid decimal number." msgstr "Vennligst skriv inn et godkjent desimal tall." -#: core/validators.py:348 +#: core/validators.py:351 #, python-format msgid "Please enter a valid decimal number with at most %s total digit." msgid_plural "" @@ -916,7 +948,7 @@ msgid_plural "" msgstr[0] "Skriv inn et desimal tall med maksimum %s total antall tall." msgstr[1] "Skriv inn et desimal tall med maksimum %s total antall tall." -#: core/validators.py:351 +#: core/validators.py:354 #, python-format msgid "Please enter a valid decimal number with at most %s decimal place." msgid_plural "" @@ -924,32 +956,32 @@ msgid_plural "" msgstr[0] "Skriv inn et desimal tall med maksimum %s tall bak komma. " msgstr[1] "Skriv inn et desimal tall med maksimum %s tall bak komma. " -#: core/validators.py:361 +#: core/validators.py:364 #, python-format msgid "Make sure your uploaded file is at least %s bytes big." msgstr "" "Er du sikker på at fila du prøver å laste opp er minimum %s bytes stor?" -#: core/validators.py:362 +#: core/validators.py:365 #, python-format msgid "Make sure your uploaded file is at most %s bytes big." msgstr "" "Er du sikker på at fila du prøver å laste opp er maksimum %s bytes stor?" -#: core/validators.py:375 +#: core/validators.py:378 msgid "The format for this field is wrong." msgstr "Formatet i dette feltet er feil." -#: core/validators.py:390 +#: core/validators.py:393 msgid "This field is invalid." msgstr "Dette feltet er feil." -#: core/validators.py:425 +#: core/validators.py:428 #, python-format msgid "Could not retrieve anything from %s." msgstr "Klarte ikke å motta noe fra %s." -#: core/validators.py:428 +#: core/validators.py:431 #, python-format msgid "" "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'." @@ -957,7 +989,7 @@ msgstr "" "Tnternettadressen %(url)s returnerte en ikke godkjent Content-Type '%" "(contenttype)s'." -#: core/validators.py:461 +#: core/validators.py:464 #, python-format msgid "" "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with " @@ -966,7 +998,7 @@ msgstr "" "Vennligst lukk taggen %(tag)s på linje %(line)s. (Linja starer med \"%(start)" "s\".)" -#: core/validators.py:465 +#: core/validators.py:468 #, python-format msgid "" "Some text starting on line %(line)s is not allowed in that context. (Line " @@ -975,7 +1007,7 @@ msgstr "" "Noe av teksten som starter på linje %(line)s er ikke tillatt. (Linja starter " "med \"%(start)s\".)" -#: core/validators.py:470 +#: core/validators.py:473 #, python-format msgid "" "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%" @@ -984,7 +1016,7 @@ msgstr "" "\"%(attr)s\" på linje %(line)s er ikke en godkjent tillegg. (Linja starter " "med \"%(start)s\".)" -#: core/validators.py:475 +#: core/validators.py:478 #, python-format msgid "" "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%" @@ -993,7 +1025,7 @@ msgstr "" "\"<%(tag)s>\" på linje %(line)s er ikke en godkjent tag. (linja starter med " "\"%(start)s\".)" -#: core/validators.py:479 +#: core/validators.py:482 #, python-format msgid "" "A tag on line %(line)s is missing one or more required attributes. (Line " @@ -1002,7 +1034,7 @@ msgstr "" "En tag på linje %(line)s mangler en av de påbydte tillegga. (linja starter " "med \"%(start)s\".)" -#: core/validators.py:484 +#: core/validators.py:487 #, python-format msgid "" "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line " @@ -1020,3 +1052,6 @@ msgid "" " Hold down \"Control\", or \"Command\" on a Mac, to select more than one." msgstr "" "Hold nede \"Control\", eller \"Command\" på en Mac, for å velge mere enn en." + +#~ msgid "Use an MD5 hash -- not the raw password." +#~ msgstr "Bruk en MD5 nøkkel -- ikke passordet i ren tekst" diff --git a/django/conf/locale/pt_BR/LC_MESSAGES/django.mo b/django/conf/locale/pt_BR/LC_MESSAGES/django.mo Binary files differindex 3926f10489..160e9f4e06 100644 --- a/django/conf/locale/pt_BR/LC_MESSAGES/django.mo +++ b/django/conf/locale/pt_BR/LC_MESSAGES/django.mo diff --git a/django/conf/locale/pt_BR/LC_MESSAGES/django.po b/django/conf/locale/pt_BR/LC_MESSAGES/django.po index 04b9e7ce30..592cee1fed 100644 --- a/django/conf/locale/pt_BR/LC_MESSAGES/django.po +++ b/django/conf/locale/pt_BR/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-15 12:40-0600\n" +"POT-Creation-Date: 2005-11-22 15:44-0600\n" "PO-Revision-Date: 2005-10-11 09:12GMT-3\n" "Last-Translator: João Paulo Farias <jpaulofarias@gmail.com>\n" "Language-Team: Português do Brasil <pt-br@li.org>\n" @@ -509,6 +509,38 @@ msgstr "Nov." msgid "Dec." msgstr "Dez." +#: utils/timesince.py:12 +msgid "year" +msgid_plural "years" +msgstr[0] "" +msgstr[1] "" + +#: utils/timesince.py:13 +msgid "month" +msgid_plural "months" +msgstr[0] "" +msgstr[1] "" + +#: utils/timesince.py:14 +#, fuzzy +msgid "day" +msgid_plural "days" +msgstr[0] "Maio" +msgstr[1] "Maio" + +#: utils/timesince.py:15 +msgid "hour" +msgid_plural "hours" +msgstr[0] "" +msgstr[1] "" + +#: utils/timesince.py:16 +#, fuzzy +msgid "minute" +msgid_plural "minutes" +msgstr[0] "site" +msgstr[1] "site" + #: models/core.py:7 msgid "domain name" msgstr "nome do domínio" @@ -618,8 +650,8 @@ msgid "password" msgstr "senha" #: models/auth.py:37 -msgid "Use an MD5 hash -- not the raw password." -msgstr "Usar um código MD5 -- não o texto da senha." +msgid "Use '[algo]$[salt]$[hexdigest]" +msgstr "" #: models/auth.py:38 msgid "staff status" @@ -666,7 +698,7 @@ msgstr "Informações pessoais" msgid "Important dates" msgstr "Datas importantes" -#: models/auth.py:195 +#: models/auth.py:216 msgid "Message" msgstr "Mensagem" @@ -748,71 +780,71 @@ msgstr "" msgid "Simplified Chinese" msgstr "" -#: core/validators.py:59 +#: core/validators.py:62 msgid "This value must contain only letters, numbers and underscores." msgstr "Deve conter apenas letras, números e sublinhados (_)." -#: core/validators.py:63 +#: core/validators.py:66 msgid "This value must contain only letters, numbers, underscores and slashes." msgstr "Deve conter apenas letras, números, sublinhados (_) e barras (/)." -#: core/validators.py:71 +#: core/validators.py:74 msgid "Uppercase letters are not allowed here." msgstr "Letras em maiúsculo não são permitidas aqui." -#: core/validators.py:75 +#: core/validators.py:78 msgid "Lowercase letters are not allowed here." msgstr "Letras em minúsculo não são permitidas aqui." -#: core/validators.py:82 +#: core/validators.py:85 msgid "Enter only digits separated by commas." msgstr "Informe apenas dígitos separados por vírgulas." -#: core/validators.py:94 +#: core/validators.py:97 msgid "Enter valid e-mail addresses separated by commas." msgstr "Informe endereços de email válidos separados por vírgulas." -#: core/validators.py:98 +#: core/validators.py:101 msgid "Please enter a valid IP address." msgstr "Informe um endereço IP válido." -#: core/validators.py:102 +#: core/validators.py:105 msgid "Empty values are not allowed here." msgstr "Valores em branco não são permitidos." -#: core/validators.py:106 +#: core/validators.py:109 msgid "Non-numeric characters aren't allowed here." msgstr "Caracteres não numéricos não são permitidos." -#: core/validators.py:110 +#: core/validators.py:113 msgid "This value can't be comprised solely of digits." msgstr "Este valor não pode conter apenas dígitos." -#: core/validators.py:115 +#: core/validators.py:118 msgid "Enter a whole number." msgstr "Informe um número inteiro." -#: core/validators.py:119 +#: core/validators.py:122 msgid "Only alphabetical characters are allowed here." msgstr "Apenas caracteres do alfabeto são permitidos aqui." -#: core/validators.py:123 +#: core/validators.py:126 msgid "Enter a valid date in YYYY-MM-DD format." msgstr "Informe uma data válida no formato AAAA-MM-DD." -#: core/validators.py:127 +#: core/validators.py:130 msgid "Enter a valid time in HH:MM format." msgstr "Informe uma hora válida no formato HH:MM." -#: core/validators.py:131 +#: core/validators.py:134 msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format." msgstr "Informe uma data/hora válida no formato AAAA-MM-DD HH:MM." -#: core/validators.py:135 +#: core/validators.py:138 msgid "Enter a valid e-mail address." msgstr "Informe um endereço de email válido." -#: core/validators.py:147 +#: core/validators.py:150 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." @@ -820,27 +852,27 @@ msgstr "" "Envie uma imagem válida. O arquivo enviado não é uma imagem ou está " "corrompido." -#: core/validators.py:154 +#: core/validators.py:157 #, python-format msgid "The URL %s does not point to a valid image." msgstr "A URL %s não aponta para um imagem válida." -#: core/validators.py:158 +#: core/validators.py:161 #, python-format msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid." msgstr "" "Números de telefone deves estar no formato XXX-XXX-XXXX.\"%s\" é inválido." -#: core/validators.py:166 +#: core/validators.py:169 #, python-format msgid "The URL %s does not point to a valid QuickTime video." msgstr "A URL %s não aponta para um vídeo QuickTime válido." -#: core/validators.py:170 +#: core/validators.py:173 msgid "A valid URL is required." msgstr "Uma URL válida é exigida." -#: core/validators.py:184 +#: core/validators.py:187 #, python-format msgid "" "Valid HTML is required. Specific errors are:\n" @@ -849,69 +881,69 @@ msgstr "" "HTML válido é exigido. Estes são os erros específicos:\n" "%s" -#: core/validators.py:191 +#: core/validators.py:194 #, python-format msgid "Badly formed XML: %s" msgstr "XML mal formado: %s" -#: core/validators.py:201 +#: core/validators.py:204 #, python-format msgid "Invalid URL: %s" msgstr "URL inválida: %s" -#: core/validators.py:205 core/validators.py:207 +#: core/validators.py:208 core/validators.py:210 #, python-format msgid "The URL %s is a broken link." msgstr "A URL %s é um link quebrado." -#: core/validators.py:213 +#: core/validators.py:216 msgid "Enter a valid U.S. state abbreviation." msgstr "Informe uma abreviação válida de nome de um estado dos EUA." -#: core/validators.py:228 +#: core/validators.py:231 #, python-format msgid "Watch your mouth! The word %s is not allowed here." msgid_plural "Watch your mouth! The words %s are not allowed here." msgstr[0] "Lave sua boca! A palavra %s não é permitida aqui." msgstr[1] "Lave sua boca! As palavras %s não são permitidas aqui." -#: core/validators.py:235 +#: core/validators.py:238 #, python-format msgid "This field must match the '%s' field." msgstr "Este campo deve ser igual ao campo '%s'." -#: core/validators.py:254 +#: core/validators.py:257 msgid "Please enter something for at least one field." msgstr "Informe algo em pelo menos um campo." -#: core/validators.py:263 core/validators.py:274 +#: core/validators.py:266 core/validators.py:277 msgid "Please enter both fields or leave them both empty." msgstr "Informe ambos os campos ou deixe ambos vazios." -#: core/validators.py:281 +#: core/validators.py:284 #, python-format msgid "This field must be given if %(field)s is %(value)s" msgstr "Este campo deve ser informado se o campo %(field)s for %(value)s." -#: core/validators.py:293 +#: core/validators.py:296 #, python-format msgid "This field must be given if %(field)s is not %(value)s" msgstr "Este campo deve ser dado se o campo %(field)s não for %(value)s." -#: core/validators.py:312 +#: core/validators.py:315 msgid "Duplicate values are not allowed." msgstr "Valores duplicados não são permitidos." -#: core/validators.py:335 +#: core/validators.py:338 #, python-format msgid "This value must be a power of %s." msgstr "Este valor deve ser uma potência de %s." -#: core/validators.py:346 +#: core/validators.py:349 msgid "Please enter a valid decimal number." msgstr "Informe um número decimal." -#: core/validators.py:348 +#: core/validators.py:351 #, python-format msgid "Please enter a valid decimal number with at most %s total digit." msgid_plural "" @@ -919,7 +951,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: core/validators.py:351 +#: core/validators.py:354 #, python-format msgid "Please enter a valid decimal number with at most %s decimal place." msgid_plural "" @@ -927,30 +959,30 @@ msgid_plural "" msgstr[0] "Informe um número decimal com no máximo %s casa decimal." msgstr[1] "Informe um número decimal com no máximo %s casas decimais." -#: core/validators.py:361 +#: core/validators.py:364 #, python-format msgid "Make sure your uploaded file is at least %s bytes big." msgstr "Verifique se o arquivo enviado tem pelo menos %s bytes." -#: core/validators.py:362 +#: core/validators.py:365 #, python-format msgid "Make sure your uploaded file is at most %s bytes big." msgstr "Verifique se o arquivo enviado tem no máximo %s bytes." -#: core/validators.py:375 +#: core/validators.py:378 msgid "The format for this field is wrong." msgstr "O formato deste campo está errado." -#: core/validators.py:390 +#: core/validators.py:393 msgid "This field is invalid." msgstr "Este campo é inválido." -#: core/validators.py:425 +#: core/validators.py:428 #, python-format msgid "Could not retrieve anything from %s." msgstr "Não foi possível receber dados de %s." -#: core/validators.py:428 +#: core/validators.py:431 #, python-format msgid "" "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'." @@ -958,7 +990,7 @@ msgstr "" "A URL %(url)s retornou um cabeçalho '%(contenttype)s' de Content-Type " "inválido." -#: core/validators.py:461 +#: core/validators.py:464 #, python-format msgid "" "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with " @@ -967,7 +999,7 @@ msgstr "" "Por favor, feche a tag %(tag)s na linha %(line)s. (A linha começa com \"%" "(start)s\".)" -#: core/validators.py:465 +#: core/validators.py:468 #, python-format msgid "" "Some text starting on line %(line)s is not allowed in that context. (Line " @@ -976,7 +1008,7 @@ msgstr "" "Algum texto começando na linha %(line)s não é permitido no contexto. (Linha " "começa com \"%(start)s\".)" -#: core/validators.py:470 +#: core/validators.py:473 #, python-format msgid "" "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%" @@ -985,7 +1017,7 @@ msgstr "" "\"%(attr)s\" na linha %(line)s não é um atributo válido. (Linha começa com " "\"%(start)s\".)" -#: core/validators.py:475 +#: core/validators.py:478 #, python-format msgid "" "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%" @@ -994,7 +1026,7 @@ msgstr "" "\"<%(tag)s>\" na linha %(line)s é uma tag inválida. (Linha começa com \"%" "(start)s\".)" -#: core/validators.py:479 +#: core/validators.py:482 #, python-format msgid "" "A tag on line %(line)s is missing one or more required attributes. (Line " @@ -1003,7 +1035,7 @@ msgstr "" "Uma tag na linha %(line)s está não apresenta um ou mais atributos exigidos." "(Linha começa com \"%(start)s\".)" -#: core/validators.py:484 +#: core/validators.py:487 #, python-format msgid "" "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line " @@ -1023,5 +1055,8 @@ msgstr "" " Mantenha pressionado \"Control\", ou \"Command\" num Mac para selecionar " "mais de uma opção." +#~ msgid "Use an MD5 hash -- not the raw password." +#~ msgstr "Usar um código MD5 -- não o texto da senha." + #~ msgid "Click to change" #~ msgstr "Clique para alterar" diff --git a/django/conf/locale/ro/LC_MESSAGES/django.mo b/django/conf/locale/ro/LC_MESSAGES/django.mo Binary files differindex aae2763361..af6d66ae1f 100644 --- a/django/conf/locale/ro/LC_MESSAGES/django.mo +++ b/django/conf/locale/ro/LC_MESSAGES/django.mo diff --git a/django/conf/locale/ro/LC_MESSAGES/django.po b/django/conf/locale/ro/LC_MESSAGES/django.po index f8cc69a191..c35ce316dd 100644 --- a/django/conf/locale/ro/LC_MESSAGES/django.po +++ b/django/conf/locale/ro/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Django \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-15 19:40+0100\n" +"POT-Creation-Date: 2005-11-22 22:43+0100\n" "PO-Revision-Date: 2005-11-08 19:06+GMT+2\n" "Last-Translator: Tiberiu Micu <tibimicu@gmx.net>\n" "Language-Team: Romanian <ro@li.org>\n" @@ -511,6 +511,38 @@ msgstr "Noi." msgid "Dec." msgstr "Dec." +#: utils/timesince.py:12 +msgid "year" +msgid_plural "years" +msgstr[0] "" +msgstr[1] "" + +#: utils/timesince.py:13 +msgid "month" +msgid_plural "months" +msgstr[0] "" +msgstr[1] "" + +#: utils/timesince.py:14 +#, fuzzy +msgid "day" +msgid_plural "days" +msgstr[0] "Mai" +msgstr[1] "Mai" + +#: utils/timesince.py:15 +msgid "hour" +msgid_plural "hours" +msgstr[0] "" +msgstr[1] "" + +#: utils/timesince.py:16 +#, fuzzy +msgid "minute" +msgid_plural "minutes" +msgstr[0] "sit" +msgstr[1] "sit" + #: models/core.py:7 msgid "domain name" msgstr "nume domeniu" @@ -616,8 +648,8 @@ msgid "password" msgstr "parola" #: models/auth.py:37 -msgid "Use an MD5 hash -- not the raw password." -msgstr "Foloseşte un hash MD5 -- nu parola brută" +msgid "Use '[algo]$[salt]$[hexdigest]" +msgstr "" #: models/auth.py:38 msgid "staff status" @@ -663,7 +695,7 @@ msgstr "Informaţii personale" msgid "Important dates" msgstr "Date importante" -#: models/auth.py:195 +#: models/auth.py:216 msgid "Message" msgstr "Mesaj" @@ -744,75 +776,75 @@ msgstr "" msgid "Simplified Chinese" msgstr "Chineză simplificată" -#: core/validators.py:59 +#: core/validators.py:62 msgid "This value must contain only letters, numbers and underscores." msgstr "" "Această valoare trebuie să conţină numai litere, numere şi liniuţe de " "subliniere." -#: core/validators.py:63 +#: core/validators.py:66 msgid "This value must contain only letters, numbers, underscores and slashes." msgstr "" "Această valoare trebuie să conţină numai litere, numere, liniuţe de " "subliniere şi slash-uri." -#: core/validators.py:71 +#: core/validators.py:74 msgid "Uppercase letters are not allowed here." msgstr "Literele mari nu sînt permise aici." -#: core/validators.py:75 +#: core/validators.py:78 msgid "Lowercase letters are not allowed here." msgstr "Literele mici nu sînt permise aici." -#: core/validators.py:82 +#: core/validators.py:85 msgid "Enter only digits separated by commas." msgstr "Introduceţi numai numere separate de virgule." -#: core/validators.py:94 +#: core/validators.py:97 msgid "Enter valid e-mail addresses separated by commas." msgstr "Introduceţi adrese de email valide separate de virgule." -#: core/validators.py:98 +#: core/validators.py:101 msgid "Please enter a valid IP address." msgstr "Introduceţi vă rog o adresă IP validă." -#: core/validators.py:102 +#: core/validators.py:105 msgid "Empty values are not allowed here." msgstr "Valorile vide nu sînt permise aici." -#: core/validators.py:106 +#: core/validators.py:109 msgid "Non-numeric characters aren't allowed here." msgstr "Caracterele ne-numerice nu sînt permise aici." -#: core/validators.py:110 +#: core/validators.py:113 msgid "This value can't be comprised solely of digits." msgstr "Această valoare nu poate conţîne numai cifre." -#: core/validators.py:115 +#: core/validators.py:118 msgid "Enter a whole number." msgstr "Introduceţi un număr întreg." -#: core/validators.py:119 +#: core/validators.py:122 msgid "Only alphabetical characters are allowed here." msgstr "Numai caractere alfabetice sînt permise aici." -#: core/validators.py:123 +#: core/validators.py:126 msgid "Enter a valid date in YYYY-MM-DD format." msgstr "Introduceţi o dată validă in format: AAAA-LL-ZZ." -#: core/validators.py:127 +#: core/validators.py:130 msgid "Enter a valid time in HH:MM format." msgstr "Introduceţi o oră în format OO:MM." -#: core/validators.py:131 +#: core/validators.py:134 msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format." msgstr "Introduceţi o dată/oră validă în format AAAA-LL-ZZ OO:MM." -#: core/validators.py:135 +#: core/validators.py:138 msgid "Enter a valid e-mail address." msgstr "Introduceţi o adresă de email validă." -#: core/validators.py:147 +#: core/validators.py:150 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." @@ -820,27 +852,27 @@ msgstr "" "Încărcaţi o imagine validă. Fişierul încărcat nu era o imagine sau era o " "imagine coruptă." -#: core/validators.py:154 +#: core/validators.py:157 #, python-format msgid "The URL %s does not point to a valid image." msgstr "URL-ul %s nu pointează către o imagine validă." -#: core/validators.py:158 +#: core/validators.py:161 #, python-format msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid." msgstr "" "Numerele de telefon trebuie să fie in format XXX-XXX-XXXX. \"%s\" e invalid." -#: core/validators.py:166 +#: core/validators.py:169 #, python-format msgid "The URL %s does not point to a valid QuickTime video." msgstr "URL-ul %s nu pointează către o imagine video QuickTime validă." -#: core/validators.py:170 +#: core/validators.py:173 msgid "A valid URL is required." msgstr "E necesar un URL valid." -#: core/validators.py:184 +#: core/validators.py:187 #, python-format msgid "" "Valid HTML is required. Specific errors are:\n" @@ -849,70 +881,70 @@ msgstr "" "E necesar cod HTML valid. Erorile specifice sînt:\n" "%s" -#: core/validators.py:191 +#: core/validators.py:194 #, python-format msgid "Badly formed XML: %s" msgstr "Format XML invalid: %s" -#: core/validators.py:201 +#: core/validators.py:204 #, python-format msgid "Invalid URL: %s" msgstr "URL invalid: %s" -#: core/validators.py:205 core/validators.py:207 +#: core/validators.py:208 core/validators.py:210 #, python-format msgid "The URL %s is a broken link." msgstr "URL-ul %s e invalid." -#: core/validators.py:213 +#: core/validators.py:216 msgid "Enter a valid U.S. state abbreviation." msgstr "Introduceţi o abreviere validă în U.S." -#: core/validators.py:228 +#: core/validators.py:231 #, python-format msgid "Watch your mouth! The word %s is not allowed here." msgid_plural "Watch your mouth! The words %s are not allowed here." msgstr[0] "Îngrijiţi-vă limbajul! Cuvîntul %s nu este permis aici." msgstr[1] "Îngrijiţi-vă limbajul! Cuvintele %s nu sînt permise aici." -#: core/validators.py:235 +#: core/validators.py:238 #, python-format msgid "This field must match the '%s' field." msgstr "" -#: core/validators.py:254 +#: core/validators.py:257 #, fuzzy msgid "Please enter something for at least one field." msgstr "Vă rog comletaţi ambele cîmpuri sau lăsaţi-le goale pe ambele." -#: core/validators.py:263 core/validators.py:274 +#: core/validators.py:266 core/validators.py:277 msgid "Please enter both fields or leave them both empty." msgstr "Vă rog comletaţi ambele cîmpuri sau lăsaţi-le goale pe ambele." -#: core/validators.py:281 +#: core/validators.py:284 #, python-format msgid "This field must be given if %(field)s is %(value)s" msgstr "Acest cîmp e necesar dacă %(field)s este %(value)s" -#: core/validators.py:293 +#: core/validators.py:296 #, python-format msgid "This field must be given if %(field)s is not %(value)s" msgstr "Acest cîmp e necesar dacă %(field)s nu este %(value)s" -#: core/validators.py:312 +#: core/validators.py:315 msgid "Duplicate values are not allowed." msgstr "Valorile duplicate nu sînt permise." -#: core/validators.py:335 +#: core/validators.py:338 #, python-format msgid "This value must be a power of %s." msgstr "Această valoare trebuie să fie o putere a lui %s." -#: core/validators.py:346 +#: core/validators.py:349 msgid "Please enter a valid decimal number." msgstr "Vă rog introduceţi un număr zecimal valid." -#: core/validators.py:348 +#: core/validators.py:351 #, python-format msgid "Please enter a valid decimal number with at most %s total digit." msgid_plural "" @@ -920,7 +952,7 @@ msgid_plural "" msgstr[0] "Vă rog introduceţi un număr zecimal valid cu cel mult %s cifră." msgstr[1] "Vă rog introduceţi un număr zecimal valid cu cel mult %s cifre." -#: core/validators.py:351 +#: core/validators.py:354 #, python-format msgid "Please enter a valid decimal number with at most %s decimal place." msgid_plural "" @@ -928,37 +960,37 @@ msgid_plural "" msgstr[0] "Vă rog introduceţi un număr zecimal valid cu cel mult %s zecimală." msgstr[1] "Vă rog introduceţi un număr zecimal valid cu cel mult %s zecimale." -#: core/validators.py:361 +#: core/validators.py:364 #, python-format msgid "Make sure your uploaded file is at least %s bytes big." msgstr "Asigură-te că fişierul încărcact are cel puţin %s octeţi." -#: core/validators.py:362 +#: core/validators.py:365 #, python-format msgid "Make sure your uploaded file is at most %s bytes big." msgstr "Asigură-te că fişierul încărcact are cel mult %s octeţi." -#: core/validators.py:375 +#: core/validators.py:378 msgid "The format for this field is wrong." msgstr "Formatul acestui cîmp este invalid." -#: core/validators.py:390 +#: core/validators.py:393 msgid "This field is invalid." msgstr "Cîmpul este invalid." -#: core/validators.py:425 +#: core/validators.py:428 #, python-format msgid "Could not retrieve anything from %s." msgstr "Nu pot prelua nimic de la %s." -#: core/validators.py:428 +#: core/validators.py:431 #, python-format msgid "" "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'." msgstr "" "URL-ul %(url)s a returnat un header Content-Type invalid '%(contenttype)s'." -#: core/validators.py:461 +#: core/validators.py:464 #, python-format msgid "" "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with " @@ -967,7 +999,7 @@ msgstr "" "Te rog închide tagurile %(tag)s din linia %(line)s. ( Linia începe cu \"%" "(start)s\".)" -#: core/validators.py:465 +#: core/validators.py:468 #, python-format msgid "" "Some text starting on line %(line)s is not allowed in that context. (Line " @@ -976,7 +1008,7 @@ msgstr "" "Textul începînd cu linia %(line)s nu e permis în acest context. (Linia " "începînd cu \"%(start)s\".)" -#: core/validators.py:470 +#: core/validators.py:473 #, python-format msgid "" "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%" @@ -985,7 +1017,7 @@ msgstr "" "\"%(attr)s\" în linia %(line)s e un atribut invalid. (Linia începînd cu \"%" "(start)s\".)" -#: core/validators.py:475 +#: core/validators.py:478 #, python-format msgid "" "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%" @@ -994,7 +1026,7 @@ msgstr "" "\"<%(tag)s>\" în linia %(line)s este un tag invalid. (Linia începe cu \"%" "(start)s\"." -#: core/validators.py:479 +#: core/validators.py:482 #, python-format msgid "" "A tag on line %(line)s is missing one or more required attributes. (Line " @@ -1003,7 +1035,7 @@ msgstr "" "Unui tag din linia %(line)s îi lipseşte unul sau mai multe atribute. (Linia " "începe cu \"%(start)s\".)" -#: core/validators.py:484 +#: core/validators.py:487 #, python-format msgid "" "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line " @@ -1022,3 +1054,6 @@ msgid "" msgstr "" " Ţine apăsat \"Control\", sau \"Command\" pe un Mac, pentru a selecta mai " "multe." + +#~ msgid "Use an MD5 hash -- not the raw password." +#~ msgstr "Foloseşte un hash MD5 -- nu parola brută" diff --git a/django/conf/locale/ru/LC_MESSAGES/django.mo b/django/conf/locale/ru/LC_MESSAGES/django.mo Binary files differindex c98881206e..62839fd5de 100644 --- a/django/conf/locale/ru/LC_MESSAGES/django.mo +++ b/django/conf/locale/ru/LC_MESSAGES/django.mo diff --git a/django/conf/locale/ru/LC_MESSAGES/django.po b/django/conf/locale/ru/LC_MESSAGES/django.po index f0a6027636..5984d0cb50 100644 --- a/django/conf/locale/ru/LC_MESSAGES/django.po +++ b/django/conf/locale/ru/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-10 05:53-0600\n" +"POT-Creation-Date: 2005-11-22 15:44-0600\n" "PO-Revision-Date: 2005-10-05 00:00\n" "Last-Translator: Dmitry Sorokin <ds@@dial.com.ru>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -108,8 +108,8 @@ msgid "" "There's been an error. It's been reported to the site administrators via e-" "mail and should be fixed shortly. Thanks for your patience." msgstr "" -" . e-mail " -" . ." +" . e-mail " +" . ." #: contrib/admin/templates/admin/404.html:4 #: contrib/admin/templates/admin/404.html:8 @@ -310,6 +310,101 @@ msgstr " !" msgid "The %(site_name)s team" msgstr " di %(site_name)s" +#: contrib/redirects/models/redirects.py:7 +msgid "redirect from" +msgstr " " + +#: contrib/redirects/models/redirects.py:8 +msgid "" +"This should be an absolute path, excluding the domain name. Example: '/" +"events/search/'." +msgstr "" +" , . : '/events/" +"search/'." + +#: contrib/redirects/models/redirects.py:9 +msgid "redirect to" +msgstr " " + +#: contrib/redirects/models/redirects.py:10 +msgid "" +"This can be either an absolute path (as above) or a full URL starting with " +"'http://'." +msgstr "" +" , ( ) URL " +" 'http://'." + +#: contrib/redirects/models/redirects.py:12 +msgid "redirect" +msgstr "" + +#: contrib/redirects/models/redirects.py:13 +msgid "redirects" +msgstr "" + +#: contrib/flatpages/models/flatpages.py:6 +msgid "URL" +msgstr "URL" + +#: contrib/flatpages/models/flatpages.py:7 +msgid "" +"Example: '/about/contact/'. Make sure to have leading and trailing slashes." +msgstr "" +": '/about/contact/'. , ." + +#: contrib/flatpages/models/flatpages.py:8 +msgid "title" +msgstr "" + +#: contrib/flatpages/models/flatpages.py:9 +msgid "content" +msgstr "" + +#: contrib/flatpages/models/flatpages.py:10 +msgid "enable comments" +msgstr " " + +#: contrib/flatpages/models/flatpages.py:11 +msgid "template name" +msgstr " " + +#: contrib/flatpages/models/flatpages.py:12 +#, fuzzy +msgid "" +"Example: 'flatpages/contact_page'. If this isn't provided, the system will " +"use 'flatpages/default'." +msgstr "" +": 'flatfiles/contact_page'. , " +" 'flatfiles/default'." + +#: contrib/flatpages/models/flatpages.py:13 +msgid "registration required" +msgstr " " + +#: contrib/flatpages/models/flatpages.py:13 +msgid "If this is checked, only logged-in users will be able to view the page." +msgstr " , " + +#: contrib/flatpages/models/flatpages.py:17 +msgid "flat page" +msgstr " " + +#: contrib/flatpages/models/flatpages.py:18 +msgid "flat pages" +msgstr " " + +#: utils/translation.py:335 +msgid "DATE_FORMAT" +msgstr "" + +#: utils/translation.py:336 +msgid "DATETIME_FORMAT" +msgstr "" + +#: utils/translation.py:337 +msgid "TIME_FORMAT" +msgstr "" + #: utils/dates.py:6 msgid "Monday" msgstr "" @@ -414,6 +509,38 @@ msgstr "." msgid "Dec." msgstr "." +#: utils/timesince.py:12 +msgid "year" +msgid_plural "years" +msgstr[0] "" +msgstr[1] "" + +#: utils/timesince.py:13 +msgid "month" +msgid_plural "months" +msgstr[0] "" +msgstr[1] "" + +#: utils/timesince.py:14 +#, fuzzy +msgid "day" +msgid_plural "days" +msgstr[0] "" +msgstr[1] "" + +#: utils/timesince.py:15 +msgid "hour" +msgid_plural "hours" +msgstr[0] "" +msgstr[1] "" + +#: utils/timesince.py:16 +#, fuzzy +msgid "minute" +msgid_plural "minutes" +msgstr[0] "" +msgstr[1] "" + #: models/core.py:7 msgid "domain name" msgstr "" @@ -459,105 +586,23 @@ msgstr " " msgid "content types" msgstr " " -#: models/core.py:68 -msgid "redirect from" -msgstr " " - -#: models/core.py:69 -msgid "" -"This should be an absolute path, excluding the domain name. Example: '/" -"events/search/'." -msgstr "" -" , . : '/" -"events/search/'." - -#: models/core.py:70 -msgid "redirect to" -msgstr " " - -#: models/core.py:71 -msgid "" -"This can be either an absolute path (as above) or a full URL starting with " -"'http://'." -msgstr "" -" , ( ) URL " -"'http://'." - -#: models/core.py:73 -msgid "redirect" -msgstr "" - -#: models/core.py:74 -msgid "redirects" -msgstr "" - -#: models/core.py:87 -msgid "URL" -msgstr "URL" - -#: models/core.py:88 -msgid "" -"Example: '/about/contact/'. Make sure to have leading and trailing slashes." -msgstr "" -": '/about/contact/'. , ." - -#: models/core.py:89 -msgid "title" -msgstr "" - -#: models/core.py:90 -msgid "content" -msgstr "" - -#: models/core.py:91 -msgid "enable comments" -msgstr " " - -#: models/core.py:92 -msgid "template name" -msgstr " " - -#: models/core.py:93 -msgid "" -"Example: 'flatfiles/contact_page'. If this isn't provided, the system will " -"use 'flatfiles/default'." -msgstr "" -": 'flatfiles/contact_page'. , " -" 'flatfiles/default'." - -#: models/core.py:94 -msgid "registration required" -msgstr " " - -#: models/core.py:94 -msgid "If this is checked, only logged-in users will be able to view the page." -msgstr " , " - -#: models/core.py:98 -msgid "flat page" -msgstr " " - -#: models/core.py:99 -msgid "flat pages" -msgstr " " - -#: models/core.py:117 +#: models/core.py:67 msgid "session key" msgstr " " -#: models/core.py:118 +#: models/core.py:68 msgid "session data" msgstr " " -#: models/core.py:119 +#: models/core.py:69 msgid "expire date" msgstr " " -#: models/core.py:121 +#: models/core.py:71 msgid "session" msgstr "" -#: models/core.py:122 +#: models/core.py:72 msgid "sessions" msgstr "" @@ -605,8 +650,8 @@ msgid "password" msgstr ":" #: models/auth.py:37 -msgid "Use an MD5 hash -- not the raw password." -msgstr " MD5 -- ." +msgid "Use '[algo]$[salt]$[hexdigest]" +msgstr "" #: models/auth.py:38 msgid "staff status" @@ -653,7 +698,7 @@ msgstr " " msgid "Important dates" msgstr " " -#: models/auth.py:182 +#: models/auth.py:216 msgid "Message" msgstr "" @@ -670,150 +715,163 @@ msgid "Welsh" msgstr "" #: conf/global_settings.py:39 -msgid "German" +msgid "Danish" msgstr "" #: conf/global_settings.py:40 -msgid "English" +msgid "German" msgstr "" #: conf/global_settings.py:41 -msgid "Spanish" +msgid "English" msgstr "" #: conf/global_settings.py:42 -msgid "French" +msgid "Spanish" msgstr "" #: conf/global_settings.py:43 -msgid "Galician" +msgid "French" msgstr "" #: conf/global_settings.py:44 -msgid "Italian" +msgid "Galician" msgstr "" #: conf/global_settings.py:45 -msgid "Norwegian" +msgid "Icelandic" msgstr "" #: conf/global_settings.py:46 -msgid "Brazilian" +msgid "Italian" msgstr "" #: conf/global_settings.py:47 -msgid "Romanian" +msgid "Norwegian" msgstr "" #: conf/global_settings.py:48 +msgid "Brazilian" +msgstr "" + +#: conf/global_settings.py:49 +msgid "Romanian" +msgstr "" + +#: conf/global_settings.py:50 msgid "Russian" msgstr "" -#: conf/global_settings.py:49 +#: conf/global_settings.py:51 msgid "Slovak" msgstr "" -#: conf/global_settings.py:50 +#: conf/global_settings.py:52 msgid "Serbian" msgstr "" -#: conf/global_settings.py:51 +#: conf/global_settings.py:53 +msgid "Swedish" +msgstr "" + +#: conf/global_settings.py:54 msgid "Simplified Chinese" msgstr "" -#: core/validators.py:59 +#: core/validators.py:62 msgid "This value must contain only letters, numbers and underscores." msgstr " , ." -#: core/validators.py:63 +#: core/validators.py:66 #, fuzzy msgid "This value must contain only letters, numbers, underscores and slashes." msgstr " , ." -#: core/validators.py:71 +#: core/validators.py:74 msgid "Uppercase letters are not allowed here." msgstr " " -#: core/validators.py:75 +#: core/validators.py:78 msgid "Lowercase letters are not allowed here." msgstr " " -#: core/validators.py:82 +#: core/validators.py:85 msgid "Enter only digits separated by commas." msgstr " ̣ " -#: core/validators.py:94 +#: core/validators.py:97 msgid "Enter valid e-mail addresses separated by commas." msgstr " e-mail ̣ " -#: core/validators.py:98 +#: core/validators.py:101 msgid "Please enter a valid IP address." msgstr ", IP " -#: core/validators.py:102 +#: core/validators.py:105 msgid "Empty values are not allowed here." msgstr " " -#: core/validators.py:106 +#: core/validators.py:109 msgid "Non-numeric characters aren't allowed here." msgstr " " -#: core/validators.py:110 +#: core/validators.py:113 msgid "This value can't be comprised solely of digits." msgstr "" -#: core/validators.py:115 +#: core/validators.py:118 msgid "Enter a whole number." msgstr " " -#: core/validators.py:119 +#: core/validators.py:122 msgid "Only alphabetical characters are allowed here." msgstr " " -#: core/validators.py:123 +#: core/validators.py:126 msgid "Enter a valid date in YYYY-MM-DD format." msgstr " YYYY-MM-DD." -#: core/validators.py:127 +#: core/validators.py:130 msgid "Enter a valid time in HH:MM format." msgstr " HH:MM." -#: core/validators.py:131 +#: core/validators.py:134 msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format." msgstr " / YYYY-MM-DD HH:MM." -#: core/validators.py:135 +#: core/validators.py:138 #, fuzzy msgid "Enter a valid e-mail address." msgstr "E-mail :" -#: core/validators.py:147 +#: core/validators.py:150 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." -msgstr " . , , " -" ." +msgstr "" +" . , , " +" ." -#: core/validators.py:154 +#: core/validators.py:157 #, python-format msgid "The URL %s does not point to a valid image." msgstr "URL %s ." -#: core/validators.py:158 +#: core/validators.py:161 #, python-format msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid." msgstr " XXX-XXX-XXXX. \"%s\" ." -#: core/validators.py:166 +#: core/validators.py:169 #, python-format msgid "The URL %s does not point to a valid QuickTime video." msgstr "URL %s QuickTime." -#: core/validators.py:170 +#: core/validators.py:173 msgid "A valid URL is required." msgstr " URL ." -#: core/validators.py:184 +#: core/validators.py:187 #, python-format msgid "" "Valid HTML is required. Specific errors are:\n" @@ -822,152 +880,157 @@ msgstr "" " HTML . :\n" "%s" -#: core/validators.py:191 +#: core/validators.py:194 #, python-format msgid "Badly formed XML: %s" msgstr " XML: %s" -#: core/validators.py:201 +#: core/validators.py:204 #, python-format msgid "Invalid URL: %s" msgstr " URL: %s" -#: core/validators.py:203 +#: core/validators.py:208 core/validators.py:210 #, python-format msgid "The URL %s is a broken link." msgstr "URL %s ." -#: core/validators.py:209 +#: core/validators.py:216 msgid "Enter a valid U.S. state abbreviation." msgstr " ." -#: core/validators.py:224 +#: core/validators.py:231 #, python-format msgid "Watch your mouth! The word %s is not allowed here." msgid_plural "Watch your mouth! The words %s are not allowed here." msgstr[0] " ! %s ." msgstr[1] " ! %s ." -#: core/validators.py:231 +#: core/validators.py:238 #, python-format msgid "This field must match the '%s' field." msgstr " '%s' ." -#: core/validators.py:250 +#: core/validators.py:257 msgid "Please enter something for at least one field." msgstr ", ." -#: core/validators.py:259 core/validators.py:270 +#: core/validators.py:266 core/validators.py:277 msgid "Please enter both fields or leave them both empty." msgstr ", ." -#: core/validators.py:277 +#: core/validators.py:284 #, python-format msgid "This field must be given if %(field)s is %(value)s" msgstr "" -#: core/validators.py:289 +#: core/validators.py:296 #, python-format msgid "This field must be given if %(field)s is not %(value)s" msgstr "" -#: core/validators.py:308 +#: core/validators.py:315 msgid "Duplicate values are not allowed." msgstr " ." -#: core/validators.py:331 +#: core/validators.py:338 #, python-format msgid "This value must be a power of %s." msgstr "" -#: core/validators.py:342 +#: core/validators.py:349 msgid "Please enter a valid decimal number." msgstr ", ." -#: core/validators.py:344 +#: core/validators.py:351 #, python-format msgid "Please enter a valid decimal number with at most %s total digit." msgid_plural "" "Please enter a valid decimal number with at most %s total digits." -msgstr[0] ", %s." +msgstr[0] "" +", " +" %s." msgstr[1] "" -", %s." +", " +" %s." -#: core/validators.py:347 +#: core/validators.py:354 #, python-format msgid "Please enter a valid decimal number with at most %s decimal place." msgid_plural "" "Please enter a valid decimal number with at most %s decimal places." -msgstr[0] ", %s." +msgstr[0] "" +", " +" %s." msgstr[1] "" -", %s." +", " +" %s." -#: core/validators.py:357 +#: core/validators.py:364 #, python-format msgid "Make sure your uploaded file is at least %s bytes big." msgstr " , %s ." -#: core/validators.py:358 +#: core/validators.py:365 #, python-format msgid "Make sure your uploaded file is at most %s bytes big." msgstr " , %s ." -#: core/validators.py:371 +#: core/validators.py:378 msgid "The format for this field is wrong." msgstr " " -#: core/validators.py:386 +#: core/validators.py:393 msgid "This field is invalid." msgstr " ." -#: core/validators.py:421 +#: core/validators.py:428 #, python-format msgid "Could not retrieve anything from %s." msgstr " %s." -#: core/validators.py:424 +#: core/validators.py:431 #, python-format msgid "" "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'." -msgstr "" -"URL %(url) Content-Type '%(contenttype)'." +msgstr "URL %(url) Content-Type '%(contenttype)'." -#: core/validators.py:457 +#: core/validators.py:464 #, python-format msgid "" "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with " "\"%(start)s\".)" msgstr "" -#: core/validators.py:461 +#: core/validators.py:468 #, python-format msgid "" "Some text starting on line %(line)s is not allowed in that context. (Line " "starts with \"%(start)s\".)" msgstr "" -#: core/validators.py:466 +#: core/validators.py:473 #, python-format msgid "" "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%" "(start)s\".)" msgstr "" -#: core/validators.py:471 +#: core/validators.py:478 #, python-format msgid "" "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%" "(start)s\".)" msgstr "" -#: core/validators.py:475 +#: core/validators.py:482 #, python-format msgid "" "A tag on line %(line)s is missing one or more required attributes. (Line " "starts with \"%(start)s\".)" msgstr "" -#: core/validators.py:480 +#: core/validators.py:487 #, python-format msgid "" "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line " @@ -982,7 +1045,11 @@ msgstr " ID ." msgid "" " Hold down \"Control\", or \"Command\" on a Mac, to select more than one." msgstr "" -" \"Control\", \"Command\" , ." +" \"Control\", \"Command\" , " +"." + +#~ msgid "Use an MD5 hash -- not the raw password." +#~ msgstr " MD5 -- ." #~ msgid "Server error <em>(500)</em>" #~ msgstr " <em>(500)</em>" diff --git a/django/conf/locale/sk/LC_MESSAGES/django.mo b/django/conf/locale/sk/LC_MESSAGES/django.mo Binary files differindex 6157573541..7a3e315aad 100644 --- a/django/conf/locale/sk/LC_MESSAGES/django.mo +++ b/django/conf/locale/sk/LC_MESSAGES/django.mo diff --git a/django/conf/locale/sk/LC_MESSAGES/django.po b/django/conf/locale/sk/LC_MESSAGES/django.po index 19994b5570..a63c73b858 100644 --- a/django/conf/locale/sk/LC_MESSAGES/django.po +++ b/django/conf/locale/sk/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-21 12:42-0500\n" +"POT-Creation-Date: 2005-11-22 15:44-0600\n" "PO-Revision-Date: 2005-11-10 23:22-0500\n" "Last-Translator: Vladimir Labath <vlado@labath.org>\n" "Language-Team: Slovak <sk@li.org>\n" @@ -16,89 +16,6 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: contrib/redirects/models/redirects.py:7 -msgid "redirect from" -msgstr "presmerovaný z" - -#: contrib/redirects/models/redirects.py:8 -msgid "" -"This should be an absolute path, excluding the domain name. Example: '/" -"events/search/'." -msgstr "" -"Tu by sa mala použiť absolútna cesta, bez domény. Napr.: '/events/search/'." - -#: contrib/redirects/models/redirects.py:9 -msgid "redirect to" -msgstr "presmerovaný na " - -#: contrib/redirects/models/redirects.py:10 -msgid "" -"This can be either an absolute path (as above) or a full URL starting with " -"'http://'." -msgstr "" -"Tu môže byť buď absolútna cesta (ako hore) alebo plné URL začínajúce s " -"'http://'." - -#: contrib/redirects/models/redirects.py:12 -msgid "redirect" -msgstr "presmerovanie" - -#: contrib/redirects/models/redirects.py:13 -msgid "redirects" -msgstr "presmerovania" - -#: contrib/flatpages/models/flatpages.py:6 -msgid "URL" -msgstr "URL" - -#: contrib/flatpages/models/flatpages.py:7 -msgid "" -"Example: '/about/contact/'. Make sure to have leading and trailing slashes." -msgstr "" -"Príklad: '/about/contact/'. Uistite sa, že máte vložené ako úvodné tak aj " -"záverečné lomítka." - -#: contrib/flatpages/models/flatpages.py:8 -msgid "title" -msgstr "názov" - -#: contrib/flatpages/models/flatpages.py:9 -msgid "content" -msgstr "obsah" - -#: contrib/flatpages/models/flatpages.py:10 -msgid "enable comments" -msgstr "povolené komentáre" - -#: contrib/flatpages/models/flatpages.py:11 -msgid "template name" -msgstr "meno predlohy" - -#: contrib/flatpages/models/flatpages.py:12 -msgid "" -"Example: 'flatpages/contact_page'. If this isn't provided, the system will " -"use 'flatpages/default'." -msgstr "" -"Príklad: 'flatpages/contact_page'. Ak sa toto nevykonalo, systém použije " -"'flatpages/default'." - -#: contrib/flatpages/models/flatpages.py:13 -msgid "registration required" -msgstr "musíte byť zaregistrovaný" - -#: contrib/flatpages/models/flatpages.py:13 -msgid "If this is checked, only logged-in users will be able to view the page." -msgstr "" -"Ak je toto označené, potom len prihlásený užívateľ môže vidieť túto stránku." - -#: contrib/flatpages/models/flatpages.py:17 -msgid "flat page" -msgstr "plochá stránka" - -#: contrib/flatpages/models/flatpages.py:18 -msgid "flat pages" -msgstr "ploché stránky" - #: contrib/admin/models/admin.py:6 msgid "action time" msgstr "čas udalosti" @@ -393,6 +310,89 @@ msgstr "Ďakujeme, že používate naše stránky!" msgid "The %(site_name)s team" msgstr "Skupina %(site_name)s" +#: contrib/redirects/models/redirects.py:7 +msgid "redirect from" +msgstr "presmerovaný z" + +#: contrib/redirects/models/redirects.py:8 +msgid "" +"This should be an absolute path, excluding the domain name. Example: '/" +"events/search/'." +msgstr "" +"Tu by sa mala použiť absolútna cesta, bez domény. Napr.: '/events/search/'." + +#: contrib/redirects/models/redirects.py:9 +msgid "redirect to" +msgstr "presmerovaný na " + +#: contrib/redirects/models/redirects.py:10 +msgid "" +"This can be either an absolute path (as above) or a full URL starting with " +"'http://'." +msgstr "" +"Tu môže byť buď absolútna cesta (ako hore) alebo plné URL začínajúce s " +"'http://'." + +#: contrib/redirects/models/redirects.py:12 +msgid "redirect" +msgstr "presmerovanie" + +#: contrib/redirects/models/redirects.py:13 +msgid "redirects" +msgstr "presmerovania" + +#: contrib/flatpages/models/flatpages.py:6 +msgid "URL" +msgstr "URL" + +#: contrib/flatpages/models/flatpages.py:7 +msgid "" +"Example: '/about/contact/'. Make sure to have leading and trailing slashes." +msgstr "" +"Príklad: '/about/contact/'. Uistite sa, že máte vložené ako úvodné tak aj " +"záverečné lomítka." + +#: contrib/flatpages/models/flatpages.py:8 +msgid "title" +msgstr "názov" + +#: contrib/flatpages/models/flatpages.py:9 +msgid "content" +msgstr "obsah" + +#: contrib/flatpages/models/flatpages.py:10 +msgid "enable comments" +msgstr "povolené komentáre" + +#: contrib/flatpages/models/flatpages.py:11 +msgid "template name" +msgstr "meno predlohy" + +#: contrib/flatpages/models/flatpages.py:12 +msgid "" +"Example: 'flatpages/contact_page'. If this isn't provided, the system will " +"use 'flatpages/default'." +msgstr "" +"Príklad: 'flatpages/contact_page'. Ak sa toto nevykonalo, systém použije " +"'flatpages/default'." + +#: contrib/flatpages/models/flatpages.py:13 +msgid "registration required" +msgstr "musíte byť zaregistrovaný" + +#: contrib/flatpages/models/flatpages.py:13 +msgid "If this is checked, only logged-in users will be able to view the page." +msgstr "" +"Ak je toto označené, potom len prihlásený užívateľ môže vidieť túto stránku." + +#: contrib/flatpages/models/flatpages.py:17 +msgid "flat page" +msgstr "plochá stránka" + +#: contrib/flatpages/models/flatpages.py:18 +msgid "flat pages" +msgstr "ploché stránky" + #: utils/translation.py:335 msgid "DATE_FORMAT" msgstr "DATUM_FORMAT" @@ -509,6 +509,38 @@ msgstr "Nov." msgid "Dec." msgstr "Dec." +#: utils/timesince.py:12 +msgid "year" +msgid_plural "years" +msgstr[0] "" +msgstr[1] "" + +#: utils/timesince.py:13 +msgid "month" +msgid_plural "months" +msgstr[0] "" +msgstr[1] "" + +#: utils/timesince.py:14 +#, fuzzy +msgid "day" +msgid_plural "days" +msgstr[0] "Máj" +msgstr[1] "Máj" + +#: utils/timesince.py:15 +msgid "hour" +msgid_plural "hours" +msgstr[0] "" +msgstr[1] "" + +#: utils/timesince.py:16 +#, fuzzy +msgid "minute" +msgid_plural "minutes" +msgstr[0] "web" +msgstr[1] "web" + #: models/core.py:7 msgid "domain name" msgstr "meno domény" @@ -615,7 +647,7 @@ msgstr "heslo" #: models/auth.py:37 msgid "Use '[algo]$[salt]$[hexdigest]" -msgstr "Použi '[algo]$[salt]$[hexdigest]" +msgstr "Použi '[algo]$[salt]$[hexdigest]" #: models/auth.py:38 msgid "staff status" @@ -1017,4 +1049,3 @@ msgid "" msgstr "" " Podržte \"Control\", alebo \"Command\" na Mac_u, na výber viac ako jednej " "položky." - diff --git a/django/conf/locale/sr/LC_MESSAGES/django.mo b/django/conf/locale/sr/LC_MESSAGES/django.mo Binary files differindex 2d67dd5387..b2ca2bada2 100644 --- a/django/conf/locale/sr/LC_MESSAGES/django.mo +++ b/django/conf/locale/sr/LC_MESSAGES/django.mo diff --git a/django/conf/locale/sr/LC_MESSAGES/django.po b/django/conf/locale/sr/LC_MESSAGES/django.po index c1be74e4bf..7d92c304eb 100644 --- a/django/conf/locale/sr/LC_MESSAGES/django.po +++ b/django/conf/locale/sr/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Django Serbian (latin) translation v1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-15 12:40-0600\n" +"POT-Creation-Date: 2005-11-22 15:43-0600\n" "PO-Revision-Date: 2005-11-13 19:21+0100\n" "Last-Translator: Nebojša Đorđević <nesh@studioquattro.co.yu>\n" "Language-Team: Nesh <nesh@studioquatro.co.yu> & Petar <petar.maric@gmail." @@ -513,6 +513,43 @@ msgstr "Nov." msgid "Dec." msgstr "Dec." +#: utils/timesince.py:12 +msgid "year" +msgid_plural "years" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: utils/timesince.py:13 +msgid "month" +msgid_plural "months" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: utils/timesince.py:14 +#, fuzzy +msgid "day" +msgid_plural "days" +msgstr[0] "Maj" +msgstr[1] "Maj" +msgstr[2] "Maj" + +#: utils/timesince.py:15 +msgid "hour" +msgid_plural "hours" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: utils/timesince.py:16 +#, fuzzy +msgid "minute" +msgid_plural "minutes" +msgstr[0] "sajt" +msgstr[1] "sajt" +msgstr[2] "sajt" + #: models/core.py:7 msgid "domain name" msgstr "ime domena" @@ -618,8 +655,8 @@ msgid "password" msgstr "lozinka" #: models/auth.py:37 -msgid "Use an MD5 hash -- not the raw password." -msgstr "Unesite MD5 hash šifre -- ne unosite sam tekst šifre." +msgid "Use '[algo]$[salt]$[hexdigest]" +msgstr "" #: models/auth.py:38 msgid "staff status" @@ -664,7 +701,7 @@ msgstr "Lične informacije" msgid "Important dates" msgstr "Važni datumi" -#: models/auth.py:195 +#: models/auth.py:216 msgid "Message" msgstr "Poruka" @@ -746,72 +783,72 @@ msgid "Simplified Chinese" msgstr "Kineski (pojednostavljen)" # nesh: Ovo je opis za stari SlugField -#: core/validators.py:59 +#: core/validators.py:62 msgid "This value must contain only letters, numbers and underscores." msgstr "Ovo polje može sadržati samo slova, brojeve i donju crtu (_)." -#: core/validators.py:63 +#: core/validators.py:66 msgid "This value must contain only letters, numbers, underscores and slashes." msgstr "" "Ovo polje može sadržati samo slova, brojeve, donju crtu (_) i kose crte." -#: core/validators.py:71 +#: core/validators.py:74 msgid "Uppercase letters are not allowed here." msgstr "Velika slova ovde nisu dozvoljena." -#: core/validators.py:75 +#: core/validators.py:78 msgid "Lowercase letters are not allowed here." msgstr "Mala slova ovde nisu dozvoljena." -#: core/validators.py:82 +#: core/validators.py:85 msgid "Enter only digits separated by commas." msgstr "Unesite samo brojeve razdvojene zarezima." -#: core/validators.py:94 +#: core/validators.py:97 msgid "Enter valid e-mail addresses separated by commas." msgstr "Unesite ispravne e-mail adrese razdvojene zarezima." -#: core/validators.py:98 +#: core/validators.py:101 msgid "Please enter a valid IP address." msgstr "Unesite ispravnu IP adresu." -#: core/validators.py:102 +#: core/validators.py:105 msgid "Empty values are not allowed here." msgstr "Prazne vrednosti ovde nisu dozvoljene." -#: core/validators.py:106 +#: core/validators.py:109 msgid "Non-numeric characters aren't allowed here." msgstr "Ovde možete uneti samo brojeve." -#: core/validators.py:110 +#: core/validators.py:113 msgid "This value can't be comprised solely of digits." msgstr "Podatak se ne može sastojati samo od brojeva." -#: core/validators.py:115 +#: core/validators.py:118 msgid "Enter a whole number." msgstr "Unesite celi broj." -#: core/validators.py:119 +#: core/validators.py:122 msgid "Only alphabetical characters are allowed here." msgstr "Ovde možete koristiti samo slova." -#: core/validators.py:123 +#: core/validators.py:126 msgid "Enter a valid date in YYYY-MM-DD format." msgstr "Unesite ispravan datum u YYYY-MM-DD formatu." -#: core/validators.py:127 +#: core/validators.py:130 msgid "Enter a valid time in HH:MM format." msgstr "Unesite ispravno vreme u HH:MM formatu." -#: core/validators.py:131 +#: core/validators.py:134 msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format." msgstr "Unesite ispravan datum i vreme u YYYY-MM-DD HH:MM formatu." -#: core/validators.py:135 +#: core/validators.py:138 msgid "Enter a valid e-mail address." msgstr "Unesite ispravnu e-mail adresu." -#: core/validators.py:147 +#: core/validators.py:150 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." @@ -819,27 +856,27 @@ msgstr "" "Pošaljite ispravnu sliku. Fajl koji ste poslali ili nije slika ili je sam " "fajl oštećen." -#: core/validators.py:154 +#: core/validators.py:157 #, python-format msgid "The URL %s does not point to a valid image." msgstr "URL %s ne pokazuje na ispravnu sliku" # nesh: tel. brojevi su u američkom formatu, ovo se ionako neće koristiti u i18n delu -#: core/validators.py:158 +#: core/validators.py:161 #, python-format msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid." msgstr "" -#: core/validators.py:166 +#: core/validators.py:169 #, python-format msgid "The URL %s does not point to a valid QuickTime video." msgstr "URL %s ne pokazuje na ispravni QuickTime video fajl." -#: core/validators.py:170 +#: core/validators.py:173 msgid "A valid URL is required." msgstr "Unesite ispravan URL." -#: core/validators.py:184 +#: core/validators.py:187 #, python-format msgid "" "Valid HTML is required. Specific errors are:\n" @@ -848,27 +885,27 @@ msgstr "" "Unesite ispravan HTML. Greške su:\n" "%s" -#: core/validators.py:191 +#: core/validators.py:194 #, python-format msgid "Badly formed XML: %s" msgstr "Neispravan XML: %s" -#: core/validators.py:201 +#: core/validators.py:204 #, python-format msgid "Invalid URL: %s" msgstr "Neispravan URL: %s" -#: core/validators.py:205 core/validators.py:207 +#: core/validators.py:208 core/validators.py:210 #, python-format msgid "The URL %s is a broken link." msgstr "URL %s je neispravan link." # nesh: Ni ovo nije interesantno za i18n -#: core/validators.py:213 +#: core/validators.py:216 msgid "Enter a valid U.S. state abbreviation." msgstr "" -#: core/validators.py:228 +#: core/validators.py:231 #, python-format msgid "Watch your mouth! The word %s is not allowed here." msgid_plural "Watch your mouth! The words %s are not allowed here." @@ -876,43 +913,43 @@ msgstr[0] "Pripazi na jezik! %s reč nije ovde dozvoljena." msgstr[1] "Pripazi na jezik! %s reči nisu ovde dozvoljene." msgstr[2] "Pripazi na jezik! %s reči nisu ovde dozvoljene." -#: core/validators.py:235 +#: core/validators.py:238 #, python-format msgid "This field must match the '%s' field." msgstr "Ovo polje mora biti jednako sa poljem '%s'." -#: core/validators.py:254 +#: core/validators.py:257 msgid "Please enter something for at least one field." msgstr "Morate popuniti barem jedno polje." -#: core/validators.py:263 core/validators.py:274 +#: core/validators.py:266 core/validators.py:277 msgid "Please enter both fields or leave them both empty." msgstr "Popunite oba polja ili oba ostavite prazna." -#: core/validators.py:281 +#: core/validators.py:284 #, python-format msgid "This field must be given if %(field)s is %(value)s" msgstr "Ovo polje mora biti uneto ako polje %(field)s ima vrednost %(value)s" -#: core/validators.py:293 +#: core/validators.py:296 #, python-format msgid "This field must be given if %(field)s is not %(value)s" msgstr "Ovo polje mora biti uneto ako polje %(field)s nema vrednost %(value)s" -#: core/validators.py:312 +#: core/validators.py:315 msgid "Duplicate values are not allowed." msgstr "Duple vrednosti nisu dozvoljene." -#: core/validators.py:335 +#: core/validators.py:338 #, python-format msgid "This value must be a power of %s." msgstr "Vrednost mora biti stepena %s." -#: core/validators.py:346 +#: core/validators.py:349 msgid "Please enter a valid decimal number." msgstr "Unesite ispravan decimalni broj." -#: core/validators.py:348 +#: core/validators.py:351 #, python-format msgid "Please enter a valid decimal number with at most %s total digit." msgid_plural "" @@ -921,7 +958,7 @@ msgstr[0] "Unesite ispravan decimalni broj sa %s cifrom." msgstr[1] "Unesite ispravan decimalni broj sa %s cifre." msgstr[2] "Unesite ispravan decimalni broj sa %s cifara." -#: core/validators.py:351 +#: core/validators.py:354 #, python-format msgid "Please enter a valid decimal number with at most %s decimal place." msgid_plural "" @@ -930,37 +967,37 @@ msgstr[0] "Unesite decimalni broj sa najviše %s decimalnim mestom." msgstr[1] "Unesite decimalni broj sa najviše %s decimalna mesta." msgstr[2] "Unesite decimalni broj sa najviše %s decimalnih mesta." -#: core/validators.py:361 +#: core/validators.py:364 #, python-format msgid "Make sure your uploaded file is at least %s bytes big." msgstr "Veličina fajla mora biti najmanje %s bajtova." -#: core/validators.py:362 +#: core/validators.py:365 #, python-format msgid "Make sure your uploaded file is at most %s bytes big." msgstr "Veličina fajla mora biti najviše %s bajtova." -#: core/validators.py:375 +#: core/validators.py:378 msgid "The format for this field is wrong." msgstr "Pogrešan format polja." -#: core/validators.py:390 +#: core/validators.py:393 msgid "This field is invalid." msgstr "Neispravno polje." -#: core/validators.py:425 +#: core/validators.py:428 #, python-format msgid "Could not retrieve anything from %s." msgstr "Ništa nije moglo da se skine sa URL-a %s." -#: core/validators.py:428 +#: core/validators.py:431 #, python-format msgid "" "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'." msgstr "" "Sa URL-a %(url)s se vratio pogrešan Content-Type header '%(contenttype)s'." -#: core/validators.py:461 +#: core/validators.py:464 #, python-format msgid "" "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with " @@ -969,7 +1006,7 @@ msgstr "" "Zatvorite nezatvoren tag \"%(tag)s\" iz reda %(line)s. (Red počinje sa \"%" "(start)s\".)" -#: core/validators.py:465 +#: core/validators.py:468 #, python-format msgid "" "Some text starting on line %(line)s is not allowed in that context. (Line " @@ -978,7 +1015,7 @@ msgstr "" "Tekst koji počinje u redu %(line)s nije dozvoljen u ovom kontekstu. (Red " "počinje sa \"%(start)s\".)" -#: core/validators.py:470 +#: core/validators.py:473 #, python-format msgid "" "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%" @@ -987,7 +1024,7 @@ msgstr "" "Atribut \"%(attr)s\" u red %(line)s je neispravan. (Red počinje sa \"%(start)" "s\".)" -#: core/validators.py:475 +#: core/validators.py:478 #, python-format msgid "" "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%" @@ -995,7 +1032,7 @@ msgid "" msgstr "" "Tag \"<%(tag)s>\" u redu %(line)s je neispravan. (Red počinje \"%(start)s\".)" -#: core/validators.py:479 +#: core/validators.py:482 #, python-format msgid "" "A tag on line %(line)s is missing one or more required attributes. (Line " @@ -1004,7 +1041,7 @@ msgstr "" "Tag-u u redu %(line)s nedostaje jedan ili više atributa. (Red počinje sa \"%" "(start)s\".)" -#: core/validators.py:484 +#: core/validators.py:487 #, python-format msgid "" "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line " @@ -1023,3 +1060,6 @@ msgid "" msgstr "" " Koristite \"Ctrl\" (PC) ili \"Jabuku\" (Mek) da bi ste selektovali više " "stavki." + +#~ msgid "Use an MD5 hash -- not the raw password." +#~ msgstr "Unesite MD5 hash šifre -- ne unosite sam tekst šifre." diff --git a/django/conf/locale/sv/LC_MESSAGES/django.mo b/django/conf/locale/sv/LC_MESSAGES/django.mo Binary files differindex 7e5a45665b..a7399e7410 100644 --- a/django/conf/locale/sv/LC_MESSAGES/django.mo +++ b/django/conf/locale/sv/LC_MESSAGES/django.mo diff --git a/django/conf/locale/sv/LC_MESSAGES/django.po b/django/conf/locale/sv/LC_MESSAGES/django.po index 39c01c4efb..ed80a55a90 100644 --- a/django/conf/locale/sv/LC_MESSAGES/django.po +++ b/django/conf/locale/sv/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-15 12:41-0600\n" +"POT-Creation-Date: 2005-11-22 15:44-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -512,6 +512,38 @@ msgstr "nov" msgid "Dec." msgstr "dec" +#: utils/timesince.py:12 +msgid "year" +msgid_plural "years" +msgstr[0] "" +msgstr[1] "" + +#: utils/timesince.py:13 +msgid "month" +msgid_plural "months" +msgstr[0] "" +msgstr[1] "" + +#: utils/timesince.py:14 +#, fuzzy +msgid "day" +msgid_plural "days" +msgstr[0] "maj" +msgstr[1] "maj" + +#: utils/timesince.py:15 +msgid "hour" +msgid_plural "hours" +msgstr[0] "" +msgstr[1] "" + +#: utils/timesince.py:16 +#, fuzzy +msgid "minute" +msgid_plural "minutes" +msgstr[0] "sida" +msgstr[1] "sida" + #: models/core.py:7 msgid "domain name" msgstr "domännamn" @@ -617,8 +649,8 @@ msgid "password" msgstr "lösenord" #: models/auth.py:37 -msgid "Use an MD5 hash -- not the raw password." -msgstr "Använd en MD5-hash -- inte lösenordet i ren text." +msgid "Use '[algo]$[salt]$[hexdigest]" +msgstr "" #: models/auth.py:38 msgid "staff status" @@ -664,7 +696,7 @@ msgstr "Personlig information" msgid "Important dates" msgstr "Viktiga datum" -#: models/auth.py:195 +#: models/auth.py:216 msgid "Message" msgstr "Meddelande" @@ -745,72 +777,72 @@ msgstr "" msgid "Simplified Chinese" msgstr "Förenklad kinesiska" -#: core/validators.py:59 +#: core/validators.py:62 msgid "This value must contain only letters, numbers and underscores." msgstr "Det här värdet får bara innehålla bokstäver, tal och understräck." -#: core/validators.py:63 +#: core/validators.py:66 msgid "This value must contain only letters, numbers, underscores and slashes." msgstr "" "Det här värdet får bara innehålla bokstäver, tal, understräck och snedsträck" -#: core/validators.py:71 +#: core/validators.py:74 msgid "Uppercase letters are not allowed here." msgstr "Stora bokstäver är inte tillåtna här." -#: core/validators.py:75 +#: core/validators.py:78 msgid "Lowercase letters are not allowed here." msgstr "Små bokstäver är inte tillåtna här." -#: core/validators.py:82 +#: core/validators.py:85 msgid "Enter only digits separated by commas." msgstr "Fyll enbart i siffror avskillda med kommatecken." -#: core/validators.py:94 +#: core/validators.py:97 msgid "Enter valid e-mail addresses separated by commas." msgstr "Fyll i giltiga e-postadresser avskillda med kommatecken." -#: core/validators.py:98 +#: core/validators.py:101 msgid "Please enter a valid IP address." msgstr "Var god fyll i ett giltigt IP-nummer." -#: core/validators.py:102 +#: core/validators.py:105 msgid "Empty values are not allowed here." msgstr "Tomma värden är inte tillåtna här." -#: core/validators.py:106 +#: core/validators.py:109 msgid "Non-numeric characters aren't allowed here." msgstr "Icke-numeriska tecken är inte tillåtna här." -#: core/validators.py:110 +#: core/validators.py:113 msgid "This value can't be comprised solely of digits." msgstr "Det här värdet kan inte enbart bestå av siffror." -#: core/validators.py:115 +#: core/validators.py:118 msgid "Enter a whole number." msgstr "Fyll i ett heltal." -#: core/validators.py:119 +#: core/validators.py:122 msgid "Only alphabetical characters are allowed here." msgstr "Endast alfabetiska bokstäver är tillåtna här." -#: core/validators.py:123 +#: core/validators.py:126 msgid "Enter a valid date in YYYY-MM-DD format." msgstr "Fyll i ett giltigt datum i formatet ÅÅÅÅ-MM-DD." -#: core/validators.py:127 +#: core/validators.py:130 msgid "Enter a valid time in HH:MM format." msgstr "Fyll i en giltig tid i formatet TT:MM" -#: core/validators.py:131 +#: core/validators.py:134 msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format." msgstr "Fyll i en giltig tidpunkt i formatet ÅÅÅÅ-MM-DD TT:MM" -#: core/validators.py:135 +#: core/validators.py:138 msgid "Enter a valid e-mail address." msgstr "Fyll i en giltig e-postadress." -#: core/validators.py:147 +#: core/validators.py:150 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." @@ -818,28 +850,28 @@ msgstr "" "Ladda upp en giltig bild. Filen du laddade upp var antingen inte en bild, " "eller så var det en korrupt bild." -#: core/validators.py:154 +#: core/validators.py:157 #, python-format msgid "The URL %s does not point to a valid image." msgstr "Adressen %s pekar inte till en giltig bild." -#: core/validators.py:158 +#: core/validators.py:161 #, python-format msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid." msgstr "" "Telefonnummer måste vara i det amerikanska formatet XXX-XXX-XXXX. \"%s\" är " "ogiltigt." -#: core/validators.py:166 +#: core/validators.py:169 #, python-format msgid "The URL %s does not point to a valid QuickTime video." msgstr "Adressen %s pekar inte till en giltig QuickTime-video." -#: core/validators.py:170 +#: core/validators.py:173 msgid "A valid URL is required." msgstr "En giltig adress krävs." -#: core/validators.py:184 +#: core/validators.py:187 #, python-format msgid "" "Valid HTML is required. Specific errors are:\n" @@ -848,69 +880,69 @@ msgstr "" "Giltig HTML krävs. Specifika fel är:\n" "%s" -#: core/validators.py:191 +#: core/validators.py:194 #, python-format msgid "Badly formed XML: %s" msgstr "Missformad XML: %s" -#: core/validators.py:201 +#: core/validators.py:204 #, python-format msgid "Invalid URL: %s" msgstr "Felaktig adress: %s" -#: core/validators.py:205 core/validators.py:207 +#: core/validators.py:208 core/validators.py:210 #, python-format msgid "The URL %s is a broken link." msgstr "Adressen %s är en trasig länk." -#: core/validators.py:213 +#: core/validators.py:216 msgid "Enter a valid U.S. state abbreviation." msgstr "Fyll i en giltig förkortning för en amerikansk delstat" -#: core/validators.py:228 +#: core/validators.py:231 #, python-format msgid "Watch your mouth! The word %s is not allowed here." msgid_plural "Watch your mouth! The words %s are not allowed here." msgstr[0] "Håll i tungan! Ordet %s är inte tillåtet här." msgstr[1] "Håll i tungan! Orden %s är inte tillåtna här." -#: core/validators.py:235 +#: core/validators.py:238 #, python-format msgid "This field must match the '%s' field." msgstr "Det här fältet måste matcha fältet '%s'." -#: core/validators.py:254 +#: core/validators.py:257 msgid "Please enter something for at least one field." msgstr "Fyll i något i minst ett fält." -#: core/validators.py:263 core/validators.py:274 +#: core/validators.py:266 core/validators.py:277 msgid "Please enter both fields or leave them both empty." msgstr "Fyll antingen i båda fälten, eller lämna båda tomma" -#: core/validators.py:281 +#: core/validators.py:284 #, python-format msgid "This field must be given if %(field)s is %(value)s" msgstr "Det är fältet måste anges om %(field)s är %(value)s" -#: core/validators.py:293 +#: core/validators.py:296 #, python-format msgid "This field must be given if %(field)s is not %(value)s" msgstr "Det här fältet måste anges om %(field)s inte är %(value)s" -#: core/validators.py:312 +#: core/validators.py:315 msgid "Duplicate values are not allowed." msgstr "Upprepade värden är inte tillåtna." -#: core/validators.py:335 +#: core/validators.py:338 #, python-format msgid "This value must be a power of %s." msgstr "Det här värdet måste vara en multipel av %s." -#: core/validators.py:346 +#: core/validators.py:349 msgid "Please enter a valid decimal number." msgstr "Fyll i ett giltigt decimaltal." -#: core/validators.py:348 +#: core/validators.py:351 #, python-format msgid "Please enter a valid decimal number with at most %s total digit." msgid_plural "" @@ -918,7 +950,7 @@ msgid_plural "" msgstr[0] "Fyll i ett giltigt decimaltal med mindre än %s siffra totalt." msgstr[1] "Fyll i ett giltigt decimaltal med mindre än %s siffror totalt." -#: core/validators.py:351 +#: core/validators.py:354 #, python-format msgid "Please enter a valid decimal number with at most %s decimal place." msgid_plural "" @@ -926,30 +958,30 @@ msgid_plural "" msgstr[0] "Fyll i ett giltigt decimaltal med som mest %s decimalsiffra." msgstr[1] "Fyll i ett giltigt decimaltal med som mest %s decimalsiffror." -#: core/validators.py:361 +#: core/validators.py:364 #, python-format msgid "Make sure your uploaded file is at least %s bytes big." msgstr "Se till att filen du laddade upp är minst %s bytes stor." -#: core/validators.py:362 +#: core/validators.py:365 #, python-format msgid "Make sure your uploaded file is at most %s bytes big." msgstr "Se till att filen du laddade upp är max %s bytes stor." -#: core/validators.py:375 +#: core/validators.py:378 msgid "The format for this field is wrong." msgstr "Formatet på det här fältet är fel." -#: core/validators.py:390 +#: core/validators.py:393 msgid "This field is invalid." msgstr "Det här fältet är ogiltigt." -#: core/validators.py:425 +#: core/validators.py:428 #, python-format msgid "Could not retrieve anything from %s." msgstr "Kunde inte hämta något från %s." -#: core/validators.py:428 +#: core/validators.py:431 #, python-format msgid "" "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'." @@ -957,7 +989,7 @@ msgstr "" "Adressen %(url)s returnerade det ogiltiga innehållstyphuvudet (Content-Type " "header) '%(contenttype)s'" -#: core/validators.py:461 +#: core/validators.py:464 #, python-format msgid "" "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with " @@ -966,7 +998,7 @@ msgstr "" "Var god avsluta den oavslutade taggen %(tag)s på rad %(line)s. (Raden börjar " "med \"%(start)s\".)" -#: core/validators.py:465 +#: core/validators.py:468 #, python-format msgid "" "Some text starting on line %(line)s is not allowed in that context. (Line " @@ -975,7 +1007,7 @@ msgstr "" "En del text från rad %(line)s är inte tillåtet i det sammanhanget. (Raden " "börjar med \"%(start)s\".)" -#: core/validators.py:470 +#: core/validators.py:473 #, python-format msgid "" "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%" @@ -984,7 +1016,7 @@ msgstr "" "\"%(attr)s\" på rad %(line)s är inte ett gilltigt attribut. (Raden startar " "med \"%(start)s\".)" -#: core/validators.py:475 +#: core/validators.py:478 #, python-format msgid "" "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%" @@ -993,7 +1025,7 @@ msgstr "" "\"<%(tag)s>\" på rad %(line)s är inte en giltig tagg. (Raden börjar med \"%" "(start)s\".)" -#: core/validators.py:479 +#: core/validators.py:482 #, python-format msgid "" "A tag on line %(line)s is missing one or more required attributes. (Line " @@ -1002,7 +1034,7 @@ msgstr "" "En tagg på rad %(line)s saknar en eller flera nödvändiga attribut. (Raden " "börjar med \"%(start)s\".)" -#: core/validators.py:484 +#: core/validators.py:487 #, python-format msgid "" "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line " @@ -1020,3 +1052,6 @@ msgid "" " Hold down \"Control\", or \"Command\" on a Mac, to select more than one." msgstr "" " Håll ner \"Control\", eller \"Command\" på en Mac, för att välja mer än en." + +#~ msgid "Use an MD5 hash -- not the raw password." +#~ msgstr "Använd en MD5-hash -- inte lösenordet i ren text." diff --git a/django/conf/locale/zh_CN/LC_MESSAGES/django.mo b/django/conf/locale/zh_CN/LC_MESSAGES/django.mo Binary files differindex c1ca2f9f73..326e0f8381 100644 --- a/django/conf/locale/zh_CN/LC_MESSAGES/django.mo +++ b/django/conf/locale/zh_CN/LC_MESSAGES/django.mo diff --git a/django/conf/locale/zh_CN/LC_MESSAGES/django.po b/django/conf/locale/zh_CN/LC_MESSAGES/django.po index 07796991e9..8fd7cd7a0e 100644 --- a/django/conf/locale/zh_CN/LC_MESSAGES/django.po +++ b/django/conf/locale/zh_CN/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: django v1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-15 12:40-0600\n" +"POT-Creation-Date: 2005-11-22 15:43-0600\n" "PO-Revision-Date: 2005-11-16 12:55+0800\n" "Last-Translator: limodou <limodou@gmail.com>\n" "Language-Team: Simplified Chinese <limodou@gmail.com>\n" @@ -66,8 +66,7 @@ msgstr "历史" msgid "Date/time" msgstr "日期/时间" -#: contrib/admin/templates/admin/object_history.html:19 -#: models/auth.py:47 +#: contrib/admin/templates/admin/object_history.html:19 models/auth.py:47 msgid "User" msgstr "用户" @@ -80,7 +79,9 @@ msgid "DATE_WITH_TIME_FULL" msgstr "N j, Y, P" #: contrib/admin/templates/admin/object_history.html:36 -msgid "This object doesn't have a change history. It probably wasn't added via this admin site." +msgid "" +"This object doesn't have a change history. It probably wasn't added via this " +"admin site." msgstr "此对象没有修改历史。可能不能通过这个管理站点来增加。" #: contrib/admin/templates/admin/base_site.html:4 @@ -104,8 +105,12 @@ msgid "Server Error <em>(500)</em>" msgstr "服务器错误 <em>(500)</em>" #: contrib/admin/templates/admin/500.html:10 -msgid "There's been an error. It's been reported to the site administrators via e-mail and should be fixed shortly. Thanks for your patience." -msgstr "存在一个错误。它已经通过电子邮件被报告给站点管理员了，并且应该很快被改正。谢谢你的关心。" +msgid "" +"There's been an error. It's been reported to the site administrators via e-" +"mail and should be fixed shortly. Thanks for your patience." +msgstr "" +"存在一个错误。它已经通过电子邮件被报告给站点管理员了，并且应该很快被改正。谢" +"谢你的关心。" #: contrib/admin/templates/admin/404.html:4 #: contrib/admin/templates/admin/404.html:8 @@ -170,13 +175,21 @@ msgstr "注销" #: contrib/admin/templates/admin/delete_confirmation.html:7 #, python-format -msgid "Deleting the %(object_name)s '%(object)s' would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:" -msgstr "删除 %(object_name)s '%(object)s' 会导致删除相关的对象，但你的帐号无权删除下列类型的对象：" +msgid "" +"Deleting the %(object_name)s '%(object)s' would result in deleting related " +"objects, but your account doesn't have permission to delete the following " +"types of objects:" +msgstr "" +"删除 %(object_name)s '%(object)s' 会导致删除相关的对象，但你的帐号无权删除下" +"列类型的对象：" #: contrib/admin/templates/admin/delete_confirmation.html:14 #, python-format -msgid "Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of the following related items will be deleted:" -msgstr "你确信相要删除 %(object_name)s \"%(object)s\"？所有相关的项目都将被删除：" +msgid "" +"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of " +"the following related items will be deleted:" +msgstr "" +"你确信相要删除 %(object_name)s \"%(object)s\"？所有相关的项目都将被删除：" #: contrib/admin/templates/admin/delete_confirmation.html:18 msgid "Yes, I'm sure" @@ -205,8 +218,12 @@ msgid "Password reset" msgstr "口令重设" #: contrib/admin/templates/registration/password_reset_form.html:12 -msgid "Forgotten your password? Enter your e-mail address below, and we'll reset your password and e-mail the new one to you." -msgstr "忘记你的口令？在下面输入你的邮箱地址，我们将重设你的口令并且将新的口令通过邮件发送给你。" +msgid "" +"Forgotten your password? Enter your e-mail address below, and we'll reset " +"your password and e-mail the new one to you." +msgstr "" +"忘记你的口令？在下面输入你的邮箱地址，我们将重设你的口令并且将新的口令通过邮" +"件发送给你。" #: contrib/admin/templates/registration/password_reset_form.html:16 msgid "E-mail address:" @@ -230,12 +247,19 @@ msgid "Password reset successful" msgstr "口令重设成功" #: contrib/admin/templates/registration/password_reset_done.html:12 -msgid "We've e-mailed a new password to the e-mail address you submitted. You should be receiving it shortly." -msgstr "我们已经按你所提交的邮箱地址发送了一个新的口令给你。你应该很会收到这封邮件。" +msgid "" +"We've e-mailed a new password to the e-mail address you submitted. You " +"should be receiving it shortly." +msgstr "" +"我们已经按你所提交的邮箱地址发送了一个新的口令给你。你应该很会收到这封邮件。" #: contrib/admin/templates/registration/password_change_form.html:12 -msgid "Please enter your old password, for security's sake, and then enter your new password twice so we can verify you typed it in correctly." -msgstr "请输入你的旧口令，为了安全起见，接着要输入你的新口令两遍，这样我们可以校验你输入的是否正确。" +msgid "" +"Please enter your old password, for security's sake, and then enter your new " +"password twice so we can verify you typed it in correctly." +msgstr "" +"请输入你的旧口令，为了安全起见，接着要输入你的新口令两遍，这样我们可以校验你" +"输入的是否正确。" #: contrib/admin/templates/registration/password_change_form.html:17 msgid "Old password:" @@ -289,7 +313,9 @@ msgid "redirect from" msgstr "重定向自" #: contrib/redirects/models/redirects.py:8 -msgid "This should be an absolute path, excluding the domain name. Example: '/events/search/'." +msgid "" +"This should be an absolute path, excluding the domain name. Example: '/" +"events/search/'." msgstr "应该是一个绝对路径，不包括域名。例如：'/events/search/'。" #: contrib/redirects/models/redirects.py:9 @@ -297,7 +323,9 @@ msgid "redirect to" msgstr "重定向到" #: contrib/redirects/models/redirects.py:10 -msgid "This can be either an absolute path (as above) or a full URL starting with 'http://'." +msgid "" +"This can be either an absolute path (as above) or a full URL starting with " +"'http://'." msgstr "可以是绝对路径(同上)或以'http://'开始的全URL。" #: contrib/redirects/models/redirects.py:12 @@ -313,7 +341,8 @@ msgid "URL" msgstr "" #: contrib/flatpages/models/flatpages.py:7 -msgid "Example: '/about/contact/'. Make sure to have leading and trailing slashes." +msgid "" +"Example: '/about/contact/'. Make sure to have leading and trailing slashes." msgstr "例如：'/about/contact/'。请确保前导和结尾的除号。" #: contrib/flatpages/models/flatpages.py:8 @@ -333,8 +362,11 @@ msgid "template name" msgstr "模板名称" #: contrib/flatpages/models/flatpages.py:12 -msgid "Example: 'flatpages/contact_page'. If this isn't provided, the system will use 'flatpages/default'." -msgstr "例如：'flatfiles/contact_page'。如果未提供，系统将使用'flatfiles/default'。" +msgid "" +"Example: 'flatpages/contact_page'. If this isn't provided, the system will " +"use 'flatpages/default'." +msgstr "" +"例如：'flatfiles/contact_page'。如果未提供，系统将使用'flatfiles/default'。" #: contrib/flatpages/models/flatpages.py:13 msgid "registration required" @@ -400,28 +432,23 @@ msgstr "一月" msgid "February" msgstr "二月" -#: utils/dates.py:14 -#: utils/dates.py:27 +#: utils/dates.py:14 utils/dates.py:27 msgid "March" msgstr "三月" -#: utils/dates.py:14 -#: utils/dates.py:27 +#: utils/dates.py:14 utils/dates.py:27 msgid "April" msgstr "四月" -#: utils/dates.py:14 -#: utils/dates.py:27 +#: utils/dates.py:14 utils/dates.py:27 msgid "May" msgstr "五月" -#: utils/dates.py:14 -#: utils/dates.py:27 +#: utils/dates.py:14 utils/dates.py:27 msgid "June" msgstr "六月" -#: utils/dates.py:15 -#: utils/dates.py:27 +#: utils/dates.py:15 utils/dates.py:27 msgid "July" msgstr "七月" @@ -473,6 +500,33 @@ msgstr "十一月" msgid "Dec." msgstr "十二月" +#: utils/timesince.py:12 +msgid "year" +msgid_plural "years" +msgstr[0] "" + +#: utils/timesince.py:13 +msgid "month" +msgid_plural "months" +msgstr[0] "" + +#: utils/timesince.py:14 +#, fuzzy +msgid "day" +msgid_plural "days" +msgstr[0] "五月" + +#: utils/timesince.py:15 +msgid "hour" +msgid_plural "hours" +msgstr[0] "" + +#: utils/timesince.py:16 +#, fuzzy +msgid "minute" +msgid_plural "minutes" +msgstr[0] "站点" + #: models/core.py:7 msgid "domain name" msgstr "域名" @@ -493,10 +547,7 @@ msgstr "站点" msgid "label" msgstr "标签" -#: models/core.py:29 -#: models/core.py:40 -#: models/auth.py:6 -#: models/auth.py:19 +#: models/core.py:29 models/core.py:40 models/auth.py:6 models/auth.py:19 msgid "name" msgstr "名称" @@ -548,8 +599,7 @@ msgstr "代码名称" msgid "Permission" msgstr "许可" -#: models/auth.py:11 -#: models/auth.py:58 +#: models/auth.py:11 models/auth.py:58 msgid "Permissions" msgstr "许可" @@ -557,8 +607,7 @@ msgstr "许可" msgid "Group" msgstr "组" -#: models/auth.py:23 -#: models/auth.py:60 +#: models/auth.py:23 models/auth.py:60 msgid "Groups" msgstr "组" @@ -583,8 +632,8 @@ msgid "password" msgstr "口令" #: models/auth.py:37 -msgid "Use an MD5 hash -- not the raw password." -msgstr "使用MD5的哈希值 -- 不是原始的口令。" +msgid "Use '[algo]$[salt]$[hexdigest]" +msgstr "" #: models/auth.py:38 msgid "staff status" @@ -611,8 +660,11 @@ msgid "date joined" msgstr "加入日期" #: models/auth.py:44 -msgid "In addition to the permissions manually assigned, this user will also get all permissions granted to each group he/she is in." -msgstr "除了手动设置权限以外，用户也会从他(她)所在的小组获得所赋组小组的所有权限。" +msgid "" +"In addition to the permissions manually assigned, this user will also get " +"all permissions granted to each group he/she is in." +msgstr "" +"除了手动设置权限以外，用户也会从他(她)所在的小组获得所赋组小组的所有权限。" #: models/auth.py:48 msgid "Users" @@ -626,7 +678,7 @@ msgstr "个人信息" msgid "Important dates" msgstr "重要日期" -#: models/auth.py:195 +#: models/auth.py:216 msgid "Message" msgstr "消息" @@ -706,94 +758,96 @@ msgstr "瑞典语" msgid "Simplified Chinese" msgstr "简体中文" -#: core/validators.py:59 +#: core/validators.py:62 msgid "This value must contain only letters, numbers and underscores." msgstr "此值只能包含字母、数字和下划线。" -#: core/validators.py:63 +#: core/validators.py:66 msgid "This value must contain only letters, numbers, underscores and slashes." msgstr "此值只能包含字母、数字、下划线和斜线。" -#: core/validators.py:71 +#: core/validators.py:74 msgid "Uppercase letters are not allowed here." msgstr "这里不允许大写字母。" -#: core/validators.py:75 +#: core/validators.py:78 msgid "Lowercase letters are not allowed here." msgstr "这里不允许小写字母。" -#: core/validators.py:82 +#: core/validators.py:85 msgid "Enter only digits separated by commas." msgstr "只能输入用逗号分隔的数字。" -#: core/validators.py:94 +#: core/validators.py:97 msgid "Enter valid e-mail addresses separated by commas." msgstr "输入用逗号分隔的有效邮件地址。" -#: core/validators.py:98 +#: core/validators.py:101 msgid "Please enter a valid IP address." msgstr "请输入一个有效的IP地址。" -#: core/validators.py:102 +#: core/validators.py:105 msgid "Empty values are not allowed here." msgstr "这里不允许输入空值。" -#: core/validators.py:106 +#: core/validators.py:109 msgid "Non-numeric characters aren't allowed here." msgstr "这里不允许非数字字符。" -#: core/validators.py:110 +#: core/validators.py:113 msgid "This value can't be comprised solely of digits." msgstr "此值不能全部由数字组成。" -#: core/validators.py:115 +#: core/validators.py:118 msgid "Enter a whole number." msgstr "输入整数。" -#: core/validators.py:119 +#: core/validators.py:122 msgid "Only alphabetical characters are allowed here." msgstr "这里只允许字母。" -#: core/validators.py:123 +#: core/validators.py:126 msgid "Enter a valid date in YYYY-MM-DD format." msgstr "输入一个 YYYY-MM-DD 格式的有效日期。" -#: core/validators.py:127 +#: core/validators.py:130 msgid "Enter a valid time in HH:MM format." msgstr "输入一个 HH:MM 格式的有效时间。" -#: core/validators.py:131 +#: core/validators.py:134 msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format." msgstr "输入一个 YYYY-MM-DD HH:MM 格式的有效日期/时间。" -#: core/validators.py:135 +#: core/validators.py:138 msgid "Enter a valid e-mail address." msgstr "输入一个有效的邮件地址。" -#: core/validators.py:147 -msgid "Upload a valid image. The file you uploaded was either not an image or a corrupted image." +#: core/validators.py:150 +msgid "" +"Upload a valid image. The file you uploaded was either not an image or a " +"corrupted image." msgstr "上传一个有效的图片。您所上传的文件或者不是图片或是一个破坏的图片。" -#: core/validators.py:154 +#: core/validators.py:157 #, python-format msgid "The URL %s does not point to a valid image." msgstr "URL %s 指向的不是一个有效的图片。" -#: core/validators.py:158 +#: core/validators.py:161 #, python-format msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid." msgstr "电话号码必须为 XXX-XXX-XXXX 格式。\"%s\"是无效的。" -#: core/validators.py:166 +#: core/validators.py:169 #, python-format msgid "The URL %s does not point to a valid QuickTime video." msgstr "URL %s 指向的不是一个有效的 QuickTime 视频。" -#: core/validators.py:170 +#: core/validators.py:173 msgid "A valid URL is required." msgstr "需要是一个有效的URL。" -#: core/validators.py:184 +#: core/validators.py:187 #, python-format msgid "" "Valid HTML is required. Specific errors are:\n" @@ -802,144 +856,166 @@ msgstr "" "需要有效的HTML。详细的错误是：\n" "%s" -#: core/validators.py:191 +#: core/validators.py:194 #, python-format msgid "Badly formed XML: %s" msgstr "格式错误的 XML: %s" -#: core/validators.py:201 +#: core/validators.py:204 #, python-format msgid "Invalid URL: %s" msgstr "无效 URL: %s" -#: core/validators.py:205 -#: core/validators.py:207 +#: core/validators.py:208 core/validators.py:210 #, python-format msgid "The URL %s is a broken link." msgstr "URL %s 是一个断开的链接。" -#: core/validators.py:213 +#: core/validators.py:216 msgid "Enter a valid U.S. state abbreviation." msgstr "输入一个有效的 U.S. 州缩写。" -#: core/validators.py:228 +#: core/validators.py:231 #, python-format msgid "Watch your mouth! The word %s is not allowed here." msgid_plural "Watch your mouth! The words %s are not allowed here." msgstr[0] "看住你的嘴！%s 不允许在这里出现。" -#: core/validators.py:235 +#: core/validators.py:238 #, python-format msgid "This field must match the '%s' field." msgstr "这个字段必须与 '%s' 字段相匹配。" -#: core/validators.py:254 +#: core/validators.py:257 msgid "Please enter something for at least one field." msgstr "请至少在一个字段上输入些什么。" -#: core/validators.py:263 -#: core/validators.py:274 +#: core/validators.py:266 core/validators.py:277 msgid "Please enter both fields or leave them both empty." msgstr "请要么两个字段都输入或者两个字段都空着。" -#: core/validators.py:281 +#: core/validators.py:284 #, python-format msgid "This field must be given if %(field)s is %(value)s" msgstr "如果 %(field)s 是 %(value)s 时这个字段必须给出" -#: core/validators.py:293 +#: core/validators.py:296 #, python-format msgid "This field must be given if %(field)s is not %(value)s" msgstr "如果 %(field)s 不是 %(value)s 时这个字段必须给出" -#: core/validators.py:312 +#: core/validators.py:315 msgid "Duplicate values are not allowed." msgstr "重复值不允许。" -#: core/validators.py:335 +#: core/validators.py:338 #, python-format msgid "This value must be a power of %s." msgstr "这个值必须是 %s 的乘方。" -#: core/validators.py:346 +#: core/validators.py:349 msgid "Please enter a valid decimal number." msgstr "请输入一个有效的小数。" -#: core/validators.py:348 +#: core/validators.py:351 #, python-format msgid "Please enter a valid decimal number with at most %s total digit." -msgid_plural "Please enter a valid decimal number with at most %s total digits." +msgid_plural "" +"Please enter a valid decimal number with at most %s total digits." msgstr[0] "请输入一个有效的小数，最多 %s 个数字。 " -#: core/validators.py:351 +#: core/validators.py:354 #, python-format msgid "Please enter a valid decimal number with at most %s decimal place." -msgid_plural "Please enter a valid decimal number with at most %s decimal places." +msgid_plural "" +"Please enter a valid decimal number with at most %s decimal places." msgstr[0] "请输入一个有效的小数，最多 %s 个小数位。 " -#: core/validators.py:361 +#: core/validators.py:364 #, python-format msgid "Make sure your uploaded file is at least %s bytes big." msgstr "请确保你上传的文件至少 %s 字节大。" -#: core/validators.py:362 +#: core/validators.py:365 #, python-format msgid "Make sure your uploaded file is at most %s bytes big." msgstr "请确保你上传的文件至多 %s 字节大。" -#: core/validators.py:375 +#: core/validators.py:378 msgid "The format for this field is wrong." msgstr "这个字段的格式不正确。" -#: core/validators.py:390 +#: core/validators.py:393 msgid "This field is invalid." msgstr "这个字段无效。" -#: core/validators.py:425 +#: core/validators.py:428 #, python-format msgid "Could not retrieve anything from %s." msgstr "不能从 %s 得到任何东西。" -#: core/validators.py:428 +#: core/validators.py:431 #, python-format -msgid "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'." +msgid "" +"The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'." msgstr "URL %(url)s 返回了无效的 Content-Type 头 '%(contenttype)s'。" -#: core/validators.py:461 +#: core/validators.py:464 #, python-format -msgid "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with \"%(start)s\".)" -msgstr "请关闭未关闭的 %(tag)s 标签从第 %(line)s 行。(行开始于 \"%(start)s\"。)" +msgid "" +"Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with " +"\"%(start)s\".)" +msgstr "" +"请关闭未关闭的 %(tag)s 标签从第 %(line)s 行。(行开始于 \"%(start)s\"。)" -#: core/validators.py:465 +#: core/validators.py:468 #, python-format -msgid "Some text starting on line %(line)s is not allowed in that context. (Line starts with \"%(start)s\".)" -msgstr "在 %(line)s 行开始的一些文本不允许在那个上下文中。(行开始于 \"%(start)s\"。)" +msgid "" +"Some text starting on line %(line)s is not allowed in that context. (Line " +"starts with \"%(start)s\".)" +msgstr "" +"在 %(line)s 行开始的一些文本不允许在那个上下文中。(行开始于 \"%(start)s\"。)" -#: core/validators.py:470 +#: core/validators.py:473 #, python-format -msgid "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%(start)s\".)" -msgstr "在 %(line)s 行的\"%(attr)s\"不是一个有效的属性。(行开始于 \"%(start)s\"。)" +msgid "" +"\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%" +"(start)s\".)" +msgstr "" +"在 %(line)s 行的\"%(attr)s\"不是一个有效的属性。(行开始于 \"%(start)s\"。)" -#: core/validators.py:475 +#: core/validators.py:478 #, python-format -msgid "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%(start)s\".)" -msgstr "在 %(line)s 行的\"<%(tag)s>\"不是一个有效的标签。(行开始于 \"%(start)s\"。)" +msgid "" +"\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%" +"(start)s\".)" +msgstr "" +"在 %(line)s 行的\"<%(tag)s>\"不是一个有效的标签。(行开始于 \"%(start)s\"。)" -#: core/validators.py:479 +#: core/validators.py:482 #, python-format -msgid "A tag on line %(line)s is missing one or more required attributes. (Line starts with \"%(start)s\".)" -msgstr "在行 %(line)s 的标签少了一个或多个必须的属性。(行开始于 \"%(start)s\"。)" +msgid "" +"A tag on line %(line)s is missing one or more required attributes. (Line " +"starts with \"%(start)s\".)" +msgstr "" +"在行 %(line)s 的标签少了一个或多个必须的属性。(行开始于 \"%(start)s\"。)" -#: core/validators.py:484 +#: core/validators.py:487 #, python-format -msgid "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line starts with \"%(start)s\".)" -msgstr "在行 %(line)s 的\"%(attr)s\"属性有一个无效的值。(行开始于 \"%(start)s\"。)" +msgid "" +"The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line " +"starts with \"%(start)s\".)" +msgstr "" +"在行 %(line)s 的\"%(attr)s\"属性有一个无效的值。(行开始于 \"%(start)s\"。)" #: core/meta/fields.py:111 msgid " Separate multiple IDs with commas." msgstr " 用逗号分隔多个ID。" #: core/meta/fields.py:114 -msgid " Hold down \"Control\", or \"Command\" on a Mac, to select more than one." +msgid "" +" Hold down \"Control\", or \"Command\" on a Mac, to select more than one." msgstr " 按下 \"Control\"，或者在Mac上按 \"Command\" 来选择一个或多个值。" +#~ msgid "Use an MD5 hash -- not the raw password." +#~ msgstr "使用MD5的哈希值 -- 不是原始的口令。" diff --git a/django/utils/timesince.py b/django/utils/timesince.py index 5b22fde58c..b1df997e2e 100644 --- a/django/utils/timesince.py +++ b/django/utils/timesince.py @@ -1,5 +1,6 @@ -import datetime, math, time +import datetime, time from django.utils.tzinfo import LocalTimezone +from django.utils.translation import ngettext def timesince(d, now=None): """ @@ -8,11 +9,11 @@ def timesince(d, now=None): Adapted from http://blog.natbat.co.uk/archive/2003/Jun/14/time_since """ chunks = ( - (60 * 60 * 24 * 365, 'year'), - (60 * 60 * 24 * 30, 'month'), - (60 * 60 * 24, 'day'), - (60 * 60, 'hour'), - (60, 'minute') + (60 * 60 * 24 * 365, lambda n: ngettext('year', 'years', n)), + (60 * 60 * 24 * 30, lambda n: ngettext('month', 'months', n)), + (60 * 60 * 24, lambda n : ngettext('day', 'days', n)), + (60 * 60, lambda n: ngettext('hour', 'hours', n)), + (60, lambda n: ngettext('minute', 'minutes', n)) ) if now: t = time.mktime(now) @@ -25,24 +26,17 @@ def timesince(d, now=None): now = datetime.datetime(t[0], t[1], t[2], t[3], t[4], t[5], tzinfo=tz) delta = now - d since = delta.days * 24 * 60 * 60 + delta.seconds - # Crazy iteration syntax because we need i to be current index - for i, (seconds, name) in zip(range(len(chunks)), chunks): - count = math.floor(since / seconds) + for i, (seconds, name) in enumerate(chunks): + count = since / seconds if count != 0: break - if count == 1: - s = '1 %s' % name - else: - s = '%d %ss' % (count, name) + s = '%d %s' % (count, name(count)) if i + 1 < len(chunks): # Now get the second item seconds2, name2 = chunks[i + 1] - count2 = math.floor((since - (seconds * count)) / seconds2) + count2 = (since - (seconds * count)) / seconds2 if count2 != 0: - if count2 == 1: - s += ', 1 %s' % name2 - else: - s += ', %d %ss' % (count2, name2) + s += ', %d %s' % (count2, name2(count2)) return s def timeuntil(d): |