Changeset 2696

Timestamp:

04/13/06 08:17:05 (3 years ago)

Author:

adrian

Message:

magic-removal: Merged to [2695]

Files:

• django/branches/magic-removal/django/conf/locale/sk/LC_MESSAGES/django.mo (modified) (previous)
• django/branches/magic-removal/django/conf/locale/sk/LC_MESSAGES/django.po (modified) (24 diffs)
• django/branches/magic-removal/docs/model-api.txt (modified) (1 diff)
• django/branches/magic-removal/tests/othertests/markup.py (modified) (1 diff)

django/branches/magic-removal/django/conf/locale/sk/LC_MESSAGES/django.po

@@ -9 +9 @@
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-2-02 06:36
+3-21 09:01
-"PO-Revision-Date: 2005-11-10 23:22-0500\n"
-"Last-Translator: Vladimir Labath <vlado@labath.org>\n"
@@ -108 +108 @@
-msgstr "je zveréjnený"
-
-6
+7
-msgid "IP address"
-msgstr "IP adresa"
@@ -385 +385 @@
-msgstr "Pošli foto"
-
-7
+8
-msgid "URL"
-msgstr "URL"
@@ -511 +511 @@
-msgstr "záznamy priebehu"
-
-1
+0
-msgid "All dates"
-msgstr "Všetky dátumy"
@@ -653 +653 @@
-msgstr "Zmena histórie:"
-
-4 contrib/admin/views/doc.py:253
-5 contrib/admin/views/doc.py:261
-2 contrib/admin/views/doc.py:264
+5 contrib/admin/views/doc.py:254
+6 contrib/admin/views/doc.py:262
+3 contrib/admin/views/doc.py:265
-msgid "Integer"
-msgstr "Celočíselná hodnota"
-
-5
+6
-msgid "Boolean (Either True or False)"
-msgstr "Logická hodnota (buď True alebo False)"
-
-6
+7 contrib/admin/views/doc.py:264
-#, python-format
-msgid "String (up to %(maxlength)s)"
-msgstr "Dĺžka reťazca (maximálne do %(maxlength)s)"
-
-7
+8
-msgid "Comma-separated integers"
-msgstr "Čiarka oddeľuje celé čísla"
-
-8
+9
-msgid "Date (without time)"
-msgstr "Dátum (bez času)"
-
-49
+50
-msgid "Date (with time)"
-msgstr "Dátum ( a čas)"
-
-0
+1
-msgid "E-mail address"
-msgstr "E-mailová adresa"
-
-1 contrib/admin/views/doc.py:254
+2 contrib/admin/views/doc.py:255
-msgid "File path"
-msgstr "Cesta k súboru"
-
-2
+3
-msgid "Decimal number"
-msgstr "Desiatkové číslo"
-
-8
+9
-msgid "Boolean (Either True, False or None)"
-msgstr "Logická hodnota (buď True, False alebo None)"
-
-59
+60
-msgid "Relation to parent model"
-msgstr "Má vzťah na rodičovský model"
-
-0
+1
-msgid "Phone number"
-msgstr "Číslo telefónu"
-
-
-
-
-
-
+
-msgid "Text"
-msgstr "Text"
-
-6
+7
-msgid "Time"
-msgstr "Čas"
-
-8
+9
-msgid "U.S. state (two uppercase letters)"
-msgstr "U.S. štát (dve veľké písmena)"
-
-69
+70
-msgid "XML text"
-msgstr "XML text"
@@ -728 +724 @@
-msgstr "Aktuálny:"
-
-
+
+
+
+
+
-msgid "Change:"
-msgstr "Zmeň:"
@@ -1465 +1465 @@
-
-#: conf/global_settings.py:42
+msgid "Greek"
+msgstr ""
+
+#: conf/global_settings.py:43
-msgid "English"
-msgstr "Anglický"
-
-3
+4
-msgid "Spanish"
-msgstr "Španielsky"
-
-4
+5
-msgid "French"
-msgstr "Francúzsky"
-
-5
+6
-msgid "Galician"
-msgstr "Galicijský"
-
-6
+7
-msgid "Icelandic"
-msgstr "Islandský"
-
-7
+8
-msgid "Italian"
-msgstr "Taliansky"
-
-8
+9
-msgid "Japanese"
-msgstr "Japónsky"
-
-49
+50
-msgid "Dutch"
-msgstr "Holándsky"
-
-0
+1
-msgid "Norwegian"
-msgstr "Nórsky"
-
-1
+2
-msgid "Brazilian"
-msgstr "Brazílsky"
-
-2
+3
-msgid "Romanian"
-msgstr "Rumúnsky"
-
-3
+4
-msgid "Russian"
-msgstr "Ruský"
-
-4
+5
-msgid "Slovak"
-msgstr "Slovenský"
-
-
+
+
+
+
+
-msgid "Serbian"
-msgstr "Srbský"
-
-6
+8
-msgid "Swedish"
-msgstr "Švédsky"
-
-7
+9
-msgid "Simplified Chinese"
-msgstr "Zjednodušená činština "
-
-58
+60
-msgid "Traditional Chinese"
-msgstr "Tradičná čínština"
-
-5 core/meta/fields.py:488
-9
+3 core/meta/fields.py:486
+7
-msgid "This field is required."
-msgstr "Toto pole  je nevyhnutné."
@@ -1569 +1577 @@
-msgstr "Vložte celé číslo s hodnotou medzi 0 a 32767."
-
-2
+1
-msgid "This value must contain only letters, numbers and underscores."
-msgstr "Toto môže obsahovať len písmená, číslice a podčiarkovníky."
-
-
-
-
-
-
+
+
+
+
+
+
+
-msgid "Uppercase letters are not allowed here."
-msgstr "Veľké písmená tu nie sú povolené."
-
-8
+7
-msgid "Lowercase letters are not allowed here."
-msgstr "Malé písmena tu nie sú povolené."
-
-5
+4
-msgid "Enter only digits separated by commas."
-msgstr "Vložte len číslice, oddelené čiarkami."
-
-7
+6
-msgid "Enter valid e-mail addresses separated by commas."
-msgstr "Vložte platné e-mail adresy oddelené čiarkami."
-
-1
+0
-msgid "Please enter a valid IP address."
-msgstr "Prosím vložte platnú IP adresu."
-
-5
+4
-msgid "Empty values are not allowed here."
-msgstr "Prázdne hodnoty tu nie sú povolené."
-
-9
+8
-msgid "Non-numeric characters aren't allowed here."
-msgstr "Znaky, ktoré nie sú číslicami, tu nie sú povolené."
-
-3
+2
-msgid "This value can't be comprised solely of digits."
-msgstr "Tento údaj nemôže byť vytvorený len z číslic."
-
-8
+7
-msgid "Enter a whole number."
-msgstr "Vložte celé číslo."
-
-2
+1
-msgid "Only alphabetical characters are allowed here."
-msgstr "Tu sú povolené len alfanumerické znaky."
-
-6
+5
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "Vložte platný dátum vo formáte RRRR-MM-DD."
-
-30
+29
-msgid "Enter a valid time in HH:MM format."
-msgstr "Vložte platný čas vo formáte HH:MM."
-
-4
+3
-msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format."
-msgstr "Vlož platný dátum/čas vo formáte RRRR-MM-DD HH:MM"
-
-8
+7
-msgid "Enter a valid e-mail address."
-msgstr "Vložte platnú e-mail adresu."
-
-50
+49
-msgid ""
-"Upload a valid image. The file you uploaded was either not an image or a "
@@ -1641 +1651 @@
-"nahratý poškodený obrázok."
-
-7
+6
-#, python-format
-msgid "The URL %s does not point to a valid image."
-msgstr "URL %s neukazuje na platný obrázok."
-
-1
+0
-#, python-format
-msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid."
@@ -1652 +1662 @@
-"Telefónne číslo musí mať formát XXX-XXX-XXXX. Číslo \"%s\" je neplatné."
-
-9
+8
-#, python-format
-msgid "The URL %s does not point to a valid QuickTime video."
-msgstr "URL %s neukazuje na platné QuickTime video."
-
-3
+2
-msgid "A valid URL is required."
-msgstr "Platné URL je požadované."
-
-7
+6
-#, python-format
-msgid ""
@@ -1670 +1680 @@
-"%s"
-
-4
+3
-#, python-format
-msgid "Badly formed XML: %s"
-msgstr "Chybne formované XML: %s"
-
-4
+3
-#, python-format
-msgid "Invalid URL: %s"
-msgstr "Neplatné URL: %s"
-
-8 core/validators.py:210
+7 core/validators.py:209
-#, python-format
-msgid "The URL %s is a broken link."
-msgstr "Odkaz na URL %s je neplatný."
-
-6
+5
-msgid "Enter a valid U.S. state abbreviation."
-msgstr "Vložte platnú skratku U.S. štátu."
-
-1
+0
-#, python-format
-msgid "Watch your mouth! The word %s is not allowed here."
@@ -1696 +1706 @@
-msgstr[1] "Vyjadrujte sa slušne! Slová %s tu nie je dovolené použivať."
-
-8
+7
-#, python-format
-msgid "This field must match the '%s' field."
-msgstr "Toto pole sa musí zhodovať s poľom '%s'. "
-
-7
+6
-msgid "Please enter something for at least one field."
-msgstr "Prosím vložte niečo aspoň pre jedno pole."
-
-6 core/validators.py:277
+5 core/validators.py:276
-msgid "Please enter both fields or leave them both empty."
-msgstr "Prosím vložte obidve polia, alebo nechajte ich obe prázdne. "
-
-4
+3
-#, python-format
-msgid "This field must be given if %(field)s is %(value)s"
-msgstr "Toto pole musí byť vyplnené tak, že %(field)s obsahuje %(value)s"
-
-6
+5
-#, python-format
-msgid "This field must be given if %(field)s is not %(value)s"
@@ -1720 +1730 @@
-"Toto pole musí byť vyplnené tak, že %(field)s nesmie obsahovať %(value)s"
-
-5
+4
-msgid "Duplicate values are not allowed."
-msgstr "Duplicitné hodnoty nie sú povolené."
-
-8
+7
-#, python-format
-msgid "This value must be a power of %s."
-msgstr "Táto hodnota musí byť mocninou  %s."
-
-9
+8
-msgid "Please enter a valid decimal number."
-msgstr "Prosím vložte platné desiatkové číslo. "
-
-1
+0
-#, python-format
-msgid "Please enter a valid decimal number with at most %s total digit."
@@ -1741 +1751 @@
-msgstr[1] "Prosím vložte platné desiatkové číslo s najviac %s číslicami."
-
-4
+3
-#, python-format
-msgid "Please enter a valid decimal number with at most %s decimal place."
@@ -1751 +1761 @@
-"Prosím vložte platné desatinné číslo s najviac %s desatinnými miestami."
-
-4
+3
-#, python-format
-msgid "Make sure your uploaded file is at least %s bytes big."
-msgstr "Presvedčte sa, že posielaný súbor nemá menej ako %s bytov."
-
-5
+4
-#, python-format
-msgid "Make sure your uploaded file is at most %s bytes big."
-msgstr "Presvedčte sa, že posielaný súbor nemá viac ako %s bytov."
-
-8
+7
-msgid "The format for this field is wrong."
-msgstr "Formát pre toto pole je chybný."
-
-3
+2
-msgid "This field is invalid."
-msgstr "Toto pole nie je platné."
-
-8
+7
-#, python-format
-msgid "Could not retrieve anything from %s."
-msgstr "Nič som nemohol získať z %s."
-
-1
+0
-#, python-format
-msgid ""
@@ -1781 +1791 @@
-" URL %(url)s vrátilo neplatnú hlavičku  Content-Type  '%(contenttype)s'."
-
-4
+3
-#, python-format
-msgid ""
@@ -1790 +1800 @@
-"začína s  \"%(start)s\".)"
-
-8
+7
-#, python-format
-msgid ""
@@ -1799 +1809 @@
-"(Riadok začína s \"%(start)s\".)"
-
-3
+2
-#, python-format
-msgid ""
@@ -1808 +1818 @@
-"(start)s\".)"
-
-8
+7
-#, python-format
-msgid ""
@@ -1817 +1827 @@
-"(start)s\".)"
-
-2
+1
-#, python-format
-msgid ""
@@ -1826 +1836 @@
-"začína s \"%(start)s\".)"
-
-7
+6
-#, python-format
-msgid ""
@@ -1835 +1845 @@
-"s \"%(start)s\".)"
-
-44
+62
-#, python-format
-msgid "%(object)s with this %(type)s already exists for the given %(field)s."
@@ -1861 +1871 @@
-"položky."
-
-8
+6
-msgid "Enter a valid filename."
-msgstr "Vložte platné meno súboru."
-
-2
+0
-#, python-format
-msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
@@ -1884 +1894 @@
-"Vyzerá, že váš web prehliadač nedovoľuje prístup ku cookies. Cookies sú  "
-"nevýhnutné aby ste sa mohli prilásiť."
+
+#~ msgid "String (up to 50)"
+#~ msgstr "Reťazec (do 50 )"

django/branches/magic-removal/docs/model-api.txt

@@ -779 +779 @@
-    leading "-" will be ordered ascending. Use the string "?" to order randomly.
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    .. _Specifying ordering: http://www.djangoproject.com/documentation/models/ordering/

django/branches/magic-removal/tests/othertests/markup.py

@@ -47 +47 @@
-t = Template("{{ markdown_content|markdown }}")
-rendered = t.render(Context(locals())).strip()
-textile
+markdown
-    assert rendered == """<p>Paragraph 1</p><h2>An h2</h2>"""
-else: