Commits

Anonymous committed 7742b9d

gis: Merged revisions 7772-7808,7811-7814,7816-7823,7826-7829,7831-7833,7835 via svnmerge from trunk. Modified `GeoWhereNode` accordingly for changes in r7835.

  • Participants
  • Parent commits c284550
  • Branches gis

Comments (0)

Files changed (104)

     Arthur <avandorp@gmail.com>
     av0000@mail.ru
     David Avsajanishvili <avsd05@gmail.com>
-    axiak@mit.edu
+    Mike Axiak <axiak@mit.edu>
     Niran Babalola <niran@niran.org>
     Morten Bagai <m@bagai.com>
     Mikaël Barbero <mikael.barbero nospam at nospam free.fr>
     Sengtha Chay <sengtha@e-khmer.com>
     ivan.chelubeev@gmail.com
     Bryan Chow <bryan at verdjn dot com>
+    Antonis Christofides <anthony@itia.ntua.gr>
     Michal Chruszcz <troll@pld-linux.org>
     Can Burak Çilingir <canburak@cs.bilgi.edu.tr>
     Ian Clelland <clelland@gmail.com>
     Marc Fargas <telenieko@telenieko.com>
     Szilveszter Farkas <szilveszter.farkas@gmail.com>
     favo@exoweb.net
+    fdr <drfarina@gmail.com>
     Dmitri Fedortchenko <zeraien@gmail.com>
+    Jonathan Feignberg <jdf@pobox.com>
     Liang Feng <hutuworm@gmail.com>
     Bill Fenner <fenner@gmail.com>
     Stefane Fermgier <sf@fermigier.com>
     james_027@yahoo.com
     jcrasta@gmail.com
     Zak Johnson <zakj@nox.cx>
+    Nis Jørgensen <nis@superlativ.dk>
     Michael Josephson <http://www.sdjournal.com/>
     jpellerin@gmail.com
     junzhang.jn@gmail.com

File django/conf/global_settings.py

 # Example: "http://media.lawrence.com"
 MEDIA_URL = ''
 
+# List of upload handler classes to be applied in order.
+FILE_UPLOAD_HANDLERS = (
+    'django.core.files.uploadhandler.MemoryFileUploadHandler',
+    'django.core.files.uploadhandler.TemporaryFileUploadHandler',
+)
+
+# Maximum size, in bytes, of a request before it will be streamed to the
+# file system instead of into memory.
+FILE_UPLOAD_MAX_MEMORY_SIZE = 2621440 # i.e. 2.5 MB
+
+# Directory in which upload streamed files will be temporarily saved. A value of
+# `None` will make Django use the operating system's default temporary directory
+# (i.e. "/tmp" on *nix systems).
+FILE_UPLOAD_TEMP_DIR = None
+
 # Default formatting for date objects. See all available format strings here:
 # http://www.djangoproject.com/documentation/templates/#now
 DATE_FORMAT = 'N j, Y'

File django/conf/locale/mk/LC_MESSAGES/django.mo

Binary file modified.

File django/conf/locale/mk/LC_MESSAGES/django.po

 # translation of django.po to Macedonian
 #
-# Georgi Stanojevski <glisha@gmail.com>, 2006, 2007.
+# Georgi Stanojevski <glisha@gmail.com>, 2006, 2007, 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: Django\n"
+"Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-04-07 19:51+0200\n"
-"PO-Revision-Date: 2007-04-07 20:29+0200\n"
+"POT-Creation-Date: 2008-06-18 12:26+0200\n"
+"PO-Revision-Date: 2008-06-28 16:36+0200\n"
 "Last-Translator: Georgi Stanojevski <glisha@gmail.com>\n"
 "Language-Team: Macedonian <ossm-members@hedona.on.net.mk>\n"
 "MIME-Version: 1.0\n"
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: db/models/manipulators.py:307
-#, python-format
-msgid "%(object)s with this %(type)s already exists for the given %(field)s."
-msgstr "%(object)s од овој тип %(type)s веќе постои за даденото %(field)s."
-
-#: db/models/manipulators.py:308 contrib/admin/views/main.py:335
-#: contrib/admin/views/main.py:337 contrib/admin/views/main.py:339
-msgid "and"
-msgstr "и"
-
-#: db/models/fields/related.py:53
-#, python-format
-msgid "Please enter a valid %s."
-msgstr "Ве молам внесете правилно %s."
-
-#: db/models/fields/related.py:642
-msgid "Separate multiple IDs with commas."
-msgstr "Одвојте ги идентификационите броеви со запирки."
-
-#: db/models/fields/related.py:644
-msgid "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
-msgstr "Држете го „Control“ или „Command“ на Мекинтош за да изберете повеќе од едно."
-
-#: db/models/fields/related.py:691
-#, 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] ""
-"Ве молам внесете правилен %(self)s идентификацион број. Оваа вредност %"
-"(value)r е неправилна."
-msgstr[1] ""
-"Ве молам внесете правилен %(self)s идентификацион број. Вредностите %(value)"
-"r се неправилни."
-
-#: db/models/fields/__init__.py:42
-#, python-format
-msgid "%(optname)s with this %(fieldname)s already exists."
-msgstr "%(optname)s со ова %(fieldname)s веќе постои."
-
-#: db/models/fields/__init__.py:117 db/models/fields/__init__.py:274
-#: db/models/fields/__init__.py:610 db/models/fields/__init__.py:621
-#: oldforms/__init__.py:357 newforms/fields.py:80 newforms/fields.py:376
-#: newforms/fields.py:452 newforms/fields.py:463 newforms/models.py:178
-msgid "This field is required."
-msgstr "Ова поле е задолжително."
-
-#: db/models/fields/__init__.py:367
-msgid "This value must be an integer."
-msgstr "Оваа вредност мора да биде цел број."
-
-#: db/models/fields/__init__.py:402
-msgid "This value must be either True or False."
-msgstr "Оваа вредност мора да биде или точно или неточно."
-
-#: db/models/fields/__init__.py:423
-msgid "This field cannot be null."
-msgstr "Оваа вредност неможе да биде null."
-
-#: db/models/fields/__init__.py:457 core/validators.py:148
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "Внесете правилен датум во форматот ГГГГ-ММ-ДД."
-
-#: db/models/fields/__init__.py:526 core/validators.py:157
-msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format."
-msgstr "Внесете правилен датум/време во форматот ГГГГ-ММ-ДД ЧЧ:ММ."
-
-#: db/models/fields/__init__.py:630
-msgid "Enter a valid filename."
-msgstr "Внесите правилно име на датотека."
-
-#: db/models/fields/__init__.py:751
-msgid "This value must be either None, True or False."
-msgstr "Оваа вредност мора да биде празна, точно или неточно."
-
-#: conf/global_settings.py:39
+#: conf/global_settings.py:44
 msgid "Arabic"
 msgstr "Арапски"
 
-#: conf/global_settings.py:40
+#: conf/global_settings.py:45
 msgid "Bengali"
 msgstr "Бенгалски"
 
-#: conf/global_settings.py:41
+#: conf/global_settings.py:46
+msgid "Bulgarian"
+msgstr "Бугарски"
+
+#: conf/global_settings.py:47
 msgid "Catalan"
 msgstr "Каталански"
 
-#: conf/global_settings.py:42
+#: conf/global_settings.py:48
 msgid "Czech"
 msgstr "Чешки"
 
-#: conf/global_settings.py:43
+#: conf/global_settings.py:49
 msgid "Welsh"
 msgstr "Велшки"
 
