diff --git a/django/conf/locale/no/LC_MESSAGES/django.mo b/django/conf/locale/no/LC_MESSAGES/django.mo
index 51c12afc3f..ca59785718 100644
Binary files a/django/conf/locale/no/LC_MESSAGES/django.mo and b/django/conf/locale/no/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/no/LC_MESSAGES/django.po b/django/conf/locale/no/LC_MESSAGES/django.po
index aa31999253..5fdfd1450d 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-18 15:43+0100\n"
+"POT-Creation-Date: 2005-11-15 17:40+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Espen Grndhaug <espen@grindhaug.org>\n"
 "Language-Team: Norwegian\n"
@@ -16,271 +16,75 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: contrib/comments/models/comments.py:8
-#: contrib/comments/models/comments.py:161
-#, fuzzy
-msgid "object ID"
-msgstr "objekt id"
-
-#: contrib/comments/models/comments.py:9
-msgid "headline"
-msgstr ""
-
-#: contrib/comments/models/comments.py:10
-#: contrib/comments/models/comments.py:162
-#, fuzzy
-msgid "comment"
-msgstr "innhold"
-
-#: contrib/comments/models/comments.py:11
-msgid "rating #1"
-msgstr ""
-
-#: contrib/comments/models/comments.py:12
-msgid "rating #2"
-msgstr ""
-
-#: contrib/comments/models/comments.py:13
-msgid "rating #3"
-msgstr ""
-
-#: contrib/comments/models/comments.py:14
-msgid "rating #4"
-msgstr ""
-
-#: contrib/comments/models/comments.py:15
-msgid "rating #5"
-msgstr ""
-
-#: contrib/comments/models/comments.py:16
-msgid "rating #6"
-msgstr ""
-
-#: contrib/comments/models/comments.py:17
-msgid "rating #7"
-msgstr ""
-
-#: contrib/comments/models/comments.py:18
-msgid "rating #8"
-msgstr ""
-
-#: contrib/comments/models/comments.py:23
-msgid "is valid rating"
-msgstr ""
-
-#: contrib/comments/models/comments.py:24
-#: contrib/comments/models/comments.py:164
-msgid "date/time submitted"
-msgstr ""
-
-#: contrib/comments/models/comments.py:25
-#: contrib/comments/models/comments.py:165
-msgid "is public"
-msgstr ""
-
-#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:274
-#, fuzzy
-msgid "IP address"
-msgstr "e-post adresse"
-
-#: contrib/comments/models/comments.py:27
-msgid "is removed"
-msgstr ""
-
-#: contrib/comments/models/comments.py:27
-msgid ""
-"Check this box if the comment is inappropriate. A \"This comment has been "
-"removed\" message will be displayed instead."
-msgstr ""
-
-#: contrib/comments/models/comments.py:31
-msgid "Comment"
-msgstr ""
-
-#: contrib/comments/models/comments.py:32
-#, fuzzy
-msgid "Comments"
-msgstr "tillat kommentarer"
-
-#: contrib/comments/models/comments.py:85
-#: contrib/comments/models/comments.py:204
-#, fuzzy
-msgid "Content object"
-msgstr "innholds type"
-
-#: contrib/comments/models/comments.py:113
-#, python-format
-msgid ""
-"Posted by %(user)s at %(date)s\n"
-"\n"
-"%(comment)s\n"
-"\n"
-"http://%(domain)s%(url)s"
-msgstr ""
-
-#: contrib/comments/models/comments.py:163
-#, fuzzy
-msgid "person's name"
-msgstr "fornavn"
-
-#: contrib/comments/models/comments.py:166
-#, fuzzy
-msgid "ip address"
-msgstr "e-post adresse"
-
-#: contrib/comments/models/comments.py:168
-msgid "approved by staff"
-msgstr ""
-
-#: contrib/comments/models/comments.py:172
-#, fuzzy
-msgid "Free comment"
-msgstr "tillat kommentarer"
-
-#: contrib/comments/models/comments.py:173
-#, fuzzy
-msgid "Free comments"
-msgstr "tillat kommentarer"
-
-#: contrib/comments/models/comments.py:209
-msgid "score"
-msgstr ""
-
-#: contrib/comments/models/comments.py:210
-#, fuzzy
-msgid "score date"
-msgstr "utløpsdato"
-
-#: contrib/comments/models/comments.py:213
-msgid "Karma score"
-msgstr ""
-
-#: contrib/comments/models/comments.py:214
-msgid "Karma scores"
-msgstr ""
-
-#: contrib/comments/models/comments.py:223
-#, python-format
-msgid "%(score)d rating by %(user)s"
-msgstr ""
-
-#: contrib/comments/models/comments.py:248
-#, fuzzy
-msgid "flag date"
-msgstr "flatside"
-
-#: contrib/comments/models/comments.py:251
-#, fuzzy
-msgid "User flag"
-msgstr "Bruker"
-
-#: contrib/comments/models/comments.py:252
-#, fuzzy
-msgid "User flags"
-msgstr "Brukere"
-
-#: contrib/comments/models/comments.py:256
-#, python-format
-msgid "Flag by %r"
-msgstr ""
-
-#: contrib/comments/models/comments.py:271
-#, python-format
-msgid ""
-"This comment was flagged by %(user)s:\n"
-"\n"
-"%(text)s"
-msgstr ""
-
-#: contrib/comments/models/comments.py:278
-#, fuzzy
-msgid "deletion date"
-msgstr "sesjon data"
-
-#: contrib/comments/models/comments.py:281
-msgid "Moderator deletion"
-msgstr ""
-
-#: contrib/comments/models/comments.py:282
-msgid "Moderator deletions"
-msgstr ""
-
-#: contrib/comments/models/comments.py:286
-#, python-format
-msgid "Moderator deletion by %r"
-msgstr ""
-
 #: contrib/comments/views/karma.py:18
 msgid "Anonymous users cannot vote"
-msgstr ""
+msgstr "Anonyme brukere kan ikke stemme"
 
 #: contrib/comments/views/karma.py:22
-#, fuzzy
 msgid "Invalid comment ID"
-msgstr "tillat kommentarer"
+msgstr "Ikke gyldig kommentar ID"
 
 #: contrib/comments/views/karma.py:24
 msgid "No voting for yourself"
-msgstr ""
+msgstr "Du kan ikke stemme selv"
 
-#: contrib/comments/views/comments.py:25
+#: contrib/comments/views/comments.py:24
+#, fuzzy
 msgid ""
 "This rating is required because you've entered at least one other rating."
 msgstr ""
+"Denne bla bla.."
 
-#: contrib/comments/views/comments.py:109
+#: contrib/comments/views/comments.py:108
 #, python-format
 msgid ""
 "This comment was posted by a user who has posted fewer than %(count)s "
-"comment:\n"
-"\n"
-"%(text)s"
-msgid_plural ""
-"This comment was posted by a user who has posted fewer than %(count)s "
 "comments:\n"
 "\n"
 "%(text)s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
+"Denne kommentaren var skrevet av en bruker som har fra før skrevet under %(count)s "
+"kommentarer:\n\n%(text)s"
 
-#: contrib/comments/views/comments.py:114
+#: contrib/comments/views/comments.py:112
 #, python-format
+#, fuzzy
 msgid ""
 "This comment was posted by a sketchy user:\n"
 "\n"
 "%(text)s"
-msgstr ""
+msgstr "Denne kommentaren er skrevet med lite omtanke:\n\n%(text)s"
 
