From 55089cc02d728679d637ce45c1738d59e04bf88a Mon Sep 17 00:00:00 2001 From: Georg Bauer Date: Tue, 22 Nov 2005 22:53:02 +0000 Subject: [PATCH 01/13] updated 'sk' translations. Fixes #881 git-svn-id: http://code.djangoproject.com/svn/django/trunk@1360 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/conf/locale/sk/LC_MESSAGES/django.mo | Bin 18107 -> 18399 bytes django/conf/locale/sk/LC_MESSAGES/django.po | 193 ++++++++++---------- 2 files changed, 95 insertions(+), 98 deletions(-) diff --git a/django/conf/locale/sk/LC_MESSAGES/django.mo b/django/conf/locale/sk/LC_MESSAGES/django.mo index 7a3e315aad7a8d392927ea4698c2aef5a0e0f687..d2fa55670db1aa4878ea11241b55ccfa9c65e71a 100644 GIT binary patch delta 5009 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 delta 4721 zcmYk|;q8;np9(hw9Cke49}g-C&l5Nc|L;j{3Oj~X#wIlj1BlmWi*My4nU zDVAYcNSdfUG&3J$`KXp=jx)1d&eZCUadND&`u^_OuH|0-?q~0F@7ZVXefGH*e^}$y zvdYVKDb%;xP`)9Ns1=Lq==3`P_4y)9#Znx~_04W7lkxwk5f-zK8sXEJfhG7nZbz+1 zmwO#!QJ+h;?R3;iWZCvW%%NR?8gK=w|8=MpS&y!KDs@ye!)v${Z`$^P2#t2Rfde{WBC4Yq*an|N?Zd^G zgyk55&8Qh1K@F@GwGwA+`y#5pzoE{*hWFtO)cJAjbWJ!tlJ#d$W-tfzMlmvZGYfTr za@0WFs7+Oi>Tm}>g!^y|-oR*llpFst&cPS(CdS~BF2?l1I@CbU;tKR}b#*RWiQ04< zQ8Q^o&7j$~52EhvQPjXr+V{^RlQNf3OaCkCX$gpSj6khuFVr4OL-qSQ>bPr*J+K`$ z!(FJEwV+n!S9}V?c@)^tWwsiu3p zvw{W4KQo0Ft?(-A2K49pW*Zf4zD5kh77V~6sC#-6b)oN29bC1?|6|)G!8tz|wW~X$ zK9_{ryboXy4z%rIr~wwCOEW38Zjl&% z{D*DdKuy3TI{k)V5Y320)<2v|3#t4s0S6{y+g{Eto{Q>WE&AgI>lU0xdpl}C zkvziPq z7ycPF!0WgRZ{fqZlbx&;{ROo$!M&Y(9fj&A*S4QP-2&HADzQ{nAbpsf$a85fq8^(L zsm^262Q|a7$SRuIsONYyPQ%kU2{SmT0oI@fxCPbU+c+IBqb5?oPbDkoGNY*IzF&Ku~*bntZv=DV~_n|sIgzES(Y9c4_Zajh*^9c+In=GYg4ET2{&&>D&% zv?I}#M)M>h8oY@WSk186@Fu#SvjW3W?bTS02T)6&m+7qB7}N!4q6Vz}e{C-dJA+T+?--5~vYa2Wxmm2gX7UjS;_xTbQieU~{OI(-*Ju~wIQ%!>i}`GTT%3rH zU;`%ObsUe~*eD~g6xl|m71h5_j`JIlh(l?YxTxr!??)}wVbrhKanwv(u_xvXa0WCT zHNy(jQdXnxc@1*A&0Dw(f3WT1f&3jwdp)ZETd0-t<(Ep=b%juAPo*P9Vge4qJk*G* zP`6+o>igjg>Rx*@ech^XR7X8*JK44~Q3D)=8gKz>vlgOmZ85gh^FNP@W>AKDUaK$+ z>+v4kYu|6R?_aR~haM-n_gZZd|48p3NKrhrrRMGNv_0)`EKYB_bud8kSMXPv~d`gxP6~<`3A|H{z5*HiZ ztRox99HO#?EGMPp6xm896BRA3N)FjgjuDkTWIlO|M3G@6p70goDRI2MLJ|q{G3-zM zU8wo9q@Gt}p22rWFY-2NC5`0HGLJ?XSxk=bMm#BQ<;CVu(*}4cd z?uO71XACsY628hjC52bMZ9L^;UY~NRo$iE9N)OxUh+pd-yhr6R@&?H#Dk~h!LEKKfi5|!^B#dk$!->ieQc1e2VM`EBAr(Yl z#!aM#1d=r3OH?Lm{nvP^#{300+WJwe*hE_HXs@NNZ;d3E(_xi24U)EYVL!E^!l;BcwgKPYuc>@`>~?F zHBsqFo+iy|P?B|heND9UG@bu)Os9UDoV3Sc@Ecoy30IO`#E(P}%^-uEBMGE8QHdpc z$?Ie(*+JHm@nj}(in~p_HVI$ah7XP=RiutgAdiq4qzj2`Y7V{P-BcU?-wy6g2^H?t v#8h`_;&1M\n" "Language-Team: Slovak \n" @@ -16,6 +16,89 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +#: contrib/redirects/models/redirects.py:7 +msgid "redirect from" +msgstr "presmerovaný z" + +#: contrib/redirects/models/redirects.py:8 +msgid "" +"This should be an absolute path, excluding the domain name. Example: '/" +"events/search/'." +msgstr "" +"Tu by sa mala použiť absolútna cesta, bez domény. Napr.: '/events/search/'." + +#: contrib/redirects/models/redirects.py:9 +msgid "redirect to" +msgstr "presmerovaný na " + +#: contrib/redirects/models/redirects.py:10 +msgid "" +"This can be either an absolute path (as above) or a full URL starting with " +"'http://'." +msgstr "" +"Tu môže byť buď absolútna cesta (ako hore) alebo plné URL začínajúce s " +"'http://'." + +#: contrib/redirects/models/redirects.py:12 +msgid "redirect" +msgstr "presmerovanie" + +#: contrib/redirects/models/redirects.py:13 +msgid "redirects" +msgstr "presmerovania" + +#: contrib/flatpages/models/flatpages.py:6 +msgid "URL" +msgstr "URL" + +#: contrib/flatpages/models/flatpages.py:7 +msgid "" +"Example: '/about/contact/'. Make sure to have leading and trailing slashes." +msgstr "" +"Príklad: '/about/contact/'. Uistite sa, že máte vložené ako úvodné tak aj " +"záverečné lomítka." + +#: contrib/flatpages/models/flatpages.py:8 +msgid "title" +msgstr "názov" + +#: contrib/flatpages/models/flatpages.py:9 +msgid "content" +msgstr "obsah" + +#: contrib/flatpages/models/flatpages.py:10 +msgid "enable comments" +msgstr "povolené komentáre" + +#: contrib/flatpages/models/flatpages.py:11 +msgid "template name" +msgstr "meno predlohy" + +#: contrib/flatpages/models/flatpages.py:12 +msgid "" +"Example: 'flatpages/contact_page'. If this isn't provided, the system will " +"use 'flatpages/default'." +msgstr "" +"Príklad: 'flatpages/contact_page'. Ak sa toto nevykonalo, systém použije " +"'flatpages/default'." + +#: contrib/flatpages/models/flatpages.py:13 +msgid "registration required" +msgstr "musíte byť zaregistrovaný" + +#: contrib/flatpages/models/flatpages.py:13 +msgid "If this is checked, only logged-in users will be able to view the page." +msgstr "" +"Ak je toto označené, potom len prihlásený užívateľ môže vidieť túto stránku." + +#: contrib/flatpages/models/flatpages.py:17 +msgid "flat page" +msgstr "plochá stránka" + +#: contrib/flatpages/models/flatpages.py:18 +msgid "flat pages" +msgstr "ploché stránky" + #: contrib/admin/models/admin.py:6 msgid "action time" msgstr "čas udalosti" @@ -310,89 +393,6 @@ msgstr "Ďakujeme, že používate naše stránky!" msgid "The %(site_name)s team" msgstr "Skupina %(site_name)s" -#: contrib/redirects/models/redirects.py:7 -msgid "redirect from" -msgstr "presmerovaný z" - -#: contrib/redirects/models/redirects.py:8 -msgid "" -"This should be an absolute path, excluding the domain name. Example: '/" -"events/search/'." -msgstr "" -"Tu by sa mala použiť absolútna cesta, bez domény. Napr.: '/events/search/'." - -#: contrib/redirects/models/redirects.py:9 -msgid "redirect to" -msgstr "presmerovaný na " - -#: contrib/redirects/models/redirects.py:10 -msgid "" -"This can be either an absolute path (as above) or a full URL starting with " -"'http://'." -msgstr "" -"Tu môže byť buď absolútna cesta (ako hore) alebo plné URL začínajúce s " -"'http://'." - -#: contrib/redirects/models/redirects.py:12 -msgid "redirect" -msgstr "presmerovanie" - -#: contrib/redirects/models/redirects.py:13 -msgid "redirects" -msgstr "presmerovania" - -#: contrib/flatpages/models/flatpages.py:6 -msgid "URL" -msgstr "URL" - -#: contrib/flatpages/models/flatpages.py:7 -msgid "" -"Example: '/about/contact/'. Make sure to have leading and trailing slashes." -msgstr "" -"Príklad: '/about/contact/'. Uistite sa, že máte vložené ako úvodné tak aj " -"záverečné lomítka." - -#: contrib/flatpages/models/flatpages.py:8 -msgid "title" -msgstr "názov" - -#: contrib/flatpages/models/flatpages.py:9 -msgid "content" -msgstr "obsah" - -#: contrib/flatpages/models/flatpages.py:10 -msgid "enable comments" -msgstr "povolené komentáre" - -#: contrib/flatpages/models/flatpages.py:11 -msgid "template name" -msgstr "meno predlohy" - -#: contrib/flatpages/models/flatpages.py:12 -msgid "" -"Example: 'flatpages/contact_page'. If this isn't provided, the system will " -"use 'flatpages/default'." -msgstr "" -"Príklad: 'flatpages/contact_page'. Ak sa toto nevykonalo, systém použije " -"'flatpages/default'." - -#: contrib/flatpages/models/flatpages.py:13 -msgid "registration required" -msgstr "musíte byť zaregistrovaný" - -#: contrib/flatpages/models/flatpages.py:13 -msgid "If this is checked, only logged-in users will be able to view the page." -msgstr "" -"Ak je toto označené, potom len prihlásený užívateľ môže vidieť túto stránku." - -#: contrib/flatpages/models/flatpages.py:17 -msgid "flat page" -msgstr "plochá stránka" - -#: contrib/flatpages/models/flatpages.py:18 -msgid "flat pages" -msgstr "ploché stránky" - #: utils/translation.py:335 msgid "DATE_FORMAT" msgstr "DATUM_FORMAT" @@ -512,34 +512,32 @@ msgstr "Dec." #: utils/timesince.py:12 msgid "year" msgid_plural "years" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "rok" +msgstr[1] "rokov" #: utils/timesince.py:13 msgid "month" msgid_plural "months" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "mesiac" +msgstr[1] "mesiacov" #: utils/timesince.py:14 -#, fuzzy msgid "day" msgid_plural "days" -msgstr[0] "Máj" -msgstr[1] "Máj" +msgstr[0] "ďeň" +msgstr[1] "dní" #: utils/timesince.py:15 msgid "hour" msgid_plural "hours" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "hodina" +msgstr[1] "hodín" #: utils/timesince.py:16 -#, fuzzy msgid "minute" msgid_plural "minutes" -msgstr[0] "web" -msgstr[1] "web" +msgstr[0] "minúta" +msgstr[1] "minút" #: models/core.py:7 msgid "domain name" @@ -710,9 +708,8 @@ msgid "Welsh" msgstr "Waleský" #: conf/global_settings.py:39 -#, fuzzy msgid "Danish" -msgstr "Španielsky" +msgstr "Dánsky" #: conf/global_settings.py:40 msgid "German" From d215cbd63ab4325cb632b7d570ae6827a0f139d3 Mon Sep 17 00:00:00 2001 From: Adrian Holovaty Date: Wed, 23 Nov 2005 15:42:09 +0000 Subject: [PATCH 02/13] Added translation strings to django.contrib.comments. Taken from new-admin. git-svn-id: http://code.djangoproject.com/svn/django/trunk@1364 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/contrib/comments/models/comments.py | 84 +++++++++++-------- .../contrib/comments/templatetags/comments.py | 19 +++-- django/contrib/comments/views/comments.py | 30 +++---- django/contrib/comments/views/karma.py | 6 +- 4 files changed, 77 insertions(+), 62 deletions(-) diff --git a/django/contrib/comments/models/comments.py b/django/contrib/comments/models/comments.py index 33a44c8494..3062af62de 100644 --- a/django/contrib/comments/models/comments.py +++ b/django/contrib/comments/models/comments.py @@ -1,32 +1,35 @@ from django.core import meta from django.models import auth, core +from django.utils.translation import gettext_lazy as _ class Comment(meta.Model): user = meta.ForeignKey(auth.User, raw_id_admin=True) content_type = meta.ForeignKey(core.ContentType) - object_id = meta.IntegerField('object ID') - headline = meta.CharField(maxlength=255, blank=True) - comment = meta.TextField(maxlength=3000) - rating1 = meta.PositiveSmallIntegerField('rating #1', blank=True, null=True) - rating2 = meta.PositiveSmallIntegerField('rating #2', blank=True, null=True) - rating3 = meta.PositiveSmallIntegerField('rating #3', blank=True, null=True) - rating4 = meta.PositiveSmallIntegerField('rating #4', blank=True, null=True) - rating5 = meta.PositiveSmallIntegerField('rating #5', blank=True, null=True) - rating6 = meta.PositiveSmallIntegerField('rating #6', blank=True, null=True) - rating7 = meta.PositiveSmallIntegerField('rating #7', blank=True, null=True) - rating8 = meta.PositiveSmallIntegerField('rating #8', blank=True, null=True) + object_id = meta.IntegerField(_('object ID')) + headline = meta.CharField(_('headline'), maxlength=255, blank=True) + comment = meta.TextField(_('comment'), maxlength=3000) + rating1 = meta.PositiveSmallIntegerField(_('rating #1'), blank=True, null=True) + rating2 = meta.PositiveSmallIntegerField(_('rating #2'), blank=True, null=True) + rating3 = meta.PositiveSmallIntegerField(_('rating #3'), blank=True, null=True) + rating4 = meta.PositiveSmallIntegerField(_('rating #4'), blank=True, null=True) + rating5 = meta.PositiveSmallIntegerField(_('rating #5'), blank=True, null=True) + rating6 = meta.PositiveSmallIntegerField(_('rating #6'), blank=True, null=True) + rating7 = meta.PositiveSmallIntegerField(_('rating #7'), blank=True, null=True) + rating8 = meta.PositiveSmallIntegerField(_('rating #8'), blank=True, null=True) # This field designates whether to use this row's ratings in aggregate # functions (summaries). We need this because people are allowed to post # multiple reviews on the same thing, but the system will only use the # latest one (with valid_rating=True) in tallying the reviews. - valid_rating = meta.BooleanField('is valid rating') - submit_date = meta.DateTimeField('date/time submitted', auto_now_add=True) - is_public = meta.BooleanField() - ip_address = meta.IPAddressField('IP address', blank=True, null=True) - is_removed = meta.BooleanField(help_text='Check this box if the comment is inappropriate. A "This comment has been removed" message will be displayed instead.') + valid_rating = meta.BooleanField(_('is valid rating')) + submit_date = meta.DateTimeField(_('date/time submitted'), auto_now_add=True) + is_public = meta.BooleanField(_('is public')) + ip_address = meta.IPAddressField(_('IP address'), blank=True, null=True) + is_removed = meta.BooleanField(_('is removed'), help_text=_('Check this box if the comment is inappropriate. A "This comment has been removed" message will be displayed instead.')) site = meta.ForeignKey(core.Site) class META: db_table = 'comments' + verbose_name = _('Comment') + verbose_name_plural = _('Comments') module_constants = { # min. and max. allowed dimensions for photo resizing (in pixels) 'MIN_PHOTO_DIMENSION': 5, @@ -79,7 +82,7 @@ class Comment(meta.Model): except ObjectDoesNotExist: return None - get_content_object.short_description = 'Content object' + get_content_object.short_description = _('Content object') def _fill_karma_cache(self): "Helper function that populates good/bad karma caches" @@ -107,9 +110,9 @@ class Comment(meta.Model): return self._karma_total_good + self._karma_total_bad def get_as_text(self): - return 'Posted by %s at %s\n\n%s\n\nhttp://%s%s' % \ - (self.get_user().username, self.submit_date, - self.comment, self.get_site().domain, self.get_absolute_url()) + return _('Posted by %(user)s at %(date)s\n\n%(comment)s\n\nhttp://%(domain)s%(url)s') % \ + {'user': self.get_user().username, 'date': self.submit_date, + 'comment': self.comment, 'domain': self.get_site().domain, 'url': self.get_absolute_url()} def _module_get_security_hash(options, photo_options, rating_options, target): """ @@ -155,17 +158,19 @@ class Comment(meta.Model): class FreeComment(meta.Model): # A FreeComment is a comment by a non-registered user. content_type = meta.ForeignKey(core.ContentType) - object_id = meta.IntegerField('object ID') - comment = meta.TextField(maxlength=3000) - person_name = meta.CharField("person's name", maxlength=50) - submit_date = meta.DateTimeField('date/time submitted', auto_now_add=True) - is_public = meta.BooleanField() - ip_address = meta.IPAddressField() + object_id = meta.IntegerField(_('object ID')) + comment = meta.TextField(_('comment'), maxlength=3000) + person_name = meta.CharField(_("person's name"), maxlength=50) + submit_date = meta.DateTimeField(_('date/time submitted'), auto_now_add=True) + is_public = meta.BooleanField(_('is public')) + ip_address = meta.IPAddressField(_('ip address')) # TODO: Change this to is_removed, like Comment - approved = meta.BooleanField('approved by staff') + approved = meta.BooleanField(_('approved by staff')) site = meta.ForeignKey(core.Site) class META: db_table = 'comments_free' + verbose_name = _('Free comment') + verbose_name_plural = _('Free comments') ordering = ('-submit_date',) admin = meta.Admin( fields = ( @@ -196,15 +201,17 @@ class FreeComment(meta.Model): except ObjectDoesNotExist: return None - get_content_object.short_description = 'Content object' + get_content_object.short_description = _('Content object') class KarmaScore(meta.Model): user = meta.ForeignKey(auth.User) comment = meta.ForeignKey(Comment) - score = meta.SmallIntegerField(db_index=True) - scored_date = meta.DateTimeField(auto_now=True) + score = meta.SmallIntegerField(_('score'), db_index=True) + scored_date = meta.DateTimeField(_('score date'), auto_now=True) class META: module_name = 'karma' + verbose_name = _('Karma score') + verbose_name_plural = _('Karma scores') unique_together = (('user', 'comment'),) module_constants = { # what users get if they don't have any karma @@ -213,7 +220,7 @@ class KarmaScore(meta.Model): } def __repr__(self): - return "%d rating by %s" % (self.score, self.get_user()) + return _("%(score)d rating by %(user)s") % {'score': self.score, 'user': self.get_user()} def _module_vote(user_id, comment_id, score): try: @@ -238,13 +245,15 @@ class KarmaScore(meta.Model): class UserFlag(meta.Model): user = meta.ForeignKey(auth.User) comment = meta.ForeignKey(Comment) - flag_date = meta.DateTimeField(auto_now_add=True) + flag_date = meta.DateTimeField(_('flag date'), auto_now_add=True) class META: db_table = 'comments_user_flags' + verbose_name = _('User flag') + verbose_name_plural = _('User flags') unique_together = (('user', 'comment'),) def __repr__(self): - return "Flag by %r" % self.get_user() + return _("Flag by %r") % self.get_user() def _module_flag(comment, user): """ @@ -259,17 +268,20 @@ class UserFlag(meta.Model): except UserFlagDoesNotExist: from django.core.mail import mail_managers f = UserFlag(None, user.id, comment.id, None) - message = 'This comment was flagged by %s:\n\n%s' % (user.username, comment.get_as_text()) + message = _('This comment was flagged by %(user)s:\n\n%(text)s') % {'user': user.username, 'text': comment.get_as_text()} mail_managers('Comment flagged', message, fail_silently=True) f.save() class ModeratorDeletion(meta.Model): user = meta.ForeignKey(auth.User, verbose_name='moderator') comment = meta.ForeignKey(Comment) - deletion_date = meta.DateTimeField(auto_now_add=True) + deletion_date = meta.DateTimeField(_('deletion date'), auto_now_add=True) class META: db_table = 'comments_moderator_deletions' + verbose_name = _('Moderator deletion') + verbose_name_plural = _('Moderator deletions') unique_together = (('user', 'comment'),) def __repr__(self): - return "Moderator deletion by %r" % self.get_user() + return _("Moderator deletion by %r") % self.get_user() + diff --git a/django/contrib/comments/templatetags/comments.py b/django/contrib/comments/templatetags/comments.py index b6f57a652b..72c586e206 100644 --- a/django/contrib/comments/templatetags/comments.py +++ b/django/contrib/comments/templatetags/comments.py @@ -7,17 +7,18 @@ from django.models.core import contenttypes import re COMMENT_FORM = ''' +{% load i18n %} {% if display_form %}
{% if user.is_anonymous %} -

Username:
Password: (Forgotten your password?)

+

{% trans "Username:" %}
{% trans "Password:" %} ({% trans "Forgotten your password?" %})

{% else %} -

Username: {{ user.username }} (Log out)

+

{% trans "Username:" %} {{ user.username }} ({% trans "Log out" %})

{% endif %} {% if ratings_optional or ratings_required %} -

Ratings ({% if ratings_required %}Required{% else %}Optional{% endif %}):

+

{% trans "Ratings" %} ({% if ratings_required %}{% trans "Required" %}{% else %}{% trans "Optional" %}{% endif %}):

{% for value in rating_range %}{% endfor %} {% for rating in rating_choices %} @@ -28,16 +29,16 @@ COMMENT_FORM = ''' {% endif %} {% if photos_optional or photos_required %} -

Post a photo ({% if photos_required %}Required{% else %}Optional{% endif %}):

+

{% trans "Post a photo" %} ({% if photos_required %}{% trans "Required" %}{% else %}{% trans "Optional" %}{% endif %}):

{% endif %} -

Comment:

+

{% trans "Comment:" %}

-

+

{% endif %} ''' @@ -45,12 +46,12 @@ COMMENT_FORM = ''' FREE_COMMENT_FORM = ''' {% if display_form %} -

Your name:

-

Comment:

+

{% trans "Your name:" %}

+

{% trans "Comment:" %}

-

+