-#: conf/global_settings.py:44
+#: conf/global_settings.py:50
 msgid "Danish"
 msgstr "Дански"
 
-#: conf/global_settings.py:45
+#: conf/global_settings.py:51
 msgid "German"
 msgstr "Германски"
 
-#: conf/global_settings.py:46
+#: conf/global_settings.py:52
 msgid "Greek"
 msgstr "Грчки"
 
-#: conf/global_settings.py:47
+#: conf/global_settings.py:53
 msgid "English"
 msgstr "Англиски"
 
-#: conf/global_settings.py:48
+#: conf/global_settings.py:54
 msgid "Spanish"
 msgstr "Шпански"
 
-#: conf/global_settings.py:49
+#: conf/global_settings.py:55
 msgid "Argentinean Spanish"
 msgstr "Аргентиско шпански"
 
-#: conf/global_settings.py:50
+#: conf/global_settings.py:56
+msgid "Basque"
+msgstr "Баскиски"
+
+#: conf/global_settings.py:57
+msgid "Persian"
+msgstr "Персиски"
+
+#: conf/global_settings.py:58
 msgid "Finnish"
 msgstr "Фински"
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:59
 msgid "French"
 msgstr "Француски"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:60
+msgid "Irish"
+msgstr "Ирски"
+
+#: conf/global_settings.py:61
 msgid "Galician"
 msgstr "Галски"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:62
 msgid "Hungarian"
 msgstr "Унгарски"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:63
 msgid "Hebrew"
 msgstr "Еврејски"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:64
+msgid "Croatian"
+msgstr "Хрватски"
+
+#: conf/global_settings.py:65
 msgid "Icelandic"
 msgstr "Исландски"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:66
 msgid "Italian"
 msgstr "Италијански"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:67
 msgid "Japanese"
 msgstr "Јапонски"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:68
+msgid "Georgian"
+msgstr "Грузиски"
+
+#: conf/global_settings.py:69
+msgid "Korean"
+msgstr "Корејски"
+
+#: conf/global_settings.py:70
+msgid "Khmer"
+msgstr "Кмер"
+
+#: conf/global_settings.py:71
 msgid "Kannada"
 msgstr "Канада"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:72
 msgid "Latvian"
 msgstr "Латвиски"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:73
 msgid "Macedonian"
 msgstr "Македонски"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:74
 msgid "Dutch"
 msgstr "Холандски"
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:75
 msgid "Norwegian"
 msgstr "Норвешки"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:76
 msgid "Polish"
 msgstr "Полски"
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:77
 msgid "Portugese"
 msgstr "Португалкски"
 
-#: conf/global_settings.py:65
-msgid "Brazilian"
-msgstr "Бразилски"
-
-#: conf/global_settings.py:66
+#: conf/global_settings.py:78
+msgid "Brazilian Portuguese"
+msgstr "Бразилско португалски"
+
+#: conf/global_settings.py:79
 msgid "Romanian"
 msgstr "Романски"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:80
 msgid "Russian"
 msgstr "Руски"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:81
 msgid "Slovak"
 msgstr "Словачки"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:82
 msgid "Slovenian"
 msgstr "Словенечки"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:83
 msgid "Serbian"
 msgstr "Српски"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:84
 msgid "Swedish"
 msgstr "Шведски"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:85
 msgid "Tamil"
 msgstr "Тамил"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:86
 msgid "Telugu"
 msgstr "Телугу"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:87
 msgid "Turkish"
 msgstr "Турски"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:88
 msgid "Ukrainian"
 msgstr "Украински"
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:89
 msgid "Simplified Chinese"
 msgstr "Упростен кинески"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:90
 msgid "Traditional Chinese"
 msgstr "Традиционален кинески"
 
