diff --git a/django/conf/locale/sk/LC_MESSAGES/django.mo b/django/conf/locale/sk/LC_MESSAGES/django.mo
index eb3d6a2d2d7..572843f9710 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 98204431be0..3a8e300cdf3 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: 2006-02-02 06:36-0500\n"
+"POT-Creation-Date: 2006-03-21 09:01-0500\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"
@@ -107,7 +107,7 @@ msgstr "dátum/čas poslania"
 msgid "is public"
 msgstr "je zveréjnený"
 
-#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:256
+#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:257
 msgid "IP address"
 msgstr "IP adresa"
 
@@ -384,7 +384,7 @@ msgstr "Voliteľné"
 msgid "Post a photo"
 msgstr "Pošli foto"
 
-#: contrib/flatpages/models/flatpages.py:6 contrib/admin/views/doc.py:267
+#: contrib/flatpages/models/flatpages.py:6 contrib/admin/views/doc.py:268
 msgid "URL"
 msgstr "URL"
 
@@ -510,7 +510,7 @@ msgstr "záznam priebehu"
 msgid "log entries"
 msgstr "záznamy priebehu"
 
-#: contrib/admin/templatetags/admin_list.py:241
+#: contrib/admin/templatetags/admin_list.py:240
 msgid "All dates"
 msgstr "Všetky dátumy"
 
@@ -652,74 +652,70 @@ msgstr "Ste si istý?"
 msgid "Change history: %s"
 msgstr "Zmena histórie:"
 
-#: contrib/admin/views/doc.py:244 contrib/admin/views/doc.py:253
-#: contrib/admin/views/doc.py:255 contrib/admin/views/doc.py:261
-#: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:264
+#: contrib/admin/views/doc.py:245 contrib/admin/views/doc.py:254
+#: contrib/admin/views/doc.py:256 contrib/admin/views/doc.py:262
+#: contrib/admin/views/doc.py:263 contrib/admin/views/doc.py:265
 msgid "Integer"
 msgstr "Celočíselná hodnota"
 
-#: contrib/admin/views/doc.py:245
+#: contrib/admin/views/doc.py:246
 msgid "Boolean (Either True or False)"
 msgstr "Logická hodnota (buď True alebo False)"
 
-#: contrib/admin/views/doc.py:246
+#: contrib/admin/views/doc.py:247 contrib/admin/views/doc.py:264
 #, python-format
 msgid "String (up to %(maxlength)s)"
 msgstr "Dĺžka reťazca (maximálne do %(maxlength)s)"
 
-#: contrib/admin/views/doc.py:247
+#: contrib/admin/views/doc.py:248
 msgid "Comma-separated integers"
 msgstr "Čiarka oddeľuje celé čísla"
 
-#: contrib/admin/views/doc.py:248
+#: contrib/admin/views/doc.py:249
 msgid "Date (without time)"
 msgstr "Dátum (bez času)"
 
-#: contrib/admin/views/doc.py:249
+#: contrib/admin/views/doc.py:250
 msgid "Date (with time)"
 msgstr "Dátum ( a čas)"
 
-#: contrib/admin/views/doc.py:250
+#: contrib/admin/views/doc.py:251
 msgid "E-mail address"
 msgstr "E-mailová adresa"
 
-#: contrib/admin/views/doc.py:251 contrib/admin/views/doc.py:254
+#: contrib/admin/views/doc.py:252 contrib/admin/views/doc.py:255
 msgid "File path"
 msgstr "Cesta k súboru"
 
-#: contrib/admin/views/doc.py:252
+#: contrib/admin/views/doc.py:253
 msgid "Decimal number"
 msgstr "Desiatkové číslo"
 
-#: contrib/admin/views/doc.py:258
+#: contrib/admin/views/doc.py:259
 msgid "Boolean (Either True, False or None)"
 msgstr "Logická hodnota (buď True, False alebo None)"
 
-#: contrib/admin/views/doc.py:259
+#: contrib/admin/views/doc.py:260
 msgid "Relation to parent model"
 msgstr "Má vzťah na rodičovský model"
 
-#: contrib/admin/views/doc.py:260
+#: contrib/admin/views/doc.py:261
 msgid "Phone number"
 msgstr "Číslo telefónu"
 
-#: contrib/admin/views/doc.py:263
-msgid "String (up to 50)"
-msgstr "Reťazec (do 50 )"
-
-#: contrib/admin/views/doc.py:265
+#: contrib/admin/views/doc.py:266
 msgid "Text"
 msgstr "Text"
 
-#: contrib/admin/views/doc.py:266
+#: contrib/admin/views/doc.py:267
 msgid "Time"
 msgstr "Čas"
 
-#: contrib/admin/views/doc.py:268
+#: contrib/admin/views/doc.py:269
 msgid "U.S. state (two uppercase letters)"
 msgstr "U.S. štát (dve veľké písmena)"
 