-#: contrib/comments/views/comments.py:186
-#: contrib/comments/views/comments.py:277
+#: contrib/comments/views/comments.py:184
+#: contrib/comments/views/comments.py:275
 msgid "Only POSTs are allowed"
-msgstr ""
+msgstr "Bare POST er tillatt"
 
-#: contrib/comments/views/comments.py:190
-#: contrib/comments/views/comments.py:281
+#: contrib/comments/views/comments.py:188
+#: contrib/comments/views/comments.py:279
 msgid "One or more of the required fields wasn't submitted"
-msgstr ""
+msgstr "En eller flere av feltene som er krevd ble ikke sendt."
 
-#: contrib/comments/views/comments.py:194
-#: contrib/comments/views/comments.py:283
+#: contrib/comments/views/comments.py:192
+#: contrib/comments/views/comments.py:281
 msgid "Somebody tampered with the comment form (security violation)"
-msgstr ""
+msgstr "Noen har endret på komentar feltene (sikkerhets advarsel)"
 
-#: contrib/comments/views/comments.py:204
-#: contrib/comments/views/comments.py:289
+#: contrib/comments/views/comments.py:202
+#: contrib/comments/views/comments.py:287
 msgid ""
 "The comment form had an invalid 'target' parameter -- the object ID was "
 "invalid"
-msgstr ""
+msgstr "Skjemaet hadde en ugyldig verdi - objekt IDen var ugyldig"
 
-#: contrib/comments/views/comments.py:254
-#: contrib/comments/views/comments.py:318
+#: contrib/comments/views/comments.py:252
+#: contrib/comments/views/comments.py:316
 msgid "The comment form didn't provide either 'preview' or 'post'"
-msgstr ""
+msgstr "Kommentar skjemaet returnerte ikke et 'forhåndsvisning' eller 'post' objekt"
 
 #: contrib/admin/models/admin.py:6
 msgid "action time"
-msgstr "handlings tid"
+msgstr "tid for handling"
 
 #: contrib/admin/models/admin.py:9
 msgid "object id"
@@ -308,7 +112,7 @@ msgstr "logg innlegg"
 
 #: contrib/admin/templatetags/admin_list.py:283
 msgid "All dates"
-msgstr ""
+msgstr "Alle datoer"
 
 #: contrib/admin/views/decorators.py:22
 #: contrib/admin/templates/admin/login.html:24
@@ -320,26 +124,25 @@ msgid ""
 "Please log in again, because your session has expired. Don't worry: Your "
 "submission has been saved."
 msgstr ""
+"Du må logge inn igjen, fordi sesjonen din har gått ut på dato, men ikke ikke bekjymr deg "
+"informasjonen du sendte ble lagret."
 
 #: contrib/admin/views/decorators.py:63
 msgid ""
 "Looks like your browser isn't configured to accept cookies. Please enable "
 "cookies, reload this page, and try again."
 msgstr ""
+"Det ser ut som om nettleseren din ikke vill ta i mot informasjonskapsler ('cookies'). "
+"Vennligst omkonfigurer nettleseren din, last siden på ny og prøv igjen."
 
 #: contrib/admin/views/decorators.py:77
 msgid "Usernames cannot contain the '@' character."
-msgstr ""
+msgstr "Brukernavnet kan ikke inneholde '@'"
 
 #: contrib/admin/views/decorators.py:79
 #, python-format
 msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr ""
-
-#: contrib/admin/views/main.py:50
-#, fuzzy
-msgid "Site administration"
-msgstr "Django administrasjon"
+msgstr "Epost adressen din er ikke brukernavnet ditt, prøv '%s' i stede."
 
 #: contrib/admin/views/main.py:84
 #, python-format
@@ -347,202 +150,175 @@ msgid ""
 "<h3>By %s:</h3>\n"
 "<ul>\n"
 msgstr ""
+"<h3>Av %s:</h3>\n"
+"<ul>\n"
 
 #: contrib/admin/views/main.py:114 contrib/admin/views/main.py:131
-#: contrib/admin/views/main.py:186
 msgid "All"
-msgstr ""
-
-#: contrib/admin/views/main.py:152
-msgid "Any date"
-msgstr ""
-
-#: contrib/admin/views/main.py:153
-#, fuzzy
-msgid "Today"
-msgstr "Mondag"
-
-#: contrib/admin/views/main.py:156
-msgid "Past 7 days"
-msgstr ""
-
-#: contrib/admin/views/main.py:158
-msgid "This month"
-msgstr ""
-
-#: contrib/admin/views/main.py:160
-msgid "This year"
-msgstr ""
-
-#: contrib/admin/views/main.py:186
-msgid "Yes"
-msgstr ""
-
-#: contrib/admin/views/main.py:186
-#, fuzzy
-msgid "No"
-msgstr "Nov."
+msgstr "Alle"
 
 #: contrib/admin/views/main.py:194
 msgid "Unknown"
-msgstr ""
+msgstr "Ukjent"
 
 #: contrib/admin/views/main.py:208
 #, python-format
 msgid "Select %s"
-msgstr ""
+msgstr "Velg %s"
 
 #: contrib/admin/views/main.py:209
 #, python-format
 msgid "Select %s to change"
-msgstr ""
+msgstr "Velg %s for å endre"
 
 #: contrib/admin/views/main.py:572
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr ""
+msgstr "%(name)s \"%(obj)s\" ble lagt inn i databasen."
 
 #: contrib/admin/views/main.py:577 contrib/admin/views/main.py:653
 msgid "You may edit it again below."
-msgstr ""
+msgstr "Du kan endre under"
 
 #: contrib/admin/views/main.py:585 contrib/admin/views/main.py:662
 #, python-format
 msgid "You may add another %s below."
-msgstr ""
+msgstr "Du kan legge til en ny %s under."
 
 #: contrib/admin/views/main.py:602
-#, fuzzy, python-format
+#, python-format
 msgid "Add %s"
-msgstr "Legg til"
+msgstr "Ny %s"
 
 #: contrib/admin/views/main.py:618
 #, python-format
 msgid "Added %s."
-msgstr ""
+msgstr "La til %s"
 
 #: contrib/admin/views/main.py:618 contrib/admin/views/main.py:620
 #: contrib/admin/views/main.py:622
 msgid "and"
-msgstr ""
+msgstr "og"
 
 #: contrib/admin/views/main.py:620
-#, fuzzy, python-format
+#, python-format
 msgid "Changed %s."
-msgstr "Endre"
+msgstr "Endret %s."
 
 #: contrib/admin/views/main.py:622
 #, python-format
 msgid "Deleted %s."
-msgstr ""
+msgstr "Slettet %s."
 
 #: contrib/admin/views/main.py:625
 msgid "No fields changed."
-msgstr ""
+msgstr "Ingen felt endret."
 
 #: contrib/admin/views/main.py:650
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr ""
+msgstr "%(name)s \"%(obj)s\" ble endret."
 
 #: contrib/admin/views/main.py:659
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
+"%(name)s \"%(obj)s\" ble endret. Du kan endre det igjen under."
 
 #: contrib/admin/views/main.py:697
-#, fuzzy, python-format
+#, python-format
 msgid "Change %s"
-msgstr "Endre"
+msgstr "Endre %s"
 
 #: contrib/admin/views/main.py:777
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
-msgstr ""
+msgstr "En eller flere %(fieldname)s i %(name)s: %(obj)s"
 
 #: contrib/admin/views/main.py:782
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
-msgstr ""
+msgstr "En eller flere %(fieldname)s i %(name)s:"
 
 #: contrib/admin/views/main.py:811
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
-msgstr ""
+msgstr "%(name)s \"%(obj)s\" ble slettet."
 
 #: contrib/admin/views/main.py:814
 msgid "Are you sure?"