-#: core/validators.py:64
-msgid "This value must contain only letters, numbers and underscores."
-msgstr "Оваа вредност смее да има само букви, бројки или долни црти."
-
-#: core/validators.py:68
-msgid ""
-"This value must contain only letters, numbers, underscores, dashes or "
-"slashes."
-msgstr "Оваа вредност смее да има само букви, бројки, долни црти, црти или коси црти."
-
-#: core/validators.py:72
-msgid "This value must contain only letters, numbers, underscores or hyphens."
-msgstr "Оваа вредност смее да содржи само букви, бројки, долни црти или црти."
-
-#: core/validators.py:76
-msgid "Uppercase letters are not allowed here."
-msgstr "Големи букви не се дозволени."
-
-#: core/validators.py:80
-msgid "Lowercase letters are not allowed here."
-msgstr "Мали букви не се дозволени."
-
-#: core/validators.py:87
-msgid "Enter only digits separated by commas."
-msgstr "Внесете само цифри одделени со запирки."
-
-#: core/validators.py:99
-msgid "Enter valid e-mail addresses separated by commas."
-msgstr "Внесете валидни адреси за е-пошта одделени со запирки."
-
-#: core/validators.py:103
-msgid "Please enter a valid IP address."
-msgstr "Ве молам внесете валидна ИП адреса."
-
-#: core/validators.py:107
-msgid "Empty values are not allowed here."
-msgstr "Празни вредности не се дозволени."
-
-#: core/validators.py:111
-msgid "Non-numeric characters aren't allowed here."
-msgstr "Ненумерички знаци не се дозволени тука."
-
-#: core/validators.py:115
-msgid "This value can't be comprised solely of digits."
-msgstr "Оваа вредност не смее да биде само од цифри."
-
-#: core/validators.py:120 newforms/fields.py:128
-msgid "Enter a whole number."
-msgstr "Внеси цел број."
-
-#: core/validators.py:124
-msgid "Only alphabetical characters are allowed here."
-msgstr "Дозволени се само букви."
-
-#: core/validators.py:139
-msgid "Year must be 1900 or later."
-msgstr "Годината мора да биде 1900 или покасно."
-
-#: core/validators.py:143
-#, python-format
-msgid "Invalid date: %s"
-msgstr "Неправилен датум: %s"
-
-#: core/validators.py:153
-msgid "Enter a valid time in HH:MM format."
-msgstr "Внесете правилно време во форматот HH:MM."
-
-#: core/validators.py:162 newforms/fields.py:271
-msgid "Enter a valid e-mail address."
-msgstr "Внесeте правилна адреса за е-пошта."
-
-#: core/validators.py:174 core/validators.py:445 oldforms/__init__.py:672
-msgid "No file was submitted. Check the encoding type on the form."
-msgstr "Не беше пратена датотека. Проверете го типот на енкодирање на формата."
-
-#: core/validators.py:178
-msgid ""
-"Upload a valid image. The file you uploaded was either not an image or a "
-"corrupted image."
-msgstr ""
-"Качете валидна фотографија. Датотеката која ја качивте или не беше "
-"фотографија или беше расипана датотеката."
-
-#: core/validators.py:185
-#, python-format
-msgid "The URL %s does not point to a valid image."
-msgstr "Адресата %s не покажува кон валидна фотографија."
-
-#: core/validators.py:189
-#, python-format
-msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid."
-msgstr ""
-"Телефонските броеви мора да бидат во XXX-XXX-XXXX форматот. „%s“ не е "
-"валиден."
-
-#: core/validators.py:197
-#, python-format
-msgid "The URL %s does not point to a valid QuickTime video."
-msgstr "Адресата „%s“ не покажува кон QuickTime видео."
-
-#: core/validators.py:201
-msgid "A valid URL is required."
-msgstr "Задолжителна е правилна адреса."
-
-#: core/validators.py:215
-#, python-format
-msgid ""
-"Valid HTML is required. Specific errors are:\n"
-"%s"
-msgstr ""
-"Задолжителен е правилен HTML. Грешките се:\n"
-"%s"
-
-#: core/validators.py:222
-#, python-format
-msgid "Badly formed XML: %s"
-msgstr "Неправилно формиран XML: %s"
-
-#: core/validators.py:239
-#, python-format
-msgid "Invalid URL: %s"
-msgstr "Неправилна адреса: %s"
-
-#: core/validators.py:244 core/validators.py:246
-#, python-format
-msgid "The URL %s is a broken link."
-msgstr "Адресата %s е скршена врска."
-
-#: core/validators.py:252
-msgid "Enter a valid U.S. state abbreviation."
-msgstr "Внесете правилна скратеница за држава во САД."
-
-#: core/validators.py:266
-#, 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:273
-#, python-format
-msgid "This field must match the '%s' field."
-msgstr "Ова поле мора да соодејствува со полето „%s“."
-
-#: core/validators.py:292
-msgid "Please enter something for at least one field."
-msgstr "Ве молам внесете нешто во барем едно поле."
-
-#: core/validators.py:301 core/validators.py:312
-msgid "Please enter both fields or leave them both empty."
-msgstr "Ве молам внесете во двете полиња или оставете ги двете празни."
-
-#: core/validators.py:320
-#, python-format
-msgid "This field must be given if %(field)s is %(value)s"
-msgstr "Ова поле мора да биде зададено ако %(field)s е %(value)s"
-
-#: core/validators.py:333
-#, python-format
-msgid "This field must be given if %(field)s is not %(value)s"
-msgstr "Ова поле мора да биде зададено ако %(field)s не е %(value)s"
-
-#: core/validators.py:352
-msgid "Duplicate values are not allowed."
-msgstr "Дупликат вредности не се дозволени."
-
-#: core/validators.py:367
-#, python-format
-msgid "This value must be between %(lower)s and %(upper)s."
-msgstr "Оваа вредноста мора да биде помеѓу %(lower)s и %(upper)s."
-
-#: core/validators.py:369
-#, python-format
-msgid "This value must be at least %s."
-msgstr "Оваа вредноста мора да биде најмалку %s."
-
-#: core/validators.py:371
-#, python-format
-msgid "This value must be no more than %s."
-msgstr "Оваа вредност не смее да биде поголема од %s."
-
-#: core/validators.py:407
-#, python-format
-msgid "This value must be a power of %s."
-msgstr "Оваа вредноста мора да биде степен од %s."
-
-#: core/validators.py:418
-msgid "Please enter a valid decimal number."
-msgstr "Ве молам внесете правилен децимален број."
-
-#: core/validators.py:422
-#, 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 цифрa."
-msgstr[1] "Ве молам внесете правилен децимален број со најмногу %s вкупно цифри."
-
-#: core/validators.py:425
-#, python-format
-msgid "Please enter a valid decimal number with a whole part of at most %s digit."
-msgid_plural "Please enter a valid decimal number with a whole part of at most %s digits."
-msgstr[0] ""
-"Ве молам внесете правилен децимален број кој во целиот број има најмногу %s "
-"цифра."
-msgstr[1] ""
-"Ве молам внесете правилен децимален број кој во целиот број има најмногу %s "
-"цифри."
-
-#: core/validators.py:428
-#, 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[1] "Ве молам внесете правилен децимален број кој има најмногу %s децимални цифри."
-
-#: core/validators.py:438
-#, python-format
-msgid "Make sure your uploaded file is at least %s bytes big."
-msgstr "Потврдете дека качената датотека има најмалку %s бајти."
-
-#: core/validators.py:439
-#, python-format
-msgid "Make sure your uploaded file is at most %s bytes big."
-msgstr "Потврдете дека качената датотека има најмногу %s бајти."
-
-#: core/validators.py:456
-msgid "The format for this field is wrong."
-msgstr "Форматот за ова поле е грешен."
-
-#: core/validators.py:471
-msgid "This field is invalid."
-msgstr "Ова поле не е правилно."
-
-#: core/validators.py:507
-#, python-format
-msgid "Could not retrieve anything from %s."
-msgstr "Неможев да извадам ништо од %s."
-
-#: core/validators.py:510
-#, 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:543
-#, 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“.)"
-
-#: core/validators.py:547
-#, 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“.)"
-
-#: core/validators.py:552
-#, python-format
-msgid ""
-"\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
-"(start)s\".)"
-msgstr ""
-"„%(attr)s“ на линија %(line)s е неправилен атрибут. (линијата започнува со „%"
-"(start)s“.)"
-
-#: core/validators.py:557
-#, python-format
-msgid ""
-"\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
-"(start)s\".)"
-msgstr ""
-"„<%(tag)s>“ на линија %(line)s е неправилен таг. (линијата започнува со „%"
-"(start)s“.)"
-
-#: core/validators.py:561
-#, 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“)."
-
-#: core/validators.py:566
-#, python-format
-msgid ""
-"The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
-"starts with \"%(start)s\".)"
-msgstr ""
-"Атрибутот „%(attr)s“ на линијата %(line)s има неправилна вредност (линијата "
-"започнува со „%(start)s“)."
-
-#: contrib/auth/forms.py:17 contrib/auth/forms.py:138
-msgid "The two password fields didn't match."
-msgstr "Двете полиња со лозинките не се совпаѓаат."
-
-#: contrib/auth/forms.py:25
-msgid "A user with that username already exists."
-msgstr "Веќе постои корисник со тоа корисничко име."
-
-#: contrib/auth/forms.py:53
-msgid ""
-"Your Web browser doesn't appear to have cookies enabled. Cookies are "
-"required for logging in."
-msgstr ""
-"Не изгледа дека вашиот прелистувач има овозможено колачиња. Колачињата се "
-"потребни за да се најавите."
-
-#: contrib/auth/forms.py:60 contrib/admin/views/decorators.py:10
-msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
-msgstr ""
-"Ве молам внесете точно корисничко име и лозинка. Имајте на ум дека и во "
-"двете полиња се битни големите и малите букви."
-
-#: contrib/auth/forms.py:62
-msgid "This account is inactive."
-msgstr "Оваа сметка е неактивна."
-
-#: contrib/auth/forms.py:85
-msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
-"you've registered?"
-msgstr ""
-"Нема регистрирано корисник со оваа адреса за е-пошта. Сигурни ли сте дека "
-"сте регистрирани?"
-
-#: contrib/auth/forms.py:117
-msgid "The two 'new password' fields didn't match."
-msgstr "Двете нови лозинки не се совпаѓаат."
-
-#: contrib/auth/forms.py:124
-msgid "Your old password was entered incorrectly. Please enter it again."
-msgstr "Не ја внесовте точно вашата стара лозинка. Ве молам внесете ја повторно."
-
-#: contrib/auth/models.py:38 contrib/auth/models.py:58
-msgid "name"
-msgstr "име"
-
-#: contrib/auth/models.py:40
-msgid "codename"
-msgstr "кодно име"
-
-#: contrib/auth/models.py:43
-msgid "permission"
-msgstr "привилегија"
-
-#: contrib/auth/models.py:44 contrib/auth/models.py:59
-msgid "permissions"
-msgstr "привилегии"
-
-#: contrib/auth/models.py:62
-msgid "group"
-msgstr "група"
-
-#: contrib/auth/models.py:63 contrib/auth/models.py:103
-msgid "groups"
-msgstr "групи"
-
-#: contrib/auth/models.py:93
-msgid "username"
-msgstr "корисничко име"
-
-#: contrib/auth/models.py:93
-msgid ""
-"Required. 30 characters or fewer. Alphanumeric characters only (letters, "
-"digits and underscores)."
-msgstr ""
-"Дозволени се најмногу 30 знаци. Дозволени се само алфанумерички знаци "
-"(букви, цифри и долна црта)."
-
-#: contrib/auth/models.py:94
-msgid "first name"
-msgstr "име"
-
-#: contrib/auth/models.py:95
-msgid "last name"
-msgstr "презиме"
-
-#: contrib/auth/models.py:96
-msgid "e-mail address"
-msgstr "е-пошта"
-
-#: contrib/auth/models.py:97
-msgid "password"
-msgstr "лозинка"
-
-#: contrib/auth/models.py:97
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
-"password form</a>."
-msgstr ""
-"Користете '[algo]$[salt]$[hexdigest]' или користете ја <a href=\"password/"
-"\">формата за промена на лозинката</a>."
-
-#: contrib/auth/models.py:98
-msgid "staff status"
-msgstr "статус на администраторите"
-
-#: contrib/auth/models.py:98
-msgid "Designates whether the user can log into this admin site."
-msgstr "Означува дали корисникот може да се логира во сајтот за администрација."
-
-#: contrib/auth/models.py:99
-msgid "active"
-msgstr "активен"
-
-#: contrib/auth/models.py:99
-msgid ""
-"Designates whether this user can log into the Django admin. Unselect this "
-"instead of deleting accounts."
-msgstr ""
-"Означува дали корисникот може да се логира. Одштиклирајте го ова наместо да "
-"бришете корисници."
-
-#: contrib/auth/models.py:100
-msgid "superuser status"
-msgstr "статус на суперкорисник"
-
-#: contrib/auth/models.py:100
-msgid ""
-"Designates that this user has all permissions without explicitly assigning "
-"them."
-msgstr ""
-"Означува дека овој корисник ги има сите привилегии без експлицитно да се "
-"доделуваат сите."
-
-#: contrib/auth/models.py:101
-msgid "last login"
-msgstr "последна најава"
-
-#: contrib/auth/models.py:102
-msgid "date joined"
-msgstr "датум на зачленување"
-
-#: contrib/auth/models.py:104
-msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
-msgstr ""
-"Како дополнување на рачно доделени привилегии, овој корисник ќе ги добие "
-"автоматски и сите привилегии за секоја група во која тој/таа членува."
-
-#: contrib/auth/models.py:105
-msgid "user permissions"
-msgstr "кориснички привилегии"
-
-#: contrib/auth/models.py:109
-msgid "user"
-msgstr "корисник"
-
-#: contrib/auth/models.py:110
-msgid "users"
-msgstr "корисници"
-
-#: contrib/auth/models.py:116
-msgid "Personal info"
-msgstr "Лични информации"
-
-#: contrib/auth/models.py:117
-msgid "Permissions"
-msgstr "Привилегии"
-
-#: contrib/auth/models.py:118
-msgid "Important dates"
-msgstr "Важни датуми"
-
-#: contrib/auth/models.py:119
-msgid "Groups"
-msgstr "Групи"
-
-#: contrib/auth/models.py:263
-msgid "message"
-msgstr "порака"
-
-#: contrib/auth/views.py:39
-msgid "Logged out"
-msgstr "Одјавен"
-
-#: contrib/admin/models.py:16
-msgid "action time"
-msgstr "време на акција"
-
-#: contrib/admin/models.py:19
-msgid "object id"
-msgstr "идентификационен број на објект"
-
-#: contrib/admin/models.py:20
-msgid "object repr"
-msgstr "object repr"
-
-#: contrib/admin/models.py:21
-msgid "action flag"
-msgstr "знакче за акција"
-
-#: contrib/admin/models.py:22
-msgid "change message"
-msgstr "измени ја пораката"
-
-#: contrib/admin/models.py:25
-msgid "log entry"
-msgstr "ставка во записникот"
-
-#: contrib/admin/models.py:26
-msgid "log entries"
-msgstr "ставки во записникот"
-
-#: contrib/admin/filterspecs.py:40
+#: contrib/admin/filterspecs.py:44
 #, python-format
 msgid ""
 "<h3>By %s:</h3>\n"
 "<h3>Од %s:</h3>\n"
 "<ul>\n"
 