-#: contrib/admin/views/doc.py:269
+#: contrib/admin/views/doc.py:270
 msgid "XML text"
 msgstr "XML text"
 
@@ -727,7 +723,11 @@ msgstr "XML text"
 msgid "Currently:"
 msgstr "Aktuálny:"
 
-#: contrib/admin/templates/widget/file.html:3
+#: contrib/admin/templates/widget/file.html:4
+msgid "Delete this file."
+msgstr "Vymaž tento súbor."
+
+#: contrib/admin/templates/widget/file.html:6
 msgid "Change:"
 msgstr "Zmeň:"
 
@@ -1464,75 +1464,83 @@ msgid "German"
 msgstr "Nemecký"
 
 #: conf/global_settings.py:42
+msgid "Greek"
+msgstr ""
+
+#: conf/global_settings.py:43
 msgid "English"
 msgstr "Anglický"
 
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
 msgid "Spanish"
 msgstr "Španielsky"
 
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
 msgid "French"
 msgstr "Francúzsky"
 
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
 msgid "Galician"
 msgstr "Galicijský"
 
-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
 msgid "Icelandic"
 msgstr "Islandský"
 
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
 msgid "Italian"
 msgstr "Taliansky"
 
-#: conf/global_settings.py:48
+#: conf/global_settings.py:49
 msgid "Japanese"
 msgstr "Japónsky"
 
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
 msgid "Dutch"
 msgstr "Holándsky"
 
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
 msgid "Norwegian"
 msgstr "Nórsky"
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
 msgid "Brazilian"
 msgstr "Brazílsky"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:53
 msgid "Romanian"
 msgstr "Rumúnsky"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:54
 msgid "Russian"
 msgstr "Ruský"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:55
 msgid "Slovak"
 msgstr "Slovenský"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:56
+msgid "Slovenian"
+msgstr "Slovinský"
+
+#: conf/global_settings.py:57
 msgid "Serbian"
 msgstr "Srbský"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:58
 msgid "Swedish"
 msgstr "Švédsky"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:59
 msgid "Simplified Chinese"
 msgstr "Zjednodušená činština "
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:60
 msgid "Traditional Chinese"
 msgstr "Tradičná čínština"
 
-#: core/formfields.py:59 core/meta/fields.py:285 core/meta/fields.py:488
-#: core/meta/fields.py:499
+#: core/formfields.py:59 core/meta/fields.py:283 core/meta/fields.py:486
+#: core/meta/fields.py:497
 msgid "This field is required."
 msgstr "Toto pole  je nevyhnutné."
 
@@ -1568,71 +1576,73 @@ msgstr "Vložte celé kladné číslo."
 msgid "Enter a whole number between 0 and 32,767."
 msgstr "Vložte celé číslo s hodnotou medzi 0 a 32767."
 
-#: core/validators.py:62
+#: core/validators.py:61
 msgid "This value must contain only letters, numbers and underscores."
 msgstr "Toto môže obsahovať len písmená, číslice a podčiarkovníky."
 
-#: core/validators.py:66
-msgid "This value must contain only letters, numbers, underscores and slashes."
-msgstr "Toto môže obsahovať len písmena, číslice, podčiarkovniky a lomítka."
+#: core/validators.py:65
+msgid ""
+"This value must contain only letters, numbers, underscores, dashes or "
+"slashes."
+msgstr "Toto môže obsahovať len písmena, číslice, podčiarkovniky, pomlčky a lomítka."
 
-#: core/validators.py:74
+#: core/validators.py:73
 msgid "Uppercase letters are not allowed here."
 msgstr "Veľké písmená tu nie sú povolené."
 
-#: core/validators.py:78
+#: core/validators.py:77
 msgid "Lowercase letters are not allowed here."
 msgstr "Malé písmena tu nie sú povolené."
 
-#: core/validators.py:85
+#: core/validators.py:84
 msgid "Enter only digits separated by commas."
 msgstr "Vložte len číslice, oddelené čiarkami."
 
-#: core/validators.py:97
+#: core/validators.py:96
 msgid "Enter valid e-mail addresses separated by commas."
 msgstr "Vložte platné e-mail adresy oddelené čiarkami."
 
-#: core/validators.py:101
+#: core/validators.py:100
 msgid "Please enter a valid IP address."
 msgstr "Prosím vložte platnú IP adresu."
 
-#: core/validators.py:105
+#: core/validators.py:104
 msgid "Empty values are not allowed here."
 msgstr "Prázdne hodnoty tu nie sú povolené."
 
-#: core/validators.py:109
+#: core/validators.py:108
 msgid "Non-numeric characters aren't allowed here."
 msgstr "Znaky, ktoré nie sú číslicami, tu nie sú povolené."
 