-msgstr ""
+msgstr "Er du sikker?"
 
 #: contrib/admin/views/main.py:829
 #, fuzzy, python-format
 msgid "Change history: %s"
-msgstr "Endre passord"
+msgstr "Endre historien: %s"
 
 #: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:271
 #: contrib/admin/views/doc.py:273 contrib/admin/views/doc.py:278
 #: contrib/admin/views/doc.py:279 contrib/admin/views/doc.py:281
 msgid "Integer"
-msgstr ""
+msgstr "Heltall"
 
 #: contrib/admin/views/doc.py:263
+#, fuzzy
 msgid "Boolean (Either True or False)"
-msgstr ""
+msgstr "Boolean (Enten \"True\" eller \"False\")"
 
 #: contrib/admin/views/doc.py:264
 #, python-format
 msgid "String (up to %(maxlength)s)"
-msgstr ""
+msgstr "Tekst (opp til %(maxlength)s tegn)"
 
 #: contrib/admin/views/doc.py:265
 msgid "Comma-separated integers"
-msgstr ""
+msgstr "Heltall skilt med kommaer"
 
 #: contrib/admin/views/doc.py:266
-#, fuzzy
 msgid "Date (without time)"
-msgstr "handlings tid"
+msgstr "Dato (uten tid)"
 
 #: contrib/admin/views/doc.py:267
-#, fuzzy
 msgid "Date (with time)"
 msgstr "Dato/tid"
 
 #: contrib/admin/views/doc.py:268
-#, fuzzy
 msgid "E-mail address"
-msgstr "Epost adresse:"
+msgstr "Epost adresse"
 
 #: contrib/admin/views/doc.py:269 contrib/admin/views/doc.py:272
 msgid "File path"
-msgstr ""
+msgstr "Sti til fil"
 
 #: contrib/admin/views/doc.py:270
-#, fuzzy
 msgid "Decimal number"
-msgstr "Desember"
+msgstr "Desimal tall"
+
+#: contrib/admin/views/doc.py:274
+msgid "IP address"
+msgstr "IP adresse"
 
 #: contrib/admin/views/doc.py:276
+#, fuzzy
 msgid "Boolean (Either True, False or None)"
-msgstr ""
+msgstr "Boolean (enten \"True\", \"False\" eller \"None\")"
 
 #: contrib/admin/views/doc.py:277
-#, fuzzy
 msgid "Phone number"
-msgstr "Skriv inn et helt nummer."
+msgstr "Telefonnummer"
 
 #: contrib/admin/views/doc.py:280
 msgid "String (up to 50)"
-msgstr ""
+msgstr "Tekst (opp til 50 tegn)"
 
 #: contrib/admin/views/doc.py:282
 msgid "Text"
-msgstr ""
+msgstr "Tekst"
 
 #: contrib/admin/views/doc.py:283
 msgid "Time"
-msgstr ""
+msgstr "Tid"
 
 #: contrib/admin/views/doc.py:284 contrib/flatpages/models/flatpages.py:6
 msgid "URL"
@@ -550,15 +326,15 @@ msgstr "Internettadresse"
 
 #: contrib/admin/views/doc.py:285
 msgid "U.S. state (two uppercase letters)"
-msgstr ""
+msgstr "Stat (i USA, to store bokstaver)"
 
 #: contrib/admin/views/doc.py:286
 msgid "XML text"
-msgstr ""
+msgstr "XML tekst"
 
 #: contrib/admin/templates/admin/template_debug.html:6
 msgid "Error in Template"
-msgstr ""
+msgstr "Feil i mal"
 
 #: contrib/admin/templates/admin/template_debug.html:8
 #, python-format
@@ -566,6 +342,8 @@ msgid ""
 "\n"
 "In template %(name)s, error at line %(line)s:\n"
 msgstr ""
+"\n"
+"I mal %(name)s, var det en feil på linje %(line)s:\n"
 
 #: contrib/admin/templates/admin/change_list.html:5
 #: contrib/admin/templates/admin/500.html:4
@@ -582,9 +360,9 @@ msgid "Home"
 msgstr "Hjem"
 
 #: contrib/admin/templates/admin/change_list.html:10
-#, fuzzy, python-format
+#, python-format
 msgid "Add %(name)s"
-msgstr "Legg til"
+msgstr "Legg til %(name)s"
 
 #: contrib/admin/templates/admin/index.html:27
 #: contrib/admin/templates/admin/change_form.html:14
@@ -650,7 +428,7 @@ msgstr "Funksjon"
 
 #: contrib/admin/templates/admin/object_history.html:26
 msgid "DATE_WITH_TIME_FULL"
-msgstr "N j, Y, P"
+msgstr "j. M U - h:i"
 
 #: contrib/admin/templates/admin/object_history.html:36
 msgid ""
@@ -691,21 +469,21 @@ msgstr "Beklager, men siden du spør etter finnest ikke."
 
 #: contrib/admin/templates/admin/change_form.html:20
 msgid "View on site"
-msgstr ""
+msgstr "Vis på siden"
 
 #: contrib/admin/templates/admin/change_form.html:28
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Vennligst fiks feilen under."
+msgstr[1] "Vennligst fiks feilene under."
 
 #: contrib/admin/templates/admin/change_form.html:45
 msgid "Ordering"
-msgstr ""
+msgstr "Rekkefølge"
 
 #: contrib/admin/templates/admin/change_form.html:48
 msgid "Order:"
-msgstr ""
+msgstr "Rekkefølge:"
 
 #: contrib/admin/templates/admin/delete_confirmation.html:7
 #, python-format
@@ -744,29 +522,28 @@ msgstr "Log ut"
 
 #: contrib/admin/templates/admin/submit_line.html:3
 msgid "Delete"
-msgstr ""
+msgstr "Slett"
 
 #: contrib/admin/templates/admin/submit_line.html:4
 msgid "Save as new"
-msgstr ""
+msgstr "Lagre som ny"
 
 #: contrib/admin/templates/admin/submit_line.html:5
 msgid "Save and add another"
-msgstr ""
+msgstr "Lagre og legg til en ny"
 
 #: contrib/admin/templates/admin/submit_line.html:6
 msgid "Save and continue editing"
-msgstr ""
+msgstr "Lagre og fortsett å endre"
 
 #: contrib/admin/templates/admin/submit_line.html:7
-#, fuzzy
 msgid "Save"
-msgstr "aktiv"
+msgstr "Lagre"
 
 #: contrib/admin/templates/admin/filter.html:1
 #, python-format
 msgid " By %(title)s "
-msgstr ""
+msgstr "Av %(title)s "
 
 #: contrib/admin/templates/registration/password_change_done.html:4
 #: contrib/admin/templates/registration/password_change_form.html:4
@@ -885,17 +662,18 @@ msgstr "Hilsen %(site_name)s"
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:3
 msgid "Documentation"
-msgstr ""
+msgstr "Dokumentasjon"
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:3
 msgid "Bookmarklets"
-msgstr ""
+msgstr "Bokmerker"
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:5
 msgid "Documentation bookmarklets"
-msgstr ""
+msgstr "Dokumentasjon bokmerker"
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:9
+#, fuzzy
 msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -908,40 +686,43 @@ msgstr ""
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:19
 msgid "Documentation for this page"
-msgstr ""
+msgstr "Dokumentasjon for denne siden"
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:20
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
 msgstr ""