-#: contrib/admin/filterspecs.py:70 contrib/admin/filterspecs.py:88
-#: contrib/admin/filterspecs.py:143 contrib/admin/filterspecs.py:169
+#: contrib/admin/filterspecs.py:74 contrib/admin/filterspecs.py:92
+#: contrib/admin/filterspecs.py:147 contrib/admin/filterspecs.py:173
 msgid "All"
 msgstr "Сите"
 
-#: contrib/admin/filterspecs.py:109
+#: contrib/admin/filterspecs.py:113
 msgid "Any date"
 msgstr "Било кој датум"
 
-#: contrib/admin/filterspecs.py:110
+#: contrib/admin/filterspecs.py:114
 msgid "Today"
 msgstr "Денеска"
 
-#: contrib/admin/filterspecs.py:113
+#: contrib/admin/filterspecs.py:117
 msgid "Past 7 days"
 msgstr "Последните 7 дена"
 
-#: contrib/admin/filterspecs.py:115
+#: contrib/admin/filterspecs.py:119
 msgid "This month"
 msgstr "Овој месец"
 
-#: contrib/admin/filterspecs.py:117
+#: contrib/admin/filterspecs.py:121
 msgid "This year"
 msgstr "Оваа година"
 
-#: contrib/admin/filterspecs.py:143 oldforms/__init__.py:577
-#: newforms/widgets.py:174
+#: contrib/admin/filterspecs.py:147 newforms/widgets.py:231
+#: oldforms/__init__.py:592
 msgid "Yes"
 msgstr "Да"
 
-#: contrib/admin/filterspecs.py:143 oldforms/__init__.py:577
-#: newforms/widgets.py:174
+#: contrib/admin/filterspecs.py:147 newforms/widgets.py:231
+#: oldforms/__init__.py:592
 msgid "No"
 msgstr "Не"
 
-#: contrib/admin/filterspecs.py:150 oldforms/__init__.py:577
-#: newforms/widgets.py:174
+#: contrib/admin/filterspecs.py:154 newforms/widgets.py:231
+#: oldforms/__init__.py:592
 msgid "Unknown"
 msgstr "Непознато"
 