{% endif %} ''' diff --git a/django/contrib/comments/views/comments.py b/django/contrib/comments/views/comments.py index 996f3d0328..5918db7dc8 100644 --- a/django/contrib/comments/views/comments.py +++ b/django/contrib/comments/views/comments.py @@ -9,6 +9,7 @@ from django.parts.auth.formfields import AuthenticationForm from django.utils.httpwrappers import HttpResponseRedirect from django.utils.text import normalize_newlines from django.conf.settings import BANNED_IPS, COMMENTS_ALLOW_PROFANITIES, COMMENTS_SKETCHY_USERS_GROUP, COMMENTS_FIRST_FEW, SITE_ID +from django.utils.translation import ngettext import base64, datetime COMMENTS_PER_PAGE = 20 @@ -21,7 +22,7 @@ class PublicCommentManipulator(AuthenticationForm): choices = [(c, c) for c in ratings_range] def get_validator_list(rating_num): if rating_num <= num_rating_choices: - return [validators.RequiredIfOtherFieldsGiven(['rating%d' % i for i in range(1, 9) if i != rating_num], "This rating is required because you've entered at least one other rating.")] + return [validators.RequiredIfOtherFieldsGiven(['rating%d' % i for i in range(1, 9) if i != rating_num], _("This rating is required because you've entered at least one other rating."))] else: return [] self.fields.extend([ @@ -105,11 +106,12 @@ class PublicCommentManipulator(AuthenticationForm): # If the commentor has posted fewer than COMMENTS_FIRST_FEW comments, # send the comment to the managers. if self.user_cache.get_comments_comment_count() <= COMMENTS_FIRST_FEW: - message = 'This comment was posted by a user who has posted fewer than %s comments:\n\n%s' % \ - (COMMENTS_FIRST_FEW, c.get_as_text()) + message = ngettext('This comment was posted by a user who has posted fewer than %(count)s comment:\n\n%(text)s', + 'This comment was posted by a user who has posted fewer than %(count)s comments:\n\n%(text)s') % \ + {'count': COMMENTS_FIRST_FEW, 'text': c.get_as_text()} mail_managers("Comment posted by rookie user", message) if COMMENTS_SKETCHY_USERS_GROUP and COMMENTS_SKETCHY_USERS_GROUP in [g.id for g in self.user_cache.get_group_list()]: - message = 'This comment was posted by a sketchy user:\n\n%s' % c.get_as_text() + message = _('This comment was posted by a sketchy user:\n\n%(text)s') % {'text': c.get_as_text()} mail_managers("Comment posted by sketchy user (%s)" % self.user_cache.username, c.get_as_text()) return c @@ -181,15 +183,15 @@ def post_comment(request): choice of ratings """ if not request.POST: - raise Http404, "Only POSTs are allowed" + raise Http404, _("Only POSTs are allowed") try: options, target, security_hash = request.POST['options'], request.POST['target'], request.POST['gonzo'] except KeyError: - raise Http404, "One or more of the required fields wasn't submitted" + raise Http404, _("One or more of the required fields wasn't submitted") photo_options = request.POST.get('photo_options', '') rating_options = normalize_newlines(request.POST.get('rating_options', '')) if comments.get_security_hash(options, photo_options, rating_options, target) != security_hash: - raise Http404, "Somebody tampered with the comment form (security violation)" + raise Http404, _("Somebody tampered with the comment form (security violation)") # Now we can be assured the data is valid. if rating_options: rating_range, rating_choices = comments.get_rating_options(base64.decodestring(rating_options)) @@ -199,7 +201,7 @@ def post_comment(request): try: obj = contenttypes.get_object(pk=content_type_id).get_object_for_this_type(pk=object_id) except ObjectDoesNotExist: - raise Http404, "The comment form had an invalid 'target' parameter -- the object ID was invalid" + raise Http404, _("The comment form had an invalid 'target' parameter -- the object ID was invalid") option_list = options.split(',') # options is something like 'pa,ra' new_data = request.POST.copy() new_data['content_type_id'] = content_type_id @@ -249,7 +251,7 @@ def post_comment(request): comment = manipulator.save(new_data) return HttpResponseRedirect("/comments/posted/?c=%s:%s" % (content_type_id, object_id)) else: - raise Http404, "The comment form didn't provide either 'preview' or 'post'" + raise Http404, _("The comment form didn't provide either 'preview' or 'post'") def post_free_comment(request): """ @@ -272,19 +274,19 @@ def post_free_comment(request): post a comment). """ if not request.POST: - raise Http404, "Only POSTs are allowed" + raise Http404, _("Only POSTs are allowed") try: options, target, security_hash = request.POST['options'], request.POST['target'], request.POST['gonzo'] except KeyError: - raise Http404, "One or more of the required fields wasn't submitted" + raise Http404, _("One or more of the required fields wasn't submitted") if comments.get_security_hash(options, '', '', target) != security_hash: - raise Http404, "Somebody tampered with the comment form (security violation)" + raise Http404, _("Somebody tampered with the comment form (security violation)") content_type_id, object_id = target.split(':') # target is something like '52:5157' content_type = contenttypes.get_object(pk=content_type_id) try: obj = content_type.get_object_for_this_type(pk=object_id) except ObjectDoesNotExist: - raise Http404, "The comment form had an invalid 'target' parameter -- the object ID was invalid" + raise Http404, _("The comment form had an invalid 'target' parameter -- the object ID was invalid") option_list = options.split(',') new_data = request.POST.copy() new_data['content_type_id'] = content_type_id @@ -313,7 +315,7 @@ def post_free_comment(request): comment = manipulator.save(new_data) return HttpResponseRedirect("/comments/posted/?c=%s:%s" % (content_type_id, object_id)) else: - raise Http404, "The comment form didn't provide either 'preview' or 'post'" + raise Http404, _("The comment form didn't provide either 'preview' or 'post'") def comment_was_posted(request): """ diff --git a/django/contrib/comments/views/karma.py b/django/contrib/comments/views/karma.py index 2e2b2495ab..9db68d69f1 100644 --- a/django/contrib/comments/views/karma.py +++ b/django/contrib/comments/views/karma.py @@ -15,13 +15,13 @@ def vote(request, comment_id, vote): if not rating: raise Http404, "Invalid vote" if request.user.is_anonymous(): - raise Http404, "Anonymous users cannot vote" + raise Http404, _("Anonymous users cannot vote") try: comment = comments.get_object(pk=comment_id) except comments.CommentDoesNotExist: - raise Http404, "Invalid comment ID" + raise Http404, _("Invalid comment ID") if comment.user_id == request.user.id: - raise Http404, "No voting for yourself" + raise Http404, _("No voting for yourself") karma.vote(request.user.id, comment_id, rating) # Reload comment to ensure we have up to date karma count comment = comments.get_object(pk=comment_id) From 6d6d90ce3350c52861e9ead920b5edee319a55c8 Mon Sep 17 00:00:00 2001 From: Georg Bauer Date: Wed, 23 Nov 2005 16:14:24 +0000 Subject: [PATCH 03/13] made the message when locale/ or conf/locale/ could not be found a bit more clear git-svn-id: http://code.djangoproject.com/svn/django/trunk@1366 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/bin/make-messages.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/django/bin/make-messages.py b/django/bin/make-messages.py index ea4f76b4aa..c989034c0b 100755 --- a/django/bin/make-messages.py +++ b/django/bin/make-messages.py @@ -14,7 +14,12 @@ if os.path.isdir(os.path.join('conf', 'locale')): elif os.path.isdir('locale'): localedir = os.path.abspath('locale') else: - print "this script should be run from the django svn tree or your project or app tree" + print "This script should be run from the django svn tree or your project or app tree." + print "If you did indeed run it from the svn checkout or your project or application," + print "maybe you are just missing the conf/locale (in the django tree) or locale (for project" + print "and application) directory?" + print "make-messages.py doesn't create it automatically, you have to create it by hand if" + print "you want to enable i18n for your project or application." sys.exit(1) (opts, args) = getopt.getopt(sys.argv[1:], 'l:d:va') From 6303141fbb1567becd4ba3e35bf347f65e22174b Mon Sep 17 00:00:00 2001 From: Adrian Holovaty Date: Wed, 23 Nov 2005 17:02:38 +0000 Subject: [PATCH 04/13] Applied translation strings from new-admin to contrib.admin.views.doc git-svn-id: http://code.djangoproject.com/svn/django/trunk@1368 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/contrib/admin/views/doc.py | 48 +++++++++++++++---------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/django/contrib/admin/views/doc.py b/django/contrib/admin/views/doc.py index e4d0f1c648..4eadb74fc4 100644 --- a/django/contrib/admin/views/doc.py +++ b/django/contrib/admin/views/doc.py @@ -259,31 +259,31 @@ def get_return_data_type(func_name): # against the values of Field.__dict__ before being output. # If a column type is set to None, it won't be included in the output. DATA_TYPE_MAPPING = { - 'AutoField' : 'Integer', - 'BooleanField' : 'Boolean (Either True or False)', - 'CharField' : 'String (up to %(maxlength)s)', - 'CommaSeparatedIntegerField': 'Comma-separated integers', - 'DateField' : 'Date (without time)', - 'DateTimeField' : 'Date (with time)', - 'EmailField' : 'E-mail address', - 'FileField' : 'File path', - 'FloatField' : 'Decimal number', - 'ForeignKey' : 'Integer', - 'ImageField' : 'File path', - 'IntegerField' : 'Integer', - 'IPAddressField' : 'IP address', + 'AutoField' : _('Integer'), + 'BooleanField' : _('Boolean (Either True or False)'), + 'CharField' : _('String (up to %(maxlength)s)'), + 'CommaSeparatedIntegerField': _('Comma-separated integers'), + 'DateField' : _('Date (without time)'), + 'DateTimeField' : _('Date (with time)'), + 'EmailField' : _('E-mail address'), + 'FileField' : _('File path'), + 'FloatField' : _('Decimal number'), + 'ForeignKey' : _('Integer'), + 'ImageField' : _('File path'), + 'IntegerField' : _('Integer'), + 'IPAddressField' : _('IP address'), 'ManyToManyField' : '', - 'NullBooleanField' : 'Boolean (Either True, False or None)', - 'PhoneNumberField' : 'Phone number', - 'PositiveIntegerField' : 'Integer', - 'PositiveSmallIntegerField' : 'Integer', - 'SlugField' : 'String (up to 50)', - 'SmallIntegerField' : 'Integer', - 'TextField' : 'Text', - 'TimeField' : 'Time', - 'URLField' : 'URL', - 'USStateField' : 'U.S. state (two uppercase letters)', - 'XMLField' : 'XML text', + 'NullBooleanField' : _('Boolean (Either True, False or None)'), + 'PhoneNumberField' : _('Phone number'), + 'PositiveIntegerField' : _('Integer'), + 'PositiveSmallIntegerField' : _('Integer'), + 'SlugField' : _('String (up to 50)'), + 'SmallIntegerField' : _('Integer'), + 'TextField' : _('Text'), + 'TimeField' : _('Time'), + 'URLField' : _('URL'), + 'USStateField' : _('U.S. state (two uppercase letters)'), + 'XMLField' : _('XML text'), } def get_readable_field_data_type(field): From 8dc25efea8968b139e10ea8bfd7d5b21a49e8f93 Mon Sep 17 00:00:00 2001 From: Georg Bauer Date: Wed, 23 Nov 2005 17:14:54 +0000 Subject: [PATCH 05/13] updated message files for new translation targets (comments) and updated 'de' translation git-svn-id: http://code.djangoproject.com/svn/django/trunk@1369 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/conf/locale/bn/LC_MESSAGES/django.mo | Bin 26898 -> 26898 bytes django/conf/locale/bn/LC_MESSAGES/django.po | 264 +++++++++++- django/conf/locale/cs/LC_MESSAGES/django.mo | Bin 17734 -> 17734 bytes django/conf/locale/cs/LC_MESSAGES/django.po | 265 +++++++++++- django/conf/locale/cy/LC_MESSAGES/django.mo | Bin 16972 -> 16972 bytes django/conf/locale/cy/LC_MESSAGES/django.po | 264 +++++++++++- django/conf/locale/da/LC_MESSAGES/django.mo | Bin 16807 -> 16807 bytes django/conf/locale/da/LC_MESSAGES/django.po | 264 +++++++++++- django/conf/locale/de/LC_MESSAGES/django.mo | Bin 18498 -> 22621 bytes django/conf/locale/de/LC_MESSAGES/django.po | 279 +++++++++++- django/conf/locale/en/LC_MESSAGES/django.mo | Bin 536 -> 536 bytes django/conf/locale/en/LC_MESSAGES/django.po | 249 ++++++++++- django/conf/locale/es/LC_MESSAGES/django.mo | Bin 5203 -> 5203 bytes django/conf/locale/es/LC_MESSAGES/django.po | 253 ++++++++++- django/conf/locale/fr/LC_MESSAGES/django.mo | Bin 17427 -> 17427 bytes django/conf/locale/fr/LC_MESSAGES/django.po | 264 +++++++++++- django/conf/locale/gl/LC_MESSAGES/django.mo | Bin 5322 -> 5322 bytes django/conf/locale/gl/LC_MESSAGES/django.po | 253 ++++++++++- django/conf/locale/is/LC_MESSAGES/django.mo | Bin 17726 -> 17726 bytes django/conf/locale/is/LC_MESSAGES/django.po | 264 +++++++++++- django/conf/locale/it/LC_MESSAGES/django.mo | Bin 16501 -> 16501 bytes django/conf/locale/it/LC_MESSAGES/django.po | 264 +++++++++++- django/conf/locale/no/LC_MESSAGES/django.mo | Bin 17324 -> 17324 bytes django/conf/locale/no/LC_MESSAGES/django.po | 264 +++++++++++- .../conf/locale/pt_BR/LC_MESSAGES/django.mo | Bin 16330 -> 16330 bytes .../conf/locale/pt_BR/LC_MESSAGES/django.po | 264 +++++++++++- django/conf/locale/ro/LC_MESSAGES/django.mo | Bin 17096 -> 17096 bytes django/conf/locale/ro/LC_MESSAGES/django.po | 264 +++++++++++- django/conf/locale/ru/LC_MESSAGES/django.mo | Bin 13774 -> 13774 bytes django/conf/locale/ru/LC_MESSAGES/django.po | 263 +++++++++++- django/conf/locale/sk/LC_MESSAGES/django.mo | Bin 18399 -> 18399 bytes django/conf/locale/sk/LC_MESSAGES/django.po | 396 +++++++++++++++--- django/conf/locale/sr/LC_MESSAGES/django.mo | Bin 17264 -> 17264 bytes django/conf/locale/sr/LC_MESSAGES/django.po | 265 +++++++++++- django/conf/locale/sv/LC_MESSAGES/django.mo | Bin 17616 -> 17616 bytes django/conf/locale/sv/LC_MESSAGES/django.po | 264 +++++++++++- .../conf/locale/zh_CN/LC_MESSAGES/django.mo | Bin 16940 -> 16940 bytes .../conf/locale/zh_CN/LC_MESSAGES/django.po | 263 +++++++++++- 38 files changed, 5038 insertions(+), 88 deletions(-) diff --git a/django/conf/locale/bn/LC_MESSAGES/django.mo b/django/conf/locale/bn/LC_MESSAGES/django.mo index b4d427d19cfead11725631fc19d70ec665fe4d69..fbc45605ac88d9afb54b827b73acaa7938233796 100644 GIT binary patch delta 22 ecmbPqiE+{;#tp(+?8XX)hE@jVo29gV*Z}}o!v{hD delta 22 ecmbPqiE+{;#tp(+>_!TPrdB2\n" "Language-Team: Ankur Bangla \n" @@ -16,6 +16,268 @@ 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 "বস্তু আই.ডি." + +#: 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 "অভ্যন্তরস্থ বস্তু" + +#: 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 +#, fuzzy +msgid "IP address" +msgstr "ই-মেল ঠিকানা" + +#: 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 "মন্তব্য সক্রিয় করুন" + +#: contrib/comments/models/comments.py:85 +#: contrib/comments/models/comments.py:204 +#, fuzzy +msgid "Content object" +msgstr "অভ্যন্তরস্থ বস্তু ধরন" + +#: 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 "প্রথম নাম" + +#: contrib/comments/models/comments.py:166 +#, fuzzy +msgid "ip address" +msgstr "ই-মেল ঠিকানা" + +#: contrib/comments/models/comments.py:168 +msgid "approved by staff" +msgstr "" + +#: contrib/comments/models/comments.py:172 +#, fuzzy +msgid "Free comment" +msgstr "মন্তব্য সক্রিয় করুন" + +#: contrib/comments/models/comments.py:173 +#, fuzzy +msgid "Free comments" +msgstr "মন্তব্য সক্রিয় করুন" + +#: contrib/comments/models/comments.py:209 +msgid "score" +msgstr "" + +#: contrib/comments/models/comments.py:210 +#, fuzzy +msgid "score date" +msgstr "শেষ তারিখ" + +#: 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 "চ্যাপ্টা পাতা" + +#: contrib/comments/models/comments.py:251 +#, fuzzy +msgid "User flag" +msgstr "ব্যবহারকারী" + +#: contrib/comments/models/comments.py:252 +#, fuzzy +msgid "User flags" +msgstr "ব্যবহারকারী" + +#: 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 "অধিবেশন তথ্য" + +#: 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 "" + +#: contrib/comments/views/karma.py:22 +#, fuzzy +msgid "Invalid comment ID" +msgstr "মন্তব্য সক্রিয় করুন" + +#: contrib/comments/views/karma.py:24 +msgid "No voting for yourself" +msgstr "" + +#: contrib/comments/views/comments.py:25 +msgid "" +"This rating is required because you've entered at least one other rating." +msgstr "" + +#: contrib/comments/views/comments.py:109 +#, 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] "" + +#: contrib/comments/views/comments.py:114 +#, python-format +msgid "" +"This comment was posted by a sketchy user:\n" +"\n" +"%(text)s" +msgstr "" + +#: contrib/comments/views/comments.py:186 +#: contrib/comments/views/comments.py:277 +msgid "Only POSTs are allowed" +msgstr "" + +#: contrib/comments/views/comments.py:190 +#: contrib/comments/views/comments.py:281 +msgid "One or more of the required fields wasn't submitted" +msgstr "" + +#: contrib/comments/views/comments.py:194 +#: contrib/comments/views/comments.py:283 +msgid "Somebody tampered with the comment form (security violation)" +msgstr "" + +#: contrib/comments/views/comments.py:204 +#: contrib/comments/views/comments.py:289 +msgid "" +"The comment form had an invalid 'target' parameter -- the object ID was " +"invalid" +msgstr "" + +#: contrib/comments/views/comments.py:254 +#: contrib/comments/views/comments.py:318 +msgid "The comment form didn't provide either 'preview' or 'post'" +msgstr "" + #: contrib/admin/models/admin.py:6 msgid "action time" msgstr "কাজের সময়" diff --git a/django/conf/locale/cs/LC_MESSAGES/django.mo b/django/conf/locale/cs/LC_MESSAGES/django.mo index 9f1e643a38b028b1be9caeaf3d922d5d40b54aaa..a8420bd847bfbd6a2a476fecfe6bbdcc1d31e6c0 100644 GIT binary patch delta 22 dcmX@s#dxfXaYM2uyRm|yp_PHz<}A%S(g0hX2Y3Jg delta 22 dcmX@s#dxfXaYM2uyODySsg;Sz<}A%S(g0h<2Ymnl diff --git a/django/conf/locale/cs/LC_MESSAGES/django.po b/django/conf/locale/cs/LC_MESSAGES/django.po index a5d73d367a..87f5a09c22 100644 --- a/django/conf/locale/cs/LC_MESSAGES/django.po +++ b/django/conf/locale/cs/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Django Czech translation\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-22 15:44-0600\n" +"POT-Creation-Date: 2005-11-23 11:06-0600\n" "PO-Revision-Date: 2005-11-14 15:34+0100\n" "Last-Translator: Radek Svarz \n" "Language-Team: Czech\n" @@ -19,6 +19,269 @@ msgstr "" "X-Poedit-Language: Czech\n" "X-Poedit-Country: CZECH REPUBLIC\n" +#: contrib/comments/models/comments.py:8 +#: contrib/comments/models/comments.py:161 +#, fuzzy +msgid "object ID" +msgstr "object 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 "obsah" + +#: 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 +#, fuzzy +msgid "IP address" +msgstr "e-mailová adresa" + +#: 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 "povolit komentáře" + +#: contrib/comments/models/comments.py:85 +#: contrib/comments/models/comments.py:204 +#, fuzzy +msgid "Content object" +msgstr "typ obsahu" + +#: 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 "křestní jméno" + +#: contrib/comments/models/comments.py:166 +#, fuzzy +msgid "ip address" +msgstr "e-mailová adresa" + +#: contrib/comments/models/comments.py:168 +msgid "approved by staff" +msgstr "" + +#: contrib/comments/models/comments.py:172 +#, fuzzy +msgid "Free comment" +msgstr "povolit komentáře" + +#: contrib/comments/models/comments.py:173 +#, fuzzy +msgid "Free comments" +msgstr "povolit komentáře" + +#: contrib/comments/models/comments.py:209 +msgid "score" +msgstr "" + +#: contrib/comments/models/comments.py:210 +#, fuzzy +msgid "score date" +msgstr "datum expirace" + +#: 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 "statická stránka" + +#: contrib/comments/models/comments.py:251 +#, fuzzy +msgid "User flag" +msgstr "Uživatel" + +#: contrib/comments/models/comments.py:252 +#, fuzzy +msgid "User flags" +msgstr "Uživatelé" + +#: 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 "data sezení" + +#: 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 "" + +#: contrib/comments/views/karma.py:22 +#, fuzzy +msgid "Invalid comment ID" +msgstr "povolit komentáře" + +#: contrib/comments/views/karma.py:24 +msgid "No voting for yourself" +msgstr "" + +#: contrib/comments/views/comments.py:25 +msgid "" +"This rating is required because you've entered at least one other rating." +msgstr "" + +#: contrib/comments/views/comments.py:109 +#, 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[2] "" + +#: contrib/comments/views/comments.py:114 +#, python-format +msgid "" +"This comment was posted by a sketchy user:\n" +"\n" +"%(text)s" +msgstr "" + +#: contrib/comments/views/comments.py:186 +#: contrib/comments/views/comments.py:277 +msgid "Only POSTs are allowed" +msgstr "" + +#: contrib/comments/views/comments.py:190 +#: contrib/comments/views/comments.py:281 +msgid "One or more of the required fields wasn't submitted" +msgstr "" + +#: contrib/comments/views/comments.py:194 +#: contrib/comments/views/comments.py:283 +msgid "Somebody tampered with the comment form (security violation)" +msgstr "" + +#: contrib/comments/views/comments.py:204 +#: contrib/comments/views/comments.py:289 +msgid "" +"The comment form had an invalid 'target' parameter -- the object ID was " +"invalid" +msgstr "" + +#: contrib/comments/views/comments.py:254 +#: contrib/comments/views/comments.py:318 +msgid "The comment form didn't provide either 'preview' or 'post'" +msgstr "" + #: contrib/admin/models/admin.py:6 msgid "action time" msgstr "čas akce" diff --git a/django/conf/locale/cy/LC_MESSAGES/django.mo b/django/conf/locale/cy/LC_MESSAGES/django.mo index 5f6dba1cd45aaec585f81351c2db10559a352dba..9fc66485c6f5e412d05176edc84907008aa5a7c5 100644 GIT binary patch delta 22 dcmX@p!g!{Ial;o4c4GxYLn{OG&A&AQB>`ng2n+xK delta 22 dcmX@p!g!{Ial;o4b|VEtQ!5jb&A&AQB>`n?2oL}O diff --git a/django/conf/locale/cy/LC_MESSAGES/django.po b/django/conf/locale/cy/LC_MESSAGES/django.po index cd2d339a7a..f1d7a34c8e 100644 --- a/django/conf/locale/cy/LC_MESSAGES/django.po +++ b/django/conf/locale/cy/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-22 15:44-0600\n" +"POT-Creation-Date: 2005-11-23 11:07-0600\n" "PO-Revision-Date: 2005-11-05 HO:MI+ZONE\n" "Last-Translator: Jason Davies \n" "Language-Team: Cymraeg \n" @@ -16,6 +16,268 @@ 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 "id gwrthrych" + +#: 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 "cynnwys" + +#: 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 +#, fuzzy +msgid "IP address" +msgstr "cyfeiriad e-bost" + +#: 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 "galluogi sylwadau" + +#: contrib/comments/models/comments.py:85 +#: contrib/comments/models/comments.py:204 +#, fuzzy +msgid "Content object" +msgstr "math cynnwys" + +#: 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 "enw cyntaf" + +#: contrib/comments/models/comments.py:166 +#, fuzzy +msgid "ip address" +msgstr "cyfeiriad e-bost" + +#: contrib/comments/models/comments.py:168 +msgid "approved by staff" +msgstr "" + +#: contrib/comments/models/comments.py:172 +#, fuzzy +msgid "Free comment" +msgstr "galluogi sylwadau" + +#: contrib/comments/models/comments.py:173 +#, fuzzy +msgid "Free comments" +msgstr "galluogi sylwadau" + +#: contrib/comments/models/comments.py:209 +msgid "score" +msgstr "" + +#: contrib/comments/models/comments.py:210 +#, fuzzy +msgid "score date" +msgstr "dyddiad darfod" + +#: 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 "tudalen fflat" + +#: contrib/comments/models/comments.py:251 +#, fuzzy +msgid "User flag" +msgstr "Defnyddiwr" + +#: contrib/comments/models/comments.py:252 +#, fuzzy +msgid "User flags" +msgstr "Defnyddwyr" + +#: 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 "data sesiwn" + +#: 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 "" + +#: contrib/comments/views/karma.py:22 +#, fuzzy +msgid "Invalid comment ID" +msgstr "galluogi sylwadau" + +#: contrib/comments/views/karma.py:24 +msgid "No voting for yourself" +msgstr "" + +#: contrib/comments/views/comments.py:25 +msgid "" +"This rating is required because you've entered at least one other rating." +msgstr "" + +#: contrib/comments/views/comments.py:109 +#, 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] "" + +#: contrib/comments/views/comments.py:114 +#, python-format +msgid "" +"This comment was posted by a sketchy user:\n" +"\n" +"%(text)s" +msgstr "" + +#: contrib/comments/views/comments.py:186 +#: contrib/comments/views/comments.py:277 +msgid "Only POSTs are allowed" +msgstr "" + +#: contrib/comments/views/comments.py:190 +#: contrib/comments/views/comments.py:281 +msgid "One or more of the required fields wasn't submitted" +msgstr "" + +#: contrib/comments/views/comments.py:194 +#: contrib/comments/views/comments.py:283 +msgid "Somebody tampered with the comment form (security violation)" +msgstr "" + +#: contrib/comments/views/comments.py:204 +#: contrib/comments/views/comments.py:289 +msgid "" +"The comment form had an invalid 'target' parameter -- the object ID was " +"invalid" +msgstr "" + +#: contrib/comments/views/comments.py:254 +#: contrib/comments/views/comments.py:318 +msgid "The comment form didn't provide either 'preview' or 'post'" +msgstr "" + #: contrib/admin/models/admin.py:6 msgid "action time" msgstr "amser gweithred" diff --git a/django/conf/locale/da/LC_MESSAGES/django.mo b/django/conf/locale/da/LC_MESSAGES/django.mo index c467726c25fc9de363b58708ec1e3949ea549a3c..ef8863f35c83019cd6836d7bd8ab01938d72cf8f 100644 GIT binary patch delta 22 dcmZ49%(%Rnaf7rbyRm|yp_PI8W+ly52>?%$215V< delta 22 dcmZ49%(%Rnaf7rbyODySsg;SzW+ly52>?&D21ft@ diff --git a/django/conf/locale/da/LC_MESSAGES/django.po b/django/conf/locale/da/LC_MESSAGES/django.po index 5035891af3..e1df78219d 100644 --- a/django/conf/locale/da/LC_MESSAGES/django.po +++ b/django/conf/locale/da/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-22 15:44-0600\n" +"POT-Creation-Date: 2005-11-23 11:07-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Morten Bagai \n" "Language-Team: Danish\n" @@ -16,6 +16,268 @@ 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 "indhold" + +#: 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 +#, fuzzy +msgid "IP address" +msgstr "e-mail 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 "tillad kommentarer" + +#: contrib/comments/models/comments.py:85 +#: contrib/comments/models/comments.py:204 +#, fuzzy +msgid "Content object" +msgstr "indholdstype" + +#: 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-mail adresse" + +#: contrib/comments/models/comments.py:168 +msgid "approved by staff" +msgstr "" + +#: contrib/comments/models/comments.py:172 +#, fuzzy +msgid "Free comment" +msgstr "tillad kommentarer" + +#: contrib/comments/models/comments.py:173 +#, fuzzy +msgid "Free comments" +msgstr "tillad kommentarer" + +#: contrib/comments/models/comments.py:209 +msgid "score" +msgstr "" + +#: contrib/comments/models/comments.py:210 +#, fuzzy +msgid "score date" +msgstr "udløbsdato" + +#: 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 "flad side" + +#: contrib/comments/models/comments.py:251 +#, fuzzy +msgid "User flag" +msgstr "Bruger" + +#: contrib/comments/models/comments.py:252 +#, fuzzy +msgid "User flags" +msgstr "Brugere" + +#: 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 "sessionsdata" + +#: 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 "" + +#: contrib/comments/views/karma.py:22 +#, fuzzy +msgid "Invalid comment ID" +msgstr "tillad kommentarer" + +#: contrib/comments/views/karma.py:24 +msgid "No voting for yourself" +msgstr "" + +#: contrib/comments/views/comments.py:25 +msgid "" +"This rating is required because you've entered at least one other rating." +msgstr "" + +#: contrib/comments/views/comments.py:109 +#, 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] "" + +#: contrib/comments/views/comments.py:114 +#, python-format +msgid "" +"This comment was posted by a sketchy user:\n" +"\n" +"%(text)s" +msgstr "" + +#: contrib/comments/views/comments.py:186 +#: contrib/comments/views/comments.py:277 +msgid "Only POSTs are allowed" +msgstr "" + +#: contrib/comments/views/comments.py:190 +#: contrib/comments/views/comments.py:281 +msgid "One or more of the required fields wasn't submitted" +msgstr "" + +#: contrib/comments/views/comments.py:194 +#: contrib/comments/views/comments.py:283 +msgid "Somebody tampered with the comment form (security violation)" +msgstr "" + +#: contrib/comments/views/comments.py:204 +#: contrib/comments/views/comments.py:289 +msgid "" +"The comment form had an invalid 'target' parameter -- the object ID was " +"invalid" +msgstr "" + +#: contrib/comments/views/comments.py:254 +#: contrib/comments/views/comments.py:318 +msgid "The comment form didn't provide either 'preview' or 'post'" +msgstr "" + #: contrib/admin/models/admin.py:6 msgid "action time" msgstr "handlingstid" diff --git a/django/conf/locale/de/LC_MESSAGES/django.mo b/django/conf/locale/de/LC_MESSAGES/django.mo index 2f4d9b38af2307499d1429a97126de9689db5d93..43308554465d32f26268faedf5e512be2fa9d840 100644 GIT binary patch delta 9126 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 delta 5073 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 diff --git a/django/conf/locale/de/LC_MESSAGES/django.po b/django/conf/locale/de/LC_MESSAGES/django.po index 30fe328b6e..463a5d2b75 100644 --- a/django/conf/locale/de/LC_MESSAGES/django.po +++ b/django/conf/locale/de/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Django 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-22 15:44-0600\n" +"POT-Creation-Date: 2005-11-23 11:06-0600\n" "PO-Revision-Date: 2005-11-06 13:54+0100\n" "Last-Translator: Lukas Kolbe \n" "Language-Team: \n" @@ -15,6 +15,278 @@ msgstr "" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" +#: contrib/comments/models/comments.py:8 +#: contrib/comments/models/comments.py:161 +msgid "object ID" +msgstr "Objekt ID" + +#: contrib/comments/models/comments.py:9 +msgid "headline" +msgstr "berschrift" + +#: contrib/comments/models/comments.py:10 +#: contrib/comments/models/comments.py:162 +msgid "comment" +msgstr "Kommentar" + +#: contrib/comments/models/comments.py:11 +msgid "rating #1" +msgstr "Bewertung #1" + +#: contrib/comments/models/comments.py:12 +msgid "rating #2" +msgstr "Bewertung #2" + +#: contrib/comments/models/comments.py:13 +msgid "rating #3" +msgstr "Bewertung #3" + +#: contrib/comments/models/comments.py:14 +msgid "rating #4" +msgstr "Bewertung #4" + +#: contrib/comments/models/comments.py:15 +msgid "rating #5" +msgstr "Bewertung #5" + +#: contrib/comments/models/comments.py:16 +msgid "rating #6" +msgstr "Bewertung #6" + +#: contrib/comments/models/comments.py:17 +msgid "rating #7" +msgstr "Bewertung #7" + +#: contrib/comments/models/comments.py:18 +msgid "rating #8" +msgstr "Bewertung #8" + +#: contrib/comments/models/comments.py:23 +msgid "is valid rating" +msgstr "ist eine Bewertung" + +#: contrib/comments/models/comments.py:24 +#: contrib/comments/models/comments.py:164 +msgid "date/time submitted" +msgstr "Datum/Zeit Erstellung" + +#: contrib/comments/models/comments.py:25 +#: contrib/comments/models/comments.py:165 +msgid "is public" +msgstr "ist ffentlich" + +#: contrib/comments/models/comments.py:26 +msgid "IP address" +msgstr "IP Adresse" + +#: contrib/comments/models/comments.py:27 +msgid "is removed" +msgstr "ist gelscht" + +#: 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 "" +"Hier einen Haken setzen, wenn der Kommentar unpassend ist. Es wird dann eine " +"\"Dieser Kommentar wurde entfernt\" Meldung statt dessen angezeigt." + +#: contrib/comments/models/comments.py:31 +msgid "Comment" +msgstr "Kommentar" + +#: contrib/comments/models/comments.py:32 +msgid "Comments" +msgstr "Kommentare" + +#: contrib/comments/models/comments.py:85 +#: contrib/comments/models/comments.py:204 +msgid "Content object" +msgstr "Inhaltsobjekt" + +#: 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 "" +"Geschrieben von %(user)s am %(date)s\n" +"\n" +"$(comment)s\n" +"\n" +"http://%(domain)s%(url)s" + +#: contrib/comments/models/comments.py:163 +msgid "person's name" +msgstr "Autorname" + +#: contrib/comments/models/comments.py:166 +msgid "ip address" +msgstr "IP-Adresse" + +#: contrib/comments/models/comments.py:168 +msgid "approved by staff" +msgstr "Besttigt vom Betreiber" + +#: contrib/comments/models/comments.py:172 +msgid "Free comment" +msgstr "Freier Kommentar" + +#: contrib/comments/models/comments.py:173 +msgid "Free comments" +msgstr "Freie Kommentare" + +#: contrib/comments/models/comments.py:209 +msgid "score" +msgstr "Bewertung" + +#: contrib/comments/models/comments.py:210 +msgid "score date" +msgstr "Bewertungsdatum" + +#: contrib/comments/models/comments.py:213 +msgid "Karma score" +msgstr "Karma Bewertung" + +#: contrib/comments/models/comments.py:214 +msgid "Karma scores" +msgstr "Karma Bewertungen" + +#: contrib/comments/models/comments.py:223 +#, python-format +msgid "%(score)d rating by %(user)s" +msgstr "%(score)d Bewertung von %(user)s" + +#: contrib/comments/models/comments.py:248 +msgid "flag date" +msgstr "Kennzeichnungsdatum" + +#: contrib/comments/models/comments.py:251 +msgid "User flag" +msgstr "Benutzerkennzeichnung" + +#: contrib/comments/models/comments.py:252 +msgid "User flags" +msgstr "Benutzerkennzeichnungen" + +#: contrib/comments/models/comments.py:256 +#, python-format +msgid "Flag by %r" +msgstr "Gekennzeichnet von %r" + +#: contrib/comments/models/comments.py:271 +#, python-format +msgid "" +"This comment was flagged by %(user)s:\n" +"\n" +"%(text)s" +msgstr "" +"Dieser Kommentar ist von %(user)s markiert:\n" +"\n" +"%(text)s" + +#: contrib/comments/models/comments.py:278 +msgid "deletion date" +msgstr "Lschdatum" + +#: contrib/comments/models/comments.py:281 +msgid "Moderator deletion" +msgstr "Lschung vom Moderator" + +#: contrib/comments/models/comments.py:282 +msgid "Moderator deletions" +msgstr "Lschungen vom Moderator" + +#: contrib/comments/models/comments.py:286 +#, python-format +msgid "Moderator deletion by %r" +msgstr "Vom Moderator %r gelscht" + +#: contrib/comments/views/karma.py:18 +msgid "Anonymous users cannot vote" +msgstr "Anonyme Benutzer knnen nicht abstimmen" + +#: contrib/comments/views/karma.py:22 +msgid "Invalid comment ID" +msgstr "Ungltige Kommentar-ID" + +#: contrib/comments/views/karma.py:24 +msgid "No voting for yourself" +msgstr "Keine Abstimmung bei Dir selber" + +#: contrib/comments/views/comments.py:25 +msgid "" +"This rating is required because you've entered at least one other rating." +msgstr "" +"Die Abstimmung ist zwangsweise, weil Du an mindestens einer anderen " +"Abstimmung teilnimmst." + +#: contrib/comments/views/comments.py:109 +#, 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] "" +"Dieser Kommentar ist von einem Benutzer mit weniger als %(count)s " +"Kommentar:\n" +"\n" +"%(text)s" +msgstr[1] "" +"Dieser Kommentar ist von einem Benutzer mit weniger als %(count)s " +"Kommentaren:\n" +"\n" +"%(text)s" + +#: contrib/comments/views/comments.py:114 +#, python-format +msgid "" +"This comment was posted by a sketchy user:\n" +"\n" +"%(text)s" +msgstr "" +"Dieser Kommentar ist von einem nicht einschtzbaren Benutzer:\n" +"\n" +"%(text)s" + +#: contrib/comments/views/comments.py:186 +#: contrib/comments/views/comments.py:277 +msgid "Only POSTs are allowed" +msgstr "Nur POST ist erlaubt" + +#: contrib/comments/views/comments.py:190 +#: contrib/comments/views/comments.py:281 +msgid "One or more of the required fields wasn't submitted" +msgstr "Eines oder mehrere der erforderlichen Felder fehlt" + +#: contrib/comments/views/comments.py:194 +#: contrib/comments/views/comments.py:283 +msgid "Somebody tampered with the comment form (security violation)" +msgstr "Jemand hat mit dem Kommentarformular herumgespielt (Sicherheitsverletzung)" + +#: contrib/comments/views/comments.py:204 +#: contrib/comments/views/comments.py:289 +msgid "" +"The comment form had an invalid 'target' parameter -- the object ID was " +"invalid" +msgstr "" +"Das Kommentarformular hatte einen falschen 'target' Parameter -- die Objekt-" +"ID ist ungltig." + +#: contrib/comments/views/comments.py:254 +#: contrib/comments/views/comments.py:318 +msgid "The comment form didn't provide either 'preview' or 'post'" +msgstr "Das Kommentarformular wurde nicht mit 'preview' oder 'post' abgeschickt" + #: contrib/admin/models/admin.py:6 msgid "action time" msgstr "Zeit der Aktion" @@ -533,8 +805,8 @@ msgstr[1] "Tage" #: utils/timesince.py:15 msgid "hour" msgid_plural "hours" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Stunde" +msgstr[1] "Stunden" #: utils/timesince.py:16 msgid "minute" @@ -1058,4 +1330,3 @@ msgid "" msgstr "" " Um mehr als eine Selektion zu treffen, \"Strg\", oder auf dem Mac \"Command" "\", beim Klicken gedrckt halten." - diff --git a/django/conf/locale/en/LC_MESSAGES/django.mo b/django/conf/locale/en/LC_MESSAGES/django.mo index f1ef3dea8ffb8e5bdeb579393a6a0ac0c1a08bbb..a359bb9f396789f064712074e4b258abbae3d7a2 100644 GIT binary patch delta 19 acmbQiGJ|D<3?sX-f}x?6f!Snb#;*V{Rs{|K delta 19 acmbQiGJ|D<3?sXdf}yFEiScA*#;*V{bOjOs diff --git a/django/conf/locale/en/LC_MESSAGES/django.po b/django/conf/locale/en/LC_MESSAGES/django.po index d55d024198..0cbba88060 100644 --- a/django/conf/locale/en/LC_MESSAGES/django.po +++ b/django/conf/locale/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-22 15:43-0600\n" +"POT-Creation-Date: 2005-11-23 11:06-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,6 +16,253 @@ 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 +msgid "object ID" +msgstr "" + +#: contrib/comments/models/comments.py:9 +msgid "headline" +msgstr "" + +#: contrib/comments/models/comments.py:10 +#: contrib/comments/models/comments.py:162 +msgid "comment" +msgstr "" + +#: 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 +msgid "IP address" +msgstr "" + +#: 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 +msgid "Comments" +msgstr "" + +#: contrib/comments/models/comments.py:85 +#: contrib/comments/models/comments.py:204 +msgid "Content object" +msgstr "" + +#: 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 +msgid "person's name" +msgstr "" + +#: contrib/comments/models/comments.py:166 +msgid "ip address" +msgstr "" + +#: contrib/comments/models/comments.py:168 +msgid "approved by staff" +msgstr "" + +#: contrib/comments/models/comments.py:172 +msgid "Free comment" +msgstr "" + +#: contrib/comments/models/comments.py:173 +msgid "Free comments" +msgstr "" + +#: contrib/comments/models/comments.py:209 +msgid "score" +msgstr "" + +#: contrib/comments/models/comments.py:210 +msgid "score date" +msgstr "" + +#: 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 +msgid "flag date" +msgstr "" + +#: contrib/comments/models/comments.py:251 +msgid "User flag" +msgstr "" + +#: contrib/comments/models/comments.py:252 +msgid "User flags" +msgstr "" + +#: 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 +msgid "deletion date" +msgstr "" + +#: 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 "" + +#: contrib/comments/views/karma.py:22 +msgid "Invalid comment ID" +msgstr "" + +#: contrib/comments/views/karma.py:24 +msgid "No voting for yourself" +msgstr "" + +#: contrib/comments/views/comments.py:25 +msgid "" +"This rating is required because you've entered at least one other rating." +msgstr "" + +#: contrib/comments/views/comments.py:109 +#, 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] "" + +#: contrib/comments/views/comments.py:114 +#, python-format +msgid "" +"This comment was posted by a sketchy user:\n" +"\n" +"%(text)s" +msgstr "" + +#: contrib/comments/views/comments.py:186 +#: contrib/comments/views/comments.py:277 +msgid "Only POSTs are allowed" +msgstr "" + +#: contrib/comments/views/comments.py:190 +#: contrib/comments/views/comments.py:281 +msgid "One or more of the required fields wasn't submitted" +msgstr "" + +#: contrib/comments/views/comments.py:194 +#: contrib/comments/views/comments.py:283 +msgid "Somebody tampered with the comment form (security violation)" +msgstr "" + +#: contrib/comments/views/comments.py:204 +#: contrib/comments/views/comments.py:289 +msgid "" +"The comment form had an invalid 'target' parameter -- the object ID was " +"invalid" +msgstr "" + +#: contrib/comments/views/comments.py:254 +#: contrib/comments/views/comments.py:318 +msgid "The comment form didn't provide either 'preview' or 'post'" +msgstr "" + #: contrib/admin/models/admin.py:6 msgid "action time" msgstr "" diff --git a/django/conf/locale/es/LC_MESSAGES/django.mo b/django/conf/locale/es/LC_MESSAGES/django.mo index 5efbe07b1754467341498957672fc0d6f5ddb2b7..5b2e98856418a3981681c61c4df32dad539df947 100644 GIT binary patch delta 20 bcmcbtaam)-J8pJk1w%tC1GCLvx#KthQt$^A delta 20 bcmcbtaam)-J8pI(1w&IS6O+wfx#KthQy2#t diff --git a/django/conf/locale/es/LC_MESSAGES/django.po b/django/conf/locale/es/LC_MESSAGES/django.po index beaa2572f6..30e9789e9a 100644 --- a/django/conf/locale/es/LC_MESSAGES/django.po +++ b/django/conf/locale/es/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-22 15:44-0600\n" +"POT-Creation-Date: 2005-11-23 11:06-0600\n" "PO-Revision-Date: 2005-10-04 20:59GMT\n" "Last-Translator: Ricardo Javier Crdenes Medina \n" @@ -17,6 +17,257 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.10.2\n" +#: contrib/comments/models/comments.py:8 +#: contrib/comments/models/comments.py:161 +msgid "object ID" +msgstr "" + +#: contrib/comments/models/comments.py:9 +msgid "headline" +msgstr "" + +#: contrib/comments/models/comments.py:10 +#: contrib/comments/models/comments.py:162 +msgid "comment" +msgstr "" + +#: 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 +#, fuzzy +msgid "IP address" +msgstr "Direccin de correo:" + +#: 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 +msgid "Comments" +msgstr "" + +#: contrib/comments/models/comments.py:85 +#: contrib/comments/models/comments.py:204 +msgid "Content object" +msgstr "" + +#: 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 +msgid "person's name" +msgstr "" + +#: contrib/comments/models/comments.py:166 +#, fuzzy +msgid "ip address" +msgstr "Direccin de correo:" + +#: contrib/comments/models/comments.py:168 +msgid "approved by staff" +msgstr "" + +#: contrib/comments/models/comments.py:172 +msgid "Free comment" +msgstr "" + +#: contrib/comments/models/comments.py:173 +msgid "Free comments" +msgstr "" + +#: contrib/comments/models/comments.py:209 +msgid "score" +msgstr "" + +#: contrib/comments/models/comments.py:210 +msgid "score date" +msgstr "" + +#: 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 +msgid "flag date" +msgstr "" + +#: contrib/comments/models/comments.py:251 +#, fuzzy +msgid "User flag" +msgstr "Usuario" + +#: contrib/comments/models/comments.py:252 +#, fuzzy +msgid "User flags" +msgstr "Usuario" + +#: 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 +msgid "deletion date" +msgstr "" + +#: 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 "" + +#: contrib/comments/views/karma.py:22 +msgid "Invalid comment ID" +msgstr "" + +#: contrib/comments/views/karma.py:24 +msgid "No voting for yourself" +msgstr "" + +#: contrib/comments/views/comments.py:25 +msgid "" +"This rating is required because you've entered at least one other rating." +msgstr "" + +#: contrib/comments/views/comments.py:109 +#, 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] "" + +#: contrib/comments/views/comments.py:114 +#, python-format +msgid "" +"This comment was posted by a sketchy user:\n" +"\n" +"%(text)s" +msgstr "" + +#: contrib/comments/views/comments.py:186 +#: contrib/comments/views/comments.py:277 +msgid "Only POSTs are allowed" +msgstr "" + +#: contrib/comments/views/comments.py:190 +#: contrib/comments/views/comments.py:281 +msgid "One or more of the required fields wasn't submitted" +msgstr "" + +#: contrib/comments/views/comments.py:194 +#: contrib/comments/views/comments.py:283 +msgid "Somebody tampered with the comment form (security violation)" +msgstr "" + +#: contrib/comments/views/comments.py:204 +#: contrib/comments/views/comments.py:289 +msgid "" +"The comment form had an invalid 'target' parameter -- the object ID was " +"invalid" +msgstr "" + +#: contrib/comments/views/comments.py:254 +#: contrib/comments/views/comments.py:318 +msgid "The comment form didn't provide either 'preview' or 'post'" +msgstr "" + #: contrib/admin/models/admin.py:6 #, fuzzy msgid "action time" diff --git a/django/conf/locale/fr/LC_MESSAGES/django.mo b/django/conf/locale/fr/LC_MESSAGES/django.mo index 9652aab688ce426515291c48e7f54901a1b33019..93a02550dcf25800c2fecd155399488ef3af8161 100644 GIT binary patch delta 22 dcmbQ-!8o~tal;vPc4GxYLn{Nb&6m|3WB^%~2SES; delta 22 dcmbQ-!8o~tal;vPb|VEtQ!5jb&6m|3WB^&d2Sxw@ diff --git a/django/conf/locale/fr/LC_MESSAGES/django.po b/django/conf/locale/fr/LC_MESSAGES/django.po index 0f39835106..6dc8122104 100644 --- a/django/conf/locale/fr/LC_MESSAGES/django.po +++ b/django/conf/locale/fr/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-22 15:44-0600\n" +"POT-Creation-Date: 2005-11-23 11:06-0600\n" "PO-Revision-Date: 2005-10-18 12:27+0200\n" "Last-Translator: Laurent Rahuel \n" "Language-Team: franais \n" @@ -15,6 +15,268 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" +#: contrib/comments/models/comments.py:8 +#: contrib/comments/models/comments.py:161 +#, fuzzy +msgid "object ID" +msgstr "id de l'objet" + +#: 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 "contenu" + +#: 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 +#, fuzzy +msgid "IP address" +msgstr "courriel" + +#: 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 "autoriser les commentaires" + +#: contrib/comments/models/comments.py:85 +#: contrib/comments/models/comments.py:204 +#, fuzzy +msgid "Content object" +msgstr "type de contenu" + +#: 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 "prnom" + +#: contrib/comments/models/comments.py:166 +#, fuzzy +msgid "ip address" +msgstr "courriel" + +#: contrib/comments/models/comments.py:168 +msgid "approved by staff" +msgstr "" + +#: contrib/comments/models/comments.py:172 +#, fuzzy +msgid "Free comment" +msgstr "autoriser les commentaires" + +#: contrib/comments/models/comments.py:173 +#, fuzzy +msgid "Free comments" +msgstr "autoriser les commentaires" + +#: contrib/comments/models/comments.py:209 +msgid "score" +msgstr "" + +#: contrib/comments/models/comments.py:210 +#, fuzzy +msgid "score date" +msgstr "date d'expiration" + +#: 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 "page plat" + +#: contrib/comments/models/comments.py:251 +#, fuzzy +msgid "User flag" +msgstr "Utilisateur" + +#: contrib/comments/models/comments.py:252 +#, fuzzy +msgid "User flags" +msgstr "Utilisateurs" + +#: 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 "donne de session" + +#: 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 "" + +#: contrib/comments/views/karma.py:22 +#, fuzzy +msgid "Invalid comment ID" +msgstr "autoriser les commentaires" + +#: contrib/comments/views/karma.py:24 +msgid "No voting for yourself" +msgstr "" + +#: contrib/comments/views/comments.py:25 +msgid "" +"This rating is required because you've entered at least one other rating." +msgstr "" + +#: contrib/comments/views/comments.py:109 +#, 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] "" + +#: contrib/comments/views/comments.py:114 +#, python-format +msgid "" +"This comment was posted by a sketchy user:\n" +"\n" +"%(text)s" +msgstr "" + +#: contrib/comments/views/comments.py:186 +#: contrib/comments/views/comments.py:277 +msgid "Only POSTs are allowed" +msgstr "" + +#: contrib/comments/views/comments.py:190 +#: contrib/comments/views/comments.py:281 +msgid "One or more of the required fields wasn't submitted" +msgstr "" + +#: contrib/comments/views/comments.py:194 +#: contrib/comments/views/comments.py:283 +msgid "Somebody tampered with the comment form (security violation)" +msgstr "" + +#: contrib/comments/views/comments.py:204 +#: contrib/comments/views/comments.py:289 +msgid "" +"The comment form had an invalid 'target' parameter -- the object ID was " +"invalid" +msgstr "" + +#: contrib/comments/views/comments.py:254 +#: contrib/comments/views/comments.py:318 +msgid "The comment form didn't provide either 'preview' or 'post'" +msgstr "" + #: contrib/admin/models/admin.py:6 msgid "action time" msgstr "heure de l'action" diff --git a/django/conf/locale/gl/LC_MESSAGES/django.mo b/django/conf/locale/gl/LC_MESSAGES/django.mo index 0d07a8cf1d2ac16a1f8e5d54b2b1a917f05a3c3e..7aecb56753c0256984fcd014b00567beac398b95 100644 GIT binary patch delta 20 ccmX@5c}jD`J8pJk1w%tC1GCLvxvz2n08*?6d;kCd delta 20 ccmX@5c}jD`J8pI(1w&IS6XVTaxvz2n08-8efB*mh diff --git a/django/conf/locale/gl/LC_MESSAGES/django.po b/django/conf/locale/gl/LC_MESSAGES/django.po index abb01c9527..a29e6d73d3 100644 --- a/django/conf/locale/gl/LC_MESSAGES/django.po +++ b/django/conf/locale/gl/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-22 15:43-0600\n" +"POT-Creation-Date: 2005-11-23 11:06-0600\n" "PO-Revision-Date: 2005-10-16 14:29+0100\n" "Last-Translator: Afonso Fernández Nogueira \n" "Language-Team: Galego\n" @@ -17,6 +17,257 @@ msgstr "" "X-Poedit-Language: Galician\n" "X-Poedit-SourceCharset: utf-8\n" +#: contrib/comments/models/comments.py:8 +#: contrib/comments/models/comments.py:161 +msgid "object ID" +msgstr "" + +#: contrib/comments/models/comments.py:9 +msgid "headline" +msgstr "" + +#: contrib/comments/models/comments.py:10 +#: contrib/comments/models/comments.py:162 +msgid "comment" +msgstr "" + +#: 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 +#, fuzzy +msgid "IP address" +msgstr "Enderezo de correo electrónico:" + +#: 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 +msgid "Comments" +msgstr "" + +#: contrib/comments/models/comments.py:85 +#: contrib/comments/models/comments.py:204 +msgid "Content object" +msgstr "" + +#: 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 +msgid "person's name" +msgstr "" + +#: contrib/comments/models/comments.py:166 +#, fuzzy +msgid "ip address" +msgstr "Enderezo de correo electrónico:" + +#: contrib/comments/models/comments.py:168 +msgid "approved by staff" +msgstr "" + +#: contrib/comments/models/comments.py:172 +msgid "Free comment" +msgstr "" + +#: contrib/comments/models/comments.py:173 +msgid "Free comments" +msgstr "" + +#: contrib/comments/models/comments.py:209 +msgid "score" +msgstr "" + +#: contrib/comments/models/comments.py:210 +msgid "score date" +msgstr "" + +#: 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 +msgid "flag date" +msgstr "" + +#: contrib/comments/models/comments.py:251 +#, fuzzy +msgid "User flag" +msgstr "Usuario" + +#: contrib/comments/models/comments.py:252 +#, fuzzy +msgid "User flags" +msgstr "Usuario" + +#: 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 +msgid "deletion date" +msgstr "" + +#: 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 "" + +#: contrib/comments/views/karma.py:22 +msgid "Invalid comment ID" +msgstr "" + +#: contrib/comments/views/karma.py:24 +msgid "No voting for yourself" +msgstr "" + +#: contrib/comments/views/comments.py:25 +msgid "" +"This rating is required because you've entered at least one other rating." +msgstr "" + +#: contrib/comments/views/comments.py:109 +#, 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] "" + +#: contrib/comments/views/comments.py:114 +#, python-format +msgid "" +"This comment was posted by a sketchy user:\n" +"\n" +"%(text)s" +msgstr "" + +#: contrib/comments/views/comments.py:186 +#: contrib/comments/views/comments.py:277 +msgid "Only POSTs are allowed" +msgstr "" + +#: contrib/comments/views/comments.py:190 +#: contrib/comments/views/comments.py:281 +msgid "One or more of the required fields wasn't submitted" +msgstr "" + +#: contrib/comments/views/comments.py:194 +#: contrib/comments/views/comments.py:283 +msgid "Somebody tampered with the comment form (security violation)" +msgstr "" + +#: contrib/comments/views/comments.py:204 +#: contrib/comments/views/comments.py:289 +msgid "" +"The comment form had an invalid 'target' parameter -- the object ID was " +"invalid" +msgstr "" + +#: contrib/comments/views/comments.py:254 +#: contrib/comments/views/comments.py:318 +msgid "The comment form didn't provide either 'preview' or 'post'" +msgstr "" + #: contrib/admin/models/admin.py:6 #, fuzzy msgid "action time" diff --git a/django/conf/locale/is/LC_MESSAGES/django.mo b/django/conf/locale/is/LC_MESSAGES/django.mo index cdaff5aa428f70a744a9103c2a786f49be627fa9..e278a6a750a125b8341d7c64fc7f3a1dfb0e9895 100644 GIT binary patch delta 22 dcmdnj#kjAFaYMf*yRm|yp_PI8=4qNMqyb$w2aNy# delta 22 dcmdnj#kjAFaYMf*yODySsg;Sz=4qNMqyb%72ax~( diff --git a/django/conf/locale/is/LC_MESSAGES/django.po b/django/conf/locale/is/LC_MESSAGES/django.po index f3d30d093a..f6c4d7b6ee 100644 --- a/django/conf/locale/is/LC_MESSAGES/django.po +++ b/django/conf/locale/is/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Django 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-22 15:44-0600\n" +"POT-Creation-Date: 2005-11-23 11:07-0600\n" "PO-Revision-Date: 2005-11-13 18:08-0000\n" "Last-Translator: Dagur Páll Ammendrup \n" "Language-Team: \n" @@ -18,6 +18,268 @@ msgstr "" "X-Poedit-Country: ICELAND\n" "Plural-Forms: nplurals=2; plural=n != 1\n" +#: contrib/comments/models/comments.py:8 +#: contrib/comments/models/comments.py:161 +#, fuzzy +msgid "object ID" +msgstr "einkenni hlutar" + +#: 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 "innihald" + +#: 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 +#, fuzzy +msgid "IP address" +msgstr "tölvupóstfang" + +#: 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 "virkja athugasemdir" + +#: contrib/comments/models/comments.py:85 +#: contrib/comments/models/comments.py:204 +#, fuzzy +msgid "Content object" +msgstr "efnistag" + +#: 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 "fornafn" + +#: contrib/comments/models/comments.py:166 +#, fuzzy +msgid "ip address" +msgstr "tölvupóstfang" + +#: contrib/comments/models/comments.py:168 +msgid "approved by staff" +msgstr "" + +#: contrib/comments/models/comments.py:172 +#, fuzzy +msgid "Free comment" +msgstr "virkja athugasemdir" + +#: contrib/comments/models/comments.py:173 +#, fuzzy +msgid "Free comments" +msgstr "virkja athugasemdir" + +#: contrib/comments/models/comments.py:209 +msgid "score" +msgstr "" + +#: contrib/comments/models/comments.py:210 +#, fuzzy +msgid "score date" +msgstr "fyrningardagsetning" + +#: 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 "flöt síða" + +#: contrib/comments/models/comments.py:251 +#, fuzzy +msgid "User flag" +msgstr "Notandi" + +#: contrib/comments/models/comments.py:252 +#, fuzzy +msgid "User flags" +msgstr "Notendur" + +#: 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 "setugögn" + +#: 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 "" + +#: contrib/comments/views/karma.py:22 +#, fuzzy +msgid "Invalid comment ID" +msgstr "virkja athugasemdir" + +#: contrib/comments/views/karma.py:24 +msgid "No voting for yourself" +msgstr "" + +#: contrib/comments/views/comments.py:25 +msgid "" +"This rating is required because you've entered at least one other rating." +msgstr "" + +#: contrib/comments/views/comments.py:109 +#, 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] "" + +#: contrib/comments/views/comments.py:114 +#, python-format +msgid "" +"This comment was posted by a sketchy user:\n" +"\n" +"%(text)s" +msgstr "" + +#: contrib/comments/views/comments.py:186 +#: contrib/comments/views/comments.py:277 +msgid "Only POSTs are allowed" +msgstr "" + +#: contrib/comments/views/comments.py:190 +#: contrib/comments/views/comments.py:281 +msgid "One or more of the required fields wasn't submitted" +msgstr "" + +#: contrib/comments/views/comments.py:194 +#: contrib/comments/views/comments.py:283 +msgid "Somebody tampered with the comment form (security violation)" +msgstr "" + +#: contrib/comments/views/comments.py:204 +#: contrib/comments/views/comments.py:289 +msgid "" +"The comment form had an invalid 'target' parameter -- the object ID was " +"invalid" +msgstr "" + +#: contrib/comments/views/comments.py:254 +#: contrib/comments/views/comments.py:318 +msgid "The comment form didn't provide either 'preview' or 'post'" +msgstr "" + #: contrib/admin/models/admin.py:6 msgid "action time" msgstr "tími aðgerðar" diff --git a/django/conf/locale/it/LC_MESSAGES/django.mo b/django/conf/locale/it/LC_MESSAGES/django.mo index b4cdd7908ef693e01cbfa75b281b20e742050b89..cdaff7af7249492ab9be386a9e8a08bc169a2dcd 100644 GIT binary patch delta 22 ecmey`!1%R+al>_Wc4GxYLn{OG&G*!&O8@|AkqBP^ delta 22 ecmey`!1%R+al>_Wb|VEtQ!5jb&G*!&O8@|Avj}4V diff --git a/django/conf/locale/it/LC_MESSAGES/django.po b/django/conf/locale/it/LC_MESSAGES/django.po index 18e5aac0db..50c0ec1a13 100644 --- a/django/conf/locale/it/LC_MESSAGES/django.po +++ b/django/conf/locale/it/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-22 15:44-0600\n" +"POT-Creation-Date: 2005-11-23 11:07-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,6 +16,268 @@ msgstr "" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" +#: contrib/comments/models/comments.py:8 +#: contrib/comments/models/comments.py:161 +#, fuzzy +msgid "object ID" +msgstr "id dell'oggetto" + +#: 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 "contenuto" + +#: 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 +#, fuzzy +msgid "IP address" +msgstr "indirizzo e-mail" + +#: 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 "abilita commenti" + +#: contrib/comments/models/comments.py:85 +#: contrib/comments/models/comments.py:204 +#, fuzzy +msgid "Content object" +msgstr "tipo di contenuto" + +#: 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 "nome" + +#: contrib/comments/models/comments.py:166 +#, fuzzy +msgid "ip address" +msgstr "indirizzo e-mail" + +#: contrib/comments/models/comments.py:168 +msgid "approved by staff" +msgstr "" + +#: contrib/comments/models/comments.py:172 +#, fuzzy +msgid "Free comment" +msgstr "abilita commenti" + +#: contrib/comments/models/comments.py:173 +#, fuzzy +msgid "Free comments" +msgstr "abilita commenti" + +#: contrib/comments/models/comments.py:209 +msgid "score" +msgstr "" + +#: contrib/comments/models/comments.py:210 +#, fuzzy +msgid "score date" +msgstr "data di scadenza" + +#: 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 "pagina statica" + +#: contrib/comments/models/comments.py:251 +#, fuzzy +msgid "User flag" +msgstr "Utente" + +#: contrib/comments/models/comments.py:252 +#, fuzzy +msgid "User flags" +msgstr "Utenti" + +#: 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 "dati di sessione" + +#: 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 "" + +#: contrib/comments/views/karma.py:22 +#, fuzzy +msgid "Invalid comment ID" +msgstr "abilita commenti" + +#: contrib/comments/views/karma.py:24 +msgid "No voting for yourself" +msgstr "" + +#: contrib/comments/views/comments.py:25 +msgid "" +"This rating is required because you've entered at least one other rating." +msgstr "" + +#: contrib/comments/views/comments.py:109 +#, 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] "" + +#: contrib/comments/views/comments.py:114 +#, python-format +msgid "" +"This comment was posted by a sketchy user:\n" +"\n" +"%(text)s" +msgstr "" + +#: contrib/comments/views/comments.py:186 +#: contrib/comments/views/comments.py:277 +msgid "Only POSTs are allowed" +msgstr "" + +#: contrib/comments/views/comments.py:190 +#: contrib/comments/views/comments.py:281 +msgid "One or more of the required fields wasn't submitted" +msgstr "" + +#: contrib/comments/views/comments.py:194 +#: contrib/comments/views/comments.py:283 +msgid "Somebody tampered with the comment form (security violation)" +msgstr "" + +#: contrib/comments/views/comments.py:204 +#: contrib/comments/views/comments.py:289 +msgid "" +"The comment form had an invalid 'target' parameter -- the object ID was " +"invalid" +msgstr "" + +#: contrib/comments/views/comments.py:254 +#: contrib/comments/views/comments.py:318 +msgid "The comment form didn't provide either 'preview' or 'post'" +msgstr "" + #: contrib/admin/models/admin.py:6 msgid "action time" msgstr "data azione" diff --git a/django/conf/locale/no/LC_MESSAGES/django.mo b/django/conf/locale/no/LC_MESSAGES/django.mo index 0f29a5f8c331a711067fbea7ab9ec9e64d1a2550..28df328b226aef1402a90a8bec8503bf7bb333af 100644 GIT binary patch delta 22 ecmZ3}&bX$Xal>0pc4GxYLn{OG&0jQkNCE(0_y{ck delta 22 ecmZ3}&bX$Xal>0pb|VEtQ!5jb&0jQkNCE(18VE4} diff --git a/django/conf/locale/no/LC_MESSAGES/django.po b/django/conf/locale/no/LC_MESSAGES/django.po index a613a677c1..23c0742679 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-22 15:44-0600\n" +"POT-Creation-Date: 2005-11-23 11:07-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Espen Grndhaug \n" "Language-Team: Norwegian\n" @@ -16,6 +16,268 @@ 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 +#, 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 "" + +#: contrib/comments/views/karma.py:22 +#, fuzzy +msgid "Invalid comment ID" +msgstr "tillat kommentarer" + +#: contrib/comments/views/karma.py:24 +msgid "No voting for yourself" +msgstr "" + +#: contrib/comments/views/comments.py:25 +msgid "" +"This rating is required because you've entered at least one other rating." +msgstr "" + +#: contrib/comments/views/comments.py:109 +#, 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] "" + +#: contrib/comments/views/comments.py:114 +#, python-format +msgid "" +"This comment was posted by a sketchy user:\n" +"\n" +"%(text)s" +msgstr "" + +#: contrib/comments/views/comments.py:186 +#: contrib/comments/views/comments.py:277 +msgid "Only POSTs are allowed" +msgstr "" + +#: contrib/comments/views/comments.py:190 +#: contrib/comments/views/comments.py:281 +msgid "One or more of the required fields wasn't submitted" +msgstr "" + +#: contrib/comments/views/comments.py:194 +#: contrib/comments/views/comments.py:283 +msgid "Somebody tampered with the comment form (security violation)" +msgstr "" + +#: contrib/comments/views/comments.py:204 +#: contrib/comments/views/comments.py:289 +msgid "" +"The comment form had an invalid 'target' parameter -- the object ID was " +"invalid" +msgstr "" + +#: contrib/comments/views/comments.py:254 +#: contrib/comments/views/comments.py:318 +msgid "The comment form didn't provide either 'preview' or 'post'" +msgstr "" + #: contrib/admin/models/admin.py:6 msgid "action time" msgstr "handlings tid" diff --git a/django/conf/locale/pt_BR/LC_MESSAGES/django.mo b/django/conf/locale/pt_BR/LC_MESSAGES/django.mo index 160e9f4e064e9c2cf0a34c7497cdcdf4999c20bd..395ee59f8b7b1b74f11d8e0cf99109d5e445e246 100644 GIT binary patch delta 20 bcmX?Af2w}NQZ;sC1w%tC1GCL*)Z`=qS;q$^ delta 20 bcmX?Af2w}NQZ;rX1w&IS6O+wr)Z`=qS?>oc diff --git a/django/conf/locale/pt_BR/LC_MESSAGES/django.po b/django/conf/locale/pt_BR/LC_MESSAGES/django.po index 592cee1fed..8ace41aa49 100644 --- a/django/conf/locale/pt_BR/LC_MESSAGES/django.po +++ b/django/conf/locale/pt_BR/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-22 15:44-0600\n" +"POT-Creation-Date: 2005-11-23 11:06-0600\n" "PO-Revision-Date: 2005-10-11 09:12GMT-3\n" "Last-Translator: João Paulo Farias \n" "Language-Team: Português do Brasil \n" @@ -16,6 +16,268 @@ 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 "id do objeto" + +#: 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 "conteúdo" + +#: 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 +#, fuzzy +msgid "IP address" +msgstr "endereço de e-mail:" + +#: 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 "habilitar comentários" + +#: contrib/comments/models/comments.py:85 +#: contrib/comments/models/comments.py:204 +#, fuzzy +msgid "Content object" +msgstr "tipo de conteúdo" + +#: 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 "primeiro nome" + +#: contrib/comments/models/comments.py:166 +#, fuzzy +msgid "ip address" +msgstr "endereço de e-mail:" + +#: contrib/comments/models/comments.py:168 +msgid "approved by staff" +msgstr "" + +#: contrib/comments/models/comments.py:172 +#, fuzzy +msgid "Free comment" +msgstr "habilitar comentários" + +#: contrib/comments/models/comments.py:173 +#, fuzzy +msgid "Free comments" +msgstr "habilitar comentários" + +#: contrib/comments/models/comments.py:209 +msgid "score" +msgstr "" + +#: contrib/comments/models/comments.py:210 +#, fuzzy +msgid "score date" +msgstr "data de expiração" + +#: 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 "página plana" + +#: contrib/comments/models/comments.py:251 +#, fuzzy +msgid "User flag" +msgstr "Usuário" + +#: contrib/comments/models/comments.py:252 +#, fuzzy +msgid "User flags" +msgstr "Usuários" + +#: 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 "dados da sessão" + +#: 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 "" + +#: contrib/comments/views/karma.py:22 +#, fuzzy +msgid "Invalid comment ID" +msgstr "habilitar comentários" + +#: contrib/comments/views/karma.py:24 +msgid "No voting for yourself" +msgstr "" + +#: contrib/comments/views/comments.py:25 +msgid "" +"This rating is required because you've entered at least one other rating." +msgstr "" + +#: contrib/comments/views/comments.py:109 +#, 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] "" + +#: contrib/comments/views/comments.py:114 +#, python-format +msgid "" +"This comment was posted by a sketchy user:\n" +"\n" +"%(text)s" +msgstr "" + +#: contrib/comments/views/comments.py:186 +#: contrib/comments/views/comments.py:277 +msgid "Only POSTs are allowed" +msgstr "" + +#: contrib/comments/views/comments.py:190 +#: contrib/comments/views/comments.py:281 +msgid "One or more of the required fields wasn't submitted" +msgstr "" + +#: contrib/comments/views/comments.py:194 +#: contrib/comments/views/comments.py:283 +msgid "Somebody tampered with the comment form (security violation)" +msgstr "" + +#: contrib/comments/views/comments.py:204 +#: contrib/comments/views/comments.py:289 +msgid "" +"The comment form had an invalid 'target' parameter -- the object ID was " +"invalid" +msgstr "" + +#: contrib/comments/views/comments.py:254 +#: contrib/comments/views/comments.py:318 +msgid "The comment form didn't provide either 'preview' or 'post'" +msgstr "" + #: contrib/admin/models/admin.py:6 msgid "action time" msgstr "hora da ação" diff --git a/django/conf/locale/ro/LC_MESSAGES/django.mo b/django/conf/locale/ro/LC_MESSAGES/django.mo index af6d66ae1fffbffd963fd19c1856c890739bf0fc..c8602854bea11da12eb9114fc10a690683e30e31 100644 GIT binary patch delta 22 dcmX@n%6Oucal=dvc4GxY3o8S&%?mU%qySy>2QB~r delta 22 dcmX@n%6Oucal=dvb|VENBP$c*%?mU%qySyT2Ppsm diff --git a/django/conf/locale/ro/LC_MESSAGES/django.po b/django/conf/locale/ro/LC_MESSAGES/django.po index c35ce316dd..11a77b91b8 100644 --- a/django/conf/locale/ro/LC_MESSAGES/django.po +++ b/django/conf/locale/ro/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Django \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-22 22:43+0100\n" +"POT-Creation-Date: 2005-11-23 18:06+0100\n" "PO-Revision-Date: 2005-11-08 19:06+GMT+2\n" "Last-Translator: Tiberiu Micu \n" "Language-Team: Romanian \n" @@ -16,6 +16,268 @@ 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 "id obiect" + +#: 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 "conţinut" + +#: 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 +#, fuzzy +msgid "IP address" +msgstr "adresa email" + +#: 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 "permite comentarii" + +#: contrib/comments/models/comments.py:85 +#: contrib/comments/models/comments.py:204 +#, fuzzy +msgid "Content object" +msgstr "tip conţinut" + +#: 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 "Prenume" + +#: contrib/comments/models/comments.py:166 +#, fuzzy +msgid "ip address" +msgstr "adresa email" + +#: contrib/comments/models/comments.py:168 +msgid "approved by staff" +msgstr "" + +#: contrib/comments/models/comments.py:172 +#, fuzzy +msgid "Free comment" +msgstr "permite comentarii" + +#: contrib/comments/models/comments.py:173 +#, fuzzy +msgid "Free comments" +msgstr "permite comentarii" + +#: contrib/comments/models/comments.py:209 +msgid "score" +msgstr "" + +#: contrib/comments/models/comments.py:210 +#, fuzzy +msgid "score date" +msgstr "data expirare" + +#: 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 "pagina plată" + +#: contrib/comments/models/comments.py:251 +#, fuzzy +msgid "User flag" +msgstr "Utilizator" + +#: contrib/comments/models/comments.py:252 +#, fuzzy +msgid "User flags" +msgstr "Utilizatori" + +#: 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 "date sesiune" + +#: 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 "" + +#: contrib/comments/views/karma.py:22 +#, fuzzy +msgid "Invalid comment ID" +msgstr "permite comentarii" + +#: contrib/comments/views/karma.py:24 +msgid "No voting for yourself" +msgstr "" + +#: contrib/comments/views/comments.py:25 +msgid "" +"This rating is required because you've entered at least one other rating." +msgstr "" + +#: contrib/comments/views/comments.py:109 +#, 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] "" + +#: contrib/comments/views/comments.py:114 +#, python-format +msgid "" +"This comment was posted by a sketchy user:\n" +"\n" +"%(text)s" +msgstr "" + +#: contrib/comments/views/comments.py:186 +#: contrib/comments/views/comments.py:277 +msgid "Only POSTs are allowed" +msgstr "" + +#: contrib/comments/views/comments.py:190 +#: contrib/comments/views/comments.py:281 +msgid "One or more of the required fields wasn't submitted" +msgstr "" + +#: contrib/comments/views/comments.py:194 +#: contrib/comments/views/comments.py:283 +msgid "Somebody tampered with the comment form (security violation)" +msgstr "" + +#: contrib/comments/views/comments.py:204 +#: contrib/comments/views/comments.py:289 +msgid "" +"The comment form had an invalid 'target' parameter -- the object ID was " +"invalid" +msgstr "" + +#: contrib/comments/views/comments.py:254 +#: contrib/comments/views/comments.py:318 +msgid "The comment form didn't provide either 'preview' or 'post'" +msgstr "" + #: contrib/admin/models/admin.py:6 msgid "action time" msgstr "timp acţiune" diff --git a/django/conf/locale/ru/LC_MESSAGES/django.mo b/django/conf/locale/ru/LC_MESSAGES/django.mo index 62839fd5de2d486d1e374bc5ce79a38ce311cff7..b7bddf0985371bb2e79c5d163d62e4908b4955fc 100644 GIT binary patch delta 20 bcmX??eJ*=Lup+y$f}x?6f!XFL#S#$!QOgFY delta 20 bcmX??eJ*=Lup+yWf}yFEiOJ?D#S#$!QS%0_ diff --git a/django/conf/locale/ru/LC_MESSAGES/django.po b/django/conf/locale/ru/LC_MESSAGES/django.po index 5984d0cb50..4d9bcf30d5 100644 --- a/django/conf/locale/ru/LC_MESSAGES/django.po +++ b/django/conf/locale/ru/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-22 15:44-0600\n" +"POT-Creation-Date: 2005-11-23 11:06-0600\n" "PO-Revision-Date: 2005-10-05 00:00\n" "Last-Translator: Dmitry Sorokin \n" "Language-Team: LANGUAGE \n" @@ -15,6 +15,267 @@ msgstr "" "Content-Type: text/plain; charset=koi8-r\n" "Content-Transfer-Encoding: 8bit\n" +#: contrib/comments/models/comments.py:8 +#: contrib/comments/models/comments.py:161 +msgid "object ID" +msgstr "" + +#: 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 "" + +#: 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 +#, fuzzy +msgid "IP address" +msgstr "E-mail :" + +#: 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 " " + +#: contrib/comments/models/comments.py:85 +#: contrib/comments/models/comments.py:204 +#, fuzzy +msgid "Content object" +msgstr " " + +#: 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 "" + +#: contrib/comments/models/comments.py:166 +#, fuzzy +msgid "ip address" +msgstr "E-mail :" + +#: contrib/comments/models/comments.py:168 +msgid "approved by staff" +msgstr "" + +#: contrib/comments/models/comments.py:172 +#, fuzzy +msgid "Free comment" +msgstr " " + +#: contrib/comments/models/comments.py:173 +#, fuzzy +msgid "Free comments" +msgstr " " + +#: contrib/comments/models/comments.py:209 +msgid "score" +msgstr "" + +#: contrib/comments/models/comments.py:210 +#, fuzzy +msgid "score date" +msgstr " " + +#: 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 " " + +#: contrib/comments/models/comments.py:251 +#, fuzzy +msgid "User flag" +msgstr "" + +#: contrib/comments/models/comments.py:252 +#, fuzzy +msgid "User flags" +msgstr "" + +#: 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 " " + +#: 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 "" + +#: contrib/comments/views/karma.py:22 +#, fuzzy +msgid "Invalid comment ID" +msgstr " " + +#: contrib/comments/views/karma.py:24 +msgid "No voting for yourself" +msgstr "" + +#: contrib/comments/views/comments.py:25 +msgid "" +"This rating is required because you've entered at least one other rating." +msgstr "" + +#: contrib/comments/views/comments.py:109 +#, 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] "" + +#: contrib/comments/views/comments.py:114 +#, python-format +msgid "" +"This comment was posted by a sketchy user:\n" +"\n" +"%(text)s" +msgstr "" + +#: contrib/comments/views/comments.py:186 +#: contrib/comments/views/comments.py:277 +msgid "Only POSTs are allowed" +msgstr "" + +#: contrib/comments/views/comments.py:190 +#: contrib/comments/views/comments.py:281 +msgid "One or more of the required fields wasn't submitted" +msgstr "" + +#: contrib/comments/views/comments.py:194 +#: contrib/comments/views/comments.py:283 +msgid "Somebody tampered with the comment form (security violation)" +msgstr "" + +#: contrib/comments/views/comments.py:204 +#: contrib/comments/views/comments.py:289 +msgid "" +"The comment form had an invalid 'target' parameter -- the object ID was " +"invalid" +msgstr "" + +#: contrib/comments/views/comments.py:254 +#: contrib/comments/views/comments.py:318 +msgid "The comment form didn't provide either 'preview' or 'post'" +msgstr "" + #: contrib/admin/models/admin.py:6 #, fuzzy msgid "action time" diff --git a/django/conf/locale/sk/LC_MESSAGES/django.mo b/django/conf/locale/sk/LC_MESSAGES/django.mo index d2fa55670db1aa4878ea11241b55ccfa9c65e71a..d8c73fe6477b2c5a97ec9e8ab3499ceb31cd32e5 100644 GIT binary patch delta 25 hcmccL&v?I|al>tGE@K5lLn{MwT?4btPqlwZ0|0-!319#K delta 25 hcmccL&v?I|al>tGE+Yj)b1P$GT?5n2PqlwZ0|0;M31a{N diff --git a/django/conf/locale/sk/LC_MESSAGES/django.po b/django/conf/locale/sk/LC_MESSAGES/django.po index 4c228cd5a6..f890bcc34b 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-22 17:33-0500\n" +"POT-Creation-Date: 2005-11-23 11:07-0600\n" "PO-Revision-Date: 2005-11-10 23:22-0500\n" "Last-Translator: Vladimir Labath \n" "Language-Team: Slovak \n" @@ -16,88 +16,267 @@ 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/comments/models/comments.py:8 +#: contrib/comments/models/comments.py:161 +#, fuzzy +msgid "object ID" +msgstr "objekt id" -#: contrib/redirects/models/redirects.py:8 -msgid "" -"This should be an absolute path, excluding the domain name. Example: '/" -"events/search/'." +#: contrib/comments/models/comments.py:9 +msgid "headline" msgstr "" -"Tu by sa mala použiť absolútna cesta, bez domény. Napr.: '/events/search/'." -#: contrib/redirects/models/redirects.py:9 -msgid "redirect to" -msgstr "presmerovaný na " - -#: contrib/redirects/models/redirects.py:10 -msgid "" -"This can be either an absolute path (as above) or a full URL starting with " -"'http://'." -msgstr "" -"Tu môže byť buď absolútna cesta (ako hore) alebo plné URL začínajúce s " -"'http://'." - -#: contrib/redirects/models/redirects.py:12 -msgid "redirect" -msgstr "presmerovanie" - -#: contrib/redirects/models/redirects.py:13 -msgid "redirects" -msgstr "presmerovania" - -#: contrib/flatpages/models/flatpages.py:6 -msgid "URL" -msgstr "URL" - -#: contrib/flatpages/models/flatpages.py:7 -msgid "" -"Example: '/about/contact/'. Make sure to have leading and trailing slashes." -msgstr "" -"Príklad: '/about/contact/'. Uistite sa, že máte vložené ako úvodné tak aj " -"záverečné lomítka." - -#: contrib/flatpages/models/flatpages.py:8 -msgid "title" -msgstr "názov" - -#: contrib/flatpages/models/flatpages.py:9 -msgid "content" +#: contrib/comments/models/comments.py:10 +#: contrib/comments/models/comments.py:162 +#, fuzzy +msgid "comment" msgstr "obsah" -#: contrib/flatpages/models/flatpages.py:10 -msgid "enable comments" +#: 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 +#, fuzzy +msgid "IP address" +msgstr "emailová adresa" + +#: 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 "povolené komentáre" -#: contrib/flatpages/models/flatpages.py:11 -msgid "template name" -msgstr "meno predlohy" +#: contrib/comments/models/comments.py:85 +#: contrib/comments/models/comments.py:204 +#, fuzzy +msgid "Content object" +msgstr "typ obsahu" -#: contrib/flatpages/models/flatpages.py:12 +#: contrib/comments/models/comments.py:113 +#, python-format msgid "" -"Example: 'flatpages/contact_page'. If this isn't provided, the system will " -"use 'flatpages/default'." +"Posted by %(user)s at %(date)s\n" +"\n" +"%(comment)s\n" +"\n" +"http://%(domain)s%(url)s" msgstr "" -"Príklad: 'flatpages/contact_page'. Ak sa toto nevykonalo, systém použije " -"'flatpages/default'." -#: contrib/flatpages/models/flatpages.py:13 -msgid "registration required" -msgstr "musíte byť zaregistrovaný" +#: contrib/comments/models/comments.py:163 +#, fuzzy +msgid "person's name" +msgstr "krstné meno" -#: contrib/flatpages/models/flatpages.py:13 -msgid "If this is checked, only logged-in users will be able to view the page." +#: contrib/comments/models/comments.py:166 +#, fuzzy +msgid "ip address" +msgstr "emailová adresa" + +#: contrib/comments/models/comments.py:168 +msgid "approved by staff" 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" +#: contrib/comments/models/comments.py:172 +#, fuzzy +msgid "Free comment" +msgstr "povolené komentáre" + +#: contrib/comments/models/comments.py:173 +#, fuzzy +msgid "Free comments" +msgstr "povolené komentáre" + +#: contrib/comments/models/comments.py:209 +msgid "score" +msgstr "" + +#: contrib/comments/models/comments.py:210 +#, fuzzy +msgid "score date" +msgstr "dátum konca platnosti" + +#: 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 "plochá stránka" -#: contrib/flatpages/models/flatpages.py:18 -msgid "flat pages" -msgstr "ploché stránky" +#: contrib/comments/models/comments.py:251 +#, fuzzy +msgid "User flag" +msgstr "Uživateľ" + +#: contrib/comments/models/comments.py:252 +#, fuzzy +msgid "User flags" +msgstr "Užívatelia" + +#: 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 "údaje sedenia" + +#: 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 "" + +#: contrib/comments/views/karma.py:22 +#, fuzzy +msgid "Invalid comment ID" +msgstr "povolené komentáre" + +#: contrib/comments/views/karma.py:24 +msgid "No voting for yourself" +msgstr "" + +#: contrib/comments/views/comments.py:25 +msgid "" +"This rating is required because you've entered at least one other rating." +msgstr "" + +#: contrib/comments/views/comments.py:109 +#, 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] "" + +#: contrib/comments/views/comments.py:114 +#, python-format +msgid "" +"This comment was posted by a sketchy user:\n" +"\n" +"%(text)s" +msgstr "" + +#: contrib/comments/views/comments.py:186 +#: contrib/comments/views/comments.py:277 +msgid "Only POSTs are allowed" +msgstr "" + +#: contrib/comments/views/comments.py:190 +#: contrib/comments/views/comments.py:281 +msgid "One or more of the required fields wasn't submitted" +msgstr "" + +#: contrib/comments/views/comments.py:194 +#: contrib/comments/views/comments.py:283 +msgid "Somebody tampered with the comment form (security violation)" +msgstr "" + +#: contrib/comments/views/comments.py:204 +#: contrib/comments/views/comments.py:289 +msgid "" +"The comment form had an invalid 'target' parameter -- the object ID was " +"invalid" +msgstr "" + +#: contrib/comments/views/comments.py:254 +#: contrib/comments/views/comments.py:318 +msgid "The comment form didn't provide either 'preview' or 'post'" +msgstr "" #: contrib/admin/models/admin.py:6 msgid "action time" @@ -393,6 +572,89 @@ msgstr "Ďakujeme, že používate naše stránky!" msgid "The %(site_name)s team" msgstr "Skupina %(site_name)s" +#: contrib/redirects/models/redirects.py:7 +msgid "redirect from" +msgstr "presmerovaný z" + +#: contrib/redirects/models/redirects.py:8 +msgid "" +"This should be an absolute path, excluding the domain name. Example: '/" +"events/search/'." +msgstr "" +"Tu by sa mala použiť absolútna cesta, bez domény. Napr.: '/events/search/'." + +#: contrib/redirects/models/redirects.py:9 +msgid "redirect to" +msgstr "presmerovaný na " + +#: contrib/redirects/models/redirects.py:10 +msgid "" +"This can be either an absolute path (as above) or a full URL starting with " +"'http://'." +msgstr "" +"Tu môže byť buď absolútna cesta (ako hore) alebo plné URL začínajúce s " +"'http://'." + +#: contrib/redirects/models/redirects.py:12 +msgid "redirect" +msgstr "presmerovanie" + +#: contrib/redirects/models/redirects.py:13 +msgid "redirects" +msgstr "presmerovania" + +#: contrib/flatpages/models/flatpages.py:6 +msgid "URL" +msgstr "URL" + +#: contrib/flatpages/models/flatpages.py:7 +msgid "" +"Example: '/about/contact/'. Make sure to have leading and trailing slashes." +msgstr "" +"Príklad: '/about/contact/'. Uistite sa, že máte vložené ako úvodné tak aj " +"záverečné lomítka." + +#: contrib/flatpages/models/flatpages.py:8 +msgid "title" +msgstr "názov" + +#: contrib/flatpages/models/flatpages.py:9 +msgid "content" +msgstr "obsah" + +#: contrib/flatpages/models/flatpages.py:10 +msgid "enable comments" +msgstr "povolené komentáre" + +#: contrib/flatpages/models/flatpages.py:11 +msgid "template name" +msgstr "meno predlohy" + +#: contrib/flatpages/models/flatpages.py:12 +msgid "" +"Example: 'flatpages/contact_page'. If this isn't provided, the system will " +"use 'flatpages/default'." +msgstr "" +"Príklad: 'flatpages/contact_page'. Ak sa toto nevykonalo, systém použije " +"'flatpages/default'." + +#: contrib/flatpages/models/flatpages.py:13 +msgid "registration required" +msgstr "musíte byť zaregistrovaný" + +#: contrib/flatpages/models/flatpages.py:13 +msgid "If this is checked, only logged-in users will be able to view the page." +msgstr "" +"Ak je toto označené, potom len prihlásený užívateľ môže vidieť túto stránku." + +#: contrib/flatpages/models/flatpages.py:17 +msgid "flat page" +msgstr "plochá stránka" + +#: contrib/flatpages/models/flatpages.py:18 +msgid "flat pages" +msgstr "ploché stránky" + #: utils/translation.py:335 msgid "DATE_FORMAT" msgstr "DATUM_FORMAT" diff --git a/django/conf/locale/sr/LC_MESSAGES/django.mo b/django/conf/locale/sr/LC_MESSAGES/django.mo index b2ca2bada2b01541cb6f39153f350668562427ba..ba0a45232f2ef0d74fe72af3903c61441ace274f 100644 GIT binary patch delta 22 dcmey+#`vL)aYL;pyRm|yp_PHz<`&I2k^p1J2nGNE delta 22 dcmey+#`vL)aYL;pyODySsg;TG<`&I2k^p1r2nqlI diff --git a/django/conf/locale/sr/LC_MESSAGES/django.po b/django/conf/locale/sr/LC_MESSAGES/django.po index 7d92c304eb..cc76c741bc 100644 --- a/django/conf/locale/sr/LC_MESSAGES/django.po +++ b/django/conf/locale/sr/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Django Serbian (latin) translation v1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-22 15:43-0600\n" +"POT-Creation-Date: 2005-11-23 11:06-0600\n" "PO-Revision-Date: 2005-11-13 19:21+0100\n" "Last-Translator: Nebojša Đorđević \n" "Language-Team: Nesh & Petar \n" "Language-Team: LANGUAGE \n" @@ -16,6 +16,268 @@ 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 "objektets 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 "innehåll" + +#: 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 +#, fuzzy +msgid "IP address" +msgstr "e-postadress" + +#: 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 "aktivera kommentarer" + +#: contrib/comments/models/comments.py:85 +#: contrib/comments/models/comments.py:204 +#, fuzzy +msgid "Content object" +msgstr "innehållstyp" + +#: 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 "förnamn" + +#: contrib/comments/models/comments.py:166 +#, fuzzy +msgid "ip address" +msgstr "e-postadress" + +#: contrib/comments/models/comments.py:168 +msgid "approved by staff" +msgstr "" + +#: contrib/comments/models/comments.py:172 +#, fuzzy +msgid "Free comment" +msgstr "aktivera kommentarer" + +#: contrib/comments/models/comments.py:173 +#, fuzzy +msgid "Free comments" +msgstr "aktivera kommentarer" + +#: contrib/comments/models/comments.py:209 +msgid "score" +msgstr "" + +#: contrib/comments/models/comments.py:210 +#, fuzzy +msgid "score date" +msgstr "bäst före" + +#: 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 "flatsida" + +#: contrib/comments/models/comments.py:251 +#, fuzzy +msgid "User flag" +msgstr "Användare" + +#: contrib/comments/models/comments.py:252 +#, fuzzy +msgid "User flags" +msgstr "Användare" + +#: 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 "sessionsdata" + +#: 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 "" + +#: contrib/comments/views/karma.py:22 +#, fuzzy +msgid "Invalid comment ID" +msgstr "aktivera kommentarer" + +#: contrib/comments/views/karma.py:24 +msgid "No voting for yourself" +msgstr "" + +#: contrib/comments/views/comments.py:25 +msgid "" +"This rating is required because you've entered at least one other rating." +msgstr "" + +#: contrib/comments/views/comments.py:109 +#, 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] "" + +#: contrib/comments/views/comments.py:114 +#, python-format +msgid "" +"This comment was posted by a sketchy user:\n" +"\n" +"%(text)s" +msgstr "" + +#: contrib/comments/views/comments.py:186 +#: contrib/comments/views/comments.py:277 +msgid "Only POSTs are allowed" +msgstr "" + +#: contrib/comments/views/comments.py:190 +#: contrib/comments/views/comments.py:281 +msgid "One or more of the required fields wasn't submitted" +msgstr "" + +#: contrib/comments/views/comments.py:194 +#: contrib/comments/views/comments.py:283 +msgid "Somebody tampered with the comment form (security violation)" +msgstr "" + +#: contrib/comments/views/comments.py:204 +#: contrib/comments/views/comments.py:289 +msgid "" +"The comment form had an invalid 'target' parameter -- the object ID was " +"invalid" +msgstr "" + +#: contrib/comments/views/comments.py:254 +#: contrib/comments/views/comments.py:318 +msgid "The comment form didn't provide either 'preview' or 'post'" +msgstr "" + #: contrib/admin/models/admin.py:6 msgid "action time" msgstr "tid för händelse" diff --git a/django/conf/locale/zh_CN/LC_MESSAGES/django.mo b/django/conf/locale/zh_CN/LC_MESSAGES/django.mo index 326e0f838166c946b7f351f6789574f602dd77ca..62a0cee95a2c24354ef77660e21bc87c5c854468 100644 GIT binary patch delta 22 dcmZ3}!nme|af5^wyRm|yp_PHzW_c}M2>?%M1=0Wj delta 22 dcmZ3}!nme|af5^wyODySsg;TGW_c}M2>?%u1=aun diff --git a/django/conf/locale/zh_CN/LC_MESSAGES/django.po b/django/conf/locale/zh_CN/LC_MESSAGES/django.po index 8fd7cd7a0e..d81b679939 100644 --- a/django/conf/locale/zh_CN/LC_MESSAGES/django.po +++ b/django/conf/locale/zh_CN/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: django v1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-22 15:43-0600\n" +"POT-Creation-Date: 2005-11-23 11:06-0600\n" "PO-Revision-Date: 2005-11-16 12:55+0800\n" "Last-Translator: limodou \n" "Language-Team: Simplified Chinese \n" @@ -19,6 +19,267 @@ msgstr "" "X-Poedit-SourceCharset: utf-8\n" "Plural-Forms: nplurals=1; plural=0;\n" +#: contrib/comments/models/comments.py:8 +#: contrib/comments/models/comments.py:161 +#, fuzzy +msgid "object ID" +msgstr "对象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 "内容" + +#: 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 +#, fuzzy +msgid "IP address" +msgstr "邮件地址" + +#: 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 "允许评论" + +#: contrib/comments/models/comments.py:85 +#: contrib/comments/models/comments.py:204 +#, fuzzy +msgid "Content object" +msgstr "内容类型" + +#: 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 "名字" + +#: contrib/comments/models/comments.py:166 +#, fuzzy +msgid "ip address" +msgstr "邮件地址" + +#: contrib/comments/models/comments.py:168 +msgid "approved by staff" +msgstr "" + +#: contrib/comments/models/comments.py:172 +#, fuzzy +msgid "Free comment" +msgstr "允许评论" + +#: contrib/comments/models/comments.py:173 +#, fuzzy +msgid "Free comments" +msgstr "允许评论" + +#: contrib/comments/models/comments.py:209 +msgid "score" +msgstr "" + +#: contrib/comments/models/comments.py:210 +#, fuzzy +msgid "score date" +msgstr "过期日期" + +#: 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 "简单页面" + +#: contrib/comments/models/comments.py:251 +#, fuzzy +msgid "User flag" +msgstr "用户" + +#: contrib/comments/models/comments.py:252 +#, fuzzy +msgid "User flags" +msgstr "用户" + +#: 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 "session数据" + +#: 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 "" + +#: contrib/comments/views/karma.py:22 +#, fuzzy +msgid "Invalid comment ID" +msgstr "允许评论" + +#: contrib/comments/views/karma.py:24 +msgid "No voting for yourself" +msgstr "" + +#: contrib/comments/views/comments.py:25 +msgid "" +"This rating is required because you've entered at least one other rating." +msgstr "" + +#: contrib/comments/views/comments.py:109 +#, 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] "" + +#: contrib/comments/views/comments.py:114 +#, python-format +msgid "" +"This comment was posted by a sketchy user:\n" +"\n" +"%(text)s" +msgstr "" + +#: contrib/comments/views/comments.py:186 +#: contrib/comments/views/comments.py:277 +msgid "Only POSTs are allowed" +msgstr "" + +#: contrib/comments/views/comments.py:190 +#: contrib/comments/views/comments.py:281 +msgid "One or more of the required fields wasn't submitted" +msgstr "" + +#: contrib/comments/views/comments.py:194 +#: contrib/comments/views/comments.py:283 +msgid "Somebody tampered with the comment form (security violation)" +msgstr "" + +#: contrib/comments/views/comments.py:204 +#: contrib/comments/views/comments.py:289 +msgid "" +"The comment form had an invalid 'target' parameter -- the object ID was " +"invalid" +msgstr "" + +#: contrib/comments/views/comments.py:254 +#: contrib/comments/views/comments.py:318 +msgid "The comment form didn't provide either 'preview' or 'post'" +msgstr "" + #: contrib/admin/models/admin.py:6 msgid "action time" msgstr "动作时间" From 0e1ae73ad7695d588083be5ac9b4bea791e994a4 Mon Sep 17 00:00:00 2001 From: Georg Bauer Date: Wed, 23 Nov 2005 17:27:47 +0000 Subject: [PATCH 06/13] another update for the german translations file git-svn-id: http://code.djangoproject.com/svn/django/trunk@1370 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/conf/locale/de/LC_MESSAGES/django.mo | Bin 22621 -> 23616 bytes django/conf/locale/de/LC_MESSAGES/django.po | 97 +++++++++++++++++--- 2 files changed, 83 insertions(+), 14 deletions(-) diff --git a/django/conf/locale/de/LC_MESSAGES/django.mo b/django/conf/locale/de/LC_MESSAGES/django.mo index 43308554465d32f26268faedf5e512be2fa9d840..f6527c64cc2288926c99778d8e1f739196a16391 100644 GIT binary patch delta 7136 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 diff --git a/django/conf/locale/de/LC_MESSAGES/django.po b/django/conf/locale/de/LC_MESSAGES/django.po index 463a5d2b75..d57b22f0f8 100644 --- a/django/conf/locale/de/LC_MESSAGES/django.po +++ b/django/conf/locale/de/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Django 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-23 11:06-0600\n" +"POT-Creation-Date: 2005-11-23 18:30+0100\n" "PO-Revision-Date: 2005-11-06 13:54+0100\n" "Last-Translator: Lukas Kolbe \n" "Language-Team: \n" @@ -75,7 +75,7 @@ msgstr "Datum/Zeit Erstellung" msgid "is public" msgstr "ist ffentlich" -#: contrib/comments/models/comments.py:26 +#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:274 msgid "IP address" msgstr "IP Adresse" @@ -271,7 +271,8 @@ msgstr "Eines oder mehrere der erforderlichen Felder fehlt" #: contrib/comments/views/comments.py:194 #: contrib/comments/views/comments.py:283 msgid "Somebody tampered with the comment form (security violation)" -msgstr "Jemand hat mit dem Kommentarformular herumgespielt (Sicherheitsverletzung)" +msgstr "" +"Jemand hat mit dem Kommentarformular herumgespielt (Sicherheitsverletzung)" #: contrib/comments/views/comments.py:204 #: contrib/comments/views/comments.py:289 @@ -285,7 +286,8 @@ msgstr "" #: contrib/comments/views/comments.py:254 #: contrib/comments/views/comments.py:318 msgid "The comment form didn't provide either 'preview' or 'post'" -msgstr "Das Kommentarformular wurde nicht mit 'preview' oder 'post' abgeschickt" +msgstr "" +"Das Kommentarformular wurde nicht mit 'preview' oder 'post' abgeschickt" #: contrib/admin/models/admin.py:6 msgid "action time" @@ -315,6 +317,77 @@ msgstr "Logeintrag" msgid "log entries" msgstr "Logeintrge" +#: 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 "Ganzzahl" + +#: contrib/admin/views/doc.py:263 +msgid "Boolean (Either True or False)" +msgstr "Wahrheitswert (Wahr oder Falsch)" + +#: contrib/admin/views/doc.py:264 +#, python-format +msgid "String (up to %(maxlength)s)" +msgstr "Zeichenkette (bis zu %(maxlength)s Zeichen)" + +#: contrib/admin/views/doc.py:265 +msgid "Comma-separated integers" +msgstr "Kommaseparierte Liste von Zahlen" + +#: contrib/admin/views/doc.py:266 +msgid "Date (without time)" +msgstr "Datum (ohne Zeit)" + +#: contrib/admin/views/doc.py:267 +msgid "Date (with time)" +msgstr "Datum (mit Zeit)" + +#: contrib/admin/views/doc.py:268 +msgid "E-mail address" +msgstr "E-mail-Adresse" + +#: contrib/admin/views/doc.py:269 contrib/admin/views/doc.py:272 +msgid "File path" +msgstr "Dateipfad" + +#: contrib/admin/views/doc.py:270 +msgid "Decimal number" +msgstr "Dezimalzahl" + +#: contrib/admin/views/doc.py:276 +msgid "Boolean (Either True, False or None)" +msgstr "Wahrheitswert (Wahr, Falsch oder Nichts)" + +#: contrib/admin/views/doc.py:277 +msgid "Phone number" +msgstr "Telefonnummer" + +#: contrib/admin/views/doc.py:280 +msgid "String (up to 50)" +msgstr "Zeichenkette (bis zu 50 Zeichen)" + +#: contrib/admin/views/doc.py:282 +msgid "Text" +msgstr "Text" + +#: contrib/admin/views/doc.py:283 +msgid "Time" +msgstr "Zeit" + +#: contrib/admin/views/doc.py:284 contrib/flatpages/models/flatpages.py:6 +msgid "URL" +msgstr "URL" + +#: contrib/admin/views/doc.py:285 +msgid "U.S. state (two uppercase letters)" +msgstr "U.S. Bundesstaat (zwei Grossbuchstaben)" + +#: contrib/admin/views/doc.py:286 +msgid "XML text" +msgstr "XML Text" + #: contrib/admin/templates/admin/object_history.html:5 #: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/base.html:29 @@ -502,7 +575,7 @@ msgstr "" #: contrib/admin/templates/registration/password_reset_form.html:16 msgid "E-mail address:" -msgstr "eMail-Adresse:" +msgstr "E-Mail-Adresse:" #: contrib/admin/templates/registration/password_reset_form.html:16 msgid "Reset my password" @@ -510,16 +583,16 @@ msgstr "Mein Kennwort zur #: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." -msgstr "Danke, dass Sie heute eine Weile bei uns waren." +msgstr "Vielen Dank, da Sie hier ein paar nette Minuten verbracht haben." #: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" -msgstr "Neu anmelden" +msgstr "Erneut Anmelden" #: contrib/admin/templates/registration/password_reset_done.html:6 #: contrib/admin/templates/registration/password_reset_done.html:10 msgid "Password reset successful" -msgstr "Kennwort erfolgreich zurckgesetzt" +msgstr "Kennwort erfolgreich zurckgesetzt" #: contrib/admin/templates/registration/password_reset_done.html:12 msgid "" @@ -617,10 +690,6 @@ msgstr "Umleitung" msgid "redirects" msgstr "Umleitungen" -#: contrib/flatpages/models/flatpages.py:6 -msgid "URL" -msgstr "URL" - #: contrib/flatpages/models/flatpages.py:7 msgid "" "Example: '/about/contact/'. Make sure to have leading and trailing slashes." @@ -1033,7 +1102,7 @@ msgstr "Russisch" #: conf/global_settings.py:51 msgid "Slovak" -msgstr "Slovakisch" +msgstr "Slowakisch" #: conf/global_settings.py:52 msgid "Serbian" @@ -1045,7 +1114,7 @@ msgstr "Schwedisch" #: conf/global_settings.py:54 msgid "Simplified Chinese" -msgstr "vereinfachtes Chinesisch" +msgstr "Vereinfachtes Chinesisch" #: core/validators.py:62 msgid "This value must contain only letters, numbers and underscores." From 87e0c2a712c9c63af81d571d0e163150575e769a Mon Sep 17 00:00:00 2001 From: Georg Bauer Date: Wed, 23 Nov 2005 17:31:52 +0000 Subject: [PATCH 07/13] updated all message files for translation hooks from [1368] git-svn-id: http://code.djangoproject.com/svn/django/trunk@1371 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/conf/locale/bn/LC_MESSAGES/django.mo | Bin 26898 -> 26898 bytes django/conf/locale/bn/LC_MESSAGES/django.po | 84 +++++++++++++++-- django/conf/locale/cs/LC_MESSAGES/django.mo | Bin 17734 -> 17734 bytes django/conf/locale/cs/LC_MESSAGES/django.po | 84 +++++++++++++++-- django/conf/locale/cy/LC_MESSAGES/django.mo | Bin 16972 -> 16972 bytes django/conf/locale/cy/LC_MESSAGES/django.po | 84 +++++++++++++++-- django/conf/locale/da/LC_MESSAGES/django.mo | Bin 16807 -> 16807 bytes django/conf/locale/da/LC_MESSAGES/django.po | 84 +++++++++++++++-- django/conf/locale/de/LC_MESSAGES/django.mo | Bin 23616 -> 23616 bytes django/conf/locale/de/LC_MESSAGES/django.po | 2 +- django/conf/locale/en/LC_MESSAGES/django.mo | Bin 536 -> 536 bytes django/conf/locale/en/LC_MESSAGES/django.po | 79 ++++++++++++++-- django/conf/locale/es/LC_MESSAGES/django.mo | Bin 5203 -> 5203 bytes django/conf/locale/es/LC_MESSAGES/django.po | 82 ++++++++++++++-- django/conf/locale/fr/LC_MESSAGES/django.mo | Bin 17427 -> 17427 bytes django/conf/locale/fr/LC_MESSAGES/django.po | 84 +++++++++++++++-- django/conf/locale/gl/LC_MESSAGES/django.mo | Bin 5322 -> 5322 bytes django/conf/locale/gl/LC_MESSAGES/django.po | 82 ++++++++++++++-- django/conf/locale/is/LC_MESSAGES/django.mo | Bin 17726 -> 17726 bytes django/conf/locale/is/LC_MESSAGES/django.po | 84 +++++++++++++++-- django/conf/locale/it/LC_MESSAGES/django.mo | Bin 16501 -> 16501 bytes django/conf/locale/it/LC_MESSAGES/django.po | 84 +++++++++++++++-- django/conf/locale/no/LC_MESSAGES/django.mo | Bin 17324 -> 17324 bytes django/conf/locale/no/LC_MESSAGES/django.po | 84 +++++++++++++++-- .../conf/locale/pt_BR/LC_MESSAGES/django.mo | Bin 16330 -> 16330 bytes .../conf/locale/pt_BR/LC_MESSAGES/django.po | 84 +++++++++++++++-- django/conf/locale/ro/LC_MESSAGES/django.mo | Bin 17096 -> 17096 bytes django/conf/locale/ro/LC_MESSAGES/django.po | 84 +++++++++++++++-- django/conf/locale/ru/LC_MESSAGES/django.mo | Bin 13774 -> 13774 bytes django/conf/locale/ru/LC_MESSAGES/django.po | 84 +++++++++++++++-- django/conf/locale/sk/LC_MESSAGES/django.mo | Bin 18399 -> 18399 bytes django/conf/locale/sk/LC_MESSAGES/django.po | 84 +++++++++++++++-- django/conf/locale/sr/LC_MESSAGES/django.mo | Bin 17264 -> 17264 bytes django/conf/locale/sr/LC_MESSAGES/django.po | 88 ++++++++++++++++-- django/conf/locale/sv/LC_MESSAGES/django.mo | Bin 17616 -> 17616 bytes django/conf/locale/sv/LC_MESSAGES/django.po | 84 +++++++++++++++-- .../conf/locale/zh_CN/LC_MESSAGES/django.mo | Bin 16940 -> 16940 bytes .../conf/locale/zh_CN/LC_MESSAGES/django.po | 84 +++++++++++++++-- 38 files changed, 1398 insertions(+), 111 deletions(-) diff --git a/django/conf/locale/bn/LC_MESSAGES/django.mo b/django/conf/locale/bn/LC_MESSAGES/django.mo index fbc45605ac88d9afb54b827b73acaa7938233796..3624f8afe2f78eb37bfdb9bbf1fb49649dd9a4e0 100644 GIT binary patch delta 17 ZcmbPqiE+{;#tjl$Ova|0rL=z70RTMY22=n5 delta 17 ZcmbPqiE+{;#tjl$Oa|tgrL=z70RTMP22%h4 diff --git a/django/conf/locale/bn/LC_MESSAGES/django.po b/django/conf/locale/bn/LC_MESSAGES/django.po index 14a2eeedc7..632a634f13 100644 --- a/django/conf/locale/bn/LC_MESSAGES/django.po +++ b/django/conf/locale/bn/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Django CVS\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-23 11:07-0600\n" +"POT-Creation-Date: 2005-11-23 11:35-0600\n" "PO-Revision-Date: 2005-11-12 20:05+0530\n" "Last-Translator: Baishampayan Ghose \n" "Language-Team: Ankur Bangla \n" @@ -78,7 +78,7 @@ msgstr "" msgid "is public" msgstr "" -#: contrib/comments/models/comments.py:26 +#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:274 #, fuzzy msgid "IP address" msgstr "ই-মেল ঠিকানা" @@ -306,6 +306,82 @@ msgstr "কার্যবিবরণী এন্ট্রি" msgid "log entries" msgstr "কার্যবিবরণী এন্ট্রি সমুহ" +#: 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 "" + +#: contrib/admin/views/doc.py:263 +msgid "Boolean (Either True or False)" +msgstr "" + +#: contrib/admin/views/doc.py:264 +#, python-format +msgid "String (up to %(maxlength)s)" +msgstr "" + +#: contrib/admin/views/doc.py:265 +msgid "Comma-separated integers" +msgstr "" + +#: contrib/admin/views/doc.py:266 +#, fuzzy +msgid "Date (without time)" +msgstr "কাজের সময়" + +#: contrib/admin/views/doc.py:267 +#, fuzzy +msgid "Date (with time)" +msgstr "তারিখ/সময়" + +#: contrib/admin/views/doc.py:268 +#, fuzzy +msgid "E-mail address" +msgstr "ই-মেল ঠিকানা:" + +#: contrib/admin/views/doc.py:269 contrib/admin/views/doc.py:272 +msgid "File path" +msgstr "" + +#: contrib/admin/views/doc.py:270 +#, fuzzy +msgid "Decimal number" +msgstr "ডিসেম্বর" + +#: contrib/admin/views/doc.py:276 +msgid "Boolean (Either True, False or None)" +msgstr "" + +#: contrib/admin/views/doc.py:277 +#, fuzzy +msgid "Phone number" +msgstr "একটি গোটা সংখ্যা ঢোকান।" + +#: contrib/admin/views/doc.py:280 +msgid "String (up to 50)" +msgstr "" + +#: contrib/admin/views/doc.py:282 +msgid "Text" +msgstr "" + +#: contrib/admin/views/doc.py:283 +msgid "Time" +msgstr "" + +#: contrib/admin/views/doc.py:284 contrib/flatpages/models/flatpages.py:6 +msgid "URL" +msgstr "ইউ.আর.এল" + +#: contrib/admin/views/doc.py:285 +msgid "U.S. state (two uppercase letters)" +msgstr "" + +#: contrib/admin/views/doc.py:286 +msgid "XML text" +msgstr "" + #: contrib/admin/templates/admin/object_history.html:5 #: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/base.html:29 @@ -602,10 +678,6 @@ msgstr "রিডাইরেক্ট" msgid "redirects" msgstr "রিডাইরেক্ট করে" -#: contrib/flatpages/models/flatpages.py:6 -msgid "URL" -msgstr "ইউ.আর.এল" - #: contrib/flatpages/models/flatpages.py:7 msgid "" "Example: '/about/contact/'. Make sure to have leading and trailing slashes." diff --git a/django/conf/locale/cs/LC_MESSAGES/django.mo b/django/conf/locale/cs/LC_MESSAGES/django.mo index a8420bd847bfbd6a2a476fecfe6bbdcc1d31e6c0..75ef21d976535fc499e69c506ac107cdb9d355d0 100644 GIT binary patch delta 17 YcmX@s#dxfXaYKeCld;L>EX_O806zN$iU0rr delta 17 YcmX@s#dxfXaYKeClY!ahEX_O806y{ti2wiq diff --git a/django/conf/locale/cs/LC_MESSAGES/django.po b/django/conf/locale/cs/LC_MESSAGES/django.po index 87f5a09c22..a745f1e752 100644 --- a/django/conf/locale/cs/LC_MESSAGES/django.po +++ b/django/conf/locale/cs/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Django Czech translation\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-23 11:06-0600\n" +"POT-Creation-Date: 2005-11-23 11:34-0600\n" "PO-Revision-Date: 2005-11-14 15:34+0100\n" "Last-Translator: Radek Svarz \n" "Language-Team: Czech\n" @@ -81,7 +81,7 @@ msgstr "" msgid "is public" msgstr "" -#: contrib/comments/models/comments.py:26 +#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:274 #, fuzzy msgid "IP address" msgstr "e-mailová adresa" @@ -310,6 +310,82 @@ msgstr "log záznam" msgid "log entries" msgstr "log záznamy" +#: 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 "" + +#: contrib/admin/views/doc.py:263 +msgid "Boolean (Either True or False)" +msgstr "" + +#: contrib/admin/views/doc.py:264 +#, python-format +msgid "String (up to %(maxlength)s)" +msgstr "" + +#: contrib/admin/views/doc.py:265 +msgid "Comma-separated integers" +msgstr "" + +#: contrib/admin/views/doc.py:266 +#, fuzzy +msgid "Date (without time)" +msgstr "čas akce" + +#: contrib/admin/views/doc.py:267 +#, fuzzy +msgid "Date (with time)" +msgstr "Datum/čas" + +#: contrib/admin/views/doc.py:268 +#, fuzzy +msgid "E-mail address" +msgstr "E-mailová adresa:" + +#: contrib/admin/views/doc.py:269 contrib/admin/views/doc.py:272 +msgid "File path" +msgstr "" + +#: contrib/admin/views/doc.py:270 +#, fuzzy +msgid "Decimal number" +msgstr "Prosinec" + +#: contrib/admin/views/doc.py:276 +msgid "Boolean (Either True, False or None)" +msgstr "" + +#: contrib/admin/views/doc.py:277 +#, fuzzy +msgid "Phone number" +msgstr "Vložte celé číslo." + +#: contrib/admin/views/doc.py:280 +msgid "String (up to 50)" +msgstr "" + +#: contrib/admin/views/doc.py:282 +msgid "Text" +msgstr "" + +#: 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" + +#: contrib/admin/views/doc.py:285 +msgid "U.S. state (two uppercase letters)" +msgstr "" + +#: contrib/admin/views/doc.py:286 +msgid "XML text" +msgstr "" + #: contrib/admin/templates/admin/object_history.html:5 #: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/base.html:29 @@ -606,10 +682,6 @@ msgstr "přesměrovat" msgid "redirects" msgstr "přesměrování" -#: contrib/flatpages/models/flatpages.py:6 -msgid "URL" -msgstr "URL" - #: contrib/flatpages/models/flatpages.py:7 msgid "" "Example: '/about/contact/'. Make sure to have leading and trailing slashes." diff --git a/django/conf/locale/cy/LC_MESSAGES/django.mo b/django/conf/locale/cy/LC_MESSAGES/django.mo index 9fc66485c6f5e412d05176edc84907008aa5a7c5..da157858a8c3fe72e578fe254b6c81276c696331 100644 GIT binary patch delta 17 YcmX@p!g!{Ial=myCS%jhzcm6S0Y%pb9smFU delta 17 YcmX@p!g!{Ial=myCIj=$zcm6S0Y%OS9RL6T diff --git a/django/conf/locale/cy/LC_MESSAGES/django.po b/django/conf/locale/cy/LC_MESSAGES/django.po index f1d7a34c8e..9e4d5afc55 100644 --- a/django/conf/locale/cy/LC_MESSAGES/django.po +++ b/django/conf/locale/cy/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-23 11:07-0600\n" +"POT-Creation-Date: 2005-11-23 11:35-0600\n" "PO-Revision-Date: 2005-11-05 HO:MI+ZONE\n" "Last-Translator: Jason Davies \n" "Language-Team: Cymraeg \n" @@ -78,7 +78,7 @@ msgstr "" msgid "is public" msgstr "" -#: contrib/comments/models/comments.py:26 +#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:274 #, fuzzy msgid "IP address" msgstr "cyfeiriad e-bost" @@ -306,6 +306,82 @@ msgstr "cofnod" msgid "log entries" msgstr "cofnodion" +#: 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 "" + +#: contrib/admin/views/doc.py:263 +msgid "Boolean (Either True or False)" +msgstr "" + +#: contrib/admin/views/doc.py:264 +#, python-format +msgid "String (up to %(maxlength)s)" +msgstr "" + +#: contrib/admin/views/doc.py:265 +msgid "Comma-separated integers" +msgstr "" + +#: contrib/admin/views/doc.py:266 +#, fuzzy +msgid "Date (without time)" +msgstr "amser gweithred" + +#: contrib/admin/views/doc.py:267 +#, fuzzy +msgid "Date (with time)" +msgstr "Dyddiad/amser" + +#: contrib/admin/views/doc.py:268 +#, fuzzy +msgid "E-mail address" +msgstr "Cyfeiriad e-bost:" + +#: contrib/admin/views/doc.py:269 contrib/admin/views/doc.py:272 +msgid "File path" +msgstr "" + +#: contrib/admin/views/doc.py:270 +#, fuzzy +msgid "Decimal number" +msgstr "Rhagfyr" + +#: contrib/admin/views/doc.py:276 +msgid "Boolean (Either True, False or None)" +msgstr "" + +#: contrib/admin/views/doc.py:277 +#, fuzzy +msgid "Phone number" +msgstr "Rhowch rhif cyfan." + +#: contrib/admin/views/doc.py:280 +msgid "String (up to 50)" +msgstr "" + +#: contrib/admin/views/doc.py:282 +msgid "Text" +msgstr "" + +#: 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" + +#: contrib/admin/views/doc.py:285 +msgid "U.S. state (two uppercase letters)" +msgstr "" + +#: contrib/admin/views/doc.py:286 +msgid "XML text" +msgstr "" + #: contrib/admin/templates/admin/object_history.html:5 #: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/base.html:29 @@ -601,10 +677,6 @@ msgstr "ailgyfeiriad" msgid "redirects" msgstr "ailgyfeiriadau" -#: contrib/flatpages/models/flatpages.py:6 -msgid "URL" -msgstr "URL" - #: contrib/flatpages/models/flatpages.py:7 msgid "" "Example: '/about/contact/'. Make sure to have leading and trailing slashes." diff --git a/django/conf/locale/da/LC_MESSAGES/django.mo b/django/conf/locale/da/LC_MESSAGES/django.mo index ef8863f35c83019cd6836d7bd8ab01938d72cf8f..8fe7ba3886c6bf088bcff2e2dc0983f2b9498109 100644 GIT binary patch delta 17 YcmZ49%(%Rnaf5;;ld\n" "Language-Team: Danish\n" @@ -78,7 +78,7 @@ msgstr "" msgid "is public" msgstr "" -#: contrib/comments/models/comments.py:26 +#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:274 #, fuzzy msgid "IP address" msgstr "e-mail adresse" @@ -306,6 +306,82 @@ msgstr "logmeddelelse" msgid "log entries" msgstr "logmeddelelser" +#: 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 "" + +#: contrib/admin/views/doc.py:263 +msgid "Boolean (Either True or False)" +msgstr "" + +#: contrib/admin/views/doc.py:264 +#, python-format +msgid "String (up to %(maxlength)s)" +msgstr "" + +#: contrib/admin/views/doc.py:265 +msgid "Comma-separated integers" +msgstr "" + +#: contrib/admin/views/doc.py:266 +#, fuzzy +msgid "Date (without time)" +msgstr "handlingstid" + +#: 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 "E-mail adresse:" + +#: contrib/admin/views/doc.py:269 contrib/admin/views/doc.py:272 +msgid "File path" +msgstr "" + +#: contrib/admin/views/doc.py:270 +#, fuzzy +msgid "Decimal number" +msgstr "December" + +#: contrib/admin/views/doc.py:276 +msgid "Boolean (Either True, False or None)" +msgstr "" + +#: contrib/admin/views/doc.py:277 +#, fuzzy +msgid "Phone number" +msgstr "Indtast et heltal." + +#: contrib/admin/views/doc.py:280 +msgid "String (up to 50)" +msgstr "" + +#: contrib/admin/views/doc.py:282 +msgid "Text" +msgstr "" + +#: contrib/admin/views/doc.py:283 +msgid "Time" +msgstr "" + +#: contrib/admin/views/doc.py:284 contrib/flatpages/models/flatpages.py:6 +msgid "URL" +msgstr "Internetadresse" + +#: contrib/admin/views/doc.py:285 +msgid "U.S. state (two uppercase letters)" +msgstr "" + +#: contrib/admin/views/doc.py:286 +msgid "XML text" +msgstr "" + #: contrib/admin/templates/admin/object_history.html:5 #: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/base.html:29 @@ -605,10 +681,6 @@ msgstr "omadressering" msgid "redirects" msgstr "omaddresseringer" -#: contrib/flatpages/models/flatpages.py:6 -msgid "URL" -msgstr "Internetadresse" - #: contrib/flatpages/models/flatpages.py:7 msgid "" "Example: '/about/contact/'. Make sure to have leading and trailing slashes." diff --git a/django/conf/locale/de/LC_MESSAGES/django.mo b/django/conf/locale/de/LC_MESSAGES/django.mo index f6527c64cc2288926c99778d8e1f739196a16391..5da1381961e116f1c0a2147de453f74eb7f2a63c 100644 GIT binary patch delta 22 ecmX@GgYm!)#tr+;*$u6XO>_;+HXk#uQUL&IeF#$k delta 22 ecmX@GgYm!)#tr+;*)6P$4YUmmHy<;vQUL&Ie+W+i diff --git a/django/conf/locale/de/LC_MESSAGES/django.po b/django/conf/locale/de/LC_MESSAGES/django.po index d57b22f0f8..56c1bc76dc 100644 --- a/django/conf/locale/de/LC_MESSAGES/django.po +++ b/django/conf/locale/de/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Django 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-23 18:30+0100\n" +"POT-Creation-Date: 2005-11-23 11:34-0600\n" "PO-Revision-Date: 2005-11-06 13:54+0100\n" "Last-Translator: Lukas Kolbe \n" "Language-Team: \n" diff --git a/django/conf/locale/en/LC_MESSAGES/django.mo b/django/conf/locale/en/LC_MESSAGES/django.mo index a359bb9f396789f064712074e4b258abbae3d7a2..6ee4ac70717b93799e2c42643b5dcbf20582b162 100644 GIT binary patch delta 14 VcmbQiGJ|D\n" "Language-Team: LANGUAGE \n" @@ -76,7 +76,7 @@ msgstr "" msgid "is public" msgstr "" -#: contrib/comments/models/comments.py:26 +#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:274 msgid "IP address" msgstr "" @@ -291,6 +291,77 @@ msgstr "" msgid "log entries" msgstr "" +#: 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 "" + +#: contrib/admin/views/doc.py:263 +msgid "Boolean (Either True or False)" +msgstr "" + +#: contrib/admin/views/doc.py:264 +#, python-format +msgid "String (up to %(maxlength)s)" +msgstr "" + +#: contrib/admin/views/doc.py:265 +msgid "Comma-separated integers" +msgstr "" + +#: contrib/admin/views/doc.py:266 +msgid "Date (without time)" +msgstr "" + +#: contrib/admin/views/doc.py:267 +msgid "Date (with time)" +msgstr "" + +#: contrib/admin/views/doc.py:268 +msgid "E-mail address" +msgstr "" + +#: contrib/admin/views/doc.py:269 contrib/admin/views/doc.py:272 +msgid "File path" +msgstr "" + +#: contrib/admin/views/doc.py:270 +msgid "Decimal number" +msgstr "" + +#: contrib/admin/views/doc.py:276 +msgid "Boolean (Either True, False or None)" +msgstr "" + +#: contrib/admin/views/doc.py:277 +msgid "Phone number" +msgstr "" + +#: contrib/admin/views/doc.py:280 +msgid "String (up to 50)" +msgstr "" + +#: contrib/admin/views/doc.py:282 +msgid "Text" +msgstr "" + +#: contrib/admin/views/doc.py:283 +msgid "Time" +msgstr "" + +#: contrib/admin/views/doc.py:284 contrib/flatpages/models/flatpages.py:6 +msgid "URL" +msgstr "" + +#: contrib/admin/views/doc.py:285 +msgid "U.S. state (two uppercase letters)" +msgstr "" + +#: contrib/admin/views/doc.py:286 +msgid "XML text" +msgstr "" + #: contrib/admin/templates/admin/object_history.html:5 #: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/base.html:29 @@ -570,10 +641,6 @@ msgstr "" msgid "redirects" msgstr "" -#: contrib/flatpages/models/flatpages.py:6 -msgid "URL" -msgstr "" - #: contrib/flatpages/models/flatpages.py:7 msgid "" "Example: '/about/contact/'. Make sure to have leading and trailing slashes." diff --git a/django/conf/locale/es/LC_MESSAGES/django.mo b/django/conf/locale/es/LC_MESSAGES/django.mo index 5b2e98856418a3981681c61c4df32dad539df947..1bfc596342956f0d79a9d75a83849c0a58a395e4 100644 GIT binary patch delta 15 Wcmcbtaam)-XKp5Alg(eb<2V2}i3TSC delta 15 Wcmcbtaam)-XKp3~v&~<*<2V2}fCeT2 diff --git a/django/conf/locale/es/LC_MESSAGES/django.po b/django/conf/locale/es/LC_MESSAGES/django.po index 30e9789e9a..d2a7cb0c4b 100644 --- a/django/conf/locale/es/LC_MESSAGES/django.po +++ b/django/conf/locale/es/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-23 11:06-0600\n" +"POT-Creation-Date: 2005-11-23 11:34-0600\n" "PO-Revision-Date: 2005-10-04 20:59GMT\n" "Last-Translator: Ricardo Javier Crdenes Medina \n" @@ -77,7 +77,7 @@ msgstr "" msgid "is public" msgstr "" -#: contrib/comments/models/comments.py:26 +#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:274 #, fuzzy msgid "IP address" msgstr "Direccin de correo:" @@ -297,6 +297,80 @@ msgstr "" msgid "log entries" msgstr "" +#: 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 "" + +#: contrib/admin/views/doc.py:263 +msgid "Boolean (Either True or False)" +msgstr "" + +#: contrib/admin/views/doc.py:264 +#, python-format +msgid "String (up to %(maxlength)s)" +msgstr "" + +#: contrib/admin/views/doc.py:265 +msgid "Comma-separated integers" +msgstr "" + +#: contrib/admin/views/doc.py:266 +#, fuzzy +msgid "Date (without time)" +msgstr "Fecha/hora" + +#: contrib/admin/views/doc.py:267 +#, fuzzy +msgid "Date (with time)" +msgstr "Fecha/hora" + +#: contrib/admin/views/doc.py:268 +#, fuzzy +msgid "E-mail address" +msgstr "Direccin de correo:" + +#: contrib/admin/views/doc.py:269 contrib/admin/views/doc.py:272 +msgid "File path" +msgstr "" + +#: contrib/admin/views/doc.py:270 +msgid "Decimal number" +msgstr "" + +#: contrib/admin/views/doc.py:276 +msgid "Boolean (Either True, False or None)" +msgstr "" + +#: contrib/admin/views/doc.py:277 +msgid "Phone number" +msgstr "" + +#: contrib/admin/views/doc.py:280 +msgid "String (up to 50)" +msgstr "" + +#: contrib/admin/views/doc.py:282 +msgid "Text" +msgstr "" + +#: contrib/admin/views/doc.py:283 +msgid "Time" +msgstr "" + +#: contrib/admin/views/doc.py:284 contrib/flatpages/models/flatpages.py:6 +msgid "URL" +msgstr "" + +#: contrib/admin/views/doc.py:285 +msgid "U.S. state (two uppercase letters)" +msgstr "" + +#: contrib/admin/views/doc.py:286 +msgid "XML text" +msgstr "" + #: contrib/admin/templates/admin/object_history.html:5 #: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/base.html:29 @@ -593,10 +667,6 @@ msgstr "" msgid "redirects" msgstr "" -#: contrib/flatpages/models/flatpages.py:6 -msgid "URL" -msgstr "" - #: contrib/flatpages/models/flatpages.py:7 msgid "" "Example: '/about/contact/'. Make sure to have leading and trailing slashes." diff --git a/django/conf/locale/fr/LC_MESSAGES/django.mo b/django/conf/locale/fr/LC_MESSAGES/django.mo index 93a02550dcf25800c2fecd155399488ef3af8161..fc0e552bb7a291e93e290f8bc583f2de3acd207c 100644 GIT binary patch delta 17 YcmbQ-!8o~tal=J*CS#M$m(?9)06hZ+Qvd(} delta 17 YcmbQ-!8o~tal=J*CIhq0m(?9)06h8zQUCw| diff --git a/django/conf/locale/fr/LC_MESSAGES/django.po b/django/conf/locale/fr/LC_MESSAGES/django.po index 6dc8122104..5988eaaf23 100644 --- a/django/conf/locale/fr/LC_MESSAGES/django.po +++ b/django/conf/locale/fr/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-23 11:06-0600\n" +"POT-Creation-Date: 2005-11-23 11:34-0600\n" "PO-Revision-Date: 2005-10-18 12:27+0200\n" "Last-Translator: Laurent Rahuel \n" "Language-Team: franais \n" @@ -77,7 +77,7 @@ msgstr "" msgid "is public" msgstr "" -#: contrib/comments/models/comments.py:26 +#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:274 #, fuzzy msgid "IP address" msgstr "courriel" @@ -305,6 +305,82 @@ msgstr "entr msgid "log entries" msgstr "entres de log" +#: 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 "" + +#: contrib/admin/views/doc.py:263 +msgid "Boolean (Either True or False)" +msgstr "" + +#: contrib/admin/views/doc.py:264 +#, python-format +msgid "String (up to %(maxlength)s)" +msgstr "" + +#: contrib/admin/views/doc.py:265 +msgid "Comma-separated integers" +msgstr "" + +#: contrib/admin/views/doc.py:266 +#, fuzzy +msgid "Date (without time)" +msgstr "heure de l'action" + +#: contrib/admin/views/doc.py:267 +#, fuzzy +msgid "Date (with time)" +msgstr "Date/Heure" + +#: contrib/admin/views/doc.py:268 +#, fuzzy +msgid "E-mail address" +msgstr "Courriel:" + +#: contrib/admin/views/doc.py:269 contrib/admin/views/doc.py:272 +msgid "File path" +msgstr "" + +#: contrib/admin/views/doc.py:270 +#, fuzzy +msgid "Decimal number" +msgstr "Dcembre" + +#: contrib/admin/views/doc.py:276 +msgid "Boolean (Either True, False or None)" +msgstr "" + +#: contrib/admin/views/doc.py:277 +#, fuzzy +msgid "Phone number" +msgstr "Entrez un nombre entier." + +#: contrib/admin/views/doc.py:280 +msgid "String (up to 50)" +msgstr "" + +#: contrib/admin/views/doc.py:282 +msgid "Text" +msgstr "" + +#: 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" + +#: contrib/admin/views/doc.py:285 +msgid "U.S. state (two uppercase letters)" +msgstr "" + +#: contrib/admin/views/doc.py:286 +msgid "XML text" +msgstr "" + #: contrib/admin/templates/admin/object_history.html:5 #: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/base.html:29 @@ -608,10 +684,6 @@ msgstr "redirection" msgid "redirects" msgstr "redirections" -#: contrib/flatpages/models/flatpages.py:6 -msgid "URL" -msgstr "URL" - #: contrib/flatpages/models/flatpages.py:7 msgid "" "Example: '/about/contact/'. Make sure to have leading and trailing slashes." diff --git a/django/conf/locale/gl/LC_MESSAGES/django.mo b/django/conf/locale/gl/LC_MESSAGES/django.mo index 7aecb56753c0256984fcd014b00567beac398b95..14eb9896adfa6c2d23f8a6e867ede9eea9f050b9 100644 GIT binary patch delta 15 XcmX@5c}jD`XKp5Alg(ebuW|qYH\n" "Language-Team: Galego\n" @@ -77,7 +77,7 @@ msgstr "" msgid "is public" msgstr "" -#: contrib/comments/models/comments.py:26 +#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:274 #, fuzzy msgid "IP address" msgstr "Enderezo de correo electrónico:" @@ -297,6 +297,80 @@ msgstr "" msgid "log entries" msgstr "" +#: 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 "" + +#: contrib/admin/views/doc.py:263 +msgid "Boolean (Either True or False)" +msgstr "" + +#: contrib/admin/views/doc.py:264 +#, python-format +msgid "String (up to %(maxlength)s)" +msgstr "" + +#: contrib/admin/views/doc.py:265 +msgid "Comma-separated integers" +msgstr "" + +#: contrib/admin/views/doc.py:266 +#, fuzzy +msgid "Date (without time)" +msgstr "Data/hora" + +#: contrib/admin/views/doc.py:267 +#, fuzzy +msgid "Date (with time)" +msgstr "Data/hora" + +#: contrib/admin/views/doc.py:268 +#, fuzzy +msgid "E-mail address" +msgstr "Enderezo de correo electrónico:" + +#: contrib/admin/views/doc.py:269 contrib/admin/views/doc.py:272 +msgid "File path" +msgstr "" + +#: contrib/admin/views/doc.py:270 +msgid "Decimal number" +msgstr "" + +#: contrib/admin/views/doc.py:276 +msgid "Boolean (Either True, False or None)" +msgstr "" + +#: contrib/admin/views/doc.py:277 +msgid "Phone number" +msgstr "" + +#: contrib/admin/views/doc.py:280 +msgid "String (up to 50)" +msgstr "" + +#: contrib/admin/views/doc.py:282 +msgid "Text" +msgstr "" + +#: contrib/admin/views/doc.py:283 +msgid "Time" +msgstr "" + +#: contrib/admin/views/doc.py:284 contrib/flatpages/models/flatpages.py:6 +msgid "URL" +msgstr "" + +#: contrib/admin/views/doc.py:285 +msgid "U.S. state (two uppercase letters)" +msgstr "" + +#: contrib/admin/views/doc.py:286 +msgid "XML text" +msgstr "" + #: contrib/admin/templates/admin/object_history.html:5 #: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/base.html:29 @@ -592,10 +666,6 @@ msgstr "" msgid "redirects" msgstr "" -#: contrib/flatpages/models/flatpages.py:6 -msgid "URL" -msgstr "" - #: contrib/flatpages/models/flatpages.py:7 msgid "" "Example: '/about/contact/'. Make sure to have leading and trailing slashes." diff --git a/django/conf/locale/is/LC_MESSAGES/django.mo b/django/conf/locale/is/LC_MESSAGES/django.mo index e278a6a750a125b8341d7c64fc7f3a1dfb0e9895..af5c7101c17e3f25cc4cbdc5541ac0543bd3db60 100644 GIT binary patch delta 17 Zcmdnj#kjAFal;f%CS%jh(==B|0{}n?2A==` delta 17 Zcmdnj#kjAFal;f%CIj=$(==B|0{}n(2A%)_ diff --git a/django/conf/locale/is/LC_MESSAGES/django.po b/django/conf/locale/is/LC_MESSAGES/django.po index f6c4d7b6ee..f88409ab64 100644 --- a/django/conf/locale/is/LC_MESSAGES/django.po +++ b/django/conf/locale/is/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Django 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-23 11:07-0600\n" +"POT-Creation-Date: 2005-11-23 11:35-0600\n" "PO-Revision-Date: 2005-11-13 18:08-0000\n" "Last-Translator: Dagur Páll Ammendrup \n" "Language-Team: \n" @@ -80,7 +80,7 @@ msgstr "" msgid "is public" msgstr "" -#: contrib/comments/models/comments.py:26 +#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:274 #, fuzzy msgid "IP address" msgstr "tölvupóstfang" @@ -308,6 +308,82 @@ msgstr "kladdafærsla" msgid "log entries" msgstr "kladdafærslur" +#: 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 "" + +#: contrib/admin/views/doc.py:263 +msgid "Boolean (Either True or False)" +msgstr "" + +#: contrib/admin/views/doc.py:264 +#, python-format +msgid "String (up to %(maxlength)s)" +msgstr "" + +#: contrib/admin/views/doc.py:265 +msgid "Comma-separated integers" +msgstr "" + +#: contrib/admin/views/doc.py:266 +#, fuzzy +msgid "Date (without time)" +msgstr "tími aðgerðar" + +#: contrib/admin/views/doc.py:267 +#, fuzzy +msgid "Date (with time)" +msgstr "Dagsetning/tími" + +#: contrib/admin/views/doc.py:268 +#, fuzzy +msgid "E-mail address" +msgstr "Tölvupóstfang:" + +#: contrib/admin/views/doc.py:269 contrib/admin/views/doc.py:272 +msgid "File path" +msgstr "" + +#: contrib/admin/views/doc.py:270 +#, fuzzy +msgid "Decimal number" +msgstr "desember" + +#: contrib/admin/views/doc.py:276 +msgid "Boolean (Either True, False or None)" +msgstr "" + +#: contrib/admin/views/doc.py:277 +#, fuzzy +msgid "Phone number" +msgstr "Settu inn heila tölu." + +#: contrib/admin/views/doc.py:280 +msgid "String (up to 50)" +msgstr "" + +#: contrib/admin/views/doc.py:282 +msgid "Text" +msgstr "" + +#: contrib/admin/views/doc.py:283 +msgid "Time" +msgstr "" + +#: contrib/admin/views/doc.py:284 contrib/flatpages/models/flatpages.py:6 +msgid "URL" +msgstr "veffang" + +#: contrib/admin/views/doc.py:285 +msgid "U.S. state (two uppercase letters)" +msgstr "" + +#: contrib/admin/views/doc.py:286 +msgid "XML text" +msgstr "" + #: contrib/admin/templates/admin/object_history.html:5 #: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/base.html:29 @@ -606,10 +682,6 @@ msgstr "beining" msgid "redirects" msgstr "beiningar" -#: contrib/flatpages/models/flatpages.py:6 -msgid "URL" -msgstr "veffang" - #: contrib/flatpages/models/flatpages.py:7 msgid "" "Example: '/about/contact/'. Make sure to have leading and trailing slashes." diff --git a/django/conf/locale/it/LC_MESSAGES/django.mo b/django/conf/locale/it/LC_MESSAGES/django.mo index cdaff7af7249492ab9be386a9e8a08bc169a2dcd..73427cb57d005f0b74b35a812c393ad1e954a98e 100644 GIT binary patch delta 17 Zcmey`!1%R+al;*TCS%jh_td9L002ot2XO!Z delta 17 Zcmey`!1%R+al;*TCIj=$_td9L002ok2XFuY diff --git a/django/conf/locale/it/LC_MESSAGES/django.po b/django/conf/locale/it/LC_MESSAGES/django.po index 50c0ec1a13..281bc84a0c 100644 --- a/django/conf/locale/it/LC_MESSAGES/django.po +++ b/django/conf/locale/it/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-23 11:07-0600\n" +"POT-Creation-Date: 2005-11-23 11:35-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -78,7 +78,7 @@ msgstr "" msgid "is public" msgstr "" -#: contrib/comments/models/comments.py:26 +#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:274 #, fuzzy msgid "IP address" msgstr "indirizzo e-mail" @@ -306,6 +306,82 @@ msgstr "voce di log" msgid "log entries" msgstr "voci di log" +#: 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 "" + +#: contrib/admin/views/doc.py:263 +msgid "Boolean (Either True or False)" +msgstr "" + +#: contrib/admin/views/doc.py:264 +#, python-format +msgid "String (up to %(maxlength)s)" +msgstr "" + +#: contrib/admin/views/doc.py:265 +msgid "Comma-separated integers" +msgstr "" + +#: contrib/admin/views/doc.py:266 +#, fuzzy +msgid "Date (without time)" +msgstr "data azione" + +#: contrib/admin/views/doc.py:267 +#, fuzzy +msgid "Date (with time)" +msgstr "Data/ora" + +#: contrib/admin/views/doc.py:268 +#, fuzzy +msgid "E-mail address" +msgstr "Indirizzo e-mail:" + +#: contrib/admin/views/doc.py:269 contrib/admin/views/doc.py:272 +msgid "File path" +msgstr "" + +#: contrib/admin/views/doc.py:270 +#, fuzzy +msgid "Decimal number" +msgstr "Dicembre" + +#: contrib/admin/views/doc.py:276 +msgid "Boolean (Either True, False or None)" +msgstr "" + +#: contrib/admin/views/doc.py:277 +#, fuzzy +msgid "Phone number" +msgstr "Inserire un numero." + +#: contrib/admin/views/doc.py:280 +msgid "String (up to 50)" +msgstr "" + +#: contrib/admin/views/doc.py:282 +msgid "Text" +msgstr "" + +#: 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" + +#: contrib/admin/views/doc.py:285 +msgid "U.S. state (two uppercase letters)" +msgstr "" + +#: contrib/admin/views/doc.py:286 +msgid "XML text" +msgstr "" + #: contrib/admin/templates/admin/object_history.html:5 #: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/base.html:29 @@ -605,10 +681,6 @@ msgstr "redirigi" msgid "redirects" msgstr "redirezioni" -#: contrib/flatpages/models/flatpages.py:6 -msgid "URL" -msgstr "URL" - #: contrib/flatpages/models/flatpages.py:7 msgid "" "Example: '/about/contact/'. Make sure to have leading and trailing slashes." diff --git a/django/conf/locale/no/LC_MESSAGES/django.mo b/django/conf/locale/no/LC_MESSAGES/django.mo index 28df328b226aef1402a90a8bec8503bf7bb333af..7630c5fa4b077a18ecbe257616da6375b3ad5510 100644 GIT binary patch delta 17 ZcmZ3}&bX$Xal|}0sunB2R{G+ delta 17 ZcmZ3}&bX$Xal|}0sun22R;A* diff --git a/django/conf/locale/no/LC_MESSAGES/django.po b/django/conf/locale/no/LC_MESSAGES/django.po index 23c0742679..532f24eef5 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-23 11:07-0600\n" +"POT-Creation-Date: 2005-11-23 11:35-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Espen Grndhaug \n" "Language-Team: Norwegian\n" @@ -78,7 +78,7 @@ msgstr "" msgid "is public" msgstr "" -#: contrib/comments/models/comments.py:26 +#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:274 #, fuzzy msgid "IP address" msgstr "e-post adresse" @@ -306,6 +306,82 @@ msgstr "logg notis" msgid "log entries" msgstr "logg innlegg" +#: 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 "" + +#: contrib/admin/views/doc.py:263 +msgid "Boolean (Either True or False)" +msgstr "" + +#: contrib/admin/views/doc.py:264 +#, python-format +msgid "String (up to %(maxlength)s)" +msgstr "" + +#: contrib/admin/views/doc.py:265 +msgid "Comma-separated integers" +msgstr "" + +#: contrib/admin/views/doc.py:266 +#, fuzzy +msgid "Date (without time)" +msgstr "handlings 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:" + +#: contrib/admin/views/doc.py:269 contrib/admin/views/doc.py:272 +msgid "File path" +msgstr "" + +#: contrib/admin/views/doc.py:270 +#, fuzzy +msgid "Decimal number" +msgstr "Desember" + +#: contrib/admin/views/doc.py:276 +msgid "Boolean (Either True, False or None)" +msgstr "" + +#: contrib/admin/views/doc.py:277 +#, fuzzy +msgid "Phone number" +msgstr "Skriv inn et helt nummer." + +#: contrib/admin/views/doc.py:280 +msgid "String (up to 50)" +msgstr "" + +#: contrib/admin/views/doc.py:282 +msgid "Text" +msgstr "" + +#: contrib/admin/views/doc.py:283 +msgid "Time" +msgstr "" + +#: contrib/admin/views/doc.py:284 contrib/flatpages/models/flatpages.py:6 +msgid "URL" +msgstr "Internettadresse" + +#: contrib/admin/views/doc.py:285 +msgid "U.S. state (two uppercase letters)" +msgstr "" + +#: contrib/admin/views/doc.py:286 +msgid "XML text" +msgstr "" + #: contrib/admin/templates/admin/object_history.html:5 #: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/base.html:29 @@ -604,10 +680,6 @@ msgstr "omadressering" msgid "redirects" msgstr "omadresserelser" -#: contrib/flatpages/models/flatpages.py:6 -msgid "URL" -msgstr "Internettadresse" - #: contrib/flatpages/models/flatpages.py:7 msgid "" "Example: '/about/contact/'. Make sure to have leading and trailing slashes." diff --git a/django/conf/locale/pt_BR/LC_MESSAGES/django.mo b/django/conf/locale/pt_BR/LC_MESSAGES/django.mo index 395ee59f8b7b1b74f11d8e0cf99109d5e445e246..8bb9fdb9bc808cdd97ad6bcccf822e0af8da575e 100644 GIT binary patch delta 15 WcmX?Af2w}NDm5l!lg(??\n" "Language-Team: Português do Brasil \n" @@ -78,7 +78,7 @@ msgstr "" msgid "is public" msgstr "" -#: contrib/comments/models/comments.py:26 +#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:274 #, fuzzy msgid "IP address" msgstr "endereço de e-mail:" @@ -306,6 +306,82 @@ msgstr "entrada de log" msgid "log entries" msgstr "entradas de log" +#: 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 "" + +#: contrib/admin/views/doc.py:263 +msgid "Boolean (Either True or False)" +msgstr "" + +#: contrib/admin/views/doc.py:264 +#, python-format +msgid "String (up to %(maxlength)s)" +msgstr "" + +#: contrib/admin/views/doc.py:265 +msgid "Comma-separated integers" +msgstr "" + +#: contrib/admin/views/doc.py:266 +#, fuzzy +msgid "Date (without time)" +msgstr "hora da ação" + +#: contrib/admin/views/doc.py:267 +#, fuzzy +msgid "Date (with time)" +msgstr "Data/hora" + +#: contrib/admin/views/doc.py:268 +#, fuzzy +msgid "E-mail address" +msgstr "Endereço de e-mail:" + +#: contrib/admin/views/doc.py:269 contrib/admin/views/doc.py:272 +msgid "File path" +msgstr "" + +#: contrib/admin/views/doc.py:270 +#, fuzzy +msgid "Decimal number" +msgstr "Dezembro" + +#: contrib/admin/views/doc.py:276 +msgid "Boolean (Either True, False or None)" +msgstr "" + +#: contrib/admin/views/doc.py:277 +#, fuzzy +msgid "Phone number" +msgstr "Informe um número inteiro." + +#: contrib/admin/views/doc.py:280 +msgid "String (up to 50)" +msgstr "" + +#: contrib/admin/views/doc.py:282 +msgid "Text" +msgstr "" + +#: 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" + +#: contrib/admin/views/doc.py:285 +msgid "U.S. state (two uppercase letters)" +msgstr "" + +#: contrib/admin/views/doc.py:286 +msgid "XML text" +msgstr "" + #: contrib/admin/templates/admin/object_history.html:5 #: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/base.html:29 @@ -605,10 +681,6 @@ msgstr "redirecionar" msgid "redirects" msgstr "redirecionamentos" -#: contrib/flatpages/models/flatpages.py:6 -msgid "URL" -msgstr "URL" - #: contrib/flatpages/models/flatpages.py:7 msgid "" "Example: '/about/contact/'. Make sure to have leading and trailing slashes." diff --git a/django/conf/locale/ro/LC_MESSAGES/django.mo b/django/conf/locale/ro/LC_MESSAGES/django.mo index c8602854bea11da12eb9114fc10a690683e30e31..6853fcd59fc955dbab0baa2e5122703884bf085e 100644 GIT binary patch delta 17 YcmX@n%6Oucal\n" "Language-Team: Romanian \n" @@ -78,7 +78,7 @@ msgstr "" msgid "is public" msgstr "" -#: contrib/comments/models/comments.py:26 +#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:274 #, fuzzy msgid "IP address" msgstr "adresa email" @@ -306,6 +306,82 @@ msgstr "intrare log" msgid "log entries" msgstr "intrări log" +#: 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 "" + +#: contrib/admin/views/doc.py:263 +msgid "Boolean (Either True or False)" +msgstr "" + +#: contrib/admin/views/doc.py:264 +#, python-format +msgid "String (up to %(maxlength)s)" +msgstr "" + +#: contrib/admin/views/doc.py:265 +msgid "Comma-separated integers" +msgstr "" + +#: contrib/admin/views/doc.py:266 +#, fuzzy +msgid "Date (without time)" +msgstr "timp acţiune" + +#: contrib/admin/views/doc.py:267 +#, fuzzy +msgid "Date (with time)" +msgstr "Dată/oră" + +#: contrib/admin/views/doc.py:268 +#, fuzzy +msgid "E-mail address" +msgstr "Adresa email:" + +#: contrib/admin/views/doc.py:269 contrib/admin/views/doc.py:272 +msgid "File path" +msgstr "" + +#: contrib/admin/views/doc.py:270 +#, fuzzy +msgid "Decimal number" +msgstr "Decembrie" + +#: contrib/admin/views/doc.py:276 +msgid "Boolean (Either True, False or None)" +msgstr "" + +#: contrib/admin/views/doc.py:277 +#, fuzzy +msgid "Phone number" +msgstr "Introduceţi un număr întreg." + +#: contrib/admin/views/doc.py:280 +msgid "String (up to 50)" +msgstr "" + +#: contrib/admin/views/doc.py:282 +msgid "Text" +msgstr "" + +#: 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" + +#: contrib/admin/views/doc.py:285 +msgid "U.S. state (two uppercase letters)" +msgstr "" + +#: contrib/admin/views/doc.py:286 +msgid "XML text" +msgstr "" + #: contrib/admin/templates/admin/object_history.html:5 #: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/base.html:29 @@ -604,10 +680,6 @@ msgstr "redirectare" msgid "redirects" msgstr "redictări" -#: contrib/flatpages/models/flatpages.py:6 -msgid "URL" -msgstr "URL" - #: contrib/flatpages/models/flatpages.py:7 msgid "" "Example: '/about/contact/'. Make sure to have leading and trailing slashes." diff --git a/django/conf/locale/ru/LC_MESSAGES/django.mo b/django/conf/locale/ru/LC_MESSAGES/django.mo index b7bddf0985371bb2e79c5d163d62e4908b4955fc..fe6ae8b76db4158dcf9b860683431120cbdccbbb 100644 GIT binary patch delta 15 WcmX??eJ*=Lgd&r%$>u1<5)lA4kp;T| delta 15 WcmX??eJ*=Lgd&rH+2$z45)lA4hy}U; diff --git a/django/conf/locale/ru/LC_MESSAGES/django.po b/django/conf/locale/ru/LC_MESSAGES/django.po index 4d9bcf30d5..8f78049cd1 100644 --- a/django/conf/locale/ru/LC_MESSAGES/django.po +++ b/django/conf/locale/ru/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-23 11:06-0600\n" +"POT-Creation-Date: 2005-11-23 11:34-0600\n" "PO-Revision-Date: 2005-10-05 00:00\n" "Last-Translator: Dmitry Sorokin \n" "Language-Team: LANGUAGE \n" @@ -76,7 +76,7 @@ msgstr "" msgid "is public" msgstr "" -#: contrib/comments/models/comments.py:26 +#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:274 #, fuzzy msgid "IP address" msgstr "E-mail :" @@ -305,6 +305,82 @@ msgstr "" msgid "log entries" msgstr "" +#: 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 "" + +#: contrib/admin/views/doc.py:263 +msgid "Boolean (Either True or False)" +msgstr "" + +#: contrib/admin/views/doc.py:264 +#, python-format +msgid "String (up to %(maxlength)s)" +msgstr "" + +#: contrib/admin/views/doc.py:265 +msgid "Comma-separated integers" +msgstr "" + +#: contrib/admin/views/doc.py:266 +#, fuzzy +msgid "Date (without time)" +msgstr "/" + +#: contrib/admin/views/doc.py:267 +#, fuzzy +msgid "Date (with time)" +msgstr "/" + +#: contrib/admin/views/doc.py:268 +#, fuzzy +msgid "E-mail address" +msgstr "E-mail :" + +#: contrib/admin/views/doc.py:269 contrib/admin/views/doc.py:272 +msgid "File path" +msgstr "" + +#: contrib/admin/views/doc.py:270 +#, fuzzy +msgid "Decimal number" +msgstr "" + +#: contrib/admin/views/doc.py:276 +msgid "Boolean (Either True, False or None)" +msgstr "" + +#: contrib/admin/views/doc.py:277 +#, fuzzy +msgid "Phone number" +msgstr " " + +#: contrib/admin/views/doc.py:280 +msgid "String (up to 50)" +msgstr "" + +#: contrib/admin/views/doc.py:282 +msgid "Text" +msgstr "" + +#: 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" + +#: contrib/admin/views/doc.py:285 +msgid "U.S. state (two uppercase letters)" +msgstr "" + +#: contrib/admin/views/doc.py:286 +msgid "XML text" +msgstr "" + #: contrib/admin/templates/admin/object_history.html:5 #: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/base.html:29 @@ -603,10 +679,6 @@ msgstr " msgid "redirects" msgstr "" -#: contrib/flatpages/models/flatpages.py:6 -msgid "URL" -msgstr "URL" - #: contrib/flatpages/models/flatpages.py:7 msgid "" "Example: '/about/contact/'. Make sure to have leading and trailing slashes." diff --git a/django/conf/locale/sk/LC_MESSAGES/django.mo b/django/conf/locale/sk/LC_MESSAGES/django.mo index d8c73fe6477b2c5a97ec9e8ab3499ceb31cd32e5..2979161d55cb929dac4559384f6fdc6ebba3e9b3 100644 GIT binary patch delta 17 ZcmccL&v?I|al->`CS%jhkF@_v0{}^b2iyPv delta 17 ZcmccL&v?I|al->`CIj=$kF@_v0{}^S2ipJu diff --git a/django/conf/locale/sk/LC_MESSAGES/django.po b/django/conf/locale/sk/LC_MESSAGES/django.po index f890bcc34b..721a0f78c7 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-23 11:07-0600\n" +"POT-Creation-Date: 2005-11-23 11:35-0600\n" "PO-Revision-Date: 2005-11-10 23:22-0500\n" "Last-Translator: Vladimir Labath \n" "Language-Team: Slovak \n" @@ -78,7 +78,7 @@ msgstr "" msgid "is public" msgstr "" -#: contrib/comments/models/comments.py:26 +#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:274 #, fuzzy msgid "IP address" msgstr "emailová adresa" @@ -306,6 +306,82 @@ msgstr "záznam priebehu" msgid "log entries" msgstr "záznamy priebehu" +#: 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 "" + +#: contrib/admin/views/doc.py:263 +msgid "Boolean (Either True or False)" +msgstr "" + +#: contrib/admin/views/doc.py:264 +#, python-format +msgid "String (up to %(maxlength)s)" +msgstr "" + +#: contrib/admin/views/doc.py:265 +msgid "Comma-separated integers" +msgstr "" + +#: contrib/admin/views/doc.py:266 +#, fuzzy +msgid "Date (without time)" +msgstr "čas udalosti" + +#: contrib/admin/views/doc.py:267 +#, fuzzy +msgid "Date (with time)" +msgstr "Dátum/čas" + +#: contrib/admin/views/doc.py:268 +#, fuzzy +msgid "E-mail address" +msgstr "E-mailová adresa" + +#: contrib/admin/views/doc.py:269 contrib/admin/views/doc.py:272 +msgid "File path" +msgstr "" + +#: contrib/admin/views/doc.py:270 +#, fuzzy +msgid "Decimal number" +msgstr "December" + +#: contrib/admin/views/doc.py:276 +msgid "Boolean (Either True, False or None)" +msgstr "" + +#: contrib/admin/views/doc.py:277 +#, fuzzy +msgid "Phone number" +msgstr "Vložte celé číslo." + +#: contrib/admin/views/doc.py:280 +msgid "String (up to 50)" +msgstr "" + +#: contrib/admin/views/doc.py:282 +msgid "Text" +msgstr "" + +#: 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" + +#: contrib/admin/views/doc.py:285 +msgid "U.S. state (two uppercase letters)" +msgstr "" + +#: contrib/admin/views/doc.py:286 +msgid "XML text" +msgstr "" + #: contrib/admin/templates/admin/object_history.html:5 #: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/base.html:29 @@ -603,10 +679,6 @@ msgstr "presmerovanie" msgid "redirects" msgstr "presmerovania" -#: contrib/flatpages/models/flatpages.py:6 -msgid "URL" -msgstr "URL" - #: contrib/flatpages/models/flatpages.py:7 msgid "" "Example: '/about/contact/'. Make sure to have leading and trailing slashes." diff --git a/django/conf/locale/sr/LC_MESSAGES/django.mo b/django/conf/locale/sr/LC_MESSAGES/django.mo index ba0a45232f2ef0d74fe72af3903c61441ace274f..f1943fa871e26541e829e8938b1f2452ecac997e 100644 GIT binary patch delta 17 Ycmey+#`vL)aYK_Pld;L>7R@)307WMU7ytkO delta 17 Ycmey+#`vL)aYK_PlY!ah7R@)307V`L7XSbN diff --git a/django/conf/locale/sr/LC_MESSAGES/django.po b/django/conf/locale/sr/LC_MESSAGES/django.po index cc76c741bc..2b729e0597 100644 --- a/django/conf/locale/sr/LC_MESSAGES/django.po +++ b/django/conf/locale/sr/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Django Serbian (latin) translation v1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-23 11:06-0600\n" +"POT-Creation-Date: 2005-11-23 11:34-0600\n" "PO-Revision-Date: 2005-11-13 19:21+0100\n" "Last-Translator: Nebojša Đorđević \n" "Language-Team: Nesh & Petar \n" "Language-Team: LANGUAGE \n" @@ -78,7 +78,7 @@ msgstr "" msgid "is public" msgstr "" -#: contrib/comments/models/comments.py:26 +#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:274 #, fuzzy msgid "IP address" msgstr "e-postadress" @@ -306,6 +306,82 @@ msgstr "loggpost" msgid "log entries" msgstr "loggpost" +#: 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 "" + +#: contrib/admin/views/doc.py:263 +msgid "Boolean (Either True or False)" +msgstr "" + +#: contrib/admin/views/doc.py:264 +#, python-format +msgid "String (up to %(maxlength)s)" +msgstr "" + +#: contrib/admin/views/doc.py:265 +msgid "Comma-separated integers" +msgstr "" + +#: contrib/admin/views/doc.py:266 +#, fuzzy +msgid "Date (without time)" +msgstr "tid för händelse" + +#: contrib/admin/views/doc.py:267 +#, fuzzy +msgid "Date (with time)" +msgstr "Datum/tid" + +#: contrib/admin/views/doc.py:268 +#, fuzzy +msgid "E-mail address" +msgstr "E-postadress:" + +#: contrib/admin/views/doc.py:269 contrib/admin/views/doc.py:272 +msgid "File path" +msgstr "" + +#: contrib/admin/views/doc.py:270 +#, fuzzy +msgid "Decimal number" +msgstr "december" + +#: contrib/admin/views/doc.py:276 +msgid "Boolean (Either True, False or None)" +msgstr "" + +#: contrib/admin/views/doc.py:277 +#, fuzzy +msgid "Phone number" +msgstr "Fyll i ett heltal." + +#: contrib/admin/views/doc.py:280 +msgid "String (up to 50)" +msgstr "" + +#: contrib/admin/views/doc.py:282 +msgid "Text" +msgstr "" + +#: 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" + +#: contrib/admin/views/doc.py:285 +msgid "U.S. state (two uppercase letters)" +msgstr "" + +#: contrib/admin/views/doc.py:286 +msgid "XML text" +msgstr "" + #: contrib/admin/templates/admin/object_history.html:5 #: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/base.html:29 @@ -606,10 +682,6 @@ msgstr "vidarebefodra" msgid "redirects" msgstr "vidarebefodringar" -#: contrib/flatpages/models/flatpages.py:6 -msgid "URL" -msgstr "URL" - #: contrib/flatpages/models/flatpages.py:7 msgid "" "Example: '/about/contact/'. Make sure to have leading and trailing slashes." diff --git a/django/conf/locale/zh_CN/LC_MESSAGES/django.mo b/django/conf/locale/zh_CN/LC_MESSAGES/django.mo index 62a0cee95a2c24354ef77660e21bc87c5c854468..70e29ea3ba994661459d17bcb8b76df839178e72 100644 GIT binary patch delta 17 YcmZ3}!nme|af7TDld;KWc`aTE05y07\n" "Language-Team: Simplified Chinese \n" @@ -81,7 +81,7 @@ msgstr "" msgid "is public" msgstr "" -#: contrib/comments/models/comments.py:26 +#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:274 #, fuzzy msgid "IP address" msgstr "邮件地址" @@ -308,6 +308,82 @@ msgstr "日志记录" msgid "log entries" msgstr "日志记录" +#: 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 "" + +#: contrib/admin/views/doc.py:263 +msgid "Boolean (Either True or False)" +msgstr "" + +#: contrib/admin/views/doc.py:264 +#, python-format +msgid "String (up to %(maxlength)s)" +msgstr "" + +#: contrib/admin/views/doc.py:265 +msgid "Comma-separated integers" +msgstr "" + +#: contrib/admin/views/doc.py:266 +#, fuzzy +msgid "Date (without time)" +msgstr "动作时间" + +#: contrib/admin/views/doc.py:267 +#, fuzzy +msgid "Date (with time)" +msgstr "日期/时间" + +#: contrib/admin/views/doc.py:268 +#, fuzzy +msgid "E-mail address" +msgstr "邮箱地址：" + +#: contrib/admin/views/doc.py:269 contrib/admin/views/doc.py:272 +msgid "File path" +msgstr "" + +#: contrib/admin/views/doc.py:270 +#, fuzzy +msgid "Decimal number" +msgstr "十二月" + +#: contrib/admin/views/doc.py:276 +msgid "Boolean (Either True, False or None)" +msgstr "" + +#: contrib/admin/views/doc.py:277 +#, fuzzy +msgid "Phone number" +msgstr "输入整数。" + +#: contrib/admin/views/doc.py:280 +msgid "String (up to 50)" +msgstr "" + +#: contrib/admin/views/doc.py:282 +msgid "Text" +msgstr "" + +#: contrib/admin/views/doc.py:283 +msgid "Time" +msgstr "" + +#: contrib/admin/views/doc.py:284 contrib/flatpages/models/flatpages.py:6 +msgid "URL" +msgstr "" + +#: contrib/admin/views/doc.py:285 +msgid "U.S. state (two uppercase letters)" +msgstr "" + +#: contrib/admin/views/doc.py:286 +msgid "XML text" +msgstr "" + #: contrib/admin/templates/admin/object_history.html:5 #: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/base.html:29 @@ -597,10 +673,6 @@ msgstr "重定向" msgid "redirects" msgstr "重定向" -#: contrib/flatpages/models/flatpages.py:6 -msgid "URL" -msgstr "" - #: contrib/flatpages/models/flatpages.py:7 msgid "" "Example: '/about/contact/'. Make sure to have leading and trailing slashes." From fce688cc743bd77c8e415c5a7a409b5fe211e6f7 Mon Sep 17 00:00:00 2001 From: Adrian Holovaty Date: Wed, 23 Nov 2005 21:13:00 +0000 Subject: [PATCH 08/13] Fixed #886 -- timesince utility now supports microseconds. Thanks, Aaron Swartz git-svn-id: http://code.djangoproject.com/svn/django/trunk@1374 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/utils/timesince.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/django/utils/timesince.py b/django/utils/timesince.py index b1df997e2e..89af456e96 100644 --- a/django/utils/timesince.py +++ b/django/utils/timesince.py @@ -1,4 +1,4 @@ -import datetime, time +import datetime, math, time from django.utils.tzinfo import LocalTimezone from django.utils.translation import ngettext @@ -30,6 +30,8 @@ def timesince(d, now=None): count = since / seconds if count != 0: break + if count < 0: + return '%d milliseconds' % math.floor(delta.microseconds / 1000) s = '%d %s' % (count, name(count)) if i + 1 < len(chunks): # Now get the second item From 08a494c40d33552133fbbe40116d9315c8b9560c Mon Sep 17 00:00:00 2001 From: Adrian Holovaty Date: Wed, 23 Nov 2005 21:44:48 +0000 Subject: [PATCH 09/13] Added better error handling for trailing periods in URLconf include()s git-svn-id: http://code.djangoproject.com/svn/django/trunk@1376 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/core/urlresolvers.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/django/core/urlresolvers.py b/django/core/urlresolvers.py index 2a0dda38b8..95cc914676 100644 --- a/django/core/urlresolvers.py +++ b/django/core/urlresolvers.py @@ -7,7 +7,7 @@ a string) and returns a tuple in this format: (view_function, dict_of_view_function_args) """ -from django.core.exceptions import Http404, ViewDoesNotExist +from django.core.exceptions import Http404, ImproperlyConfigured, ViewDoesNotExist import re class Resolver404(Http404): @@ -74,7 +74,11 @@ class RegexURLResolver(object): try: return self._urlconf_module except AttributeError: - self._urlconf_module = __import__(self.urlconf_name, '', '', ['']) + try: + self._urlconf_module = __import__(self.urlconf_name, '', '', ['']) + except ValueError, e: + # Invalid urlconf_name, such as "foo.bar." (note trailing period) + raise ImproperlyConfigured, "Error while importing URLconf %r: %s" % (self.urlconf_name, e) return self._urlconf_module urlconf_module = property(_get_urlconf_module) From cfc5786d03f3dc190f3ed1606edc3a196f16915e Mon Sep 17 00:00:00 2001 From: Adrian Holovaty Date: Wed, 23 Nov 2005 21:56:21 +0000 Subject: [PATCH 10/13] Fixed missing {% load i18n %} tag in comments FREE_COMMENT_FORM template git-svn-id: http://code.djangoproject.com/svn/django/trunk@1378 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/contrib/comments/templatetags/comments.py | 1 + 1 file changed, 1 insertion(+) diff --git a/django/contrib/comments/templatetags/comments.py b/django/contrib/comments/templatetags/comments.py index 72c586e206..126009a5b9 100644 --- a/django/contrib/comments/templatetags/comments.py +++ b/django/contrib/comments/templatetags/comments.py @@ -44,6 +44,7 @@ COMMENT_FORM = ''' ''' FREE_COMMENT_FORM = ''' +{% load i18n %} {% if display_form %}