+"Hopp fra hvilken som helst side til dokumentasjonen for visnings funksjonen "
+"som laget siden."
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:22
-#, fuzzy
 msgid "Show object ID"
-msgstr "objekt id"
+msgstr "Vis objekt ID"
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:23
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
-msgstr ""
+msgstr "Viser \"content-type\" og en unik ID for sider som representerer et "
+"enkelt objekt."
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:25
 msgid "Edit this object (current window)"
-msgstr ""
+msgstr "Endre dette objektet (åpnes i dette vinduet)"
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:26
+#, fuzzy
 msgid "Jumps to the admin page for pages that represent a single object."
-msgstr ""
+msgstr "Hopp til administrasjonsiden for siden som representerer et enkelt objekt."
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:28
 msgid "Edit this object (new window)"
-msgstr ""
+msgstr "Endre dette objektet (åpnes i et nytt vindu)"
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:29
 msgid "As above, but opens the admin page in a new window."
-msgstr ""
+msgstr "Samme som over, men åpner administrasjonsiden i et nytt vindu."
 
 #: contrib/redirects/models/redirects.py:7
 msgid "redirect from"
@@ -998,7 +779,6 @@ msgid "template name"
 msgstr "mal navn"
 
 #: contrib/flatpages/models/flatpages.py:12
-#, fuzzy
 msgid ""
 "Example: 'flatpages/contact_page'. If this isn't provided, the system will "
 "use 'flatpages/default'."
@@ -1026,15 +806,15 @@ msgstr "flatsider"
 
 #: utils/translation.py:335
 msgid "DATE_FORMAT"
-msgstr ""
+msgstr "j. M U"
 
 #: utils/translation.py:336
 msgid "DATETIME_FORMAT"
-msgstr ""
+msgstr "j. M U - h:i"
 
 #: utils/translation.py:337
 msgid "TIME_FORMAT"
-msgstr ""
+msgstr "h:i"
 
 #: utils/dates.py:6
 msgid "Monday"
@@ -1310,107 +1090,102 @@ msgstr "Walisisk"
 
 #: conf/global_settings.py:40
 msgid "Danish"
-msgstr "Dnask"
+msgstr "Dansk"
 
-#: conf/global_settings.py:41
+#: conf/global_settings.py:40
 msgid "German"
 msgstr "Tysk"
 
-#: conf/global_settings.py:42
+#: conf/global_settings.py:41
 msgid "English"
 msgstr "Engelsk"
 
-#: conf/global_settings.py:43
+#: conf/global_settings.py:42
 msgid "Spanish"
 msgstr "Spansk"
 
-#: conf/global_settings.py:44
+#: conf/global_settings.py:43
 msgid "French"
 msgstr "Fransk"
 
-#: conf/global_settings.py:45
+#: conf/global_settings.py:44
 msgid "Galician"
 msgstr "Galisisk"
 
-#: conf/global_settings.py:46
+#: conf/global_settings.py:45
 msgid "Icelandic"
 msgstr "Islandsk"
 
-#: conf/global_settings.py:47
+#: conf/global_settings.py:46
 msgid "Italian"
 msgstr "Italiensk"
 
-#: conf/global_settings.py:48
+#: conf/global_settings.py:47
 msgid "Norwegian"
 msgstr "Norsk"
 
-#: conf/global_settings.py:49
+#: conf/global_settings.py:48
 msgid "Brazilian"
 msgstr "Brasiliansk"
 
-#: conf/global_settings.py:50
+#: conf/global_settings.py:49
 msgid "Romanian"
 msgstr "Romansk"
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:50
 msgid "Russian"
 msgstr "Russisk"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:51
 msgid "Slovak"
 msgstr "Slovakisk"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:52
 msgid "Serbian"
 msgstr "Serbisk"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:53
 msgid "Swedish"
 msgstr "Svensk"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:54
 msgid "Simplified Chinese"
 msgstr "Simplifisert Kinesisk"
 
-#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:484
-#: core/meta/fields.py:495
-#, fuzzy
+#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:482
+#: core/meta/fields.py:493
 msgid "This field is required."
-msgstr "Dette feltet er feil."
+msgstr "Dette feltet er påkrevd."
 
-#: core/formfields.py:338
+#: core/formfields.py:329
 #, python-format
 msgid "Ensure your text is less than %s characters."
-msgstr ""
+msgstr "Sjekk at teksten er kortere enn %s bokstaver"
 
-#: core/formfields.py:342
-#, fuzzy
+#: core/formfields.py:333
 msgid "Line breaks are not allowed here."
-msgstr "Små bokstaver er ikke tillatt her."
+msgstr "Det er ikke tillatt med flere linjer her."
 
-#: core/formfields.py:438 core/formfields.py:509 core/formfields.py:547
+#: core/formfields.py:429 core/formfields.py:500 core/formfields.py:538
 #, python-format
 msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
-msgstr ""
+msgstr "Velg et av valga; '%(data)s' er ikke i %(choices)s."
 
-#: core/formfields.py:603
+#: core/formfields.py:594
 msgid "The submitted file is empty."
-msgstr ""
+msgstr "Filen er tom."
+
+#: core/formfields.py:648
+msgid "Enter a whole number between -32,768 and 32,767."
+msgstr "Skriv inn et heltall mellom -31768 og 32767."
 
 #: core/formfields.py:657
-#, fuzzy
-msgid "Enter a whole number between -32,768 and 32,767."
-msgstr "Skriv inn et helt nummer."
+msgid "Enter a positive number."
+msgstr "Skriv inn et positivt heltall."
 
 #: core/formfields.py:666
-#, fuzzy
-msgid "Enter a positive number."
-msgstr "Skriv inn et helt nummer."
-
-#: core/formfields.py:675
-#, fuzzy
 msgid "Enter a whole number between 0 and 32,767."
-msgstr "Skriv inn et helt nummer."
+msgstr "Skriv inn et heltall mellom 0 og 32767."
 
 #: core/validators.py:59
 msgid "This value must contain only letters, numbers and underscores."
@@ -1688,7 +1463,7 @@ msgstr "Vennligst skriv inn en godkjent IP adresse."
 #: core/meta/fields.py:60
 #, python-format
 msgid "%(optname)s with this %(fieldname)s already exists."
-msgstr ""
+msgstr "$(optname)s med %(fieldname)s finnes allerede."
 
 #: core/meta/fields.py:131
 msgid " Separate multiple IDs with commas."
@@ -1700,22 +1475,15 @@ msgid ""
 msgstr ""
 "Hold nede \"Control\", eller \"Command\" på en Mac, for å velge mere enn en."
 
-#: core/meta/fields.py:504
+#: core/meta/fields.py:502
 #, fuzzy
 msgid "Enter a valid filename."
 msgstr "Skriv inn en godkjent e-post adresse."
 
-#: core/meta/fields.py:773
-#, python-format
+#: core/meta/fields.py:771
+#, fuzzy, python-format
 msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
 msgid_plural ""
 "Please enter valid %(self)s IDs. The values %(value)r are invalid"
 msgstr[0] ""
 msgstr[1] ""
-
-#, fuzzy
-#~ msgid "count"
-#~ msgstr "innhold"
-
-#~ msgid "Traditional Chinese"
-#~ msgstr "Tradisjonell Kinesisk"
diff --git a/django/conf/locale/sk/LC_MESSAGES/django.mo b/django/conf/locale/sk/LC_MESSAGES/django.mo
index 82b84db61c..45677b8596 100644
Binary files a/django/conf/locale/sk/LC_MESSAGES/django.mo and b/django/conf/locale/sk/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/sk/LC_MESSAGES/django.po b/django/conf/locale/sk/LC_MESSAGES/django.po
index 191adaa06f..331aed19ca 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-18 15:43+0100\n"
+"POT-Creation-Date: 2005-11-18 11:37-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Vladimir Labath <vlado@labath.org>\n"
 "Language-Team: Slovak <sk@li.org>\n"