-#: contrib/admin/views/decorators.py:24
-#: contrib/admin/templates/admin/login.html:25
-msgid "Log in"
-msgstr "Најава"
-
-#: contrib/admin/views/decorators.py:62
+#: contrib/admin/models.py:18
+msgid "action time"
+msgstr "време на акција"
+
+#: contrib/admin/models.py:21
+msgid "object id"
+msgstr "идентификационен број на објект"
+
+#: contrib/admin/models.py:22
+msgid "object repr"
+msgstr "object repr"
+
+#: contrib/admin/models.py:23
+msgid "action flag"
+msgstr "знакче за акција"
+
+#: contrib/admin/models.py:24
+msgid "change message"
+msgstr "измени ја пораката"
+
+#: contrib/admin/models.py:27
+msgid "log entry"
+msgstr "ставка во записникот"
+
+#: contrib/admin/models.py:28
+msgid "log entries"
+msgstr "ставки во записникот"
+
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr "Страницата не е најдена"
+
+#: contrib/admin/templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr "Се извинуваме, но неможе да ја најдеме страницата која ја баравте."
+
+#: contrib/admin/templates/admin/500.html:4
+#: contrib/admin/templates/admin/base.html:37
+#: contrib/admin/templates/admin/change_form.html:12
+#: contrib/admin/templates/admin/change_list.html:5
+#: contrib/admin/templates/admin/delete_confirmation.html:5
+#: contrib/admin/templates/admin/invalid_setup.html:4
+#: contrib/admin/templates/admin/object_history.html:4
+#: contrib/admin/templates/admin/auth/user/change_password.html:11
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+#: contrib/admin/templates/registration/logged_out.html:4
+#: contrib/admin/templates/registration/password_change_done.html:3
+#: contrib/admin/templates/registration/password_change_form.html:3
+#: contrib/admin/templates/registration/password_reset_done.html:4
+#: contrib/admin/templates/registration/password_reset_form.html:4
+msgid "Home"
+msgstr "Дома"
+
+#: contrib/admin/templates/admin/500.html:4
+msgid "Server error"
+msgstr "Грешка со серверот"
+
+#: contrib/admin/templates/admin/500.html:6
+msgid "Server error (500)"
+msgstr "Грешка со серверот (500)"
+
+#: contrib/admin/templates/admin/500.html:9
+msgid "Server Error <em>(500)</em>"
+msgstr "Грешка со серверот <em>(500)</em>"
+
+#: contrib/admin/templates/admin/500.html:10
 msgid ""
-"Please log in again, because your session has expired. Don't worry: Your "
-"submission has been saved."
+"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/views/decorators.py:69
-msgid ""
-"Looks like your browser isn't configured to accept cookies. Please enable "
-"cookies, reload this page, and try again."
-msgstr ""
-"Изгледа дека вашиот прелистувач не е конфигуриран да прифаќа колачиња. Ве "
-"молам овозможете ги колачињата, превчитајте ја страта и пробајте повторно."
-
-#: contrib/admin/views/decorators.py:83
-msgid "Usernames cannot contain the '@' character."
-msgstr "Корисничките имиња неможе да го содржат „@“ знакот."
-
-#: contrib/admin/views/decorators.py:85
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr "Вашата е-пошта не е вашето корисничко име. Пробајте со „%s“."
-
-#: contrib/admin/views/main.py:223
-msgid "Site administration"
-msgstr "Администрација на сајт"
-
-#: contrib/admin/views/main.py:257 contrib/admin/views/auth.py:19
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "%(name)s \"%(obj)s\" беше успешно додаден."
-
-#: contrib/admin/views/main.py:261 contrib/admin/views/main.py:347
-#: contrib/admin/views/auth.py:24
-msgid "You may edit it again below."
-msgstr "Подолу можете повторно да го уредите."
-
-#: contrib/admin/views/main.py:271 contrib/admin/views/main.py:356
-#, python-format
-msgid "You may add another %s below."
-msgstr "Подолу можете да додате уште еден %s."
-
-#: contrib/admin/views/main.py:289
-#, python-format
-msgid "Add %s"
-msgstr "Додади %s"
-
-#: contrib/admin/views/main.py:335
-#, python-format
-msgid "Added %s."
-msgstr "Додадено %s."
-
-#: contrib/admin/views/main.py:337
-#, python-format
-msgid "Changed %s."
-msgstr "Изменета %s."
-
-#: contrib/admin/views/main.py:339
-#, python-format
-msgid "Deleted %s."
-msgstr "Избришана %s."
-
-#: contrib/admin/views/main.py:342
-msgid "No fields changed."
-msgstr "Не беше изменето ниедно поле."
-
-#: contrib/admin/views/main.py:345
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "%(name)s \"%(obj)s\" беше успешно изменета."
-
-#: contrib/admin/views/main.py:353
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
-msgstr ""
-"%(name)s \"%(obj)s\" беше успешно додадена.Подолу можете повторно да ја "
-"уредите."
-
-#: contrib/admin/views/main.py:391
-#, python-format
-msgid "Change %s"
-msgstr "Измени %s"
-
-#: contrib/admin/views/main.py:476
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
-msgstr "Еден или повеќе %(fieldname)s во %(name)s: %(obj)s"
-
-#: contrib/admin/views/main.py:481
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s:"
-msgstr "Еден или повеќе %(fieldname)s во %(name)s:"
-
-#: contrib/admin/views/main.py:514
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was deleted successfully."
-msgstr "%(name)s \"%(obj)s\" беше избришана успешно."
-
-#: contrib/admin/views/main.py:517
-msgid "Are you sure?"
-msgstr "Сигурни сте?"
-
-#: contrib/admin/views/main.py:539
-#, python-format
-msgid "Change history: %s"
-msgstr "Историја на измени: %s"
-
-#: contrib/admin/views/main.py:573
-#, python-format
-msgid "Select %s"
-msgstr "Изберет %s"
-
-#: contrib/admin/views/main.py:573
-#, python-format
-msgid "Select %s to change"
-msgstr "Изберете %s за измена"
-
-#: contrib/admin/views/main.py:768
-msgid "Database error"
-msgstr "Грешка во базата со податоци"
-
-#: contrib/admin/views/doc.py:46 contrib/admin/views/doc.py:48
-#: contrib/admin/views/doc.py:50
-msgid "tag:"
-msgstr "таг:"
-
-#: contrib/admin/views/doc.py:77 contrib/admin/views/doc.py:79
-#: contrib/admin/views/doc.py:81
-msgid "filter:"
-msgstr "филтер:"
-
-#: contrib/admin/views/doc.py:135 contrib/admin/views/doc.py:137
-#: contrib/admin/views/doc.py:139
-msgid "view:"
-msgstr "поглед:"
-
-#: contrib/admin/views/doc.py:164
-#, python-format
-msgid "App %r not found"
-msgstr "Не е најдена апликацијата %r"
-
-#: contrib/admin/views/doc.py:171
-#, python-format
-msgid "Model %(name)r not found in app %(label)r"
-msgstr "Моделот %(name)r не е најден во апликацијата %(label)r"
-
-#: contrib/admin/views/doc.py:183
-#, python-format
-msgid "the related `%(label)s.%(type)s` object"
-msgstr "поврзаниот`%(label)s.%(type)s` објект"
-
-#: contrib/admin/views/doc.py:183 contrib/admin/views/doc.py:205
-#: contrib/admin/views/doc.py:219 contrib/admin/views/doc.py:224
-msgid "model:"
-msgstr "модел:"
-
-#: contrib/admin/views/doc.py:214
-#, python-format
-msgid "related `%(label)s.%(name)s` objects"
-msgstr "поврзани `%(label)s.%(name)s` објекти"
-
-#: contrib/admin/views/doc.py:219
-#, python-format
-msgid "all %s"
-msgstr "сите %s"
-
-#: contrib/admin/views/doc.py:224
-#, python-format
-msgid "number of %s"
-msgstr "број на %s"
-
-#: contrib/admin/views/doc.py:229
-#, python-format
-msgid "Fields on %s objects"
-msgstr "Полиња на %s објекти"
-
-#: contrib/admin/views/doc.py:291 contrib/admin/views/doc.py:301
-#: contrib/admin/views/doc.py:303 contrib/admin/views/doc.py:309
-#: contrib/admin/views/doc.py:310 contrib/admin/views/doc.py:312
-msgid "Integer"
-msgstr "Цел број"
-
-#: contrib/admin/views/doc.py:292
-msgid "Boolean (Either True or False)"
-msgstr "Логичка (или точно или неточно)"
-
-#: contrib/admin/views/doc.py:293 contrib/admin/views/doc.py:311
-#, python-format
-msgid "String (up to %(maxlength)s)"
-msgstr "Збор (до %(maxlength)s)"
-
-#: contrib/admin/views/doc.py:294
-msgid "Comma-separated integers"
-msgstr "Целобројни вредности одделени со запирка"
-
-#: contrib/admin/views/doc.py:295
-msgid "Date (without time)"
-msgstr "Датум (без час)"
-
-#: contrib/admin/views/doc.py:296
-msgid "Date (with time)"
-msgstr "Датум (со час)"
-
-#: contrib/admin/views/doc.py:297
-msgid "E-mail address"
-msgstr "Адреса на е-пошта"
-
-#: contrib/admin/views/doc.py:298 contrib/admin/views/doc.py:299
-#: contrib/admin/views/doc.py:302
-msgid "File path"
-msgstr "Патека на датотека"
-
-#: contrib/admin/views/doc.py:300
-msgid "Decimal number"
-msgstr "Децимален број"
-
-#: contrib/admin/views/doc.py:304 contrib/comments/models.py:85
-msgid "IP address"
-msgstr "ИП адреса"
-
-#: contrib/admin/views/doc.py:306
-msgid "Boolean (Either True, False or None)"
-msgstr "Логичка (точно,неточно или празно)"
-
-#: contrib/admin/views/doc.py:307
-msgid "Relation to parent model"
-msgstr "Релација со родителскиот модел"
-
-#: contrib/admin/views/doc.py:308
-msgid "Phone number"
-msgstr "Телефонски број"
-
-#: contrib/admin/views/doc.py:313
-msgid "Text"
-msgstr "Текст"
-
-#: contrib/admin/views/doc.py:314
-msgid "Time"
-msgstr "Час"
-
-#: contrib/admin/views/doc.py:315 contrib/flatpages/models.py:7
-msgid "URL"
-msgstr "URL"
-
-#: contrib/admin/views/doc.py:316
-msgid "U.S. state (two uppercase letters)"
-msgstr "Држава во САД (две големи букви)"
-
-#: contrib/admin/views/doc.py:317
-msgid "XML text"
-msgstr "XML текст"
-
-#: contrib/admin/views/doc.py:343
-#, python-format
-msgid "%s does not appear to be a urlpattern object"
-msgstr "%s не изгледа дека е url објект"
-
-#: contrib/admin/views/auth.py:30
-msgid "Add user"
-msgstr "Додади корисник"
-
-#: contrib/admin/views/auth.py:57
-msgid "Password changed successfully."
-msgstr "Успешна промена на лозинката."
-
-#: contrib/admin/views/auth.py:64
-#, python-format
-msgid "Change password: %s"
-msgstr "Промени лозинка: %s"
-
-#: contrib/admin/templatetags/admin_list.py:247
-msgid "All dates"
-msgstr "Сите датуми"
-
-#: contrib/admin/templates/admin/pagination.html:10
-msgid "Show all"
-msgstr "Прикажи ги сите"
-
-#: contrib/admin/templates/admin/delete_confirmation.html:3
-#: contrib/admin/templates/admin/change_form.html:10
-#: contrib/admin/templates/admin/change_list.html:5
-#: contrib/admin/templates/admin/object_history.html:3
-#: contrib/admin/templates/admin/base.html:25
-#: contrib/admin/templates/admin/auth/user/change_password.html:9
+"Имаше грешка. Истата беше пријавена на администраторите и ќе биде поправена "
+"во брзо време. Ви благодариме за вашето трпение."
+
+#: contrib/admin/templates/admin/base.html:26
+msgid "Welcome,"
+msgstr "Добредојдовте,"
+
+#: contrib/admin/templates/admin/base.html:28
 #: contrib/admin/templates/admin_doc/bookmarklets.html:3