-#: core/validators.py:113
+#: core/validators.py:112
 msgid "This value can't be comprised solely of digits."
 msgstr "Tento údaj nemôže byť vytvorený len z číslic."
 
-#: core/validators.py:118
+#: core/validators.py:117
 msgid "Enter a whole number."
 msgstr "Vložte celé číslo."
 
-#: core/validators.py:122
+#: core/validators.py:121
 msgid "Only alphabetical characters are allowed here."
 msgstr "Tu sú povolené len alfanumerické znaky."
 
-#: core/validators.py:126
+#: core/validators.py:125
 msgid "Enter a valid date in YYYY-MM-DD format."
 msgstr "Vložte platný dátum vo formáte RRRR-MM-DD."
 
-#: core/validators.py:130
+#: core/validators.py:129
 msgid "Enter a valid time in HH:MM format."
 msgstr "Vložte platný čas vo formáte HH:MM."
 
-#: core/validators.py:134
+#: core/validators.py:133
 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"
 
-#: core/validators.py:138
+#: core/validators.py:137
 msgid "Enter a valid e-mail address."
 msgstr "Vložte platnú e-mail adresu."
 
-#: core/validators.py:150
+#: core/validators.py:149
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
@@ -1640,27 +1650,27 @@ msgstr ""
 "Nahrajte platný obrázok. Súbor, ktorý ste nahrali buď nebol obrázok alebo je "
 "nahratý poškodený obrázok."
 
-#: core/validators.py:157
+#: core/validators.py:156
 #, python-format
 msgid "The URL %s does not point to a valid image."
 msgstr "URL %s neukazuje na platný obrázok."
 
-#: core/validators.py:161
+#: core/validators.py:160
 #, python-format
 msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid."
 msgstr ""
 "Telefónne číslo musí mať formát XXX-XXX-XXXX. Číslo \"%s\" je neplatné."
 
-#: core/validators.py:169
+#: core/validators.py:168
 #, python-format
 msgid "The URL %s does not point to a valid QuickTime video."
 msgstr "URL %s neukazuje na platné QuickTime video."
 
-#: core/validators.py:173
+#: core/validators.py:172
 msgid "A valid URL is required."
 msgstr "Platné URL je požadované."
 
-#: core/validators.py:187
+#: core/validators.py:186
 #, python-format
 msgid ""
 "Valid HTML is required. Specific errors are:\n"
@@ -1669,70 +1679,70 @@ msgstr ""
 "Je požadovaná bezchybná stránka  HTML. Zistené chyby sú:\n"
 "%s"
 
-#: core/validators.py:194
+#: core/validators.py:193
 #, python-format
 msgid "Badly formed XML: %s"
 msgstr "Chybne formované XML: %s"
 
-#: core/validators.py:204
+#: core/validators.py:203
 #, python-format
 msgid "Invalid URL: %s"
 msgstr "Neplatné URL: %s"
 
-#: core/validators.py:208 core/validators.py:210
+#: core/validators.py:207 core/validators.py:209
 #, python-format
 msgid "The URL %s is a broken link."
 msgstr "Odkaz na URL %s je neplatný."
 
-#: core/validators.py:216
+#: core/validators.py:215
 msgid "Enter a valid U.S. state abbreviation."
 msgstr "Vložte platnú skratku U.S. štátu."
 
-#: core/validators.py:231
+#: core/validators.py:230
 #, 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] "Vyjadrujte sa slušne! Slovo %s tu nie je dovolené použivať."
 msgstr[1] "Vyjadrujte sa slušne! Slová %s tu nie je dovolené použivať."
 
-#: core/validators.py:238
+#: core/validators.py:237
 #, python-format
 msgid "This field must match the '%s' field."
 msgstr "Toto pole sa musí zhodovať s poľom '%s'. "
 
-#: core/validators.py:257
+#: core/validators.py:256
 msgid "Please enter something for at least one field."
 msgstr "Prosím vložte niečo aspoň pre jedno pole."
 
-#: core/validators.py:266 core/validators.py:277
+#: core/validators.py:265 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. "
 
-#: core/validators.py:284
+#: core/validators.py:283
 #, 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"
 
-#: core/validators.py:296
+#: core/validators.py:295
 #, python-format
 msgid "This field must be given if %(field)s is not %(value)s"
 msgstr ""
 "Toto pole musí byť vyplnené tak, že %(field)s nesmie obsahovať %(value)s"
 
-#: core/validators.py:315
+#: core/validators.py:314
 msgid "Duplicate values are not allowed."
 msgstr "Duplicitné hodnoty nie sú povolené."
 
-#: core/validators.py:338
+#: core/validators.py:337
 #, python-format
 msgid "This value must be a power of %s."
 msgstr "Táto hodnota musí byť mocninou  %s."
 