@@ -16,6 +16,37 @@ 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/comments/models/comments.py:8
 #: contrib/comments/models/comments.py:161
 #, fuzzy
@@ -24,7 +55,7 @@ msgstr "Ukáž objekt id"
 
 #: contrib/comments/models/comments.py:9
 msgid "headline"
-msgstr ""
+msgstr "titulok"
 
 #: contrib/comments/models/comments.py:10
 #: contrib/comments/models/comments.py:162
@@ -34,79 +65,81 @@ msgstr "obsah"
 
 #: contrib/comments/models/comments.py:11
 msgid "rating #1"
-msgstr ""
+msgstr "hodnotenie #1"
 
 #: contrib/comments/models/comments.py:12
 msgid "rating #2"
-msgstr ""
+msgstr "hodnotenie #2"
 
 #: contrib/comments/models/comments.py:13
 msgid "rating #3"
-msgstr ""
+msgstr "hodnotenie #3"
 
 #: contrib/comments/models/comments.py:14
 msgid "rating #4"
-msgstr ""
+msgstr "hodnotenie #4"
 
 #: contrib/comments/models/comments.py:15
 msgid "rating #5"
-msgstr ""
+msgstr "hodnotenie #5"
 
 #: contrib/comments/models/comments.py:16
 msgid "rating #6"
-msgstr ""
+msgstr "hodnotenie #6"
 
 #: contrib/comments/models/comments.py:17
 msgid "rating #7"
-msgstr ""
+msgstr "hodnotenie #7"
 
 #: contrib/comments/models/comments.py:18
 msgid "rating #8"
-msgstr ""
+msgstr "hodnotenie #8"
 
 #: contrib/comments/models/comments.py:23
 msgid "is valid rating"
-msgstr ""
+msgstr "je platné hodnotenie"
 
 #: contrib/comments/models/comments.py:24
 #: contrib/comments/models/comments.py:164
 msgid "date/time submitted"
-msgstr ""
+msgstr "dítum/čas odoslania"
 
 #: contrib/comments/models/comments.py:25
 #: contrib/comments/models/comments.py:165
 msgid "is public"
-msgstr ""
+msgstr "je zverejnený"
 
 #: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:274
 #, fuzzy
 msgid "IP address"
-msgstr "emailová adresa"
+msgstr "IP adresa"
 
 #: contrib/comments/models/comments.py:27
 msgid "is removed"
-msgstr ""
+msgstr "je vymazaný"
 
 #: contrib/comments/models/comments.py:27
 msgid ""
 "Check this box if the comment is inappropriate. A \"This comment has been "
 "removed\" message will be displayed instead."
 msgstr ""
+"Označ túto voľbu ak je komentár nevhodný.  \"Tento komentár bol "
+"vymazaný\" sa zobrazí namiesto neho."
 
 #: contrib/comments/models/comments.py:31
 msgid "Comment"
-msgstr ""
+msgstr "Komentár"
 
 #: contrib/comments/models/comments.py:32
 #, fuzzy
 msgid "Comments"
-msgstr "povolené komentáre"
+msgstr "Komentáre"
 
 #: contrib/comments/models/comments.py:85
 #: contrib/comments/models/comments.py:204
 #, fuzzy
 msgid "Content object"
-msgstr "typ obsahu"
+msgstr "Obsah objectu"
 
 #: contrib/comments/models/comments.py:113
 #, python-format
@@ -117,34 +150,39 @@ msgid ""
 "\n"
 "http://%(domain)s%(url)s"
 msgstr ""
+"Poslal %(user)s at %(date)s\n"
+"\n"
+"%(comment)s\n"
+"\n"
+"http://%(domain)s%(url)s"
 
 #: contrib/comments/models/comments.py:163
 #, fuzzy
 msgid "person's name"
-msgstr "meno"
+msgstr "meno osoby"
 
 #: contrib/comments/models/comments.py:166
 #, fuzzy
 msgid "ip address"
-msgstr "emailová adresa"
+msgstr "ip adresa"
 
 #: contrib/comments/models/comments.py:168
 msgid "approved by staff"
-msgstr ""
+msgstr "schvalený za zamestnanca"
 
 #: contrib/comments/models/comments.py:172
 #, fuzzy
 msgid "Free comment"
-msgstr "povolené komentáre"
+msgstr "Voľný komentár"
 
 #: contrib/comments/models/comments.py:173
 #, fuzzy
 msgid "Free comments"
-msgstr "povolené komentáre"
+msgstr "Voľné komentáre"
 
 #: contrib/comments/models/comments.py:209
 msgid "score"
-msgstr ""
+msgstr "stav"
 
 #: contrib/comments/models/comments.py:210
 #, fuzzy
@@ -153,36 +191,36 @@ msgstr "dátum konca platnosti"
 
 #: contrib/comments/models/comments.py:213
 msgid "Karma score"
-msgstr ""
+msgstr "Karma stav"
 
 #: contrib/comments/models/comments.py:214
 msgid "Karma scores"
-msgstr ""
+msgstr "Karma stavy"
 
 #: contrib/comments/models/comments.py:223
 #, python-format
 msgid "%(score)d rating by %(user)s"
-msgstr ""
+msgstr "%(score)d hodnotil  %(user)s"
 
 #: contrib/comments/models/comments.py:248
 #, fuzzy
 msgid "flag date"
-msgstr "plochá stránka"
+msgstr "návestie dátumu"
 
 #: contrib/comments/models/comments.py:251
 #, fuzzy
 msgid "User flag"
-msgstr "Uživateľ"
+msgstr "Návestie uživateľa"
 
 #: contrib/comments/models/comments.py:252
 #, fuzzy
 msgid "User flags"
-msgstr "Užívatelia"
+msgstr "Návestia užívateľa"
 
 #: contrib/comments/models/comments.py:256
 #, python-format
 msgid "Flag by %r"
-msgstr ""
+msgstr "Návestie %r"
 
 #: contrib/comments/models/comments.py:271
 #, fuzzy, python-format
@@ -191,27 +229,27 @@ msgid ""
 "\n"
 "%(text)s"
 msgstr ""
-"Tento komentár bol poslaný rámcovým uzívateľom:\n"
+"Tento komentár bol označený %(user)s:\n"
 "\n"
 "%(text)s"
 
 #: contrib/comments/models/comments.py:278
 #, fuzzy
 msgid "deletion date"
-msgstr "údaje sedenia"
+msgstr "vymazaný dátum"
 
 #: contrib/comments/models/comments.py:281
 msgid "Moderator deletion"
-msgstr ""
+msgstr "Prostredník mazania"
 
 #: contrib/comments/models/comments.py:282
 msgid "Moderator deletions"
-msgstr ""
+msgstr "Prostredník mazaní"
 
 #: contrib/comments/models/comments.py:286
 #, python-format
 msgid "Moderator deletion by %r"
-msgstr ""
+msgstr "Prostredník mazania bol %r"
 
 #: contrib/comments/views/karma.py:18
 msgid "Anonymous users cannot vote"
@@ -220,7 +258,7 @@ msgstr "Ak chcete hlasovať, najprv sa musíte prihlásiť"
 #: contrib/comments/views/karma.py:22
 #, fuzzy
 msgid "Invalid comment ID"