-#: contrib/admin/templates/registration/password_change_form.html:3
-#: contrib/admin/templates/registration/password_change_done.html:3
 msgid "Documentation"
 msgstr "Документација"
 
-#: contrib/admin/templates/admin/delete_confirmation.html:3
-#: contrib/admin/templates/admin/change_form.html:10
-#: contrib/admin/templates/admin/change_list.html:5
-#: contrib/admin/templates/admin/object_history.html:3
-#: contrib/admin/templates/admin/base.html:25
-#: contrib/admin/templates/admin/auth/user/change_password.html:9
-#: contrib/admin/templates/admin/auth/user/change_password.html:15
-#: contrib/admin/templates/admin/auth/user/change_password.html:46
-#: contrib/admin/templates/admin_doc/template_filter_index.html:5
-#: contrib/admin/templates/admin_doc/bookmarklets.html:4
-#: contrib/admin/templates/admin_doc/template_tag_index.html:5
-#: contrib/admin/templates/admin_doc/index.html:4
-#: contrib/admin/templates/admin_doc/model_detail.html:3
-#: contrib/admin/templates/admin_doc/missing_docutils.html:4
-#: contrib/admin/templates/admin_doc/template_detail.html:4
-#: contrib/admin/templates/admin_doc/view_index.html:5
-#: contrib/admin/templates/admin_doc/model_index.html:5
-#: contrib/admin/templates/admin_doc/view_detail.html:4
-#: contrib/admin/templates/registration/password_change_form.html:3
-#: contrib/admin/templates/registration/password_change_done.html:3
+#: contrib/admin/templates/admin/base.html:29
+#: contrib/admin/templates/admin/auth/user/change_password.html:14
+#: contrib/admin/templates/admin/auth/user/change_password.html:45
 msgid "Change password"
 msgstr "Промени лозинка"
 
-#: contrib/admin/templates/admin/delete_confirmation.html:3
-#: contrib/admin/templates/admin/change_form.html:10
-#: contrib/admin/templates/admin/change_list.html:5
-#: contrib/admin/templates/admin/object_history.html:3
-#: contrib/admin/templates/admin/base.html:25
-#: contrib/admin/templates/admin/auth/user/change_password.html:9
-#: contrib/admin/templates/admin_doc/template_filter_index.html:5
-#: contrib/admin/templates/admin_doc/bookmarklets.html:4
-#: contrib/admin/templates/admin_doc/template_tag_index.html:5
-#: contrib/admin/templates/admin_doc/index.html:4
-#: contrib/admin/templates/admin_doc/model_detail.html:3
-#: contrib/admin/templates/admin_doc/missing_docutils.html:4
-#: contrib/admin/templates/admin_doc/template_detail.html:4
-#: contrib/admin/templates/admin_doc/view_index.html:5
-#: contrib/admin/templates/admin_doc/model_index.html:5
-#: contrib/admin/templates/admin_doc/view_detail.html:4
-#: contrib/admin/templates/registration/password_change_form.html:3
-#: contrib/admin/templates/registration/password_change_done.html:3
+#: contrib/admin/templates/admin/base.html:30
 #: contrib/comments/templates/comments/form.html:6
 msgid "Log out"
 msgstr "Одјава"
 