{% trans "Your name:" %}

From 5d863f1fbd26537a8bca2920bc591279d15fbdf1 Mon Sep 17 00:00:00 2001 From: Adrian Holovaty Date: Wed, 23 Nov 2005 23:10:17 +0000 Subject: [PATCH 11/13] Fixed #603 -- Added template debugging errors to pretty error-page output, if TEMPLATE_DEBUG setting is True. Also refactored FilterParser for a significant speed increase and changed the template_loader interface so that it returns information about the loader. Taken from new-admin. Thanks rjwittams and crew git-svn-id: http://code.djangoproject.com/svn/django/trunk@1379 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/conf/global_settings.py | 1 + django/conf/project_template/settings.py | 1 + django/core/template/__init__.py | 484 +++++++++++------- django/core/template/defaulttags.py | 5 +- django/core/template/loader.py | 47 +- .../core/template/loaders/app_directories.py | 2 +- django/core/template/loaders/eggs.py | 2 +- django/core/template/loaders/filesystem.py | 2 +- django/views/debug.py | 125 +++-- tests/othertests/templates.py | 24 +- 10 files changed, 454 insertions(+), 239 deletions(-) diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py index a272f01970..565f72cfaf 100644 --- a/django/conf/global_settings.py +++ b/django/conf/global_settings.py @@ -8,6 +8,7 @@ from django.utils.translation import gettext_lazy as _ #################### DEBUG = False +TEMPLATE_DEBUG = False # Whether to use the "Etag" header. This saves bandwidth but slows down performance. USE_ETAGS = False diff --git a/django/conf/project_template/settings.py b/django/conf/project_template/settings.py index eaeeb56a53..5135508f0f 100644 --- a/django/conf/project_template/settings.py +++ b/django/conf/project_template/settings.py @@ -1,6 +1,7 @@ # Django settings for {{ project_name }} project. DEBUG = True +TEMPLATE_DEBUG = DEBUG ADMINS = ( # ('Your Name', 'your_email@domain.com'), diff --git a/django/core/template/__init__.py b/django/core/template/__init__.py index c007e4bc80..5cb4e0a1c6 100644 --- a/django/core/template/__init__.py +++ b/django/core/template/__init__.py @@ -55,7 +55,7 @@ times with multiple contexts) '\n\n\n\n' """ import re -from django.conf.settings import DEFAULT_CHARSET +from django.conf.settings import DEFAULT_CHARSET, TEMPLATE_DEBUG __all__ = ('Template','Context','compile_string') @@ -74,6 +74,10 @@ VARIABLE_TAG_END = '}}' ALLOWED_VARIABLE_CHARS = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_.' +# what to report as the origin for templates that come from non-loader sources +# (e.g. strings) +UNKNOWN_SOURCE="" + # match a variable or block tag and capture the entire tag, including start/end delimiters tag_re = re.compile('(%s.*?%s|%s.*?%s)' % (re.escape(BLOCK_TAG_START), re.escape(BLOCK_TAG_END), re.escape(VARIABLE_TAG_START), re.escape(VARIABLE_TAG_END))) @@ -101,10 +105,32 @@ class SilentVariableFailure(Exception): "Any function raising this exception will be ignored by resolve_variable" pass +class Origin(object): + def __init__(self, name): + self.name = name + + def reload(self): + raise NotImplementedException + + def __str__(self): + return self.name + +class StringOrigin(Origin): + def __init__(self, source): + super(StringOrigin, self).__init__(UNKNOWN_SOURCE) + self.source = source + + def reload(self): + return self.source + class Template: - def __init__(self, template_string): + def __init__(self, template_string, origin=None): "Compilation stage" - self.nodelist = compile_string(template_string) + if TEMPLATE_DEBUG and origin == None: + origin = StringOrigin(template_string) + # Could do some crazy stack-frame stuff to record where this string + # came from... + self.nodelist = compile_string(template_string, origin) def __iter__(self): for node in self.nodelist: @@ -115,10 +141,10 @@ class Template: "Display stage -- can be called many times" return self.nodelist.render(context) -def compile_string(template_string): +def compile_string(template_string, origin): "Compiles template_string into NodeList ready for rendering" - tokens = tokenize(template_string) - parser = Parser(tokens) + lexer = lexer_factory(template_string, origin) + parser = parser_factory(lexer.tokenize()) return parser.parse() class Context: @@ -163,6 +189,12 @@ class Context: return True return False + def get(self, key, otherwise): + for dict in self.dicts: + if dict.has_key(key): + return dict[key] + return otherwise + def update(self, other_dict): "Like dict.update(). Pushes an entire dictionary's keys and values onto the context." self.dicts = [other_dict] + self.dicts @@ -174,39 +206,76 @@ class Token: def __str__(self): return '<%s token: "%s...">' % ( - {TOKEN_TEXT:'Text', TOKEN_VAR:'Var', TOKEN_BLOCK:'Block'}[self.token_type], + {TOKEN_TEXT: 'Text', TOKEN_VAR: 'Var', TOKEN_BLOCK: 'Block'}[self.token_type], self.contents[:20].replace('\n', '') ) -def tokenize(template_string): - "Return a list of tokens from a given template_string" - # remove all empty strings, because the regex has a tendency to add them - bits = filter(None, tag_re.split(template_string)) - return map(create_token, bits) + def __repr__(self): + return '<%s token: "%s">' % ( + {TOKEN_TEXT: 'Text', TOKEN_VAR: 'Var', TOKEN_BLOCK: 'Block'}[self.token_type], + self.contents[:].replace('\n', '') + ) -def create_token(token_string): - "Convert the given token string into a new Token object and return it" - if token_string.startswith(VARIABLE_TAG_START): - return Token(TOKEN_VAR, token_string[len(VARIABLE_TAG_START):-len(VARIABLE_TAG_END)].strip()) - elif token_string.startswith(BLOCK_TAG_START): - return Token(TOKEN_BLOCK, token_string[len(BLOCK_TAG_START):-len(BLOCK_TAG_END)].strip()) - else: - return Token(TOKEN_TEXT, token_string) +class Lexer(object): + def __init__(self, template_string, origin): + self.template_string = template_string + self.origin = origin -class Parser: + def tokenize(self): + "Return a list of tokens from a given template_string" + # remove all empty strings, because the regex has a tendency to add them + bits = filter(None, tag_re.split(self.template_string)) + return map(self.create_token, bits) + + def create_token(self,token_string): + "Convert the given token string into a new Token object and return it" + if token_string.startswith(VARIABLE_TAG_START): + token = Token(TOKEN_VAR, token_string[len(VARIABLE_TAG_START):-len(VARIABLE_TAG_END)].strip()) + elif token_string.startswith(BLOCK_TAG_START): + token = Token(TOKEN_BLOCK, token_string[len(BLOCK_TAG_START):-len(BLOCK_TAG_END)].strip()) + else: + token = Token(TOKEN_TEXT, token_string) + return token + +class DebugLexer(Lexer): + def __init__(self, template_string, origin): + super(DebugLexer, self).__init__(template_string, origin) + + def tokenize(self): + "Return a list of tokens from a given template_string" + token_tups, upto = [], 0 + for match in tag_re.finditer(self.template_string): + start, end = match.span() + if start > upto: + token_tups.append( (self.template_string[upto:start], (upto, start)) ) + upto = start + token_tups.append( (self.template_string[start:end], (start,end)) ) + upto = end + last_bit = self.template_string[upto:] + if last_bit: + token_tups.append( (last_bit, (upto, upto + len(last_bit))) ) + return [self.create_token(tok, (self.origin, loc)) for tok, loc in token_tups] + + def create_token(self, token_string, source): + token = super(DebugLexer, self).create_token(token_string) + token.source = source + return token + +class Parser(object): def __init__(self, tokens): self.tokens = tokens def parse(self, parse_until=[]): - nodelist = NodeList() + nodelist = self.create_nodelist() while self.tokens: token = self.next_token() if token.token_type == TOKEN_TEXT: - nodelist.append(TextNode(token.contents)) + self.extend_nodelist(nodelist, TextNode(token.contents), token) elif token.token_type == TOKEN_VAR: if not token.contents: - raise TemplateSyntaxError, "Empty variable tag" - nodelist.append(VariableNode(token.contents)) + self.empty_variable(token) + var_node = self.create_variable_node(token.contents) + self.extend_nodelist(nodelist, var_node,token) elif token.token_type == TOKEN_BLOCK: if token.contents in parse_until: # put token back on token list so calling code knows why it terminated @@ -215,16 +284,57 @@ class Parser: try: command = token.contents.split()[0] except IndexError: - raise TemplateSyntaxError, "Empty block tag" + self.empty_block_tag(token) + # execute callback function for this tag and append resulting node + self.enter_command(command, token) try: - # execute callback function for this tag and append resulting node - nodelist.append(registered_tags[command](self, token)) + compile_func = registered_tags[command] except KeyError: - raise TemplateSyntaxError, "Invalid block tag: '%s'" % command + self.invalid_block_tag(token, command) + try: + compiled_result = compile_func(self, token) + except TemplateSyntaxError, e: + if not self.compile_function_error(token, e): + raise + self.extend_nodelist(nodelist, compiled_result, token) + self.exit_command() if parse_until: - raise TemplateSyntaxError, "Unclosed tag(s): '%s'" % ', '.join(parse_until) + self.unclosed_block_tag(parse_until) return nodelist + def create_variable_node(self, contents): + return VariableNode(contents) + + def create_nodelist(self): + return NodeList() + + def extend_nodelist(self, nodelist, node, token): + nodelist.append(node) + + def enter_command(self, command, token): + pass + + def exit_command(self): + pass + + def error(self, token, msg ): + return TemplateSyntaxError(msg) + + def empty_variable(self, token): + raise self.error( token, "Empty variable tag") + + def empty_block_tag(self, token): + raise self.error( token, "Empty block tag") + + def invalid_block_tag(self, token, command): + raise self.error( token, "Invalid block tag: '%s'" % command) + + def unclosed_block_tag(self, parse_until): + raise self.error(None, "Unclosed tags: %s " % ', '.join(parse_until)) + + def compile_function_error(self, token, e): + pass + def next_token(self): return self.tokens.pop(0) @@ -234,6 +344,51 @@ class Parser: def delete_first_token(self): del self.tokens[0] +class DebugParser(Parser): + def __init__(self, lexer): + super(DebugParser, self).__init__(lexer) + self.command_stack = [] + + def enter_command(self, command, token): + self.command_stack.append( (command, token.source) ) + + def exit_command(self): + self.command_stack.pop() + + def error(self, token, msg): + return self.source_error(token.source, msg) + + def source_error(self, source,msg): + e = TemplateSyntaxError(msg) + e.source = source + return e + + def create_nodelist(self): + return DebugNodeList() + + def create_variable_node(self, contents): + return DebugVariableNode(contents) + + def extend_nodelist(self, nodelist, node, token): + node.source = token.source + super(DebugParser, self).extend_nodelist(nodelist, node, token) + + def unclosed_block_tag(self, parse_until): + (command, source) = self.command_stack.pop() + msg = "Unclosed tag '%s'. Looking for one of: %s " % (command, ', '.join(parse_until)) + raise self.source_error( source, msg) + + def compile_function_error(self, token, e): + if not hasattr(e, 'source'): + e.source = token.source + +if TEMPLATE_DEBUG: + lexer_factory = DebugLexer + parser_factory = DebugParser +else: + lexer_factory = Lexer + parser_factory = Parser + class TokenParser: """ Subclass this and implement the top() method to parse a template line. When @@ -316,7 +471,34 @@ class TokenParser: self.pointer = i return s -class FilterParser: + + + +filter_raw_string = r""" +^%(i18n_open)s"(?P%(str)s)"%(i18n_close)s| +^"(?P%(str)s)"| +^(?P[%(var_chars)s]+)| + (?:%(filter_sep)s + (?P\w+) + (?:%(arg_sep)s + (?: + %(i18n_open)s"(?P%(str)s)"%(i18n_close)s| + "(?P%(str)s)" + ) + )? + )""" % { + 'str': r"""[^"\\]*(?:\\.[^"\\]*)*""", + 'var_chars': "A-Za-z0-9\_\." , + 'filter_sep': re.escape(FILTER_SEPARATOR), + 'arg_sep': re.escape(FILTER_ARGUMENT_SEPARATOR), + 'i18n_open' : re.escape("_("), + 'i18n_close' : re.escape(")"), + } + +filter_raw_string = filter_raw_string.replace("\n", "").replace(" ", "") +filter_re = re.compile(filter_raw_string) + +class FilterParser(object): """ Parses a variable token and its optional filters (all as a single string), and return a list of tuples of the filter name and arguments. @@ -331,162 +513,45 @@ class FilterParser: This class should never be instantiated outside of the get_filters_from_token helper function. """ - def __init__(self, s): - self.s = s - self.i = -1 - self.current = '' - self.filters = [] - self.current_filter_name = None - self.current_filter_arg = None - # First read the variable part. Decide whether we need to parse a - # string or a variable by peeking into the stream. - if self.peek_char() in ('_', '"', "'"): - self.var = self.read_constant_string_token() - else: - self.var = self.read_alphanumeric_token() - if not self.var: - raise TemplateSyntaxError, "Could not read variable name: '%s'" % self.s - if self.var.find(VARIABLE_ATTRIBUTE_SEPARATOR + '_') > -1 or self.var[0] == '_': - raise TemplateSyntaxError, "Variables and attributes may not begin with underscores: '%s'" % self.var - # Have we reached the end? - if self.current is None: - return - if self.current != FILTER_SEPARATOR: - raise TemplateSyntaxError, "Bad character (expecting '%s') '%s'" % (FILTER_SEPARATOR, self.current) - # We have a filter separator; start reading the filters - self.read_filters() - - def peek_char(self): - try: - return self.s[self.i+1] - except IndexError: - return None - - def next_char(self): - self.i = self.i + 1 - try: - self.current = self.s[self.i] - except IndexError: - self.current = None - - def read_constant_string_token(self): - """ - Reads a constant string that must be delimited by either " or ' - characters. The string is returned with its delimiters. - """ - val = '' - qchar = None - i18n = False - self.next_char() - if self.current == '_': - i18n = True - self.next_char() - if self.current != '(': - raise TemplateSyntaxError, "Bad character (expecting '(') '%s'" % self.current - self.next_char() - if not self.current in ('"', "'"): - raise TemplateSyntaxError, "Bad character (expecting '\"' or ''') '%s'" % self.current - qchar = self.current - val += qchar - while 1: - self.next_char() - if self.current == qchar: - break - val += self.current - val += self.current - self.next_char() - if i18n: - if self.current != ')': - raise TemplateSyntaxError, "Bad character (expecting ')') '%s'" % self.current - self.next_char() - val = qchar+_(val.strip(qchar))+qchar - return val - - def read_alphanumeric_token(self): - """ - Reads a variable name or filter name, which are continuous strings of - alphanumeric characters + the underscore. - """ - var = '' - while 1: - self.next_char() - if self.current is None: - break - if self.current not in ALLOWED_VARIABLE_CHARS: - break - var += self.current - return var - - def read_filters(self): - while 1: - filter_name, arg = self.read_filter() - if not registered_filters.has_key(filter_name): - raise TemplateSyntaxError, "Invalid filter: '%s'" % filter_name - if registered_filters[filter_name][1] == True and arg is None: - raise TemplateSyntaxError, "Filter '%s' requires an argument" % filter_name - if registered_filters[filter_name][1] == False and arg is not None: - raise TemplateSyntaxError, "Filter '%s' should not have an argument (argument is %r)" % (filter_name, arg) - self.filters.append((filter_name, arg)) - if self.current is None: - break - - def read_filter(self): - self.current_filter_name = self.read_alphanumeric_token() - self.current_filter_arg = None - # Have we reached the end? - if self.current is None: - return (self.current_filter_name, None) - # Does the filter have an argument? - if self.current == FILTER_ARGUMENT_SEPARATOR: - self.current_filter_arg = self.read_arg() - return (self.current_filter_name, self.current_filter_arg) - # Next thing MUST be a pipe - if self.current != FILTER_SEPARATOR: - raise TemplateSyntaxError, "Bad character (expecting '%s') '%s'" % (FILTER_SEPARATOR, self.current) - return (self.current_filter_name, self.current_filter_arg) - - def read_arg(self): - # First read a " or a _(" - self.next_char() - translated = False - if self.current == '_': - self.next_char() - if self.current != '(': - raise TemplateSyntaxError, "Bad character (expecting '(') '%s'" % self.current - translated = True - self.next_char() - if self.current != '"': - raise TemplateSyntaxError, "Bad character (expecting '\"') '%s'" % self.current - self.escaped = False - arg = '' - while 1: - self.next_char() - if self.current == '"' and not self.escaped: - break - if self.current == '\\' and not self.escaped: - self.escaped = True - continue - if self.current == '\\' and self.escaped: - arg += '\\' - self.escaped = False - continue - if self.current == '"' and self.escaped: - arg += '"' - self.escaped = False - continue - if self.escaped and self.current not in '\\"': - raise TemplateSyntaxError, "Unescaped backslash in '%s'" % self.s - if self.current is None: - raise TemplateSyntaxError, "Unexpected end of argument in '%s'" % self.s - arg += self.current - # self.current must now be '"' - self.next_char() - if translated: - if self.current != ')': - raise TemplateSyntaxError, "Bad character (expecting ')') '%s'" % self.current - self.next_char() - arg = _(arg) - return arg + def __init__(self, token): + matches = filter_re.finditer(token) + var = None + filters = [] + upto = 0 + for match in matches: + start = match.start() + if upto != start: + raise TemplateSyntaxError, "Could not parse some characters: %s|%s|%s" % \ + (token[:upto], token[upto:start], token[start:]) + if var == None: + var, constant, i18n_constant = match.group("var", "constant", "i18n_constant") + if i18n_constant: + var = '"%s"' % _(i18n_constant) + elif constant: + var = '"%s"' % constant + upto = match.end() + if var == None: + raise TemplateSyntaxError, "Could not find variable at start of %s" % token + elif var.find(VARIABLE_ATTRIBUTE_SEPARATOR + '_') > -1 or var[0] == '_': + raise TemplateSyntaxError, "Variables and attributes may not begin with underscores: '%s'" % var + else: + filter_name = match.group("filter_name") + arg, i18n_arg = match.group("arg","i18n_arg") + if i18n_arg: + arg =_(i18n_arg.replace('\\', '')) + if arg: + arg = arg.replace('\\', '') + if not registered_filters.has_key(filter_name): + raise TemplateSyntaxError, "Invalid filter: '%s'" % filter_name + if registered_filters[filter_name][1] == True and arg is None: + raise TemplateSyntaxError, "Filter '%s' requires an argument" % filter_name + if registered_filters[filter_name][1] == False and arg is not None: + raise TemplateSyntaxError, "Filter '%s' should not have an argument (argument is %r)" % (filter_name, arg) + filters.append( (filter_name,arg) ) + upto = match.end() + if upto != len(token): + raise TemplateSyntaxError, "Could not parse the remainder: %s" % token[upto:] + self.var , self.filters = var, filters def get_filters_from_token(token): "Convenient wrapper for FilterParser" @@ -580,7 +645,7 @@ class NodeList(list): bits = [] for node in self: if isinstance(node, Node): - bits.append(node.render(context)) + bits.append(self.render_node(node, context)) else: bits.append(node) return ''.join(bits) @@ -592,6 +657,25 @@ class NodeList(list): nodes.extend(node.get_nodes_by_type(nodetype)) return nodes + def render_node(self, node, context): + return(node.render(context)) + +class DebugNodeList(NodeList): + def render_node(self, node, context): + try: + result = node.render(context) + except TemplateSyntaxError, e: + if not hasattr(e, 'source'): + e.source = node.source + raise + except Exception: + from sys import exc_info + wrapped = TemplateSyntaxError('Caught an exception while rendering.') + wrapped.source = node.source + wrapped.exc_info = exc_info() + raise wrapped + return result + class TextNode(Node): def __init__(self, s): self.s = s @@ -609,14 +693,28 @@ class VariableNode(Node): def __repr__(self): return "" % self.var_string - def render(self, context): - output = resolve_variable_with_filters(self.var_string, context) + def encode_output(self, output): # Check type so that we don't run str() on a Unicode object if not isinstance(output, basestring): - output = str(output) + return str(output) elif isinstance(output, unicode): - output = output.encode(DEFAULT_CHARSET) - return output + return output.encode(DEFAULT_CHARSET) + else: + return output + + def render(self, context): + output = resolve_variable_with_filters(self.var_string, context) + return self.encode_output(output) + +class DebugVariableNode(VariableNode): + def render(self, context): + try: + output = resolve_variable_with_filters(self.var_string, context) + except TemplateSyntaxError, e: + if not hasattr(e, 'source'): + e.source = self.source + raise + return self.encode_output(output) def register_tag(token_command, callback_function): registered_tags[token_command] = callback_function diff --git a/django/core/template/defaulttags.py b/django/core/template/defaulttags.py index 8997d54b79..08ae3d9852 100644 --- a/django/core/template/defaulttags.py +++ b/django/core/template/defaulttags.py @@ -192,6 +192,7 @@ class RegroupNode(Node): for obj in obj_list: grouper = resolve_variable_with_filters('var.%s' % self.expression, \ Context({'var': obj})) + # TODO: Is this a sensible way to determine equality? if output and repr(output[-1]['grouper']) == repr(grouper): output[-1]['list'].append(obj) else: @@ -628,8 +629,8 @@ def do_load(parser, token): # check at compile time that the module can be imported try: LoadNode.load_taglib(taglib) - except ImportError: - raise TemplateSyntaxError, "'%s' is not a valid tag library" % taglib + except ImportError, e: + raise TemplateSyntaxError, "'%s' is not a valid tag library: %s" % (taglib, e) return LoadNode(taglib) def do_now(parser, token): diff --git a/django/core/template/loader.py b/django/core/template/loader.py index 0369a35e2b..10989424db 100644 --- a/django/core/template/loader.py +++ b/django/core/template/loader.py @@ -8,6 +8,10 @@ # name is the template name. # dirs is an optional list of directories to search instead of TEMPLATE_DIRS. # +# The loader should return a tuple of (template_source, path). The path returned +# might be shown to the user for debugging purposes, so it should identify where +# the template was loaded from. +# # Each loader should have an "is_usable" attribute set. This is a boolean that # specifies whether the loader can be used in this Python installation. Each # loader is responsible for setting this when it's initialized. @@ -17,8 +21,8 @@ # installed, because pkg_resources is necessary to read eggs. from django.core.exceptions import ImproperlyConfigured -from django.core.template import Template, Context, Node, TemplateDoesNotExist, TemplateSyntaxError, resolve_variable_with_filters, resolve_variable, register_tag -from django.conf.settings import TEMPLATE_LOADERS +from django.core.template import Origin, StringOrigin, Template, Context, Node, TemplateDoesNotExist, TemplateSyntaxError, resolve_variable_with_filters, resolve_variable, register_tag +from django.conf.settings import TEMPLATE_LOADERS, TEMPLATE_DEBUG template_source_loaders = [] for path in TEMPLATE_LOADERS: @@ -38,14 +42,32 @@ for path in TEMPLATE_LOADERS: else: template_source_loaders.append(func) -def load_template_source(name, dirs=None): +class LoaderOrigin(Origin): + def __init__(self, display_name, loader, name, dirs): + super(LoaderOrigin, self).__init__(display_name) + self.loader, self.loadname, self.dirs = loader, name, dirs + + def reload(self): + return self.loader(self.loadname, self.dirs)[0] + +def make_origin(display_name, loader, name, dirs): + if TEMPLATE_DEBUG: + return LoaderOrigin(display_name, loader, name, dirs) + else: + return None + +def find_template_source(name, dirs=None): for loader in template_source_loaders: try: - return loader(name, dirs) + source, display_name = loader(name, dirs) + return (source, make_origin(display_name, loader, name, dirs)) except TemplateDoesNotExist: pass raise TemplateDoesNotExist, name +def load_template_source(name, dirs=None): + find_template_source(name, dirs)[0] + class ExtendsError(Exception): pass @@ -54,14 +76,14 @@ def get_template(template_name): Returns a compiled Template object for the given template name, handling template inheritance recursively. """ - return get_template_from_string(load_template_source(template_name)) + return get_template_from_string(*find_template_source(template_name)) -def get_template_from_string(source): +def get_template_from_string(source, origin=None ): """ Returns a compiled Template object for the given template code, handling template inheritance recursively. """ - return Template(source) + return Template(source, origin) def render_to_string(template_name, dictionary=None, context_instance=None): """ @@ -134,7 +156,7 @@ class ExtendsNode(Node): error_msg += " Got this from the %r variable." % self.parent_name_var raise TemplateSyntaxError, error_msg try: - return get_template_from_string(load_template_source(parent, self.template_dirs)) + return get_template_from_string(*find_template_source(parent, self.template_dirs)) except TemplateDoesNotExist: raise TemplateSyntaxError, "Template %r cannot be extended, because it doesn't exist" % parent @@ -165,7 +187,9 @@ class ConstantIncludeNode(Node): try: t = get_template(template_path) self.template = t - except: + except Exception, e: + if TEMPLATE_DEBUG: + raise self.template = None def render(self, context): @@ -183,6 +207,10 @@ class IncludeNode(Node): template_name = resolve_variable(self.template_name, context) t = get_template(template_name) return t.render(context) + except TemplateSyntaxError, e: + if TEMPLATE_DEBUG: + raise + return '' except: return '' # Fail silently for invalid included templates. @@ -236,6 +264,7 @@ def do_include(parser, token): {% include "foo/some_include" %} """ + bits = token.contents.split() if len(bits) != 2: raise TemplateSyntaxError, "%r tag takes one argument: the name of the template to be included" % bits[0] diff --git a/django/core/template/loaders/app_directories.py b/django/core/template/loaders/app_directories.py index b8bd0d6169..d7c02c68ea 100644 --- a/django/core/template/loaders/app_directories.py +++ b/django/core/template/loaders/app_directories.py @@ -31,7 +31,7 @@ def load_template_source(template_name, template_dirs=None): for template_dir in app_template_dirs: filepath = os.path.join(template_dir, template_name) + TEMPLATE_FILE_EXTENSION try: - return open(filepath).read() + return (open(filepath).read(), filepath) except IOError: pass raise TemplateDoesNotExist, template_name diff --git a/django/core/template/loaders/eggs.py b/django/core/template/loaders/eggs.py index 33ba043220..5d48326dce 100644 --- a/django/core/template/loaders/eggs.py +++ b/django/core/template/loaders/eggs.py @@ -18,7 +18,7 @@ def load_template_source(template_name, template_dirs=None): pkg_name = 'templates/' + template_name + TEMPLATE_FILE_EXTENSION for app in INSTALLED_APPS: try: - return resource_string(app, pkg_name) + return (resource_string(app, pkg_name), 'egg:%s:%s ' % (app, pkg_name)) except: pass raise TemplateDoesNotExist, template_name diff --git a/django/core/template/loaders/filesystem.py b/django/core/template/loaders/filesystem.py index e5bb1bab1c..9a93481705 100644 --- a/django/core/template/loaders/filesystem.py +++ b/django/core/template/loaders/filesystem.py @@ -11,7 +11,7 @@ def load_template_source(template_name, template_dirs=None): for template_dir in template_dirs: filepath = os.path.join(template_dir, template_name) + TEMPLATE_FILE_EXTENSION try: - return open(filepath).read() + return (open(filepath).read(), filepath) except IOError: tried.append(filepath) if template_dirs: diff --git a/django/views/debug.py b/django/views/debug.py index 189b244af2..012d7f9a75 100644 --- a/django/views/debug.py +++ b/django/views/debug.py @@ -1,19 +1,64 @@ -import re -import os -import sys -import inspect from django.conf import settings -from os.path import dirname, join as pathjoin from django.core.template import Template, Context +from django.utils.html import escape from django.utils.httpwrappers import HttpResponseServerError, HttpResponseNotFound +import inspect, os, re, sys +from itertools import count, izip +from os.path import dirname, join as pathjoin HIDDEN_SETTINGS = re.compile('SECRET|PASSWORD') +def linebreak_iter(template_source): + newline_re = re.compile("^", re.M) + for match in newline_re.finditer(template_source): + yield match.start() + yield len(template_source) + 1 + +def get_template_exception_info(exc_type, exc_value, tb): + origin, (start, end) = exc_value.source + template_source = origin.reload() + context_lines = 10 + line = 0 + upto = 0 + source_lines = [] + linebreaks = izip(count(0), linebreak_iter(template_source)) + linebreaks.next() # skip the nothing before initial line start + for num, next in linebreaks: + if start >= upto and end <= next: + line = num + before = escape(template_source[upto:start]) + during = escape(template_source[start:end]) + after = escape(template_source[end:next - 1]) + source_lines.append( (num, escape(template_source[upto:next - 1])) ) + upto = next + total = len(source_lines) + + top = max(0, line - context_lines) + bottom = min(total, line + 1 + context_lines) + + template_info = { + 'message': exc_value.args[0], + 'source_lines': source_lines[top:bottom], + 'before': before, + 'during': during, + 'after': after, + 'top': top , + 'bottom': bottom , + 'total': total, + 'line': line, + 'name': origin.name, + } + exc_info = hasattr(exc_value, 'exc_info') and exc_value.exc_info or (exc_type, exc_value, tb) + return exc_info + (template_info,) + def technical_500_response(request, exc_type, exc_value, tb): """ Create a technical server error response. The last three arguments are the values returned from sys.exc_info() and friends. """ + template_info = None + if settings.TEMPLATE_DEBUG and hasattr(exc_value, 'source'): + exc_type, exc_value, tb, template_info = get_template_exception_info(exc_type, exc_value, tb) frames = [] while tb is not None: filename = tb.tb_frame.f_code.co_filename @@ -21,16 +66,16 @@ def technical_500_response(request, exc_type, exc_value, tb): lineno = tb.tb_lineno - 1 pre_context_lineno, pre_context, context_line, post_context = _get_lines_from_file(filename, lineno, 7) frames.append({ - 'tb' : tb, - 'filename' : filename, - 'function' : function, - 'lineno' : lineno, - 'vars' : tb.tb_frame.f_locals.items(), - 'id' : id(tb), - 'pre_context' : pre_context, - 'context_line' : context_line, - 'post_context' : post_context, - 'pre_context_lineno' : pre_context_lineno, + 'tb': tb, + 'filename': filename, + 'function': function, + 'lineno': lineno, + 'vars': tb.tb_frame.f_locals.items(), + 'id': id(tb), + 'pre_context': pre_context, + 'context_line': context_line, + 'post_context': post_context, + 'pre_context_lineno': pre_context_lineno, }) tb = tb.tb_next @@ -46,14 +91,14 @@ def technical_500_response(request, exc_type, exc_value, tb): t = Template(TECHNICAL_500_TEMPLATE) c = Context({ - 'exception_type' : exc_type.__name__, - 'exception_value' : exc_value, - 'frames' : frames, - 'lastframe' : frames[-1], - 'request' : request, - 'request_protocol' : os.environ.get("HTTPS") == "on" and "https" or "http", - 'settings' : settings_dict, - + 'exception_type': exc_type.__name__, + 'exception_value': exc_value, + 'frames': frames, + 'lastframe': frames[-1], + 'request': request, + 'request_protocol': os.environ.get("HTTPS") == "on" and "https" or "http", + 'settings': settings_dict, + 'template_info': template_info, }) return HttpResponseServerError(t.render(c), mimetype='text/html') @@ -69,12 +114,12 @@ def technical_404_response(request, exception): t = Template(TECHNICAL_404_TEMPLATE) c = Context({ - 'root_urlconf' : settings.ROOT_URLCONF, - 'urlpatterns' : tried, - 'reason' : str(exception), - 'request' : request, - 'request_protocol' : os.environ.get("HTTPS") == "on" and "https" or "http", - 'settings' : dict([(k, getattr(settings, k)) for k in dir(settings) if k.isupper()]), + 'root_urlconf': settings.ROOT_URLCONF, + 'urlpatterns': tried, + 'reason': str(exception), + 'request': request, + 'request_protocol': os.environ.get("HTTPS") == "on" and "https" or "http", + 'settings': dict([(k, getattr(settings, k)) for k in dir(settings) if k.isupper()]), }) return HttpResponseNotFound(t.render(c), mimetype='text/html') @@ -144,6 +189,9 @@ TECHNICAL_500_TEMPLATE = """ #summary table { border:none; background:transparent; } #requestinfo h2, #requestinfo h3 { position:relative; margin-left:-100px; } #requestinfo h3 { margin-bottom:-1em; } + table.source td { font-family: monospace; white-space: pre; } + span.specific { background:#ffcab7; } + .error { background: #ffc; }
 {{ value }}