-msgstr "povolené komentáre"
+msgstr "Neplatný komentár ID"
 
 #: contrib/comments/views/karma.py:24
 msgid "No voting for yourself"
@@ -246,7 +284,7 @@ msgid_plural ""
 "%(text)s"
 msgstr[0] ""
 "Tento komentár bol poslaný užívateľom, ktorý ma menej než %(count)s "
-"komentárov:\n"
+"komentár:\n"
 "\n"
 "%(text)s"
 msgstr[1] ""
@@ -262,7 +300,7 @@ msgid ""
 "\n"
 "%(text)s"
 msgstr ""
-"Tento komentár bol poslaný rámcovým uzívateľom:\n"
+"Tento komentár bol poslaný prchkým uzívateľom:\n"
 "\n"
 "%(text)s"
 
@@ -293,6 +331,59 @@ msgstr "Formulár kometára má chybný výstupný parameter -- objectID bol chy
 msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr "Neprišla ani jedna z možných volieb 'preview' alebo 'post'"
 
+#: contrib/flatpages/models/flatpages.py:6 contrib/admin/views/doc.py:284
+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
+#, fuzzy
+msgid ""
+"Example: 'flatpages/contact_page'. If this isn't provided, the system will "
+"use 'flatpages/default'."
+msgstr ""
+"Príklad: 'flatfiles/contact_page'. Ak sa toto nevykonalo,  systém použije  "
+"'flatfiles/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"
@@ -343,20 +434,22 @@ msgid ""
 "Looks like your browser isn't configured to accept cookies. Please enable "
 "cookies, reload this page, and try again."
 msgstr ""
+"Vyzera, že váš prehliadač neakceptuje  cookies. Prosím povoľte "
+"cookies, znovu natiahnite túto stránku, a skúste znova."
 
 #: contrib/admin/views/decorators.py:77
 msgid "Usernames cannot contain the '@' character."
-msgstr ""
+msgstr "Meno užívateľa nemôže obsahovať znak '@'."
 
 #: contrib/admin/views/decorators.py:79
 #, python-format
 msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr ""
+msgstr "Vaša emailová adresa nie je vaším užívateľským menon. Skuste toto '%s' namiesto nej"
 
 #: contrib/admin/views/main.py:50
 #, fuzzy
 msgid "Site administration"
-msgstr "Administrácia Django"
+msgstr "Spáva webu"
 
 #: contrib/admin/views/main.py:84
 #, python-format
@@ -364,37 +457,39 @@ msgid ""
 "<h3>By %s:</h3>\n"
 "<ul>\n"
 msgstr ""
+"<h3>Od %s:</h3>\n"
+"<ul>\n"
 
 #: contrib/admin/views/main.py:114 contrib/admin/views/main.py:131
 #: contrib/admin/views/main.py:186
 msgid "All"
-msgstr ""
+msgstr "Všetko"
 
 #: contrib/admin/views/main.py:152
 #, fuzzy
 msgid "Any date"
-msgstr "Všetky dátumy"
+msgstr "Ľubovoľný dátum"
 
 #: contrib/admin/views/main.py:153
 #, fuzzy
 msgid "Today"
-msgstr "Pondelok"
+msgstr "Dnes"
 
 #: contrib/admin/views/main.py:156
 msgid "Past 7 days"
-msgstr ""
+msgstr "Poslených 7 dní"
 
 #: contrib/admin/views/main.py:158
 msgid "This month"
-msgstr ""
+msgstr "Tento mesiac"
 
 #: contrib/admin/views/main.py:160
 msgid "This year"
-msgstr ""
+msgstr "Tento rok"
 
 #: contrib/admin/views/main.py:186
 msgid "Yes"
-msgstr ""
+msgstr "Áno"
 
 #: contrib/admin/views/main.py:186
 #, fuzzy
@@ -403,31 +498,31 @@ msgstr "Nov."
 
 #: contrib/admin/views/main.py:194
 msgid "Unknown"
-msgstr ""
+msgstr "Neznámy"
 
 #: contrib/admin/views/main.py:208
 #, python-format
 msgid "Select %s"
-msgstr ""
+msgstr "Vyber %s"
 
 #: contrib/admin/views/main.py:209
 #, python-format
 msgid "Select %s to change"
-msgstr ""
+msgstr "Vyber %s na zmenu"
 
 #: contrib/admin/views/main.py:572
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr ""
+msgstr " %(name)s \"%(obj)s\" bol úspešne pridaný."
 
 #: contrib/admin/views/main.py:577 contrib/admin/views/main.py:653
 msgid "You may edit it again below."
-msgstr ""
+msgstr "Môžete to zmeniť znovu nižšie."
 
 #: contrib/admin/views/main.py:585 contrib/admin/views/main.py:662
 #, python-format
 msgid "You may add another %s below."
-msgstr ""
+msgstr "Môžete pridať ďalší %s nižšie."
 
 #: contrib/admin/views/main.py:602
 #, fuzzy, python-format
@@ -437,37 +532,38 @@ msgstr "Pridaj"
 #: contrib/admin/views/main.py:618
 #, python-format
 msgid "Added %s."
-msgstr ""
+msgstr "Pridal %s"
 
 #: contrib/admin/views/main.py:618 contrib/admin/views/main.py:620
 #: contrib/admin/views/main.py:622
 msgid "and"
-msgstr ""
+msgstr "a"
 
 #: contrib/admin/views/main.py:620
 #, fuzzy, python-format
 msgid "Changed %s."
-msgstr "Zmeň"
+msgstr "Zmenený"
 
 #: contrib/admin/views/main.py:622
 #, python-format
 msgid "Deleted %s."
-msgstr ""
+msgstr "Vymazaný"
 
 #: contrib/admin/views/main.py:625
 msgid "No fields changed."
-msgstr ""
+msgstr "Polia neboli zmenené."
 
 #: contrib/admin/views/main.py:650
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr ""
+msgstr " %(name)s \"%(obj)s\" bol úspešne zmenený."
 
 #: contrib/admin/views/main.py:659
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
+" %(name)s \"%(obj)s\" bol úspešne pridaný. Môžete ho zmeniť zase nižšie."
 
 #: contrib/admin/views/main.py:697
 #, fuzzy, python-format
@@ -477,55 +573,55 @@ msgstr "Zmeň"
 #: contrib/admin/views/main.py:777
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
-msgstr ""
+msgstr "Jeden alebo viac %(fieldname)s v %(name)s: %(obj)s"
 
 #: contrib/admin/views/main.py:782
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
-msgstr ""
+msgstr "jeden alebo viac %(fieldname)s v %(name)s:"
 
 #: contrib/admin/views/main.py:811
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
-msgstr ""
+msgstr " %(name)s \"%(obj)s\" bol úspešne vymazaný."
 
 #: contrib/admin/views/main.py:814
 msgid "Are you sure?"
-msgstr ""
+msgstr "Ste si istý/á?"
 
 #: contrib/admin/views/main.py:829
 #, fuzzy, python-format
 msgid "Change history: %s"
-msgstr "Zmena hesla"
+msgstr "Zmena histórie:"
 
 #: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:271
 #: contrib/admin/views/doc.py:273 contrib/admin/views/doc.py:278
 #: contrib/admin/views/doc.py:279 contrib/admin/views/doc.py:281
 msgid "Integer"
-msgstr ""
+msgstr "Integer"
 
 #: contrib/admin/views/doc.py:263
 msgid "Boolean (Either True or False)"