-#: contrib/admin/templates/admin/delete_confirmation.html:6
-#: contrib/admin/templates/admin/change_form.html:13
-#: contrib/admin/templates/admin/change_list.html:6
-#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/500.html:4
-#: contrib/admin/templates/admin/invalid_setup.html:4
-#: contrib/admin/templates/admin/base.html:30
-#: contrib/admin/templates/admin/auth/user/change_password.html:12
-#: contrib/admin/templates/admin_doc/bookmarklets.html:3
-#: contrib/admin/templates/registration/password_reset_form.html:4
-#: contrib/admin/templates/registration/logged_out.html:4
-#: contrib/admin/templates/registration/password_reset_done.html:4
-#: contrib/admin/templates/registration/password_change_form.html:4
-#: contrib/admin/templates/registration/password_change_done.html:4
-msgid "Home"
-msgstr "Дома"
-
-#: contrib/admin/templates/admin/delete_confirmation.html:9
+#: contrib/admin/templates/admin/base_site.html:4
+msgid "Django site admin"
+msgstr "Џанго администрација на сајт"
+
+#: contrib/admin/templates/admin/base_site.html:7
+msgid "Django administration"
+msgstr "Џанго администрација"
+
+#: contrib/admin/templates/admin/change_form.html:14
+#: contrib/admin/templates/admin/index.html:28
+msgid "Add"
+msgstr "Додади"
+
+#: contrib/admin/templates/admin/change_form.html:20
+#: contrib/admin/templates/admin/object_history.html:4
+msgid "History"
+msgstr "Историја"
+
+#: contrib/admin/templates/admin/change_form.html:21
+msgid "View on site"
+msgstr "Погледни на сајтот"
+
+#: contrib/admin/templates/admin/change_form.html:31
+#: contrib/admin/templates/admin/auth/user/change_password.html:23
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] "Ве молам поправете ја грешката подолу."
+msgstr[1] "Ве молам поправете ги грешките подолу."
+
+#: contrib/admin/templates/admin/change_form.html:49
+msgid "Ordering"
+msgstr "Подредување"
+
+#: contrib/admin/templates/admin/change_form.html:52
+msgid "Order:"
+msgstr "Подреди:"
+
+#: contrib/admin/templates/admin/change_list.html:11
+#, python-format
+msgid "Add %(name)s"
+msgstr "Додади %(name)s"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:8
 #: contrib/admin/templates/admin/submit_line.html:3
 msgid "Delete"
 msgstr "Избриши"
 
-#: contrib/admin/templates/admin/delete_confirmation.html:14
+#: contrib/admin/templates/admin/delete_confirmation.html:13
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
 "поврзаните објекти, но со вашата сметка немате доволно привилегии да ги "
 "бришете следните типови на објекти:"
 
-#: contrib/admin/templates/admin/delete_confirmation.html:21
+#: contrib/admin/templates/admin/delete_confirmation.html:20
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
 "Сигурне сте дека сакате да ги бришете %(object_name)s „%(escaped_object)s“? "
 "Сите овие ставки ќе бидат избришани:"
 
-#: contrib/admin/templates/admin/delete_confirmation.html:26
+#: contrib/admin/templates/admin/delete_confirmation.html:25
 msgid "Yes, I'm sure"
 msgstr "Да, сигурен сум"
 
-#: contrib/admin/templates/admin/404.html:4
-#: contrib/admin/templates/admin/404.html:8
-msgid "Page not found"
-msgstr "Страницата не е најдена"
-
-#: contrib/admin/templates/admin/404.html:10
-msgid "We're sorry, but the requested page could not be found."
-msgstr "Се извинуваме, но неможе да ја најдеме страницата која ја баравте."
-
-#: contrib/admin/templates/admin/change_form.html:15
-#: contrib/admin/templates/admin/index.html:28
-msgid "Add"
-msgstr "Додади"
-
-#: contrib/admin/templates/admin/change_form.html:21
-#: contrib/admin/templates/admin/object_history.html:5
-msgid "History"
-msgstr "Историја"
-
-#: contrib/admin/templates/admin/change_form.html:22
-msgid "View on site"
-msgstr "Погледни на сајтот"
-
-#: contrib/admin/templates/admin/change_form.html:32
-#: contrib/admin/templates/admin/auth/user/change_password.html:24
-msgid "Please correct the error below."
-msgid_plural "Please correct the errors below."
-msgstr[0] "Ве молам поправете ја грешката подолу."
-msgstr[1] "Ве молам поправете ги грешките подолу."
-
-#: contrib/admin/templates/admin/change_form.html:50
-msgid "Ordering"
-msgstr "Подредување"
-
-#: contrib/admin/templates/admin/change_form.html:53
-msgid "Order:"
-msgstr "Подреди:"
-
 #: contrib/admin/templates/admin/filter.html:2
 #, python-format
 msgid " By %(filter_title)s "
 msgstr " Од %(filter_title)s "
 
-#: contrib/admin/templates/admin/submit_line.html:4
-msgid "Save as new"
-msgstr "Сними како нова"
-
-#: contrib/admin/templates/admin/submit_line.html:5
-msgid "Save and add another"
-msgstr "Сними и додади уште"
-
-#: contrib/admin/templates/admin/submit_line.html:6
-msgid "Save and continue editing"
-msgstr "Сними и продолжи со уредување"
-
-#: contrib/admin/templates/admin/submit_line.html:7
-msgid "Save"
-msgstr "Сними"
-
-#: contrib/admin/templates/admin/change_list.html:12
-#, python-format
-msgid "Add %(name)s"
-msgstr "Додади %(name)s"
+#: contrib/admin/templates/admin/filters.html:4
+msgid "Filter"
+msgstr "Филтер"
 
 #: contrib/admin/templates/admin/index.html:17
 #, python-format
 msgid "None available"
 msgstr "Ништо не е достапно"
 
-#: contrib/admin/templates/admin/base_site.html:4
-msgid "Django site admin"
-msgstr "Џанго администрација на сајт"
-
-#: contrib/admin/templates/admin/base_site.html:7
-msgid "Django administration"
-msgstr "Џанго администрација"
-
-#: contrib/admin/templates/admin/object_history.html:18
-msgid "Date/time"
-msgstr "Датум/час"
-
-#: contrib/admin/templates/admin/object_history.html:19
-msgid "User"
-msgstr "Корисник"
-
-#: contrib/admin/templates/admin/object_history.html:20
-msgid "Action"
-msgstr "Акција"
-
-#: contrib/admin/templates/admin/object_history.html:26
-msgid "DATE_WITH_TIME_FULL"
-msgstr "j M Y, H:i"
-
-#: 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."
-msgstr ""
-"Овој објект нема историја на измени. Најверојатно не бил додаден со админ "
-"сајтот."
-
-#: contrib/admin/templates/admin/500.html:4
-msgid "Server error"
-msgstr "Грешка со серверот"
-
-#: contrib/admin/templates/admin/500.html:6
-msgid "Server error (500)"
-msgstr "Грешка со серверот (500)"
-
-#: contrib/admin/templates/admin/500.html:9
-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 ""
-"Имаше грешка. Истата беше пријавена на администраторите и ќе биде поправена "
-"во брзо време. Ви благодариме за вашето трпение."
-
 #: contrib/admin/templates/admin/invalid_setup.html:8
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
 "соодветни табели во базата се направени и потврдете дека базата може да биде "
 "прочитана од соодветниот корисник."
 