-#: core/validators.py:349
+#: core/validators.py:348
 msgid "Please enter a valid decimal number."
 msgstr "Prosím vložte platné desiatkové číslo. "
 
-#: core/validators.py:351
+#: core/validators.py:350
 #, python-format
 msgid "Please enter a valid decimal number with at most %s total digit."
 msgid_plural ""
@@ -1740,7 +1750,7 @@ msgid_plural ""
 msgstr[0] "Prosím vložte platné desiatkové číslo s najviac %s číslicou."
 msgstr[1] "Prosím vložte platné desiatkové číslo s najviac %s číslicami."
 
-#: core/validators.py:354
+#: core/validators.py:353
 #, python-format
 msgid "Please enter a valid decimal number with at most %s decimal place."
 msgid_plural ""
@@ -1750,37 +1760,37 @@ msgstr[0] ""
 msgstr[1] ""
 "Prosím vložte platné desatinné číslo s najviac %s desatinnými miestami."
 
-#: core/validators.py:364
+#: core/validators.py:363
 #, 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."
 
-#: core/validators.py:365
+#: core/validators.py:364
 #, 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."
 
-#: core/validators.py:378
+#: core/validators.py:377
 msgid "The format for this field is wrong."
 msgstr "Formát pre toto pole je chybný."
 
-#: core/validators.py:393
+#: core/validators.py:392
 msgid "This field is invalid."
 msgstr "Toto pole nie je platné."
 
-#: core/validators.py:428
+#: core/validators.py:427
 #, python-format
 msgid "Could not retrieve anything from %s."
 msgstr "Nič som nemohol získať z %s."
 
-#: core/validators.py:431
+#: core/validators.py:430
 #, python-format
 msgid ""
 "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
 msgstr ""
 " URL %(url)s vrátilo neplatnú hlavičku  Content-Type  '%(contenttype)s'."
 
-#: core/validators.py:464
+#: core/validators.py:463
 #, python-format
 msgid ""
 "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
@@ -1789,7 +1799,7 @@ msgstr ""
 "Prosím zavrite nezavretý  %(tag)s popisovač v riadku %(line)s. (Riadok "
 "začína s  \"%(start)s\".)"
 
-#: core/validators.py:468
+#: core/validators.py:467
 #, python-format
 msgid ""
 "Some text starting on line %(line)s is not allowed in that context. (Line "
@@ -1798,7 +1808,7 @@ msgstr ""
 "Nejaký text začínajúci na riadku %(line)s nie je povolený v tomto kontexte. "
 "(Riadok začína s \"%(start)s\".)"
 
-#: core/validators.py:473
+#: core/validators.py:472
 #, python-format
 msgid ""
 "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
@@ -1807,7 +1817,7 @@ msgstr ""
 "\"%(attr)s\" na riadku %(line)s je neplatný atribút. (Riadok začína s \"%"
 "(start)s\".)"
 
-#: core/validators.py:478
+#: core/validators.py:477
 #, python-format
 msgid ""
 "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
@@ -1816,7 +1826,7 @@ msgstr ""
 "\"<%(tag)s>\" na riadku %(line)s je neplatný popisovač. (Riadok začína s \"%"
 "(start)s\".)"
 
-#: core/validators.py:482
+#: core/validators.py:481
 #, python-format
 msgid ""
 "A tag on line %(line)s is missing one or more required attributes. (Line "
@@ -1825,7 +1835,7 @@ msgstr ""
 "Popisovaču na riadku %(line)s chýba jeden alebo viac atribútov. (Riadok "
 "začína s \"%(start)s\".)"
 
-#: core/validators.py:487
+#: core/validators.py:486
 #, python-format
 msgid ""
 "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
@@ -1834,7 +1844,7 @@ msgstr ""
 "Atribút \"%(attr)s\" na riadku %(line)s má neplatnú hodnotu. (Riadok začína "
 "s \"%(start)s\".)"
 
-#: core/meta/__init__.py:1944
+#: core/meta/__init__.py:1962
 #, python-format
 msgid "%(object)s with this %(type)s already exists for the given %(field)s."
 msgstr "%(object)s s %(type)s už existuje pre prvok  %(field)s."
@@ -1860,11 +1870,11 @@ msgstr ""
 " Podržte \"Control\", alebo \"Command\" na  Mac_u, na výber viac ako jednej "
 "položky."
 
-#: core/meta/fields.py:508
+#: core/meta/fields.py:506
 msgid "Enter a valid filename."
 msgstr "Vložte platné meno súboru."
 
-#: core/meta/fields.py:782
+#: core/meta/fields.py:780
 #, python-format
 msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
 msgid_plural ""
@@ -1883,3 +1893,6 @@ msgid ""
 msgstr ""
 "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 )"