-msgstr ""
+msgstr "Boolean (Buď True alebo False)"
 
 #: contrib/admin/views/doc.py:264
 #, python-format
 msgid "String (up to %(maxlength)s)"
-msgstr ""
+msgstr "Reťazec (maximálne do  %(maxlength)s)"
 
 #: contrib/admin/views/doc.py:265
 msgid "Comma-separated integers"
-msgstr ""
+msgstr "Celé čísla oddelené čiarkami"
 
 #: contrib/admin/views/doc.py:266
 #, fuzzy
 msgid "Date (without time)"
-msgstr "čas udalosti"
+msgstr "Dátum (bez času)"
 
 #: contrib/admin/views/doc.py:267
 #, fuzzy
 msgid "Date (with time)"
-msgstr "Dátum/čas"
+msgstr "Dátum (a čas)"
 
 #: contrib/admin/views/doc.py:268
 #, fuzzy
@@ -534,37 +630,33 @@ msgstr "E-mailová adresa"
 
 #: contrib/admin/views/doc.py:269 contrib/admin/views/doc.py:272
 msgid "File path"
-msgstr ""
+msgstr "Cesta k súboru"
 
 #: contrib/admin/views/doc.py:270
 #, fuzzy
 msgid "Decimal number"
-msgstr "December"
+msgstr "Desiatkové číslo"
 
 #: contrib/admin/views/doc.py:276
 msgid "Boolean (Either True, False or None)"
-msgstr ""
+msgstr "Boolean (Možné hodnoty sú True, False alebo None)"
 
 #: contrib/admin/views/doc.py:277
 #, fuzzy
 msgid "Phone number"
-msgstr "Vložte celé číslo."
+msgstr "Číslo telefónu"
 
 #: contrib/admin/views/doc.py:280
 msgid "String (up to 50)"
-msgstr ""
+msgstr "Reťazec (maximálne do 50 znakov)"
 
 #: contrib/admin/views/doc.py:282
 msgid "Text"
-msgstr ""
+msgstr "Text"
 
 #: contrib/admin/views/doc.py:283
 msgid "Time"
-msgstr ""
-
-#: contrib/admin/views/doc.py:284 contrib/flatpages/models/flatpages.py:6
-msgid "URL"
-msgstr "URL"
+msgstr "Čas"
 
 #: contrib/admin/views/doc.py:285
 msgid "U.S. state (two uppercase letters)"
@@ -574,24 +666,11 @@ msgstr "U.S. štát (dve veľké písmená)"
 msgid "XML text"
 msgstr "XML text"
 
-#: contrib/admin/templates/admin/template_debug.html:6
-msgid "Error in Template"
-msgstr "Chyba v predlohe"
-
-#: contrib/admin/templates/admin/template_debug.html:8
-#, python-format
-msgid ""
-"\n"
-"In template %(name)s, error at line %(line)s:\n"
-msgstr ""
-"\n"
-"V predlohe %(name)s, chyba na riadku %(line)s:\n"
-
-#: contrib/admin/templates/admin/change_list.html:5
-#: contrib/admin/templates/admin/500.html:4
 #: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/change_form.html:12
+#: contrib/admin/templates/admin/500.html:4
 #: contrib/admin/templates/admin/base.html:29
+#: contrib/admin/templates/admin/change_list.html:5
+#: contrib/admin/templates/admin/change_form.html:12
 #: contrib/admin/templates/registration/password_change_done.html:4
 #: contrib/admin/templates/registration/password_reset_form.html:4
 #: contrib/admin/templates/registration/logged_out.html:4
@@ -601,56 +680,6 @@ msgstr ""
 msgid "Home"
 msgstr "Začiatok"
 
-#: contrib/admin/templates/admin/change_list.html:10
-#, fuzzy, python-format
-msgid "Add %(name)s"
-msgstr "Pridaj"
-
-#: contrib/admin/templates/admin/index.html:27
-#: contrib/admin/templates/admin/change_form.html:14
-msgid "Add"
-msgstr "Pridaj"
-
-#: contrib/admin/templates/admin/index.html:33
-msgid "Change"
-msgstr "Zmeň"
-
-#: contrib/admin/templates/admin/index.html:43
-msgid "You don't have permission to edit anything."
-msgstr "Nemáte povolenie na zmeny ."
-
-#: contrib/admin/templates/admin/index.html:51
-msgid "Recent Actions"
-msgstr "Posledné udalosti"
-
-#: contrib/admin/templates/admin/index.html:52
-msgid "My Actions"
-msgstr "Moje udalosti"
-
-#: contrib/admin/templates/admin/index.html:56
-msgid "None available"
-msgstr "Nepovolené"
-
-#: contrib/admin/templates/admin/500.html:4
-msgid "Server error"
-msgstr "Chyba servera"
-
-#: contrib/admin/templates/admin/500.html:6
-msgid "Server error (500)"
-msgstr "Chyba servera (500)"
-
-#: contrib/admin/templates/admin/500.html:9
-msgid "Server Error <em>(500)</em>"
-msgstr "Chyba servera <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 ""
-"Vznikla chyba. Prostredníctvom e-mailu  bol o nej informovaný správca a "
-"chyba by mala byť o chviľu odstránená. Ďakujeme za vašu trpezlivosť."
-
 #: contrib/admin/templates/admin/object_history.html:5
 #: contrib/admin/templates/admin/change_form.html:19
 msgid "History"
@@ -688,17 +717,25 @@ msgstr "Django web admin"
 msgid "Django administration"
 msgstr "Administrácia Django"
 
-#: contrib/admin/templates/admin/login.html:15
-msgid "Username:"
-msgstr "Meno:"
+#: contrib/admin/templates/admin/500.html:4
+msgid "Server error"
+msgstr "Chyba servera"
 
-#: contrib/admin/templates/admin/login.html:18
-msgid "Password:"
-msgstr "Heslo:"
+#: contrib/admin/templates/admin/500.html:6
+msgid "Server error (500)"
+msgstr "Chyba servera (500)"
 
-#: contrib/admin/templates/admin/login.html:20
-msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
-msgstr "Zabudli ste<a href=\"/password_reset/\"> vaše heslo</a>?"
+#: contrib/admin/templates/admin/500.html:9
+msgid "Server Error <em>(500)</em>"
+msgstr "Chyba servera <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 ""
+"Vznikla chyba. Prostredníctvom e-mailu  bol o nej informovaný správca a "
+"chyba by mala byť o chviľu odstránená. Ďakujeme za vašu trpezlivosť."
 
 #: contrib/admin/templates/admin/404.html:4
 #: contrib/admin/templates/admin/404.html:8
@@ -714,23 +751,54 @@ msgstr ""
 msgid "We're sorry, but the requested page could not be found."
 msgstr "Ľutujeme, ale požadovaná stránka nebola nájdená."
 
-#: contrib/admin/templates/admin/change_form.html:20
-msgid "View on site"
-msgstr "Pozri tu"
+#: contrib/admin/templates/admin/index.html:27
+#: contrib/admin/templates/admin/change_form.html:14
+msgid "Add"
+msgstr "Pridaj"
 
-#: contrib/admin/templates/admin/change_form.html:28
-msgid "Please correct the error below."
-msgid_plural "Please correct the errors below."
-msgstr[0] "Prosím opravte chybu, je nižšie"
-msgstr[1] "Prosím opravte chyby, sú nižšie"
+#: contrib/admin/templates/admin/index.html:33
+msgid "Change"
+msgstr "Zmeň"
 