+#: contrib/admin/templates/admin/login.html:17
+#: contrib/comments/templates/comments/form.html:6
+#: contrib/comments/templates/comments/form.html:8
+msgid "Username:"
+msgstr "Корисник:"
+
+#: contrib/admin/templates/admin/login.html:20
+#: contrib/comments/templates/comments/form.html:8
+msgid "Password:"
+msgstr "Лозинка:"
+
+#: contrib/admin/templates/admin/login.html:25
+#: contrib/admin/views/decorators.py:31
+msgid "Log in"
+msgstr "Најава"
+
+#: contrib/admin/templates/admin/object_history.html:17
+msgid "Date/time"
+msgstr "Датум/час"
+
+#: contrib/admin/templates/admin/object_history.html:18
+msgid "User"
+msgstr "Корисник"
+
+#: contrib/admin/templates/admin/object_history.html:19
+msgid "Action"
+msgstr "Акција"
+
+#: contrib/admin/templates/admin/object_history.html:25
+msgid "DATE_WITH_TIME_FULL"
+msgstr "j M Y, H:i"
+
+#: contrib/admin/templates/admin/object_history.html:35
+msgid ""
+"This object doesn't have a change history. It probably wasn't added via this "
+"admin site."
+msgstr ""
+"Овој објект нема историја на измени. Најверојатно не бил додаден со админ "
+"сајтот."
+
+#: contrib/admin/templates/admin/pagination.html:10
+msgid "Show all"
+msgstr "Прикажи ги сите"
+
 #: contrib/admin/templates/admin/search_form.html:8
 msgid "Go"
 msgstr "Оди"
 msgid "%(full_result_count)s total"
 msgstr "вкупно %(full_result_count)s"
 
-#: contrib/admin/templates/admin/filters.html:4
-msgid "Filter"
-msgstr "Филтер"
-
-#: contrib/admin/templates/admin/login.html:17
-#: contrib/comments/templates/comments/form.html:6
-#: contrib/comments/templates/comments/form.html:8
-msgid "Username:"
-msgstr "Корисник:"
-
-#: contrib/admin/templates/admin/login.html:20
-#: contrib/comments/templates/comments/form.html:8
-msgid "Password:"
-msgstr "Лозинка:"
-
-#: contrib/admin/templates/admin/base.html:25
-msgid "Welcome,"
-msgstr "Добредојдовте,"
+#: contrib/admin/templates/admin/submit_line.html:4
+msgid "Save as new"
+msgstr "Сними како нова"
+
+#: contrib/admin/templates/admin/submit_line.html:5
+msgid "Save and add another"
+msgstr "Сними и додади уште"
+
+#: contrib/admin/templates/admin/submit_line.html:6
+msgid "Save and continue editing"
+msgstr "Сними и продолжи со уредување"
+
+#: contrib/admin/templates/admin/submit_line.html:7
+msgid "Save"
+msgstr "Сними"
 
 #: contrib/admin/templates/admin/auth/user/add_form.html:6
 msgid ""
 msgstr "Корисник"
 
 #: contrib/admin/templates/admin/auth/user/add_form.html:18
-#: contrib/admin/templates/admin/auth/user/change_password.html:34
+#: contrib/admin/templates/admin/auth/user/change_password.html:33
 msgid "Password"
 msgstr "Лозинка"
 
 #: contrib/admin/templates/admin/auth/user/add_form.html:23
-#: contrib/admin/templates/admin/auth/user/change_password.html:39
+#: contrib/admin/templates/admin/auth/user/change_password.html:38
 msgid "Password (again)"
 msgstr "Лозинка (повторно)"
 
 #: contrib/admin/templates/admin/auth/user/add_form.html:24
-#: contrib/admin/templates/admin/auth/user/change_password.html:40
+#: contrib/admin/templates/admin/auth/user/change_password.html:39
 msgid "Enter the same password as above, for verification."
 msgstr "Заради верификација внесете ја истата лозинка како и горе."
 
-#: contrib/admin/templates/admin/auth/user/change_password.html:28
+#: contrib/admin/templates/admin/auth/user/change_password.html:27
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr "Внесете нова лозинка за корисникот <strong>%(username)s</strong>."
 msgid "Bookmarklets"
 msgstr "Обележувачи"
 
-#: contrib/admin/templates/admin_doc/bookmarklets.html:5
+#: contrib/admin/templates/admin_doc/bookmarklets.html:4
 msgid "Documentation bookmarklets"
 msgstr "Обележувачи на документација"
 
-#: contrib/admin/templates/admin_doc/bookmarklets.html:9
+#: contrib/admin/templates/admin_doc/bookmarklets.html:8
 msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
 "сајтот од компјутер кој е означен како „внатрешен“ (разговарајте со вашиот \n"
 "администратор ако не сте сигурни).</p>\n"
 
-#: contrib/admin/templates/admin_doc/bookmarklets.html:19
+#: contrib/admin/templates/admin_doc/bookmarklets.html:18
 msgid "Documentation for this page"
 msgstr "Документација за оваа страница"
 
-#: contrib/admin/templates/admin_doc/bookmarklets.html:20
+#: contrib/admin/templates/admin_doc/bookmarklets.html:19
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
 "Ве носи од било која страница од документацијата до погледот кој ја генерира "
 "таа страница."
 
-#: contrib/admin/templates/admin_doc/bookmarklets.html:22
+#: contrib/admin/templates/admin_doc/bookmarklets.html:21
 msgid "Show object ID"
 msgstr "Прикажи идентификационен број на објектот"
 
-#: contrib/admin/templates/admin_doc/bookmarklets.html:23
+#: contrib/admin/templates/admin_doc/bookmarklets.html:22
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
 "Го прикажува типот на содржината и уникатниот идентификационен број за "
 "страници  кои претставуваат единечен објект."
 
-#: contrib/admin/templates/admin_doc/bookmarklets.html:25
+#: contrib/admin/templates/admin_doc/bookmarklets.html:24
 msgid "Edit this object (current window)"
 msgstr "Уреди го овој објект (во овој прозорец)"
 
-#: contrib/admin/templates/admin_doc/bookmarklets.html:26
+#: contrib/admin/templates/admin_doc/bookmarklets.html:25
 msgid "Jumps to the admin page for pages that represent a single object."
 msgstr "Скокнува до админ страницата за страници кои претставуваат единечен објект."
 
-#: contrib/admin/templates/admin_doc/bookmarklets.html:28
+#: contrib/admin/templates/admin_doc/bookmarklets.html:27
 msgid "Edit this object (new window)"
 msgstr "Уреди го овој објект (во нов прозорец)"
 
-#: contrib/admin/templates/admin_doc/bookmarklets.html:29
+#: contrib/admin/templates/admin_doc/bookmarklets.html:28
 msgid "As above, but opens the admin page in a new window."
 msgstr "Како погоре, но ја отвара админ страницата во нов прозорец."
 
-#: contrib/admin/templates/widget/date_time.html:3
-msgid "Date:"
-msgstr "Датум:"
-
-#: contrib/admin/templates/widget/date_time.html:4
-msgid "Time:"
-msgstr "Време:"
-
-#: contrib/admin/templates/widget/file.html:2
-msgid "Currently:"
-msgstr "Моментално:"
-
-#: contrib/admin/templates/widget/file.html:3
-msgid "Change:"
-msgstr "Измена:"
-
+#: contrib/admin/templates/registration/logged_out.html:8
+msgid "Thanks for spending some quality time with the Web site today."
+msgstr "Ви благодариме што денеска поминавте квалитетно време со интернет страницава."
+
+#: contrib/admin/templates/registration/logged_out.html:10
+msgid "Log in again"
+msgstr "Логирајте се повторно"
+
+#: contrib/admin/templates/registration/password_change_done.html:3
+#: contrib/admin/templates/registration/password_change_form.html:3
+#: contrib/admin/templates/registration/password_change_form.html:5
+#: contrib/admin/templates/registration/password_change_form.html:9
+msgid "Password change"
+msgstr "Измена на лозинка"
+
+#: contrib/admin/templates/registration/password_change_done.html:5
+#: contrib/admin/templates/registration/password_change_done.html:9
+msgid "Password change successful"
+msgstr "Успешна промена на лозинката"