-#: contrib/admin/templates/admin/change_form.html:45
-msgid "Ordering"
-msgstr "Objednávanie"
+#: contrib/admin/templates/admin/index.html:43
+msgid "You don't have permission to edit anything."
+msgstr "Nemáte povolenie na zmeny ."
 
-#: contrib/admin/templates/admin/change_form.html:48
-msgid "Order:"
-msgstr "Objednávka:"
+#: contrib/admin/templates/admin/index.html:51
+msgid "Recent Actions"
+msgstr "Posledné udalosti"
+
+#: contrib/admin/templates/admin/index.html:52
+msgid "My Actions"
+msgstr "Moje udalosti"
+
+#: contrib/admin/templates/admin/index.html:56
+msgid "None available"
+msgstr "Nepovolené"
+
+#: contrib/admin/templates/admin/login.html:15
+msgid "Username:"
+msgstr "Meno užívateľa:"
+
+#: contrib/admin/templates/admin/login.html:18
+msgid "Password:"
+msgstr "Heslo:"
+
+#: contrib/admin/templates/admin/login.html:20
+msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
+msgstr "Zabudli ste<a href=\"/password_reset/\"> vaše heslo</a>?"
+
+#: contrib/admin/templates/admin/base.html:23
+msgid "Welcome,"
+msgstr "Vítajte,"
+
+#: contrib/admin/templates/admin/base.html:23
+msgid "Change password"
+msgstr "Zmena hesla"
+
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
+msgstr "Odhlásenie"
 
 #: contrib/admin/templates/admin/delete_confirmation.html:7
 #, python-format
@@ -756,17 +824,46 @@ msgstr ""
 msgid "Yes, I'm sure"
 msgstr "Ano, som si istý"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Welcome,"
-msgstr "Vítajte,"
+#: contrib/admin/templates/admin/template_debug.html:6
+msgid "Error in Template"
+msgstr "Chyba v predlohe"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
-msgstr "Zmena hesla"
+#: contrib/admin/templates/admin/template_debug.html:8
+#, python-format
+msgid ""
+"\n"
+"In template %(name)s, error at line %(line)s:\n"
+msgstr ""
+"\n"
+"V predlohe %(name)s, chyba na riadku %(line)s:\n"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "Odhlásenie"
+#: contrib/admin/templates/admin/change_list.html:10
+#, fuzzy, python-format
+msgid "Add %(name)s"
+msgstr "Pridaj %(name)s"
+
+#: contrib/admin/templates/admin/filter.html:1
+#, python-format
+msgid " By %(title)s "
+msgstr "Podľa %(title)s "
+
+#: contrib/admin/templates/admin/change_form.html:20
+msgid "View on site"
+msgstr "Pozri tu"
+
+#: contrib/admin/templates/admin/change_form.html:28
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] "Prosím opravte chybu, je nižšie"
+msgstr[1] "Prosím opravte chyby, sú nižšie"
+
+#: contrib/admin/templates/admin/change_form.html:45
+msgid "Ordering"
+msgstr "Objednávanie"
+
+#: contrib/admin/templates/admin/change_form.html:48
+msgid "Order:"
+msgstr "Objednávka:"
 
 #: contrib/admin/templates/admin/submit_line.html:3
 msgid "Delete"
@@ -787,12 +884,7 @@ msgstr "Uložiť a pokračovať editovať"
 #: contrib/admin/templates/admin/submit_line.html:7
 #, fuzzy
 msgid "Save"
-msgstr "aktívny"
-
-#: contrib/admin/templates/admin/filter.html:1
-#, python-format
-msgid " By %(title)s "
-msgstr "Podľa %(title)s "
+msgstr "Uložiť"
 
 #: contrib/admin/templates/registration/password_change_done.html:4
 #: contrib/admin/templates/registration/password_change_form.html:4
@@ -826,7 +918,7 @@ msgstr ""
 
 #: contrib/admin/templates/registration/password_reset_form.html:16
 msgid "E-mail address:"
-msgstr "E-mailová adresa"
+msgstr "E-mailová adresa:"
 
 #: contrib/admin/templates/registration/password_reset_form.html:16
 msgid "Reset my password"
@@ -932,14 +1024,11 @@ msgid ""
 msgstr ""
 "\n"
 "<p class=\"help\">Na inštaláciu zarážok, ťahajte linku do vášho bookmarks\n"
-"toolbar, alebo klik pravou myšou na linku a pridať do vášho  bookmarks. "
-"Teraz si môžete\n"
-"vyberať zarážky z ľubovoľnej stránky webu.  Poznámka: pri tvorbe niektorých\n"
-"zarážok z ních, sa vyžaduje aby ste sa pohybovali po stránke z počítača "
-"označeného\n"
-"ako \"internal\" (obrátte sa na vášho systémového administrátora, ak nie ste "
-"si istý a ak\n"
-"ak váš počítač je \"internal\").</p>\n"
+"toolbar, alebo klik pravou myšou na linku a pridať do vášho  bookmarks.\n "
+"Teraz si môžete vyberať zarážky z ľubovoľnej stránky webu.\n"
+"Poznámka: pri tvorbe niektorých zarážok, sa vyžaduje aby ste sa pohybovali\n"
+"po stránke z počítača označeného ako \"internal\" (obrátte sa na vášho \n"
+"systémového administrátora, ak nie ste si istý či váš počítač je \"internal\").</p>\n"
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:19
 msgid "Documentation for this page"
@@ -980,86 +1069,6 @@ msgstr "Edituj tento objekt (nové okno)"
 msgid "As above, but opens the admin page in a new window."
 msgstr "Ako hore, ale otvorí admin stránku v novom okne"
 
-#: 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: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
-#, fuzzy
-msgid ""
-"Example: 'flatpages/contact_page'. If this isn't provided, the system will "
-"use 'flatpages/default'."
-msgstr ""
-"Príklad: 'flatfiles/contact_page'. Ak sa toto nevykonalo,  systém použije  "
-"'flatfiles/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"
@@ -1266,7 +1275,7 @@ msgstr "užívateľské meno"
 
 #: models/auth.py:34
 msgid "first name"
-msgstr "krstné meno"
+msgstr "meno"
 
 #: models/auth.py:35
 msgid "last name"
@@ -1345,12 +1354,12 @@ msgstr "Český"
 msgid "Welsh"
 msgstr "Waleský"
 
-#: conf/global_settings.py:40 conf/global_settings.py:41
+#: conf/global_settings.py:40
 #, fuzzy
 msgid "Danish"
 msgstr "Španielsky"
 
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
 msgid "German"
 msgstr "Nemecký"
 
@@ -1649,7 +1658,7 @@ msgstr "Formát pre toto pole je chybný."
 msgid "This field is invalid."
 msgstr "Toto pole nie je platné."
 
-#: core/validators.py:425
+#: core/validators.py:425a
 #, python-format
 msgid "Could not retrieve anything from %s."
 msgstr "Nič som nemohol získať z %s."
@@ -1718,7 +1727,7 @@ msgstr ""
 #: core/meta/fields.py:46
 #, fuzzy, python-format
 msgid "Please enter a valid %s."
-msgstr "Prosím vložte platnú IP adresu."
+msgstr "Prosím vložte platné %s."
 
 #: core/meta/fields.py:60
 #, python-format
@@ -1739,7 +1748,7 @@ msgstr ""
 #: core/meta/fields.py:504
 #, fuzzy
 msgid "Enter a valid filename."
-msgstr "Vložte platnú e-mail adresu."
+msgstr "Vložte platné meno súboru."
 
 #: core/meta/fields.py:773
 #, python-format