diff --git a/django/contrib/humanize/locale/ar/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/ar/LC_MESSAGES/django.mo index 8aed818103..1382da17b1 100644 Binary files a/django/contrib/humanize/locale/ar/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/ar/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/ar/LC_MESSAGES/django.po b/django/contrib/humanize/locale/ar/LC_MESSAGES/django.po index e4447b8ea6..f3ee822fc4 100644 --- a/django/contrib/humanize/locale/ar/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/ar/LC_MESSAGES/django.po @@ -1,37 +1,53 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Jannis Leidel , 2011. +# Ossama Khayat , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-20 21:08+0100\n" -"PO-Revision-Date: 2011-03-17 17:38+0000\n" -"Last-Translator: okhayat \n" -"Language-Team: Arabic \n" +"POT-Creation-Date: 2012-03-14 00:19-0700\n" +"PO-Revision-Date: 2012-02-14 13:08+0000\n" +"Last-Translator: Ossama Khayat \n" +"Language-Team: Arabic (http://www.transifex.net/projects/p/django/language/" +"ar/)\n" +"Language: ar\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ar\n" "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 " "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n" -#: templatetags/humanize.py:19 +#: tests.py:108 templatetags/humanize.py:164 +msgid "today" +msgstr "اليوم" + +#: tests.py:108 templatetags/humanize.py:168 +msgid "yesterday" +msgstr "أمس" + +#: tests.py:108 templatetags/humanize.py:166 +msgid "tomorrow" +msgstr "غداً" + +#: templatetags/humanize.py:24 msgid "th" msgstr " " -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "st" msgstr " " -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "nd" msgstr " " -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "rd" msgstr " " -#: templatetags/humanize.py:54 +#: templatetags/humanize.py:53 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" @@ -42,6 +58,17 @@ msgstr[3] "%(value).1f مليون" msgstr[4] "%(value).1f مليون" msgstr[5] "%(value).1f مليون" +#: templatetags/humanize.py:54 +#, python-format +msgid "%(value)s million" +msgid_plural "%(value)s million" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + #: templatetags/humanize.py:57 #, python-format msgid "%(value).1f billion" @@ -53,7 +80,18 @@ msgstr[3] "%(value).1f مليار" msgstr[4] "%(value).1f مليار" msgstr[5] "%(value).1f مليار" -#: templatetags/humanize.py:60 +#: templatetags/humanize.py:58 +#, python-format +msgid "%(value)s billion" +msgid_plural "%(value)s billion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + +#: templatetags/humanize.py:61 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" @@ -64,50 +102,307 @@ msgstr[3] "%(value).1f ترليونات" msgstr[4] "%(value).1f ترليون" msgstr[5] "%(value).1f ترليون" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:62 +#, python-format +msgid "%(value)s trillion" +msgid_plural "%(value)s trillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + +#: templatetags/humanize.py:65 +#, python-format +msgid "%(value).1f quadrillion" +msgid_plural "%(value).1f quadrillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + +#: templatetags/humanize.py:66 +#, python-format +msgid "%(value)s quadrillion" +msgid_plural "%(value)s quadrillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + +#: templatetags/humanize.py:69 +#, python-format +msgid "%(value).1f quintillion" +msgid_plural "%(value).1f quintillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + +#: templatetags/humanize.py:70 +#, python-format +msgid "%(value)s quintillion" +msgid_plural "%(value)s quintillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + +#: templatetags/humanize.py:73 +#, python-format +msgid "%(value).1f sextillion" +msgid_plural "%(value).1f sextillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + +#: templatetags/humanize.py:74 +#, python-format +msgid "%(value)s sextillion" +msgid_plural "%(value)s sextillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + +#: templatetags/humanize.py:77 +#, python-format +msgid "%(value).1f septillion" +msgid_plural "%(value).1f septillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + +#: templatetags/humanize.py:78 +#, python-format +msgid "%(value)s septillion" +msgid_plural "%(value)s septillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + +#: templatetags/humanize.py:81 +#, python-format +msgid "%(value).1f octillion" +msgid_plural "%(value).1f octillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + +#: templatetags/humanize.py:82 +#, python-format +msgid "%(value)s octillion" +msgid_plural "%(value)s octillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + +#: templatetags/humanize.py:85 +#, python-format +msgid "%(value).1f nonillion" +msgid_plural "%(value).1f nonillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + +#: templatetags/humanize.py:86 +#, python-format +msgid "%(value)s nonillion" +msgid_plural "%(value)s nonillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + +#: templatetags/humanize.py:89 +#, python-format +msgid "%(value).1f decillion" +msgid_plural "%(value).1f decillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + +#: templatetags/humanize.py:90 +#, python-format +msgid "%(value)s decillion" +msgid_plural "%(value)s decillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + +#: templatetags/humanize.py:93 +#, python-format +msgid "%(value).1f googol" +msgid_plural "%(value).1f googol" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + +#: templatetags/humanize.py:94 +#, python-format +msgid "%(value)s googol" +msgid_plural "%(value)s googol" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + +#: templatetags/humanize.py:143 msgid "one" msgstr "واحد" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "two" msgstr "إثنان" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "three" msgstr "ثلالثة" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "four" msgstr "أربعة" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "five" msgstr "خمسة" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "six" msgstr "ستة" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "seven" msgstr "سبعة" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "eight" msgstr "ثمانية" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "nine" msgstr "تسعة" -#: templatetags/humanize.py:96 -msgid "today" -msgstr "اليوم" +#: templatetags/humanize.py:185 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s ago" +msgstr "" -#: templatetags/humanize.py:98 -msgid "tomorrow" -msgstr "غداً" +#: templatetags/humanize.py:188 templatetags/humanize.py:210 +msgid "now" +msgstr "" -#: templatetags/humanize.py:100 -msgid "yesterday" -msgstr "أمس" +#: templatetags/humanize.py:191 +#, python-format +msgid "a second ago" +msgid_plural "%(count)s seconds ago" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + +#: templatetags/humanize.py:196 +#, python-format +msgid "a minute ago" +msgid_plural "%(count)s minutes ago" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + +#: templatetags/humanize.py:201 +#, python-format +msgid "an hour ago" +msgid_plural "%(count)s hours ago" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + +#: templatetags/humanize.py:207 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s from now" +msgstr "" + +#: templatetags/humanize.py:213 +#, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + +#: templatetags/humanize.py:218 +#, python-format +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + +#: templatetags/humanize.py:223 +#, python-format +msgid "an hour from now" +msgid_plural "%(count)s hours from now" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" diff --git a/django/contrib/humanize/locale/az/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/az/LC_MESSAGES/django.mo index d1e665e700..158df1717c 100644 Binary files a/django/contrib/humanize/locale/az/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/az/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/az/LC_MESSAGES/django.po b/django/contrib/humanize/locale/az/LC_MESSAGES/django.po index af6356f484..009ce6e4e8 100644 --- a/django/contrib/humanize/locale/az/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/az/LC_MESSAGES/django.po @@ -1,97 +1,278 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Ali Ismayilov , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:18-0400\n" -"PO-Revision-Date: 2011-03-04 18:39+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Azerbaijani \n" +"POT-Creation-Date: 2012-03-14 00:19-0700\n" +"PO-Revision-Date: 2012-02-14 13:08+0000\n" +"Last-Translator: Ali Ismayilov \n" +"Language-Team: Azerbaijani (http://www.transifex.net/projects/p/django/" +"language/az/)\n" +"Language: az\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: az\n" "Plural-Forms: nplurals=1; plural=0\n" -#: templatetags/humanize.py:19 +#: tests.py:108 templatetags/humanize.py:164 +msgid "today" +msgstr "bu gün" + +#: tests.py:108 templatetags/humanize.py:168 +msgid "yesterday" +msgstr "dünən" + +#: tests.py:108 templatetags/humanize.py:166 +msgid "tomorrow" +msgstr "sabah" + +#: templatetags/humanize.py:24 msgid "th" -msgstr "" +msgstr "-ıncı" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "st" -msgstr "" +msgstr "-ıncı" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "nd" -msgstr "" +msgstr "-ıncı" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "rd" -msgstr "" +msgstr "-ıncı" -#: templatetags/humanize.py:54 +#: templatetags/humanize.py:53 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" -msgstr[0] "" +msgstr[0] "%(value).1f milyon" + +#: templatetags/humanize.py:54 +#, python-format +msgid "%(value)s million" +msgid_plural "%(value)s million" +msgstr[0] "%(value)s milyon" #: templatetags/humanize.py:57 #, python-format msgid "%(value).1f billion" msgid_plural "%(value).1f billion" -msgstr[0] "" +msgstr[0] "%(value).1f milyard" -#: templatetags/humanize.py:60 +#: templatetags/humanize.py:58 +#, python-format +msgid "%(value)s billion" +msgid_plural "%(value)s billion" +msgstr[0] "%(value)s milyard" + +#: templatetags/humanize.py:61 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" +msgstr[0] "%(value).1f trilyon" + +#: templatetags/humanize.py:62 +#, python-format +msgid "%(value)s trillion" +msgid_plural "%(value)s trillion" +msgstr[0] "%(value)s trilyon" + +#: templatetags/humanize.py:65 +#, python-format +msgid "%(value).1f quadrillion" +msgid_plural "%(value).1f quadrillion" msgstr[0] "" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:66 +#, python-format +msgid "%(value)s quadrillion" +msgid_plural "%(value)s quadrillion" +msgstr[0] "" + +#: templatetags/humanize.py:69 +#, python-format +msgid "%(value).1f quintillion" +msgid_plural "%(value).1f quintillion" +msgstr[0] "" + +#: templatetags/humanize.py:70 +#, python-format +msgid "%(value)s quintillion" +msgid_plural "%(value)s quintillion" +msgstr[0] "" + +#: templatetags/humanize.py:73 +#, python-format +msgid "%(value).1f sextillion" +msgid_plural "%(value).1f sextillion" +msgstr[0] "" + +#: templatetags/humanize.py:74 +#, python-format +msgid "%(value)s sextillion" +msgid_plural "%(value)s sextillion" +msgstr[0] "" + +#: templatetags/humanize.py:77 +#, python-format +msgid "%(value).1f septillion" +msgid_plural "%(value).1f septillion" +msgstr[0] "" + +#: templatetags/humanize.py:78 +#, python-format +msgid "%(value)s septillion" +msgid_plural "%(value)s septillion" +msgstr[0] "" + +#: templatetags/humanize.py:81 +#, python-format +msgid "%(value).1f octillion" +msgid_plural "%(value).1f octillion" +msgstr[0] "" + +#: templatetags/humanize.py:82 +#, python-format +msgid "%(value)s octillion" +msgid_plural "%(value)s octillion" +msgstr[0] "" + +#: templatetags/humanize.py:85 +#, python-format +msgid "%(value).1f nonillion" +msgid_plural "%(value).1f nonillion" +msgstr[0] "" + +#: templatetags/humanize.py:86 +#, python-format +msgid "%(value)s nonillion" +msgid_plural "%(value)s nonillion" +msgstr[0] "" + +#: templatetags/humanize.py:89 +#, python-format +msgid "%(value).1f decillion" +msgid_plural "%(value).1f decillion" +msgstr[0] "" + +#: templatetags/humanize.py:90 +#, python-format +msgid "%(value)s decillion" +msgid_plural "%(value)s decillion" +msgstr[0] "" + +#: templatetags/humanize.py:93 +#, python-format +msgid "%(value).1f googol" +msgid_plural "%(value).1f googol" +msgstr[0] "" + +#: templatetags/humanize.py:94 +#, python-format +msgid "%(value)s googol" +msgid_plural "%(value)s googol" +msgstr[0] "" + +#: templatetags/humanize.py:143 msgid "one" -msgstr "" +msgstr "bir" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "two" -msgstr "" +msgstr "iki" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "three" -msgstr "" +msgstr "üç" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "four" -msgstr "" +msgstr "dörd" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "five" -msgstr "" +msgstr "beş" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "six" -msgstr "" +msgstr "altı" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "seven" -msgstr "" +msgstr "yeddi" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "eight" -msgstr "" +msgstr "səkkiz" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "nine" -msgstr "" +msgstr "doqquz" -#: templatetags/humanize.py:96 -msgid "today" -msgstr "" +#: templatetags/humanize.py:185 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s ago" +msgstr "%(delta)s əvvəl" -#: templatetags/humanize.py:98 -msgid "tomorrow" -msgstr "" +#: templatetags/humanize.py:188 templatetags/humanize.py:210 +msgid "now" +msgstr "indi" -#: templatetags/humanize.py:100 -msgid "yesterday" -msgstr "" +#: templatetags/humanize.py:191 +#, python-format +msgid "a second ago" +msgid_plural "%(count)s seconds ago" +msgstr[0] "" +"one: bir saniyə əvvəl\n" +"other: %(count)s saniyə əvvəl" + +#: templatetags/humanize.py:196 +#, python-format +msgid "a minute ago" +msgid_plural "%(count)s minutes ago" +msgstr[0] "" +"one: bir dəqiqə əvvəl\n" +"other: %(count)s dəqiqə əvvəl" + +#: templatetags/humanize.py:201 +#, python-format +msgid "an hour ago" +msgid_plural "%(count)s hours ago" +msgstr[0] "" +"one: bir saat əvvəl\n" +"other: %(count)s saat əvvəl" + +#: templatetags/humanize.py:207 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s from now" +msgstr "%(delta)s sonra" + +#: templatetags/humanize.py:213 +#, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "" +"one: bir saniyə sonra\n" +"other: %(count)s saniyə sonra" + +#: templatetags/humanize.py:218 +#, python-format +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "" +"one: bir dəqiqə sonra\n" +"other: %(count)s dəqiqə sonra" + +#: templatetags/humanize.py:223 +#, python-format +msgid "an hour from now" +msgid_plural "%(count)s hours from now" +msgstr[0] "" +"one: bir saat sonra\n" +"other: %(count)s saat sonra" diff --git a/django/contrib/humanize/locale/bg/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/bg/LC_MESSAGES/django.mo index 7c63556da8..51069e51f5 100644 Binary files a/django/contrib/humanize/locale/bg/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/bg/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/bg/LC_MESSAGES/django.po b/django/contrib/humanize/locale/bg/LC_MESSAGES/django.po index 8c5df10f9d..72702885ce 100644 --- a/django/contrib/humanize/locale/bg/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/bg/LC_MESSAGES/django.po @@ -1,42 +1,65 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Jannis Leidel , 2011. +# Todor Lubenov , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:18-0400\n" -"PO-Revision-Date: 2011-03-06 06:17+0000\n" -"Last-Translator: tlubenov \n" -"Language-Team: Bulgarian \n" +"POT-Creation-Date: 2012-03-14 00:19-0700\n" +"PO-Revision-Date: 2012-02-14 13:08+0000\n" +"Last-Translator: Todor Lubenov \n" +"Language-Team: Bulgarian (http://www.transifex.net/projects/p/django/" +"language/bg/)\n" +"Language: bg\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: bg\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: templatetags/humanize.py:19 +#: tests.py:108 templatetags/humanize.py:164 +msgid "today" +msgstr "днес" + +#: tests.py:108 templatetags/humanize.py:168 +msgid "yesterday" +msgstr "вчера" + +#: tests.py:108 templatetags/humanize.py:166 +msgid "tomorrow" +msgstr "Утре" + +#: templatetags/humanize.py:24 msgid "th" msgstr "и" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "st" msgstr "ви" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "nd" msgstr "ри" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "rd" msgstr "ти" -#: templatetags/humanize.py:54 +#: templatetags/humanize.py:53 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" msgstr[0] "%(value).1f милион" msgstr[1] "%(value).1f милиона" +#: templatetags/humanize.py:54 +#, python-format +msgid "%(value)s million" +msgid_plural "%(value)s million" +msgstr[0] "" +msgstr[1] "" + #: templatetags/humanize.py:57 #, python-format msgid "%(value).1f billion" @@ -44,57 +67,229 @@ msgid_plural "%(value).1f billion" msgstr[0] "%(value).1f милиард" msgstr[1] "%(value).1f милиарда" -#: templatetags/humanize.py:60 +#: templatetags/humanize.py:58 +#, python-format +msgid "%(value)s billion" +msgid_plural "%(value)s billion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:61 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" msgstr[0] "%(value).1f трилион" msgstr[1] "%(value).1f трилиона" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:62 +#, python-format +msgid "%(value)s trillion" +msgid_plural "%(value)s trillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:65 +#, python-format +msgid "%(value).1f quadrillion" +msgid_plural "%(value).1f quadrillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:66 +#, python-format +msgid "%(value)s quadrillion" +msgid_plural "%(value)s quadrillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:69 +#, python-format +msgid "%(value).1f quintillion" +msgid_plural "%(value).1f quintillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:70 +#, python-format +msgid "%(value)s quintillion" +msgid_plural "%(value)s quintillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:73 +#, python-format +msgid "%(value).1f sextillion" +msgid_plural "%(value).1f sextillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:74 +#, python-format +msgid "%(value)s sextillion" +msgid_plural "%(value)s sextillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:77 +#, python-format +msgid "%(value).1f septillion" +msgid_plural "%(value).1f septillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:78 +#, python-format +msgid "%(value)s septillion" +msgid_plural "%(value)s septillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:81 +#, python-format +msgid "%(value).1f octillion" +msgid_plural "%(value).1f octillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:82 +#, python-format +msgid "%(value)s octillion" +msgid_plural "%(value)s octillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:85 +#, python-format +msgid "%(value).1f nonillion" +msgid_plural "%(value).1f nonillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:86 +#, python-format +msgid "%(value)s nonillion" +msgid_plural "%(value)s nonillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:89 +#, python-format +msgid "%(value).1f decillion" +msgid_plural "%(value).1f decillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:90 +#, python-format +msgid "%(value)s decillion" +msgid_plural "%(value)s decillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:93 +#, python-format +msgid "%(value).1f googol" +msgid_plural "%(value).1f googol" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:94 +#, python-format +msgid "%(value)s googol" +msgid_plural "%(value)s googol" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:143 msgid "one" msgstr "един" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "two" msgstr "два" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "three" msgstr "три" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "four" msgstr "четири" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "five" msgstr "пет" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "six" msgstr "шест" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "seven" msgstr "седем" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "eight" msgstr "осем" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "nine" msgstr "девет" -#: templatetags/humanize.py:96 -msgid "today" -msgstr "днес" +#: templatetags/humanize.py:185 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s ago" +msgstr "" -#: templatetags/humanize.py:98 -msgid "tomorrow" -msgstr "Утре" +#: templatetags/humanize.py:188 templatetags/humanize.py:210 +msgid "now" +msgstr "" -#: templatetags/humanize.py:100 -msgid "yesterday" -msgstr "вчера" +#: templatetags/humanize.py:191 +#, python-format +msgid "a second ago" +msgid_plural "%(count)s seconds ago" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:196 +#, python-format +msgid "a minute ago" +msgid_plural "%(count)s minutes ago" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:201 +#, python-format +msgid "an hour ago" +msgid_plural "%(count)s hours ago" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:207 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s from now" +msgstr "" + +#: templatetags/humanize.py:213 +#, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:218 +#, python-format +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:223 +#, python-format +msgid "an hour from now" +msgid_plural "%(count)s hours from now" +msgstr[0] "" +msgstr[1] "" diff --git a/django/contrib/humanize/locale/bn/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/bn/LC_MESSAGES/django.mo index 420320ecc2..cc84cafd6c 100644 Binary files a/django/contrib/humanize/locale/bn/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/bn/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/bn/LC_MESSAGES/django.po b/django/contrib/humanize/locale/bn/LC_MESSAGES/django.po index dee59bb2c3..0e2869602b 100644 --- a/django/contrib/humanize/locale/bn/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/bn/LC_MESSAGES/django.po @@ -1,42 +1,64 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Jannis Leidel , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:18-0400\n" -"PO-Revision-Date: 2011-03-04 18:39+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Bengali <>\n" +"POT-Creation-Date: 2012-03-14 00:19-0700\n" +"PO-Revision-Date: 2012-02-14 13:08+0000\n" +"Last-Translator: Jannis Leidel \n" +"Language-Team: Bengali (http://www.transifex.net/projects/p/django/language/" +"bn/)\n" +"Language: bn\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: bn\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: templatetags/humanize.py:19 +#: tests.py:108 templatetags/humanize.py:164 +msgid "today" +msgstr "আজ" + +#: tests.py:108 templatetags/humanize.py:168 +msgid "yesterday" +msgstr "গতকাল" + +#: tests.py:108 templatetags/humanize.py:166 +msgid "tomorrow" +msgstr "আগামীকাল" + +#: templatetags/humanize.py:24 msgid "th" msgstr "তম" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "st" msgstr "ম" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "nd" msgstr "য়" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "rd" msgstr "য়" -#: templatetags/humanize.py:54 +#: templatetags/humanize.py:53 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" msgstr[0] "%(value).1f মিলিয়ন" msgstr[1] "%(value).1f মিলিয়ন" +#: templatetags/humanize.py:54 +#, python-format +msgid "%(value)s million" +msgid_plural "%(value)s million" +msgstr[0] "" +msgstr[1] "" + #: templatetags/humanize.py:57 #, python-format msgid "%(value).1f billion" @@ -44,57 +66,229 @@ msgid_plural "%(value).1f billion" msgstr[0] "%(value).1f বিলিয়ন" msgstr[1] "%(value).1f বিলিয়ন" -#: templatetags/humanize.py:60 +#: templatetags/humanize.py:58 +#, python-format +msgid "%(value)s billion" +msgid_plural "%(value)s billion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:61 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" msgstr[0] "%(value).1f ট্রিলিয়ন" msgstr[1] "%(value).1f ট্রিলিয়ন" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:62 +#, python-format +msgid "%(value)s trillion" +msgid_plural "%(value)s trillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:65 +#, python-format +msgid "%(value).1f quadrillion" +msgid_plural "%(value).1f quadrillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:66 +#, python-format +msgid "%(value)s quadrillion" +msgid_plural "%(value)s quadrillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:69 +#, python-format +msgid "%(value).1f quintillion" +msgid_plural "%(value).1f quintillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:70 +#, python-format +msgid "%(value)s quintillion" +msgid_plural "%(value)s quintillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:73 +#, python-format +msgid "%(value).1f sextillion" +msgid_plural "%(value).1f sextillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:74 +#, python-format +msgid "%(value)s sextillion" +msgid_plural "%(value)s sextillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:77 +#, python-format +msgid "%(value).1f septillion" +msgid_plural "%(value).1f septillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:78 +#, python-format +msgid "%(value)s septillion" +msgid_plural "%(value)s septillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:81 +#, python-format +msgid "%(value).1f octillion" +msgid_plural "%(value).1f octillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:82 +#, python-format +msgid "%(value)s octillion" +msgid_plural "%(value)s octillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:85 +#, python-format +msgid "%(value).1f nonillion" +msgid_plural "%(value).1f nonillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:86 +#, python-format +msgid "%(value)s nonillion" +msgid_plural "%(value)s nonillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:89 +#, python-format +msgid "%(value).1f decillion" +msgid_plural "%(value).1f decillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:90 +#, python-format +msgid "%(value)s decillion" +msgid_plural "%(value)s decillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:93 +#, python-format +msgid "%(value).1f googol" +msgid_plural "%(value).1f googol" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:94 +#, python-format +msgid "%(value)s googol" +msgid_plural "%(value)s googol" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:143 msgid "one" msgstr "এক" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "two" msgstr "দুই" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "three" msgstr "তিন" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "four" msgstr "চার" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "five" msgstr "পাঁচ" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "six" msgstr "ছয়" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "seven" msgstr "সাত" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "eight" msgstr "আট" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "nine" msgstr "নয়" -#: templatetags/humanize.py:96 -msgid "today" -msgstr "আজ" +#: templatetags/humanize.py:185 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s ago" +msgstr "" -#: templatetags/humanize.py:98 -msgid "tomorrow" -msgstr "আগামীকাল" +#: templatetags/humanize.py:188 templatetags/humanize.py:210 +msgid "now" +msgstr "" -#: templatetags/humanize.py:100 -msgid "yesterday" -msgstr "গতকাল" +#: templatetags/humanize.py:191 +#, python-format +msgid "a second ago" +msgid_plural "%(count)s seconds ago" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:196 +#, python-format +msgid "a minute ago" +msgid_plural "%(count)s minutes ago" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:201 +#, python-format +msgid "an hour ago" +msgid_plural "%(count)s hours ago" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:207 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s from now" +msgstr "" + +#: templatetags/humanize.py:213 +#, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:218 +#, python-format +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:223 +#, python-format +msgid "an hour from now" +msgid_plural "%(count)s hours from now" +msgstr[0] "" +msgstr[1] "" diff --git a/django/contrib/humanize/locale/bs/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/bs/LC_MESSAGES/django.mo index 9aba4f4913..1f3fdc26dd 100644 Binary files a/django/contrib/humanize/locale/bs/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/bs/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/bs/LC_MESSAGES/django.po b/django/contrib/humanize/locale/bs/LC_MESSAGES/django.po index bc3ca6a685..5c50164f2f 100644 --- a/django/contrib/humanize/locale/bs/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/bs/LC_MESSAGES/django.po @@ -1,37 +1,53 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Filip Dupanović , 2011. +# Jannis Leidel , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-20 21:08+0100\n" -"PO-Revision-Date: 2011-03-20 16:44+0000\n" -"Last-Translator: fdupanovic \n" -"Language-Team: Bosnian <>\n" +"POT-Creation-Date: 2012-03-14 00:19-0700\n" +"PO-Revision-Date: 2012-02-14 13:08+0000\n" +"Last-Translator: Filip Dupanović \n" +"Language-Team: Bosnian (http://www.transifex.net/projects/p/django/language/" +"bs/)\n" +"Language: bs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: bs\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" -"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" -#: templatetags/humanize.py:19 +#: tests.py:108 templatetags/humanize.py:164 +msgid "today" +msgstr "deset" + +#: tests.py:108 templatetags/humanize.py:168 +msgid "yesterday" +msgstr "jučer" + +#: tests.py:108 templatetags/humanize.py:166 +msgid "tomorrow" +msgstr "sutra" + +#: templatetags/humanize.py:24 msgid "th" msgstr "-i" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "st" msgstr "-vi" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "nd" msgstr "-i" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "rd" msgstr "-i" -#: templatetags/humanize.py:54 +#: templatetags/humanize.py:53 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" @@ -39,6 +55,14 @@ msgstr[0] "%(value).1f million" msgstr[1] "%(value).1f miliona" msgstr[2] "%(value).1f miliona" +#: templatetags/humanize.py:54 +#, python-format +msgid "%(value)s million" +msgid_plural "%(value)s million" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + #: templatetags/humanize.py:57 #, python-format msgid "%(value).1f billion" @@ -47,7 +71,15 @@ msgstr[0] "%(value).1f milijarda" msgstr[1] "%(value).1f milijarde" msgstr[2] "%(value).1f milijardi" -#: templatetags/humanize.py:60 +#: templatetags/humanize.py:58 +#, python-format +msgid "%(value)s billion" +msgid_plural "%(value)s billion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:61 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" @@ -55,50 +87,238 @@ msgstr[0] "%(value).1f bilion" msgstr[1] "%(value).1f biliona" msgstr[2] "%(value).1f biliona" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:62 +#, python-format +msgid "%(value)s trillion" +msgid_plural "%(value)s trillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:65 +#, python-format +msgid "%(value).1f quadrillion" +msgid_plural "%(value).1f quadrillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:66 +#, python-format +msgid "%(value)s quadrillion" +msgid_plural "%(value)s quadrillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:69 +#, python-format +msgid "%(value).1f quintillion" +msgid_plural "%(value).1f quintillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:70 +#, python-format +msgid "%(value)s quintillion" +msgid_plural "%(value)s quintillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:73 +#, python-format +msgid "%(value).1f sextillion" +msgid_plural "%(value).1f sextillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:74 +#, python-format +msgid "%(value)s sextillion" +msgid_plural "%(value)s sextillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:77 +#, python-format +msgid "%(value).1f septillion" +msgid_plural "%(value).1f septillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:78 +#, python-format +msgid "%(value)s septillion" +msgid_plural "%(value)s septillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:81 +#, python-format +msgid "%(value).1f octillion" +msgid_plural "%(value).1f octillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:82 +#, python-format +msgid "%(value)s octillion" +msgid_plural "%(value)s octillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:85 +#, python-format +msgid "%(value).1f nonillion" +msgid_plural "%(value).1f nonillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:86 +#, python-format +msgid "%(value)s nonillion" +msgid_plural "%(value)s nonillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:89 +#, python-format +msgid "%(value).1f decillion" +msgid_plural "%(value).1f decillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:90 +#, python-format +msgid "%(value)s decillion" +msgid_plural "%(value)s decillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:93 +#, python-format +msgid "%(value).1f googol" +msgid_plural "%(value).1f googol" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:94 +#, python-format +msgid "%(value)s googol" +msgid_plural "%(value)s googol" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:143 msgid "one" msgstr "jedan" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "two" msgstr "dva" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "three" msgstr "tri" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "four" msgstr "četiri" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "five" msgstr "pet" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "six" msgstr "šest" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "seven" msgstr "sedam" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "eight" msgstr "osam" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "nine" msgstr "devet" -#: templatetags/humanize.py:96 -msgid "today" -msgstr "deset" +#: templatetags/humanize.py:185 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s ago" +msgstr "" -#: templatetags/humanize.py:98 -msgid "tomorrow" -msgstr "sutra" +#: templatetags/humanize.py:188 templatetags/humanize.py:210 +msgid "now" +msgstr "" -#: templatetags/humanize.py:100 -msgid "yesterday" -msgstr "jučer" +#: templatetags/humanize.py:191 +#, python-format +msgid "a second ago" +msgid_plural "%(count)s seconds ago" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:196 +#, python-format +msgid "a minute ago" +msgid_plural "%(count)s minutes ago" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:201 +#, python-format +msgid "an hour ago" +msgid_plural "%(count)s hours ago" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:207 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s from now" +msgstr "" + +#: templatetags/humanize.py:213 +#, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:218 +#, python-format +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:223 +#, python-format +msgid "an hour from now" +msgid_plural "%(count)s hours from now" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" diff --git a/django/contrib/humanize/locale/ca/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/ca/LC_MESSAGES/django.mo index b115dbed24..2e1dcfa02b 100644 Binary files a/django/contrib/humanize/locale/ca/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/ca/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/ca/LC_MESSAGES/django.po b/django/contrib/humanize/locale/ca/LC_MESSAGES/django.po index 0168f67ac3..db1ebbd618 100644 --- a/django/contrib/humanize/locale/ca/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/ca/LC_MESSAGES/django.po @@ -1,100 +1,296 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Antoni Aloy , 2011, 2012. +# Carles Barrobés , 2011. +# Jannis Leidel , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:18-0400\n" -"PO-Revision-Date: 2011-03-04 18:39+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Catalan \n" +"POT-Creation-Date: 2012-03-14 00:19-0700\n" +"PO-Revision-Date: 2012-03-05 23:00+0000\n" +"Last-Translator: Antoni Aloy \n" +"Language-Team: Catalan (http://www.transifex.net/projects/p/django/language/" +"ca/)\n" +"Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ca\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: templatetags/humanize.py:19 +#: tests.py:108 templatetags/humanize.py:164 +msgid "today" +msgstr "avui" + +#: tests.py:108 templatetags/humanize.py:168 +msgid "yesterday" +msgstr "ahir" + +#: tests.py:108 templatetags/humanize.py:166 +msgid "tomorrow" +msgstr "demà" + +#: templatetags/humanize.py:24 msgid "th" msgstr "è" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "st" msgstr "r" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "nd" msgstr "n" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "rd" msgstr "r" -#: templatetags/humanize.py:54 +#: templatetags/humanize.py:53 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" msgstr[0] "%(value).1f milió" msgstr[1] "%(value).1f milions" +#: templatetags/humanize.py:54 +#, python-format +msgid "%(value)s million" +msgid_plural "%(value)s million" +msgstr[0] "%(value)s milió" +msgstr[1] "%(value)s milions" + #: templatetags/humanize.py:57 #, python-format msgid "%(value).1f billion" msgid_plural "%(value).1f billion" -msgstr[0] "%(value).1f bilió" -msgstr[1] "%(value).1f bilions" +msgstr[0] "%(value).1f miliard" +msgstr[1] "%(value).1f miliards" -#: templatetags/humanize.py:60 +#: templatetags/humanize.py:58 +#, python-format +msgid "%(value)s billion" +msgid_plural "%(value)s billion" +msgstr[0] "%(value)s miliard" +msgstr[1] "%(value)s miliards" + +#: templatetags/humanize.py:61 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" -msgstr[0] "%(value).1f trilió" -msgstr[1] "%(value).1f trilions" +msgstr[0] "%(value).1f bilió" +msgstr[1] "%(value).1f bilions" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:62 +#, python-format +msgid "%(value)s trillion" +msgid_plural "%(value)s trillion" +msgstr[0] "%(value)s bilió" +msgstr[1] "%(value)s bilió" + +#: templatetags/humanize.py:65 +#, python-format +msgid "%(value).1f quadrillion" +msgid_plural "%(value).1f quadrillion" +msgstr[0] "%(value).1f quadrilió" +msgstr[1] "%(value).1f quadrilions" + +#: templatetags/humanize.py:66 +#, python-format +msgid "%(value)s quadrillion" +msgid_plural "%(value)s quadrillion" +msgstr[0] "%(value)s quadrilió" +msgstr[1] "%(value)s quadrilions" + +#: templatetags/humanize.py:69 +#, python-format +msgid "%(value).1f quintillion" +msgid_plural "%(value).1f quintillion" +msgstr[0] "%(value).1f quintilió" +msgstr[1] "%(value).1f quintilions" + +#: templatetags/humanize.py:70 +#, python-format +msgid "%(value)s quintillion" +msgid_plural "%(value)s quintillion" +msgstr[0] "%(value)s quintilió" +msgstr[1] "%(value)s quintilions" + +#: templatetags/humanize.py:73 +#, python-format +msgid "%(value).1f sextillion" +msgid_plural "%(value).1f sextillion" +msgstr[0] "%(value).1f sextilió" +msgstr[1] "%(value).1f sextilions" + +#: templatetags/humanize.py:74 +#, python-format +msgid "%(value)s sextillion" +msgid_plural "%(value)s sextillion" +msgstr[0] "%(value)s sextilió" +msgstr[1] "%(value)s sextilions" + +#: templatetags/humanize.py:77 +#, python-format +msgid "%(value).1f septillion" +msgid_plural "%(value).1f septillion" +msgstr[0] "%(value).1f septilió" +msgstr[1] "%(value).1f septilions" + +#: templatetags/humanize.py:78 +#, python-format +msgid "%(value)s septillion" +msgid_plural "%(value)s septillion" +msgstr[0] "%(value)s septilió" +msgstr[1] "%(value)s septilions" + +#: templatetags/humanize.py:81 +#, python-format +msgid "%(value).1f octillion" +msgid_plural "%(value).1f octillion" +msgstr[0] "%(value).1f octilió" +msgstr[1] "%(value).1f octilions" + +#: templatetags/humanize.py:82 +#, python-format +msgid "%(value)s octillion" +msgid_plural "%(value)s octillion" +msgstr[0] "%(value)s octilió" +msgstr[1] "%(value)s octilions" + +#: templatetags/humanize.py:85 +#, python-format +msgid "%(value).1f nonillion" +msgid_plural "%(value).1f nonillion" +msgstr[0] "%(value).1f nonilió" +msgstr[1] "%(value).1f nonilions" + +#: templatetags/humanize.py:86 +#, python-format +msgid "%(value)s nonillion" +msgid_plural "%(value)s nonillion" +msgstr[0] "%(value)s nonilió" +msgstr[1] "%(value)s nonilions" + +#: templatetags/humanize.py:89 +#, python-format +msgid "%(value).1f decillion" +msgid_plural "%(value).1f decillion" +msgstr[0] "%(value).1f decilió" +msgstr[1] "%(value).1f decilions" + +#: templatetags/humanize.py:90 +#, python-format +msgid "%(value)s decillion" +msgid_plural "%(value)s decillion" +msgstr[0] "%(value)s decilió" +msgstr[1] "%(value)s decilions" + +#: templatetags/humanize.py:93 +#, python-format +msgid "%(value).1f googol" +msgid_plural "%(value).1f googol" +msgstr[0] "%(value).1f googol" +msgstr[1] "%(value).1f googols" + +#: templatetags/humanize.py:94 +#, python-format +msgid "%(value)s googol" +msgid_plural "%(value)s googol" +msgstr[0] "%(value)s googol" +msgstr[1] "%(value)s googols" + +#: templatetags/humanize.py:143 msgid "one" msgstr "un" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "two" msgstr "dos" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "three" msgstr "tres" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "four" msgstr "quatre" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "five" msgstr "cinc" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "six" msgstr "sis" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "seven" msgstr "set" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "eight" msgstr "vuit" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "nine" msgstr "nou" -#: templatetags/humanize.py:96 -msgid "today" -msgstr "avui" +#: templatetags/humanize.py:185 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s ago" +msgstr "fa %(delta)s" -#: templatetags/humanize.py:98 -msgid "tomorrow" -msgstr "demà" +#: templatetags/humanize.py:188 templatetags/humanize.py:210 +msgid "now" +msgstr "ara" -#: templatetags/humanize.py:100 -msgid "yesterday" -msgstr "ahir" +#: templatetags/humanize.py:191 +#, python-format +msgid "a second ago" +msgid_plural "%(count)s seconds ago" +msgstr[0] "fa un segon" +msgstr[1] "fa %(count)s segons" + +#: templatetags/humanize.py:196 +#, python-format +msgid "a minute ago" +msgid_plural "%(count)s minutes ago" +msgstr[0] "fa un minut" +msgstr[1] "fa %(count)s minuts" + +#: templatetags/humanize.py:201 +#, python-format +msgid "an hour ago" +msgid_plural "%(count)s hours ago" +msgstr[0] "fa una hora" +msgstr[1] "fa %(count)s hores" + +#: templatetags/humanize.py:207 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s from now" +msgstr "%(delta)s des d'ara" + +#: templatetags/humanize.py:213 +#, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "d'aquí a un segon" +msgstr[1] "d'aquí a %(count)s segons" + +#: templatetags/humanize.py:218 +#, python-format +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "d'aquí a un minut" +msgstr[1] "d'aquí a %(count)s minuts" + +#: templatetags/humanize.py:223 +#, python-format +msgid "an hour from now" +msgid_plural "%(count)s hours from now" +msgstr[0] "d'aquí a una hora" +msgstr[1] "d'aquí a %(count)s hores" diff --git a/django/contrib/humanize/locale/cs/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/cs/LC_MESSAGES/django.mo index 5ed027f79a..76151125e3 100644 Binary files a/django/contrib/humanize/locale/cs/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/cs/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/cs/LC_MESSAGES/django.po b/django/contrib/humanize/locale/cs/LC_MESSAGES/django.po index 7fdd571ef1..d46aef71d7 100644 --- a/django/contrib/humanize/locale/cs/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/cs/LC_MESSAGES/django.po @@ -1,36 +1,52 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Jannis Leidel , 2011. +# Vlada Macek , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:18-0400\n" -"PO-Revision-Date: 2011-03-04 18:39+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Czech \n" +"POT-Creation-Date: 2012-03-14 00:19-0700\n" +"PO-Revision-Date: 2012-02-14 13:08+0000\n" +"Last-Translator: Vlada Macek \n" +"Language-Team: Czech (http://www.transifex.net/projects/p/django/language/" +"cs/)\n" +"Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: cs\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n" -#: templatetags/humanize.py:19 +#: tests.py:108 templatetags/humanize.py:164 +msgid "today" +msgstr "dnes" + +#: tests.py:108 templatetags/humanize.py:168 +msgid "yesterday" +msgstr "včera" + +#: tests.py:108 templatetags/humanize.py:166 +msgid "tomorrow" +msgstr "zítra" + +#: templatetags/humanize.py:24 msgid "th" msgstr "." -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "st" msgstr "." -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "nd" msgstr "." -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "rd" msgstr "." -#: templatetags/humanize.py:54 +#: templatetags/humanize.py:53 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" @@ -38,6 +54,14 @@ msgstr[0] "%(value).1f milion" msgstr[1] "%(value).1f miliony" msgstr[2] "%(value).1f milionů" +#: templatetags/humanize.py:54 +#, python-format +msgid "%(value)s million" +msgid_plural "%(value)s million" +msgstr[0] " %(value)s milion" +msgstr[1] " %(value)s miliony" +msgstr[2] " %(value)s milionů" + #: templatetags/humanize.py:57 #, python-format msgid "%(value).1f billion" @@ -46,7 +70,15 @@ msgstr[0] "%(value).1f miliarda" msgstr[1] "%(value).1f miliardy" msgstr[2] "%(value).1f miliard" -#: templatetags/humanize.py:60 +#: templatetags/humanize.py:58 +#, python-format +msgid "%(value)s billion" +msgid_plural "%(value)s billion" +msgstr[0] "%(value)s miliarda" +msgstr[1] "%(value)s miliardy" +msgstr[2] "%(value)s miliard" + +#: templatetags/humanize.py:61 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" @@ -54,50 +86,238 @@ msgstr[0] "%(value).1f bilion" msgstr[1] "%(value).1f biliony" msgstr[2] "%(value).1f bilionů" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:62 +#, python-format +msgid "%(value)s trillion" +msgid_plural "%(value)s trillion" +msgstr[0] "%(value)s bilion" +msgstr[1] "%(value)s biliony" +msgstr[2] "%(value)s bilionů" + +#: templatetags/humanize.py:65 +#, python-format +msgid "%(value).1f quadrillion" +msgid_plural "%(value).1f quadrillion" +msgstr[0] "%(value).1f biliarda" +msgstr[1] "%(value).1f biliardy" +msgstr[2] "%(value).1f biliard" + +#: templatetags/humanize.py:66 +#, python-format +msgid "%(value)s quadrillion" +msgid_plural "%(value)s quadrillion" +msgstr[0] "%(value)s biliarda" +msgstr[1] "%(value)s biliardy" +msgstr[2] "%(value)s biliard" + +#: templatetags/humanize.py:69 +#, python-format +msgid "%(value).1f quintillion" +msgid_plural "%(value).1f quintillion" +msgstr[0] "%(value).1f trilion" +msgstr[1] "%(value).1f triliony" +msgstr[2] "%(value).1f trilionů" + +#: templatetags/humanize.py:70 +#, python-format +msgid "%(value)s quintillion" +msgid_plural "%(value)s quintillion" +msgstr[0] "%(value)s trilion" +msgstr[1] "%(value)s triliony" +msgstr[2] "%(value)s trilionů" + +#: templatetags/humanize.py:73 +#, python-format +msgid "%(value).1f sextillion" +msgid_plural "%(value).1f sextillion" +msgstr[0] "%(value).1f triliarda" +msgstr[1] "%(value).1f triliardy" +msgstr[2] "%(value).1f triliard" + +#: templatetags/humanize.py:74 +#, python-format +msgid "%(value)s sextillion" +msgid_plural "%(value)s sextillion" +msgstr[0] "%(value)s triliard" +msgstr[1] "%(value)s triliardy" +msgstr[2] "%(value)s triliard" + +#: templatetags/humanize.py:77 +#, python-format +msgid "%(value).1f septillion" +msgid_plural "%(value).1f septillion" +msgstr[0] "%(value).1f kvadrilion" +msgstr[1] "%(value).1f kvadriliony" +msgstr[2] "%(value).1f kvadrilionů" + +#: templatetags/humanize.py:78 +#, python-format +msgid "%(value)s septillion" +msgid_plural "%(value)s septillion" +msgstr[0] "%(value)s kvadrilion" +msgstr[1] "%(value)s kvadriliony" +msgstr[2] "%(value)s kvadrilionů" + +#: templatetags/humanize.py:81 +#, python-format +msgid "%(value).1f octillion" +msgid_plural "%(value).1f octillion" +msgstr[0] "%(value).1f kvadriliarda" +msgstr[1] "%(value).1f kvadriliardy" +msgstr[2] "%(value).1f kvadriliard" + +#: templatetags/humanize.py:82 +#, python-format +msgid "%(value)s octillion" +msgid_plural "%(value)s octillion" +msgstr[0] "%(value)s kvadriliarda" +msgstr[1] "%(value)s kvadriliardy" +msgstr[2] "%(value)s kvadriliard" + +#: templatetags/humanize.py:85 +#, python-format +msgid "%(value).1f nonillion" +msgid_plural "%(value).1f nonillion" +msgstr[0] "%(value).1f kvintilion" +msgstr[1] "%(value).1f kvintiliony" +msgstr[2] "%(value).1f kvintilionů" + +#: templatetags/humanize.py:86 +#, python-format +msgid "%(value)s nonillion" +msgid_plural "%(value)s nonillion" +msgstr[0] "%(value)s kvintilion" +msgstr[1] "%(value)s kvintiliony" +msgstr[2] "%(value)s kvintilionů" + +#: templatetags/humanize.py:89 +#, python-format +msgid "%(value).1f decillion" +msgid_plural "%(value).1f decillion" +msgstr[0] "%(value).1f kvintiliarda" +msgstr[1] "%(value).1f kvintiliardy" +msgstr[2] "%(value).1f kvintiliard" + +#: templatetags/humanize.py:90 +#, python-format +msgid "%(value)s decillion" +msgid_plural "%(value)s decillion" +msgstr[0] "%(value)s kvintiliarda" +msgstr[1] "%(value)s kvintiliardy" +msgstr[2] "%(value)s kvintiliard" + +#: templatetags/humanize.py:93 +#, python-format +msgid "%(value).1f googol" +msgid_plural "%(value).1f googol" +msgstr[0] "%(value).1f googol" +msgstr[1] "%(value).1f googoly" +msgstr[2] "%(value).1f googolů" + +#: templatetags/humanize.py:94 +#, python-format +msgid "%(value)s googol" +msgid_plural "%(value)s googol" +msgstr[0] "%(value)s googol" +msgstr[1] "%(value)s googoly" +msgstr[2] "%(value)s googolů" + +#: templatetags/humanize.py:143 msgid "one" msgstr "jedna" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "two" msgstr "dvě" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "three" msgstr "tři" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "four" msgstr "čtyři" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "five" msgstr "pět" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "six" msgstr "šest" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "seven" msgstr "sedm" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "eight" msgstr "osm" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "nine" msgstr "devět" -#: templatetags/humanize.py:96 -msgid "today" -msgstr "dnes" +#: templatetags/humanize.py:185 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s ago" +msgstr "%(delta)s v minulosti" -#: templatetags/humanize.py:98 -msgid "tomorrow" -msgstr "zítra" +#: templatetags/humanize.py:188 templatetags/humanize.py:210 +msgid "now" +msgstr "nyní" -#: templatetags/humanize.py:100 -msgid "yesterday" -msgstr "včera" +#: templatetags/humanize.py:191 +#, python-format +msgid "a second ago" +msgid_plural "%(count)s seconds ago" +msgstr[0] "před sekundou" +msgstr[1] "před %(count)s sekundami" +msgstr[2] "před %(count)s sekundami" + +#: templatetags/humanize.py:196 +#, python-format +msgid "a minute ago" +msgid_plural "%(count)s minutes ago" +msgstr[0] "před minutou" +msgstr[1] "před %(count)s minutami" +msgstr[2] "před %(count)s minutami" + +#: templatetags/humanize.py:201 +#, python-format +msgid "an hour ago" +msgid_plural "%(count)s hours ago" +msgstr[0] "před hodinou" +msgstr[1] "před %(count)s hodinami" +msgstr[2] "před %(count)s hodinami" + +#: templatetags/humanize.py:207 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s from now" +msgstr "%(delta)s v budoucnosti" + +#: templatetags/humanize.py:213 +#, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "za sekundu" +msgstr[1] "za %(count)s sekundy" +msgstr[2] "za %(count)s sekund" + +#: templatetags/humanize.py:218 +#, python-format +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "za minutu" +msgstr[1] "za %(count)s minuty" +msgstr[2] "za %(count)s minut" + +#: templatetags/humanize.py:223 +#, python-format +msgid "an hour from now" +msgid_plural "%(count)s hours from now" +msgstr[0] "za hodinu" +msgstr[1] "za %(count)s hodiny" +msgstr[2] "za %(count)s hodin" diff --git a/django/contrib/humanize/locale/cy/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/cy/LC_MESSAGES/django.mo index c3c4943c56..7d6e42c0b1 100644 Binary files a/django/contrib/humanize/locale/cy/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/cy/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/cy/LC_MESSAGES/django.po b/django/contrib/humanize/locale/cy/LC_MESSAGES/django.po index 3aa7b8a524..ca8ee3bf24 100644 --- a/django/contrib/humanize/locale/cy/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/cy/LC_MESSAGES/django.po @@ -4,34 +4,46 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:18-0400\n" +"POT-Creation-Date: 2012-03-14 00:19-0700\n" "PO-Revision-Date: 2011-03-15 15:28+0000\n" "Last-Translator: Django team\n" "Language-Team: English \n" +"Language: cy\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: cy\n" "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != " "11) ? 2 : 3\n" -#: templatetags/humanize.py:19 +#: tests.py:108 templatetags/humanize.py:164 +msgid "today" +msgstr "" + +#: tests.py:108 templatetags/humanize.py:168 +msgid "yesterday" +msgstr "" + +#: tests.py:108 templatetags/humanize.py:166 +msgid "tomorrow" +msgstr "" + +#: templatetags/humanize.py:24 msgid "th" msgstr "" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "st" msgstr "" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "nd" msgstr "" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "rd" msgstr "" -#: templatetags/humanize.py:54 +#: templatetags/humanize.py:53 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" @@ -40,6 +52,15 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" +#: templatetags/humanize.py:54 +#, python-format +msgid "%(value)s million" +msgid_plural "%(value)s million" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #: templatetags/humanize.py:57 #, python-format msgid "%(value).1f billion" @@ -49,7 +70,16 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templatetags/humanize.py:60 +#: templatetags/humanize.py:58 +#, python-format +msgid "%(value)s billion" +msgid_plural "%(value)s billion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: templatetags/humanize.py:61 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" @@ -58,50 +88,261 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:62 +#, python-format +msgid "%(value)s trillion" +msgid_plural "%(value)s trillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: templatetags/humanize.py:65 +#, python-format +msgid "%(value).1f quadrillion" +msgid_plural "%(value).1f quadrillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: templatetags/humanize.py:66 +#, python-format +msgid "%(value)s quadrillion" +msgid_plural "%(value)s quadrillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: templatetags/humanize.py:69 +#, python-format +msgid "%(value).1f quintillion" +msgid_plural "%(value).1f quintillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: templatetags/humanize.py:70 +#, python-format +msgid "%(value)s quintillion" +msgid_plural "%(value)s quintillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: templatetags/humanize.py:73 +#, python-format +msgid "%(value).1f sextillion" +msgid_plural "%(value).1f sextillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: templatetags/humanize.py:74 +#, python-format +msgid "%(value)s sextillion" +msgid_plural "%(value)s sextillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: templatetags/humanize.py:77 +#, python-format +msgid "%(value).1f septillion" +msgid_plural "%(value).1f septillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: templatetags/humanize.py:78 +#, python-format +msgid "%(value)s septillion" +msgid_plural "%(value)s septillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: templatetags/humanize.py:81 +#, python-format +msgid "%(value).1f octillion" +msgid_plural "%(value).1f octillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: templatetags/humanize.py:82 +#, python-format +msgid "%(value)s octillion" +msgid_plural "%(value)s octillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: templatetags/humanize.py:85 +#, python-format +msgid "%(value).1f nonillion" +msgid_plural "%(value).1f nonillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: templatetags/humanize.py:86 +#, python-format +msgid "%(value)s nonillion" +msgid_plural "%(value)s nonillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: templatetags/humanize.py:89 +#, python-format +msgid "%(value).1f decillion" +msgid_plural "%(value).1f decillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: templatetags/humanize.py:90 +#, python-format +msgid "%(value)s decillion" +msgid_plural "%(value)s decillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: templatetags/humanize.py:93 +#, python-format +msgid "%(value).1f googol" +msgid_plural "%(value).1f googol" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: templatetags/humanize.py:94 +#, python-format +msgid "%(value)s googol" +msgid_plural "%(value)s googol" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: templatetags/humanize.py:143 msgid "one" msgstr "" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "two" msgstr "" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "three" msgstr "" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "four" msgstr "" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "five" msgstr "" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "six" msgstr "" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "seven" msgstr "" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "eight" msgstr "" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "nine" msgstr "" -#: templatetags/humanize.py:96 -msgid "today" +#: templatetags/humanize.py:185 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s ago" msgstr "" -#: templatetags/humanize.py:98 -msgid "tomorrow" +#: templatetags/humanize.py:188 templatetags/humanize.py:210 +msgid "now" msgstr "" -#: templatetags/humanize.py:100 -msgid "yesterday" +#: templatetags/humanize.py:191 +#, python-format +msgid "a second ago" +msgid_plural "%(count)s seconds ago" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: templatetags/humanize.py:196 +#, python-format +msgid "a minute ago" +msgid_plural "%(count)s minutes ago" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: templatetags/humanize.py:201 +#, python-format +msgid "an hour ago" +msgid_plural "%(count)s hours ago" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: templatetags/humanize.py:207 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s from now" msgstr "" + +#: templatetags/humanize.py:213 +#, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: templatetags/humanize.py:218 +#, python-format +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: templatetags/humanize.py:223 +#, python-format +msgid "an hour from now" +msgid_plural "%(count)s hours from now" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" diff --git a/django/contrib/humanize/locale/da/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/da/LC_MESSAGES/django.mo index 98211a107d..6af86464db 100644 Binary files a/django/contrib/humanize/locale/da/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/da/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/da/LC_MESSAGES/django.po b/django/contrib/humanize/locale/da/LC_MESSAGES/django.po index 2890331e36..176e126f53 100644 --- a/django/contrib/humanize/locale/da/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/da/LC_MESSAGES/django.po @@ -1,42 +1,65 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Christian Joergensen , 2012. +# Jannis Leidel , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:18-0400\n" -"PO-Revision-Date: 2011-03-04 18:39+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Danish <>\n" +"POT-Creation-Date: 2012-03-14 00:19-0700\n" +"PO-Revision-Date: 2012-02-14 13:08+0000\n" +"Last-Translator: Christian Joergensen \n" +"Language-Team: Danish (http://www.transifex.net/projects/p/django/language/" +"da/)\n" +"Language: da\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: da\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: templatetags/humanize.py:19 +#: tests.py:108 templatetags/humanize.py:164 +msgid "today" +msgstr "i dag" + +#: tests.py:108 templatetags/humanize.py:168 +msgid "yesterday" +msgstr "i går" + +#: tests.py:108 templatetags/humanize.py:166 +msgid "tomorrow" +msgstr "i morgen" + +#: templatetags/humanize.py:24 msgid "th" msgstr "." -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "st" msgstr "." -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "nd" msgstr "." -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "rd" msgstr "." -#: templatetags/humanize.py:54 +#: templatetags/humanize.py:53 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" msgstr[0] "%(value).1f million" msgstr[1] "%(value).1f millioner" +#: templatetags/humanize.py:54 +#, python-format +msgid "%(value)s million" +msgid_plural "%(value)s million" +msgstr[0] "%(value)s million" +msgstr[1] "%(value)s millioner" + #: templatetags/humanize.py:57 #, python-format msgid "%(value).1f billion" @@ -44,57 +67,229 @@ msgid_plural "%(value).1f billion" msgstr[0] "%(value).1f milliard" msgstr[1] "%(value).1f milliarder" -#: templatetags/humanize.py:60 +#: templatetags/humanize.py:58 +#, python-format +msgid "%(value)s billion" +msgid_plural "%(value)s billion" +msgstr[0] "%(value)s milliard" +msgstr[1] "%(value)s milliarder" + +#: templatetags/humanize.py:61 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" msgstr[0] "%(value).1f billion" msgstr[1] "%(value).1f billioner" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:62 +#, python-format +msgid "%(value)s trillion" +msgid_plural "%(value)s trillion" +msgstr[0] "%(value)s billion" +msgstr[1] "%(value)s billioner" + +#: templatetags/humanize.py:65 +#, python-format +msgid "%(value).1f quadrillion" +msgid_plural "%(value).1f quadrillion" +msgstr[0] "%(value).1f billiard" +msgstr[1] "%(value).1f billiarder" + +#: templatetags/humanize.py:66 +#, python-format +msgid "%(value)s quadrillion" +msgid_plural "%(value)s quadrillion" +msgstr[0] "%(value)s billiard" +msgstr[1] "%(value)s billiarder" + +#: templatetags/humanize.py:69 +#, python-format +msgid "%(value).1f quintillion" +msgid_plural "%(value).1f quintillion" +msgstr[0] "%(value).1f trillion" +msgstr[1] "%(value).1f trillioner" + +#: templatetags/humanize.py:70 +#, python-format +msgid "%(value)s quintillion" +msgid_plural "%(value)s quintillion" +msgstr[0] "%(value)s trillion" +msgstr[1] "%(value)s trillioner" + +#: templatetags/humanize.py:73 +#, python-format +msgid "%(value).1f sextillion" +msgid_plural "%(value).1f sextillion" +msgstr[0] "%(value).1f trilliard" +msgstr[1] "%(value).1f trilliarder" + +#: templatetags/humanize.py:74 +#, python-format +msgid "%(value)s sextillion" +msgid_plural "%(value)s sextillion" +msgstr[0] "%(value)s trilliard" +msgstr[1] "%(value)s trilliarder" + +#: templatetags/humanize.py:77 +#, python-format +msgid "%(value).1f septillion" +msgid_plural "%(value).1f septillion" +msgstr[0] "%(value).1f kvadrillion" +msgstr[1] "%(value).1f kvadrillioner" + +#: templatetags/humanize.py:78 +#, python-format +msgid "%(value)s septillion" +msgid_plural "%(value)s septillion" +msgstr[0] "%(value)s kvadrillion" +msgstr[1] "%(value)s kvadrillioner" + +#: templatetags/humanize.py:81 +#, python-format +msgid "%(value).1f octillion" +msgid_plural "%(value).1f octillion" +msgstr[0] "%(value).1f kvadrilliard" +msgstr[1] "%(value).1f kvadrilliarder" + +#: templatetags/humanize.py:82 +#, python-format +msgid "%(value)s octillion" +msgid_plural "%(value)s octillion" +msgstr[0] "%(value)s kvadrilliard" +msgstr[1] "%(value)s kvadrilliarder" + +#: templatetags/humanize.py:85 +#, python-format +msgid "%(value).1f nonillion" +msgid_plural "%(value).1f nonillion" +msgstr[0] "%(value).1f kvintillion" +msgstr[1] "%(value).1f kvintillioner" + +#: templatetags/humanize.py:86 +#, python-format +msgid "%(value)s nonillion" +msgid_plural "%(value)s nonillion" +msgstr[0] "%(value)s kvintillion" +msgstr[1] "%(value)s kvintillioner" + +#: templatetags/humanize.py:89 +#, python-format +msgid "%(value).1f decillion" +msgid_plural "%(value).1f decillion" +msgstr[0] "%(value).1f kvintilliard" +msgstr[1] "%(value).1f kvintilliarder" + +#: templatetags/humanize.py:90 +#, python-format +msgid "%(value)s decillion" +msgid_plural "%(value)s decillion" +msgstr[0] "%(value)s kvintilliard" +msgstr[1] "%(value)s kvintilliarder" + +#: templatetags/humanize.py:93 +#, python-format +msgid "%(value).1f googol" +msgid_plural "%(value).1f googol" +msgstr[0] "%(value).1f gogol" +msgstr[1] "%(value).1f gogoler" + +#: templatetags/humanize.py:94 +#, python-format +msgid "%(value)s googol" +msgid_plural "%(value)s googol" +msgstr[0] "%(value)s gogol" +msgstr[1] "%(value)s gogoler" + +#: templatetags/humanize.py:143 msgid "one" msgstr "en" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "two" msgstr "to" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "three" msgstr "tre" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "four" msgstr "fire" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "five" msgstr "fem" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "six" msgstr "seks" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "seven" msgstr "syv" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "eight" msgstr "otte" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "nine" msgstr "ni" -#: templatetags/humanize.py:96 -msgid "today" -msgstr "i dag" +#: templatetags/humanize.py:185 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s ago" +msgstr "%(delta)s siden" -#: templatetags/humanize.py:98 -msgid "tomorrow" -msgstr "i morgen" +#: templatetags/humanize.py:188 templatetags/humanize.py:210 +msgid "now" +msgstr "nu" -#: templatetags/humanize.py:100 -msgid "yesterday" -msgstr "i går" +#: templatetags/humanize.py:191 +#, python-format +msgid "a second ago" +msgid_plural "%(count)s seconds ago" +msgstr[0] "et sekund siden" +msgstr[1] "%(count)s sekunder siden" + +#: templatetags/humanize.py:196 +#, python-format +msgid "a minute ago" +msgid_plural "%(count)s minutes ago" +msgstr[0] "et minut siden" +msgstr[1] "%(count)s minutter siden" + +#: templatetags/humanize.py:201 +#, python-format +msgid "an hour ago" +msgid_plural "%(count)s hours ago" +msgstr[0] "en time siden" +msgstr[1] "%(count)s timer siden" + +#: templatetags/humanize.py:207 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s from now" +msgstr "%(delta)s fra nu af" + +#: templatetags/humanize.py:213 +#, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "et sekund fra nu af" +msgstr[1] "%(count)s sekunder fra nu af" + +#: templatetags/humanize.py:218 +#, python-format +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "et minut fra nu af" +msgstr[1] "%(count)s minutter fra nu af" + +#: templatetags/humanize.py:223 +#, python-format +msgid "an hour from now" +msgid_plural "%(count)s hours from now" +msgstr[0] "en time fra nu af" +msgstr[1] "%(count)s timer fra nu af" diff --git a/django/contrib/humanize/locale/de/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/de/LC_MESSAGES/django.mo index 1639f6ecbd..f55963b72d 100644 Binary files a/django/contrib/humanize/locale/de/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/de/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/de/LC_MESSAGES/django.po b/django/contrib/humanize/locale/de/LC_MESSAGES/django.po index 8a7843bbc8..cf2c6534bb 100644 --- a/django/contrib/humanize/locale/de/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/de/LC_MESSAGES/django.po @@ -1,148 +1,295 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# André Hagenbruch , 2011. +# Jannis Leidel , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-06 14:14+0200\n" -"PO-Revision-Date: 2011-03-04 18:39+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: German <>\n" +"POT-Creation-Date: 2012-03-14 00:19-0700\n" +"PO-Revision-Date: 2012-02-14 13:08+0000\n" +"Last-Translator: André Hagenbruch \n" +"Language-Team: German (http://www.transifex.net/projects/p/django/language/" +"de/)\n" +"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: templatetags/humanize.py:21 +#: tests.py:108 templatetags/humanize.py:164 +msgid "today" +msgstr "heute" + +#: tests.py:108 templatetags/humanize.py:168 +msgid "yesterday" +msgstr "gestern" + +#: tests.py:108 templatetags/humanize.py:166 +msgid "tomorrow" +msgstr "morgen" + +#: templatetags/humanize.py:24 msgid "th" msgstr "." -#: templatetags/humanize.py:21 +#: templatetags/humanize.py:24 msgid "st" msgstr "." -#: templatetags/humanize.py:21 +#: templatetags/humanize.py:24 msgid "nd" msgstr "." -#: templatetags/humanize.py:21 +#: templatetags/humanize.py:24 msgid "rd" msgstr "." -#: templatetags/humanize.py:68 +#: templatetags/humanize.py:53 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" msgstr[0] "%(value).1f Million" msgstr[1] "%(value).1f Millionen" -#: templatetags/humanize.py:69 +#: templatetags/humanize.py:54 #, python-format msgid "%(value)s million" msgid_plural "%(value)s million" msgstr[0] "%(value)s Million" msgstr[1] "%(value)s Millionen" -#: templatetags/humanize.py:74 +#: templatetags/humanize.py:57 #, python-format msgid "%(value).1f billion" msgid_plural "%(value).1f billion" msgstr[0] "%(value).1f Milliarde" msgstr[1] "%(value).1f Milliarden" -#: templatetags/humanize.py:75 +#: templatetags/humanize.py:58 #, python-format msgid "%(value)s billion" msgid_plural "%(value)s billion" msgstr[0] "%(value)s Milliarde" msgstr[1] "%(value)s Milliarden" -#: templatetags/humanize.py:80 +#: templatetags/humanize.py:61 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" msgstr[0] "%(value).1f Billion" msgstr[1] "%(value).1f Billionen" -#: templatetags/humanize.py:81 +#: templatetags/humanize.py:62 #, python-format msgid "%(value)s trillion" msgid_plural "%(value)s trillion" msgstr[0] "%(value)s Billion" msgstr[1] "%(value)s Billionen" -#: templatetags/humanize.py:98 +#: templatetags/humanize.py:65 +#, python-format +msgid "%(value).1f quadrillion" +msgid_plural "%(value).1f quadrillion" +msgstr[0] "%(value).1f Billiarde" +msgstr[1] "%(value).1f Billiarden" + +#: templatetags/humanize.py:66 +#, python-format +msgid "%(value)s quadrillion" +msgid_plural "%(value)s quadrillion" +msgstr[0] "%(value)s Billiarde" +msgstr[1] "%(value)s Billiarden" + +#: templatetags/humanize.py:69 +#, python-format +msgid "%(value).1f quintillion" +msgid_plural "%(value).1f quintillion" +msgstr[0] "%(value).1f Trillion" +msgstr[1] "%(value).1f Trillionen" + +#: templatetags/humanize.py:70 +#, python-format +msgid "%(value)s quintillion" +msgid_plural "%(value)s quintillion" +msgstr[0] "%(value)s Trillion" +msgstr[1] "%(value)s Trillionen" + +#: templatetags/humanize.py:73 +#, python-format +msgid "%(value).1f sextillion" +msgid_plural "%(value).1f sextillion" +msgstr[0] "%(value).1f Trilliarde" +msgstr[1] "%(value).1f Trilliarden" + +#: templatetags/humanize.py:74 +#, python-format +msgid "%(value)s sextillion" +msgid_plural "%(value)s sextillion" +msgstr[0] "%(value)s Trilliarde" +msgstr[1] "%(value)s Trilliarden" + +#: templatetags/humanize.py:77 +#, python-format +msgid "%(value).1f septillion" +msgid_plural "%(value).1f septillion" +msgstr[0] "%(value).1f Quadrillion" +msgstr[1] "%(value).1f Quadrillionen" + +#: templatetags/humanize.py:78 +#, python-format +msgid "%(value)s septillion" +msgid_plural "%(value)s septillion" +msgstr[0] "%(value)s Quadrillion" +msgstr[1] "%(value)s Quadrillionen" + +#: templatetags/humanize.py:81 +#, python-format +msgid "%(value).1f octillion" +msgid_plural "%(value).1f octillion" +msgstr[0] "%(value).1f Quadrilliarde" +msgstr[1] "%(value).1f Quadrilliarden" + +#: templatetags/humanize.py:82 +#, python-format +msgid "%(value)s octillion" +msgid_plural "%(value)s octillion" +msgstr[0] "%(value)s Quadrilliarde" +msgstr[1] "%(value)s Quadrilliarden" + +#: templatetags/humanize.py:85 +#, python-format +msgid "%(value).1f nonillion" +msgid_plural "%(value).1f nonillion" +msgstr[0] "%(value).1f Quintillion" +msgstr[1] "%(value).1f Quintillionen" + +#: templatetags/humanize.py:86 +#, python-format +msgid "%(value)s nonillion" +msgid_plural "%(value)s nonillion" +msgstr[0] "%(value)s Quintillion" +msgstr[1] "%(value)s Quintillionen" + +#: templatetags/humanize.py:89 +#, python-format +msgid "%(value).1f decillion" +msgid_plural "%(value).1f decillion" +msgstr[0] "%(value).1f Quintilliarde" +msgstr[1] "%(value).1f Quintilliarden" + +#: templatetags/humanize.py:90 +#, python-format +msgid "%(value)s decillion" +msgid_plural "%(value)s decillion" +msgstr[0] "%(value)s Quintilliarde" +msgstr[1] "%(value)s Quintilliarden" + +#: templatetags/humanize.py:93 +#, python-format +msgid "%(value).1f googol" +msgid_plural "%(value).1f googol" +msgstr[0] "%(value).1f Sedezilliarde" +msgstr[1] "%(value).1f Sedezilliarden" + +#: templatetags/humanize.py:94 +#, python-format +msgid "%(value)s googol" +msgid_plural "%(value)s googol" +msgstr[0] "%(value)s Sedezilliarde" +msgstr[1] "%(value)s Sedezilliarden" + +#: templatetags/humanize.py:143 msgid "one" msgstr "ein" -#: templatetags/humanize.py:98 +#: templatetags/humanize.py:143 msgid "two" msgstr "zwei" -#: templatetags/humanize.py:98 +#: templatetags/humanize.py:143 msgid "three" msgstr "drei" -#: templatetags/humanize.py:98 +#: templatetags/humanize.py:143 msgid "four" msgstr "vier" -#: templatetags/humanize.py:98 +#: templatetags/humanize.py:143 msgid "five" msgstr "fünf" -#: templatetags/humanize.py:98 +#: templatetags/humanize.py:143 msgid "six" msgstr "sechs" -#: templatetags/humanize.py:98 +#: templatetags/humanize.py:143 msgid "seven" msgstr "sieben" -#: templatetags/humanize.py:98 +#: templatetags/humanize.py:143 msgid "eight" msgstr "acht" -#: templatetags/humanize.py:98 +#: templatetags/humanize.py:143 msgid "nine" msgstr "neun" -#: templatetags/humanize.py:121 -msgid "today" -msgstr "heute" +#: templatetags/humanize.py:185 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s ago" +msgstr "vor %(delta)s" -#: templatetags/humanize.py:123 -msgid "tomorrow" -msgstr "morgen" - -#: templatetags/humanize.py:125 -msgid "yesterday" -msgstr "gestern" - -#: templatetags/humanize.py:147 +#: templatetags/humanize.py:188 templatetags/humanize.py:210 msgid "now" -msgstr "" +msgstr "jetzt" -#: templatetags/humanize.py:149 +#: templatetags/humanize.py:191 #, python-format -msgid "%s seconds ago" -msgstr "" +msgid "a second ago" +msgid_plural "%(count)s seconds ago" +msgstr[0] "vor einer Sekunde" +msgstr[1] "vor %(count)s Sekunden" -#: templatetags/humanize.py:151 +#: templatetags/humanize.py:196 +#, python-format msgid "a minute ago" -msgstr "" +msgid_plural "%(count)s minutes ago" +msgstr[0] "vor einer Minute" +msgstr[1] "vor %(count)s Minuten" -#: templatetags/humanize.py:153 +#: templatetags/humanize.py:201 #, python-format -msgid "%s minutes ago" -msgstr "" - -#: templatetags/humanize.py:155 msgid "an hour ago" -msgstr "" +msgid_plural "%(count)s hours ago" +msgstr[0] "vor einer Stunde" +msgstr[1] "vor %(count)s Stunden" -#: templatetags/humanize.py:157 +#: templatetags/humanize.py:207 #, python-format -msgid "%s hours ago" -msgstr "" +msgctxt "naturaltime" +msgid "%(delta)s from now" +msgstr "in %(delta)s" + +#: templatetags/humanize.py:213 +#, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "in einer Sekunde" +msgstr[1] "in %(count)s Sekunden" + +#: templatetags/humanize.py:218 +#, python-format +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "in einer Minute" +msgstr[1] "in %(count)s Minuten" + +#: templatetags/humanize.py:223 +#, python-format +msgid "an hour from now" +msgid_plural "%(count)s hours from now" +msgstr[0] "in einer Stunde" +msgstr[1] "in %(count)s Stunden" diff --git a/django/contrib/humanize/locale/el/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/el/LC_MESSAGES/django.mo index d6accb280b..535491c021 100644 Binary files a/django/contrib/humanize/locale/el/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/el/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/el/LC_MESSAGES/django.po b/django/contrib/humanize/locale/el/LC_MESSAGES/django.po index 3d7695675f..f19e150aca 100644 --- a/django/contrib/humanize/locale/el/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/el/LC_MESSAGES/django.po @@ -1,42 +1,66 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Dimitris Glezos , 2011. +# Jannis Leidel , 2011. +# Kostas Papadimitriou , 2012. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:18-0400\n" -"PO-Revision-Date: 2011-03-04 18:39+0000\n" -"Last-Translator: glezos \n" -"Language-Team: Greek <>\n" +"POT-Creation-Date: 2012-03-14 00:19-0700\n" +"PO-Revision-Date: 2012-03-12 19:02+0000\n" +"Last-Translator: Kostas Papadimitriou \n" +"Language-Team: Greek (http://www.transifex.net/projects/p/django/language/" +"el/)\n" +"Language: el\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: el\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: templatetags/humanize.py:19 +#: tests.py:108 templatetags/humanize.py:164 +msgid "today" +msgstr "σήμερα" + +#: tests.py:108 templatetags/humanize.py:168 +msgid "yesterday" +msgstr "χθες" + +#: tests.py:108 templatetags/humanize.py:166 +msgid "tomorrow" +msgstr "αύριο" + +#: templatetags/humanize.py:24 msgid "th" msgstr "η" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "st" msgstr "η" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "nd" msgstr "η" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "rd" msgstr "η" -#: templatetags/humanize.py:54 +#: templatetags/humanize.py:53 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" msgstr[0] "%(value).1f εκατομμύριο" msgstr[1] "%(value).1f εκατομμύρια" +#: templatetags/humanize.py:54 +#, python-format +msgid "%(value)s million" +msgid_plural "%(value)s million" +msgstr[0] " %(value)s εκατομμύριο" +msgstr[1] " %(value)s εκατομμύρια" + #: templatetags/humanize.py:57 #, python-format msgid "%(value).1f billion" @@ -44,57 +68,229 @@ msgid_plural "%(value).1f billion" msgstr[0] "%(value).1f δισεκατομμύριο" msgstr[1] "%(value).1f δισεκατομμύρια" -#: templatetags/humanize.py:60 +#: templatetags/humanize.py:58 +#, python-format +msgid "%(value)s billion" +msgid_plural "%(value)s billion" +msgstr[0] "%(value)s δισεκατομμύριο" +msgstr[1] "%(value)s δισεκατομμύρια" + +#: templatetags/humanize.py:61 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" msgstr[0] "%(value).1f τρισεκατομμύριο" msgstr[1] "%(value).1f τρισεκατομμύρια" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:62 +#, python-format +msgid "%(value)s trillion" +msgid_plural "%(value)s trillion" +msgstr[0] "%(value)s τρισεκατομμύριο" +msgstr[1] "%(value)s τρισεκατομμύρια" + +#: templatetags/humanize.py:65 +#, python-format +msgid "%(value).1f quadrillion" +msgid_plural "%(value).1f quadrillion" +msgstr[0] "%(value).1f τετράκις εκατομμύριο" +msgstr[1] "%(value).1f τετράκις εκατομμύρια" + +#: templatetags/humanize.py:66 +#, python-format +msgid "%(value)s quadrillion" +msgid_plural "%(value)s quadrillion" +msgstr[0] "%(value)s τετράκις εκατομμύριο" +msgstr[1] "%(value)s τετράκις εκατομμύρια" + +#: templatetags/humanize.py:69 +#, python-format +msgid "%(value).1f quintillion" +msgid_plural "%(value).1f quintillion" +msgstr[0] "%(value).1f πεντάκις εκατομμύριo" +msgstr[1] "%(value).1f πεντάκις εκατομμύρια" + +#: templatetags/humanize.py:70 +#, python-format +msgid "%(value)s quintillion" +msgid_plural "%(value)s quintillion" +msgstr[0] "%(value)s πεντάκις εκατομμύριo" +msgstr[1] "%(value)s πεντάκις εκατομμύρια" + +#: templatetags/humanize.py:73 +#, python-format +msgid "%(value).1f sextillion" +msgid_plural "%(value).1f sextillion" +msgstr[0] "%(value).1f εξάκις εκατομμύριo" +msgstr[1] "%(value).1f εξάκις εκατομμύρια" + +#: templatetags/humanize.py:74 +#, python-format +msgid "%(value)s sextillion" +msgid_plural "%(value)s sextillion" +msgstr[0] "%(value)s εξάκις εκατομμύριo" +msgstr[1] "%(value)s εξάκις εκατομμύρια" + +#: templatetags/humanize.py:77 +#, python-format +msgid "%(value).1f septillion" +msgid_plural "%(value).1f septillion" +msgstr[0] "%(value).1f επτάκις εκατομμύριο" +msgstr[1] "%(value).1f επτάκις εκατομμύρια" + +#: templatetags/humanize.py:78 +#, python-format +msgid "%(value)s septillion" +msgid_plural "%(value)s septillion" +msgstr[0] "%(value)s επτάκις εκατομμύριο" +msgstr[1] "%(value)s επτάκις εκατομμύρια" + +#: templatetags/humanize.py:81 +#, python-format +msgid "%(value).1f octillion" +msgid_plural "%(value).1f octillion" +msgstr[0] "%(value).1f οκτάκις εκατομμύριο" +msgstr[1] "%(value).1f οκτάκις εκατομμύρια" + +#: templatetags/humanize.py:82 +#, python-format +msgid "%(value)s octillion" +msgid_plural "%(value)s octillion" +msgstr[0] "%(value)s οκτάκις εκατομμύριο" +msgstr[1] "%(value)s οκτάκις εκατομμύρια" + +#: templatetags/humanize.py:85 +#, python-format +msgid "%(value).1f nonillion" +msgid_plural "%(value).1f nonillion" +msgstr[0] "%(value).1f εννεάκις εκατομμύριο" +msgstr[1] "%(value).1f εννεάκις εκατομμύρια" + +#: templatetags/humanize.py:86 +#, python-format +msgid "%(value)s nonillion" +msgid_plural "%(value)s nonillion" +msgstr[0] "%(value)s εννεάκις εκατομμύριο" +msgstr[1] "%(value)s εννεάκις εκατομμύρια" + +#: templatetags/humanize.py:89 +#, python-format +msgid "%(value).1f decillion" +msgid_plural "%(value).1f decillion" +msgstr[0] "%(value).1f δεκάκις εκατομμύριο" +msgstr[1] "%(value).1f δεκάκις εκατομμύρια" + +#: templatetags/humanize.py:90 +#, python-format +msgid "%(value)s decillion" +msgid_plural "%(value)s decillion" +msgstr[0] "%(value)s δεκάκις εκατομμύριο" +msgstr[1] "%(value)s δεκάκις εκατομμύρια" + +#: templatetags/humanize.py:93 +#, python-format +msgid "%(value).1f googol" +msgid_plural "%(value).1f googol" +msgstr[0] "%(value).1f googol" +msgstr[1] "%(value).1f googol" + +#: templatetags/humanize.py:94 +#, python-format +msgid "%(value)s googol" +msgid_plural "%(value)s googol" +msgstr[0] "%(value)s googol" +msgstr[1] "%(value)s googol" + +#: templatetags/humanize.py:143 msgid "one" msgstr "ένα" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "two" msgstr "δύο" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "three" msgstr "τρία" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "four" msgstr "τέσσερα" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "five" msgstr "πέντε" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "six" msgstr "έξι" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "seven" msgstr "εφτά" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "eight" msgstr "οκτώ" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "nine" msgstr "εννιά" -#: templatetags/humanize.py:96 -msgid "today" -msgstr "σήμερα" +#: templatetags/humanize.py:185 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s ago" +msgstr "πριν από %(delta)s" -#: templatetags/humanize.py:98 -msgid "tomorrow" -msgstr "αύριο" +#: templatetags/humanize.py:188 templatetags/humanize.py:210 +msgid "now" +msgstr "τώρα" -#: templatetags/humanize.py:100 -msgid "yesterday" -msgstr "χθες" +#: templatetags/humanize.py:191 +#, python-format +msgid "a second ago" +msgid_plural "%(count)s seconds ago" +msgstr[0] "πριν από ένα δευτερόλεπτο" +msgstr[1] "πριν από %(count)s δευτερόλεπτα" + +#: templatetags/humanize.py:196 +#, python-format +msgid "a minute ago" +msgid_plural "%(count)s minutes ago" +msgstr[0] "πριν από ένα λεπτό" +msgstr[1] "πριν από %(count)s λεπτά" + +#: templatetags/humanize.py:201 +#, python-format +msgid "an hour ago" +msgid_plural "%(count)s hours ago" +msgstr[0] "πριν από μια ώρα" +msgstr[1] "πριν από %(count)s ώρες" + +#: templatetags/humanize.py:207 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s from now" +msgstr "σε %(delta)s" + +#: templatetags/humanize.py:213 +#, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "σε ένα δευτερόλεπτο" +msgstr[1] "σε %(count)s δευτερόλεπτα" + +#: templatetags/humanize.py:218 +#, python-format +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "σε ένα λεπτό" +msgstr[1] "σε %(count)s λεπτά" + +#: templatetags/humanize.py:223 +#, python-format +msgid "an hour from now" +msgid_plural "%(count)s hours from now" +msgstr[0] "σε μία ώρα" +msgstr[1] "σε %(count)s ώρες" diff --git a/django/contrib/humanize/locale/en/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/en/LC_MESSAGES/django.mo index ba05bc9d70..dcd912cc33 100644 Binary files a/django/contrib/humanize/locale/en/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/en/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/en/LC_MESSAGES/django.po b/django/contrib/humanize/locale/en/LC_MESSAGES/django.po index e3fb66abb0..a49426a358 100644 --- a/django/contrib/humanize/locale/en/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/en/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-12-22 23:56+0100\n" +"POT-Creation-Date: 2012-03-14 00:19-0700\n" "PO-Revision-Date: 2010-05-13 15:35+0200\n" "Last-Translator: Django team\n" "Language-Team: English \n" @@ -13,15 +13,15 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: tests.py:102 templatetags/humanize.py:164 +#: tests.py:108 templatetags/humanize.py:164 msgid "today" msgstr "" -#: tests.py:102 templatetags/humanize.py:168 +#: tests.py:108 templatetags/humanize.py:168 msgid "yesterday" msgstr "" -#: tests.py:102 templatetags/humanize.py:166 +#: tests.py:108 templatetags/humanize.py:166 msgid "tomorrow" msgstr "" diff --git a/django/contrib/humanize/locale/en_GB/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/en_GB/LC_MESSAGES/django.mo index 77525f5d87..4ad1b4b66c 100644 Binary files a/django/contrib/humanize/locale/en_GB/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/en_GB/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/en_GB/LC_MESSAGES/django.po b/django/contrib/humanize/locale/en_GB/LC_MESSAGES/django.po index eafc495a96..4f975d096f 100644 --- a/django/contrib/humanize/locale/en_GB/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/en_GB/LC_MESSAGES/django.po @@ -1,42 +1,66 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# , 2011. +# jon_atkinson , 2011. +# , 2012. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:18-0400\n" -"PO-Revision-Date: 2011-03-04 18:39+0000\n" +"POT-Creation-Date: 2012-03-14 00:19-0700\n" +"PO-Revision-Date: 2012-02-14 13:08+0000\n" "Last-Translator: jon_atkinson \n" -"Language-Team: English (United Kingdom) \n" +"Language-Team: English (United Kingdom) (http://www.transifex.net/projects/p/" +"django/language/en_GB/)\n" +"Language: en_GB\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: en_GB\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: templatetags/humanize.py:19 +#: tests.py:108 templatetags/humanize.py:164 +msgid "today" +msgstr "today" + +#: tests.py:108 templatetags/humanize.py:168 +msgid "yesterday" +msgstr "yesterday" + +#: tests.py:108 templatetags/humanize.py:166 +msgid "tomorrow" +msgstr "tomorrow" + +#: templatetags/humanize.py:24 msgid "th" msgstr "th" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "st" msgstr "st" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "nd" msgstr "nd" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "rd" msgstr "rd" -#: templatetags/humanize.py:54 +#: templatetags/humanize.py:53 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" msgstr[0] "%(value).1f million" msgstr[1] "%(value).1f million" +#: templatetags/humanize.py:54 +#, python-format +msgid "%(value)s million" +msgid_plural "%(value)s million" +msgstr[0] "%(value)s million" +msgstr[1] "%(value)s million" + #: templatetags/humanize.py:57 #, python-format msgid "%(value).1f billion" @@ -44,57 +68,229 @@ msgid_plural "%(value).1f billion" msgstr[0] "%(value).1f billion" msgstr[1] "%(value).1f billion" -#: templatetags/humanize.py:60 +#: templatetags/humanize.py:58 +#, python-format +msgid "%(value)s billion" +msgid_plural "%(value)s billion" +msgstr[0] "%(value)s billion" +msgstr[1] "%(value)s billion" + +#: templatetags/humanize.py:61 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" msgstr[0] "%(value).1f trillion" msgstr[1] "%(value).1f trillion" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:62 +#, python-format +msgid "%(value)s trillion" +msgid_plural "%(value)s trillion" +msgstr[0] "%(value)s trillion" +msgstr[1] "%(value)s trillion" + +#: templatetags/humanize.py:65 +#, python-format +msgid "%(value).1f quadrillion" +msgid_plural "%(value).1f quadrillion" +msgstr[0] "%(value).1f quadrillion" +msgstr[1] "%(value).1f quadrillion" + +#: templatetags/humanize.py:66 +#, python-format +msgid "%(value)s quadrillion" +msgid_plural "%(value)s quadrillion" +msgstr[0] "%(value)s quadrillion" +msgstr[1] "%(value)s quadrillion" + +#: templatetags/humanize.py:69 +#, python-format +msgid "%(value).1f quintillion" +msgid_plural "%(value).1f quintillion" +msgstr[0] "%(value).1f quintillion" +msgstr[1] "%(value).1f quintillion" + +#: templatetags/humanize.py:70 +#, python-format +msgid "%(value)s quintillion" +msgid_plural "%(value)s quintillion" +msgstr[0] "%(value)s quintillion" +msgstr[1] "%(value)s quintillion" + +#: templatetags/humanize.py:73 +#, python-format +msgid "%(value).1f sextillion" +msgid_plural "%(value).1f sextillion" +msgstr[0] "%(value).1f sextillion" +msgstr[1] "%(value).1f sextillion" + +#: templatetags/humanize.py:74 +#, python-format +msgid "%(value)s sextillion" +msgid_plural "%(value)s sextillion" +msgstr[0] "%(value)s sextillion" +msgstr[1] "%(value)s sextillion" + +#: templatetags/humanize.py:77 +#, python-format +msgid "%(value).1f septillion" +msgid_plural "%(value).1f septillion" +msgstr[0] "%(value).1f septillion" +msgstr[1] "%(value).1f septillion" + +#: templatetags/humanize.py:78 +#, python-format +msgid "%(value)s septillion" +msgid_plural "%(value)s septillion" +msgstr[0] "%(value)s septillion" +msgstr[1] "%(value)s septillion" + +#: templatetags/humanize.py:81 +#, python-format +msgid "%(value).1f octillion" +msgid_plural "%(value).1f octillion" +msgstr[0] "%(value).1f octillion" +msgstr[1] "%(value).1f octillion" + +#: templatetags/humanize.py:82 +#, python-format +msgid "%(value)s octillion" +msgid_plural "%(value)s octillion" +msgstr[0] "%(value)s octillion" +msgstr[1] "%(value)s octillion" + +#: templatetags/humanize.py:85 +#, python-format +msgid "%(value).1f nonillion" +msgid_plural "%(value).1f nonillion" +msgstr[0] "%(value).1f nonillion" +msgstr[1] "%(value).1f nonillion" + +#: templatetags/humanize.py:86 +#, python-format +msgid "%(value)s nonillion" +msgid_plural "%(value)s nonillion" +msgstr[0] "%(value)s nonillion" +msgstr[1] "%(value)s nonillion" + +#: templatetags/humanize.py:89 +#, python-format +msgid "%(value).1f decillion" +msgid_plural "%(value).1f decillion" +msgstr[0] "%(value).1f decillion" +msgstr[1] "%(value).1f decillion" + +#: templatetags/humanize.py:90 +#, python-format +msgid "%(value)s decillion" +msgid_plural "%(value)s decillion" +msgstr[0] "%(value)s decillion" +msgstr[1] "%(value)s decillion" + +#: templatetags/humanize.py:93 +#, python-format +msgid "%(value).1f googol" +msgid_plural "%(value).1f googol" +msgstr[0] "%(value).1f googol" +msgstr[1] "%(value).1f googol" + +#: templatetags/humanize.py:94 +#, python-format +msgid "%(value)s googol" +msgid_plural "%(value)s googol" +msgstr[0] "%(value)s googol" +msgstr[1] "%(value)s googol" + +#: templatetags/humanize.py:143 msgid "one" msgstr "one" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "two" msgstr "two" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "three" msgstr "three" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "four" msgstr "four" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "five" msgstr "five" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "six" msgstr "six" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "seven" msgstr "seven" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "eight" msgstr "eight" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "nine" msgstr "nine" -#: templatetags/humanize.py:96 -msgid "today" -msgstr "today" +#: templatetags/humanize.py:185 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s ago" +msgstr "%(delta)s ago" -#: templatetags/humanize.py:98 -msgid "tomorrow" -msgstr "tomorrow" +#: templatetags/humanize.py:188 templatetags/humanize.py:210 +msgid "now" +msgstr "now" -#: templatetags/humanize.py:100 -msgid "yesterday" -msgstr "yesterday" +#: templatetags/humanize.py:191 +#, python-format +msgid "a second ago" +msgid_plural "%(count)s seconds ago" +msgstr[0] "a second ago" +msgstr[1] "%(count)s seconds ago" + +#: templatetags/humanize.py:196 +#, python-format +msgid "a minute ago" +msgid_plural "%(count)s minutes ago" +msgstr[0] "a minute ago" +msgstr[1] "%(count)s minutes ago" + +#: templatetags/humanize.py:201 +#, python-format +msgid "an hour ago" +msgid_plural "%(count)s hours ago" +msgstr[0] "an hour ago" +msgstr[1] "%(count)s hours ago" + +#: templatetags/humanize.py:207 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s from now" +msgstr "%(delta)s from now" + +#: templatetags/humanize.py:213 +#, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "a second from now" +msgstr[1] "%(count)s seconds from now" + +#: templatetags/humanize.py:218 +#, python-format +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "a minute from now" +msgstr[1] "%(count)s minutes from now" + +#: templatetags/humanize.py:223 +#, python-format +msgid "an hour from now" +msgid_plural "%(count)s hours from now" +msgstr[0] "an hour from now" +msgstr[1] "%(count)s hours from now" diff --git a/django/contrib/humanize/locale/es/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/es/LC_MESSAGES/django.mo index b7d5d3d24d..11581050a4 100644 Binary files a/django/contrib/humanize/locale/es/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/es/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/es/LC_MESSAGES/django.po b/django/contrib/humanize/locale/es/LC_MESSAGES/django.po index f278aebf72..30c70560f8 100644 --- a/django/contrib/humanize/locale/es/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/es/LC_MESSAGES/django.po @@ -1,100 +1,296 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Antoni Aloy , 2012. +# Jannis Leidel , 2011. +# Leonardo J. Caballero G. , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:18-0400\n" -"PO-Revision-Date: 2011-03-04 18:39+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Spanish (Castilian) <>\n" +"POT-Creation-Date: 2012-03-14 00:19-0700\n" +"PO-Revision-Date: 2012-03-05 23:10+0000\n" +"Last-Translator: Antoni Aloy \n" +"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/" +"django/language/es/)\n" +"Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: templatetags/humanize.py:19 +#: tests.py:108 templatetags/humanize.py:164 +msgid "today" +msgstr "hoy" + +#: tests.py:108 templatetags/humanize.py:168 +msgid "yesterday" +msgstr "ayer" + +#: tests.py:108 templatetags/humanize.py:166 +msgid "tomorrow" +msgstr "mañana" + +#: templatetags/humanize.py:24 msgid "th" msgstr "º" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "st" msgstr "º" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "nd" msgstr "º" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "rd" msgstr "º" -#: templatetags/humanize.py:54 +#: templatetags/humanize.py:53 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" msgstr[0] "%(value).1f millón" msgstr[1] "%(value).1f millón" +#: templatetags/humanize.py:54 +#, python-format +msgid "%(value)s million" +msgid_plural "%(value)s million" +msgstr[0] "%(value)s millon" +msgstr[1] "%(value)s millones" + #: templatetags/humanize.py:57 #, python-format msgid "%(value).1f billion" msgid_plural "%(value).1f billion" -msgstr[0] "%(value).1f mil millones" -msgstr[1] "%(value).1f mil millones" +msgstr[0] "%(value).1f millardo" +msgstr[1] "%(value).1f millardos" -#: templatetags/humanize.py:60 +#: templatetags/humanize.py:58 +#, python-format +msgid "%(value)s billion" +msgid_plural "%(value)s billion" +msgstr[0] "%(value)s millardo" +msgstr[1] "%(value)s millardos" + +#: templatetags/humanize.py:61 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" msgstr[0] "%(value).1f billón" msgstr[1] "%(value).1f billón" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:62 +#, python-format +msgid "%(value)s trillion" +msgid_plural "%(value)s trillion" +msgstr[0] "%(value)s billón" +msgstr[1] "%(value)s billones" + +#: templatetags/humanize.py:65 +#, python-format +msgid "%(value).1f quadrillion" +msgid_plural "%(value).1f quadrillion" +msgstr[0] "%(value).1f cuatrillón" +msgstr[1] "%(value).1f cuatrillones" + +#: templatetags/humanize.py:66 +#, python-format +msgid "%(value)s quadrillion" +msgid_plural "%(value)s quadrillion" +msgstr[0] "%(value)s cuatrillón" +msgstr[1] "%(value)s cuatrillones" + +#: templatetags/humanize.py:69 +#, python-format +msgid "%(value).1f quintillion" +msgid_plural "%(value).1f quintillion" +msgstr[0] "%(value).1f quintillón" +msgstr[1] "%(value).1f quintillones" + +#: templatetags/humanize.py:70 +#, python-format +msgid "%(value)s quintillion" +msgid_plural "%(value)s quintillion" +msgstr[0] "%(value)s quintillón" +msgstr[1] "%(value)s quintillón" + +#: templatetags/humanize.py:73 +#, python-format +msgid "%(value).1f sextillion" +msgid_plural "%(value).1f sextillion" +msgstr[0] "%(value).1f sextillón" +msgstr[1] "%(value).1f sextillones" + +#: templatetags/humanize.py:74 +#, python-format +msgid "%(value)s sextillion" +msgid_plural "%(value)s sextillion" +msgstr[0] "%(value)s sextillón" +msgstr[1] "%(value)s sextillones" + +#: templatetags/humanize.py:77 +#, python-format +msgid "%(value).1f septillion" +msgid_plural "%(value).1f septillion" +msgstr[0] "%(value).1f septillón" +msgstr[1] "%(value).1f septillones" + +#: templatetags/humanize.py:78 +#, python-format +msgid "%(value)s septillion" +msgid_plural "%(value)s septillion" +msgstr[0] "%(value)s septillón" +msgstr[1] "%(value)s septillones" + +#: templatetags/humanize.py:81 +#, python-format +msgid "%(value).1f octillion" +msgid_plural "%(value).1f octillion" +msgstr[0] "%(value).1f octillón" +msgstr[1] "%(value).1f octillones" + +#: templatetags/humanize.py:82 +#, python-format +msgid "%(value)s octillion" +msgid_plural "%(value)s octillion" +msgstr[0] "%(value)s octillón" +msgstr[1] "%(value)s octillones" + +#: templatetags/humanize.py:85 +#, python-format +msgid "%(value).1f nonillion" +msgid_plural "%(value).1f nonillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:86 +#, python-format +msgid "%(value)s nonillion" +msgid_plural "%(value)s nonillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:89 +#, python-format +msgid "%(value).1f decillion" +msgid_plural "%(value).1f decillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:90 +#, python-format +msgid "%(value)s decillion" +msgid_plural "%(value)s decillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:93 +#, python-format +msgid "%(value).1f googol" +msgid_plural "%(value).1f googol" +msgstr[0] "%(value).1f googol" +msgstr[1] "%(value).1f googol" + +#: templatetags/humanize.py:94 +#, python-format +msgid "%(value)s googol" +msgid_plural "%(value)s googol" +msgstr[0] " %(value)s googol" +msgstr[1] " %(value)s googol" + +#: templatetags/humanize.py:143 msgid "one" msgstr "uno" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "two" msgstr "dos" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "three" msgstr "tres" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "four" msgstr "cuatro" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "five" msgstr "cinco" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "six" msgstr "seis" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "seven" msgstr "siete" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "eight" msgstr "ocho" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "nine" msgstr "nueve" -#: templatetags/humanize.py:96 -msgid "today" -msgstr "hoy" +#: templatetags/humanize.py:185 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s ago" +msgstr "hace %(delta)s" -#: templatetags/humanize.py:98 -msgid "tomorrow" -msgstr "mañana" +#: templatetags/humanize.py:188 templatetags/humanize.py:210 +msgid "now" +msgstr "ahora" -#: templatetags/humanize.py:100 -msgid "yesterday" -msgstr "ayer" +#: templatetags/humanize.py:191 +#, python-format +msgid "a second ago" +msgid_plural "%(count)s seconds ago" +msgstr[0] "hace un segundo" +msgstr[1] "hace %(count)s segundos" + +#: templatetags/humanize.py:196 +#, python-format +msgid "a minute ago" +msgid_plural "%(count)s minutes ago" +msgstr[0] "hace un minuto" +msgstr[1] "hace %(count)s minutos " + +#: templatetags/humanize.py:201 +#, python-format +msgid "an hour ago" +msgid_plural "%(count)s hours ago" +msgstr[0] "hace una hora" +msgstr[1] "hace %(count)s horas" + +#: templatetags/humanize.py:207 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s from now" +msgstr "%(delta)s a partir de ahora" + +#: templatetags/humanize.py:213 +#, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "un segundo a partir de ahora" +msgstr[1] "%(count)s segundos a partir de ahora" + +#: templatetags/humanize.py:218 +#, python-format +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "un minuto a partir de ahora" +msgstr[1] " %(count)s minutos a partir de ahora" + +#: templatetags/humanize.py:223 +#, python-format +msgid "an hour from now" +msgid_plural "%(count)s hours from now" +msgstr[0] "una hora a partir de ahora" +msgstr[1] "%(count)s horas a partir de ahora" diff --git a/django/contrib/humanize/locale/es_AR/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/es_AR/LC_MESSAGES/django.mo index 2f88ef3d76..ffac545ac7 100644 Binary files a/django/contrib/humanize/locale/es_AR/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/es_AR/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/es_AR/LC_MESSAGES/django.po b/django/contrib/humanize/locale/es_AR/LC_MESSAGES/django.po index 74b26fe023..83e0e1f1be 100644 --- a/django/contrib/humanize/locale/es_AR/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/es_AR/LC_MESSAGES/django.po @@ -1,42 +1,64 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Jannis Leidel , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:18-0400\n" -"PO-Revision-Date: 2011-03-04 18:39+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Spanish (Argentinian) <>\n" +"POT-Creation-Date: 2012-03-14 00:19-0700\n" +"PO-Revision-Date: 2012-02-14 13:08+0000\n" +"Last-Translator: Jannis Leidel \n" +"Language-Team: Spanish (Argentina) (http://www.transifex.net/projects/p/" +"django/language/es_AR/)\n" +"Language: es_AR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: es_AR\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: templatetags/humanize.py:19 +#: tests.py:108 templatetags/humanize.py:164 +msgid "today" +msgstr "hoy" + +#: tests.py:108 templatetags/humanize.py:168 +msgid "yesterday" +msgstr "ayer" + +#: tests.py:108 templatetags/humanize.py:166 +msgid "tomorrow" +msgstr "mañana" + +#: templatetags/humanize.py:24 msgid "th" msgstr "to" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "st" msgstr "ro" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "nd" msgstr "do" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "rd" msgstr "ro" -#: templatetags/humanize.py:54 +#: templatetags/humanize.py:53 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" msgstr[0] "%(value).1f millón" msgstr[1] "%(value).1f millones" +#: templatetags/humanize.py:54 +#, python-format +msgid "%(value)s million" +msgid_plural "%(value)s million" +msgstr[0] "" +msgstr[1] "" + #: templatetags/humanize.py:57 #, python-format msgid "%(value).1f billion" @@ -44,57 +66,229 @@ msgid_plural "%(value).1f billion" msgstr[0] "%(value).1f millardo" msgstr[1] "%(value).1f millardos" -#: templatetags/humanize.py:60 +#: templatetags/humanize.py:58 +#, python-format +msgid "%(value)s billion" +msgid_plural "%(value)s billion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:61 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" msgstr[0] "%(value).1f billón" msgstr[1] "%(value).1f billones" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:62 +#, python-format +msgid "%(value)s trillion" +msgid_plural "%(value)s trillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:65 +#, python-format +msgid "%(value).1f quadrillion" +msgid_plural "%(value).1f quadrillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:66 +#, python-format +msgid "%(value)s quadrillion" +msgid_plural "%(value)s quadrillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:69 +#, python-format +msgid "%(value).1f quintillion" +msgid_plural "%(value).1f quintillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:70 +#, python-format +msgid "%(value)s quintillion" +msgid_plural "%(value)s quintillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:73 +#, python-format +msgid "%(value).1f sextillion" +msgid_plural "%(value).1f sextillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:74 +#, python-format +msgid "%(value)s sextillion" +msgid_plural "%(value)s sextillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:77 +#, python-format +msgid "%(value).1f septillion" +msgid_plural "%(value).1f septillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:78 +#, python-format +msgid "%(value)s septillion" +msgid_plural "%(value)s septillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:81 +#, python-format +msgid "%(value).1f octillion" +msgid_plural "%(value).1f octillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:82 +#, python-format +msgid "%(value)s octillion" +msgid_plural "%(value)s octillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:85 +#, python-format +msgid "%(value).1f nonillion" +msgid_plural "%(value).1f nonillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:86 +#, python-format +msgid "%(value)s nonillion" +msgid_plural "%(value)s nonillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:89 +#, python-format +msgid "%(value).1f decillion" +msgid_plural "%(value).1f decillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:90 +#, python-format +msgid "%(value)s decillion" +msgid_plural "%(value)s decillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:93 +#, python-format +msgid "%(value).1f googol" +msgid_plural "%(value).1f googol" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:94 +#, python-format +msgid "%(value)s googol" +msgid_plural "%(value)s googol" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:143 msgid "one" msgstr "uno" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "two" msgstr "dos" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "three" msgstr "tres" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "four" msgstr "cuatro" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "five" msgstr "cinco" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "six" msgstr "seis" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "seven" msgstr "siete" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "eight" msgstr "ocho" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "nine" msgstr "nueve" -#: templatetags/humanize.py:96 -msgid "today" -msgstr "hoy" +#: templatetags/humanize.py:185 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s ago" +msgstr "" -#: templatetags/humanize.py:98 -msgid "tomorrow" -msgstr "mañana" +#: templatetags/humanize.py:188 templatetags/humanize.py:210 +msgid "now" +msgstr "" -#: templatetags/humanize.py:100 -msgid "yesterday" -msgstr "ayer" +#: templatetags/humanize.py:191 +#, python-format +msgid "a second ago" +msgid_plural "%(count)s seconds ago" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:196 +#, python-format +msgid "a minute ago" +msgid_plural "%(count)s minutes ago" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:201 +#, python-format +msgid "an hour ago" +msgid_plural "%(count)s hours ago" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:207 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s from now" +msgstr "" + +#: templatetags/humanize.py:213 +#, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:218 +#, python-format +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:223 +#, python-format +msgid "an hour from now" +msgid_plural "%(count)s hours from now" +msgstr[0] "" +msgstr[1] "" diff --git a/django/contrib/humanize/locale/es_MX/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/es_MX/LC_MESSAGES/django.mo index f077de5833..03faf2f55a 100644 Binary files a/django/contrib/humanize/locale/es_MX/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/es_MX/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/es_MX/LC_MESSAGES/django.po b/django/contrib/humanize/locale/es_MX/LC_MESSAGES/django.po index 96ed948c5f..8a6a11133e 100644 --- a/django/contrib/humanize/locale/es_MX/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/es_MX/LC_MESSAGES/django.po @@ -1,42 +1,64 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Abraham Estrada , 2011, 2012. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:18-0400\n" -"PO-Revision-Date: 2011-03-04 18:39+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Spanish (Mexican) \n" +"POT-Creation-Date: 2012-03-14 00:19-0700\n" +"PO-Revision-Date: 2012-03-06 20:32+0000\n" +"Last-Translator: Abraham Estrada \n" +"Language-Team: Spanish (Mexico) (http://www.transifex.net/projects/p/django/" +"language/es_MX/)\n" +"Language: es_MX\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: es_MX\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: templatetags/humanize.py:19 +#: tests.py:108 templatetags/humanize.py:164 +msgid "today" +msgstr "hoy" + +#: tests.py:108 templatetags/humanize.py:168 +msgid "yesterday" +msgstr "ayer" + +#: tests.py:108 templatetags/humanize.py:166 +msgid "tomorrow" +msgstr "mañana" + +#: templatetags/humanize.py:24 msgid "th" msgstr "to" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "st" msgstr "ro" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "nd" msgstr "do" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "rd" msgstr "ro" -#: templatetags/humanize.py:54 +#: templatetags/humanize.py:53 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" msgstr[0] "%(value).1f millón" msgstr[1] "%(value).1f millones" +#: templatetags/humanize.py:54 +#, python-format +msgid "%(value)s million" +msgid_plural "%(value)s million" +msgstr[0] "%(value)s millones" +msgstr[1] "%(value)s millones" + #: templatetags/humanize.py:57 #, python-format msgid "%(value).1f billion" @@ -44,57 +66,229 @@ msgid_plural "%(value).1f billion" msgstr[0] "%(value).1f billón" msgstr[1] "%(value).1f billones" -#: templatetags/humanize.py:60 +#: templatetags/humanize.py:58 +#, python-format +msgid "%(value)s billion" +msgid_plural "%(value)s billion" +msgstr[0] "%(value)s billiones" +msgstr[1] "%(value)s billiones" + +#: templatetags/humanize.py:61 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" msgstr[0] "%(value).1f trillón" msgstr[1] "%(value).1f trillones" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:62 +#, python-format +msgid "%(value)s trillion" +msgid_plural "%(value)s trillion" +msgstr[0] "%(value)s trilliones" +msgstr[1] "%(value)s trilliones" + +#: templatetags/humanize.py:65 +#, python-format +msgid "%(value).1f quadrillion" +msgid_plural "%(value).1f quadrillion" +msgstr[0] "%(value).1f cuatrillón" +msgstr[1] "%(value).1f cuatrillones" + +#: templatetags/humanize.py:66 +#, python-format +msgid "%(value)s quadrillion" +msgid_plural "%(value)s quadrillion" +msgstr[0] "%(value)s cuatrillón" +msgstr[1] "%(value)s cuatrillones" + +#: templatetags/humanize.py:69 +#, python-format +msgid "%(value).1f quintillion" +msgid_plural "%(value).1f quintillion" +msgstr[0] "%(value).1f quintillón" +msgstr[1] "%(value).1f quintillones" + +#: templatetags/humanize.py:70 +#, python-format +msgid "%(value)s quintillion" +msgid_plural "%(value)s quintillion" +msgstr[0] "%(value)s quintillón" +msgstr[1] "%(value)s quintillones" + +#: templatetags/humanize.py:73 +#, python-format +msgid "%(value).1f sextillion" +msgid_plural "%(value).1f sextillion" +msgstr[0] "%(value).1f sextillón" +msgstr[1] "%(value).1f sextillones" + +#: templatetags/humanize.py:74 +#, python-format +msgid "%(value)s sextillion" +msgid_plural "%(value)s sextillion" +msgstr[0] "%(value)s sextillón" +msgstr[1] "%(value)s sextillones" + +#: templatetags/humanize.py:77 +#, python-format +msgid "%(value).1f septillion" +msgid_plural "%(value).1f septillion" +msgstr[0] "%(value).1f septillón" +msgstr[1] "%(value).1f septillones" + +#: templatetags/humanize.py:78 +#, python-format +msgid "%(value)s septillion" +msgid_plural "%(value)s septillion" +msgstr[0] "%(value)s septillón" +msgstr[1] "%(value)s septillones" + +#: templatetags/humanize.py:81 +#, python-format +msgid "%(value).1f octillion" +msgid_plural "%(value).1f octillion" +msgstr[0] "%(value).1f octillón" +msgstr[1] "%(value).1f octillones" + +#: templatetags/humanize.py:82 +#, python-format +msgid "%(value)s octillion" +msgid_plural "%(value)s octillion" +msgstr[0] "%(value)s octillón" +msgstr[1] "%(value)s octillones" + +#: templatetags/humanize.py:85 +#, python-format +msgid "%(value).1f nonillion" +msgid_plural "%(value).1f nonillion" +msgstr[0] "%(value).1f nonillion" +msgstr[1] "%(value).1f nonillion" + +#: templatetags/humanize.py:86 +#, python-format +msgid "%(value)s nonillion" +msgid_plural "%(value)s nonillion" +msgstr[0] "%(value)s nonillón" +msgstr[1] "%(value)s nonillones" + +#: templatetags/humanize.py:89 +#, python-format +msgid "%(value).1f decillion" +msgid_plural "%(value).1f decillion" +msgstr[0] "%(value).1f decillón" +msgstr[1] "%(value).1f decillones" + +#: templatetags/humanize.py:90 +#, python-format +msgid "%(value)s decillion" +msgid_plural "%(value)s decillion" +msgstr[0] "%(value)s decillón" +msgstr[1] "%(value)s decillones" + +#: templatetags/humanize.py:93 +#, python-format +msgid "%(value).1f googol" +msgid_plural "%(value).1f googol" +msgstr[0] "%(value).1f googol" +msgstr[1] "%(value).1f googoles" + +#: templatetags/humanize.py:94 +#, python-format +msgid "%(value)s googol" +msgid_plural "%(value)s googol" +msgstr[0] "%(value)s googol" +msgstr[1] "%(value)s googoles" + +#: templatetags/humanize.py:143 msgid "one" msgstr "uno" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "two" msgstr "dos" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "three" msgstr "tres" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "four" msgstr "cuatro" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "five" msgstr "cinco" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "six" msgstr "seis" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "seven" msgstr "siete" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "eight" msgstr "ocho" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "nine" msgstr "nueve" -#: templatetags/humanize.py:96 -msgid "today" -msgstr "hoy" +#: templatetags/humanize.py:185 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s ago" +msgstr "hace %(delta)s" -#: templatetags/humanize.py:98 -msgid "tomorrow" -msgstr "mañana" +#: templatetags/humanize.py:188 templatetags/humanize.py:210 +msgid "now" +msgstr "ahora" -#: templatetags/humanize.py:100 -msgid "yesterday" -msgstr "ayer" +#: templatetags/humanize.py:191 +#, python-format +msgid "a second ago" +msgid_plural "%(count)s seconds ago" +msgstr[0] "hace un segundo" +msgstr[1] "hace %(count)s segundos" + +#: templatetags/humanize.py:196 +#, python-format +msgid "a minute ago" +msgid_plural "%(count)s minutes ago" +msgstr[0] "Hace %(count)s minuto" +msgstr[1] "Hace %(count)s minutos" + +#: templatetags/humanize.py:201 +#, python-format +msgid "an hour ago" +msgid_plural "%(count)s hours ago" +msgstr[0] "Hace %(count)s hora" +msgstr[1] "Hace %(count)s horas" + +#: templatetags/humanize.py:207 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s from now" +msgstr "%(delta)s a partir de ahora" + +#: templatetags/humanize.py:213 +#, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "un segundo a partir de ahora" +msgstr[1] "%(count)s segundos a partir de ahora" + +#: templatetags/humanize.py:218 +#, python-format +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "un minuto a partir de ahora" +msgstr[1] "%(count)s minutos a partir de ahora" + +#: templatetags/humanize.py:223 +#, python-format +msgid "an hour from now" +msgid_plural "%(count)s hours from now" +msgstr[0] "una hora a partir de ahora" +msgstr[1] "%(count)s horas a partir de ahora" diff --git a/django/contrib/humanize/locale/et/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/et/LC_MESSAGES/django.mo index 44bac2d145..24c7e3fa85 100644 Binary files a/django/contrib/humanize/locale/et/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/et/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/et/LC_MESSAGES/django.po b/django/contrib/humanize/locale/et/LC_MESSAGES/django.po index 2f570d6bc9..0fbf9820ea 100644 --- a/django/contrib/humanize/locale/et/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/et/LC_MESSAGES/django.po @@ -1,42 +1,64 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Jannis Leidel , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:18-0400\n" -"PO-Revision-Date: 2011-03-04 18:39+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Estonian <>\n" +"POT-Creation-Date: 2012-03-14 00:19-0700\n" +"PO-Revision-Date: 2012-02-14 13:08+0000\n" +"Last-Translator: Jannis Leidel \n" +"Language-Team: Estonian (http://www.transifex.net/projects/p/django/language/" +"et/)\n" +"Language: et\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: et\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: templatetags/humanize.py:19 +#: tests.py:108 templatetags/humanize.py:164 +msgid "today" +msgstr "täna" + +#: tests.py:108 templatetags/humanize.py:168 +msgid "yesterday" +msgstr "eile" + +#: tests.py:108 templatetags/humanize.py:166 +msgid "tomorrow" +msgstr "homme" + +#: templatetags/humanize.py:24 msgid "th" msgstr "." -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "st" msgstr "." -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "nd" msgstr "." -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "rd" msgstr "." -#: templatetags/humanize.py:54 +#: templatetags/humanize.py:53 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" msgstr[0] "%(value).1f miljon" msgstr[1] "%(value).11f miljonit" +#: templatetags/humanize.py:54 +#, python-format +msgid "%(value)s million" +msgid_plural "%(value)s million" +msgstr[0] "" +msgstr[1] "" + #: templatetags/humanize.py:57 #, python-format msgid "%(value).1f billion" @@ -44,57 +66,229 @@ msgid_plural "%(value).1f billion" msgstr[0] "%(value).1f miljard" msgstr[1] "%(value).1f miljardit" -#: templatetags/humanize.py:60 +#: templatetags/humanize.py:58 +#, python-format +msgid "%(value)s billion" +msgid_plural "%(value)s billion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:61 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" msgstr[0] "%(value).1f triljon" msgstr[1] "%(value).1f triljonit" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:62 +#, python-format +msgid "%(value)s trillion" +msgid_plural "%(value)s trillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:65 +#, python-format +msgid "%(value).1f quadrillion" +msgid_plural "%(value).1f quadrillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:66 +#, python-format +msgid "%(value)s quadrillion" +msgid_plural "%(value)s quadrillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:69 +#, python-format +msgid "%(value).1f quintillion" +msgid_plural "%(value).1f quintillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:70 +#, python-format +msgid "%(value)s quintillion" +msgid_plural "%(value)s quintillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:73 +#, python-format +msgid "%(value).1f sextillion" +msgid_plural "%(value).1f sextillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:74 +#, python-format +msgid "%(value)s sextillion" +msgid_plural "%(value)s sextillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:77 +#, python-format +msgid "%(value).1f septillion" +msgid_plural "%(value).1f septillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:78 +#, python-format +msgid "%(value)s septillion" +msgid_plural "%(value)s septillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:81 +#, python-format +msgid "%(value).1f octillion" +msgid_plural "%(value).1f octillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:82 +#, python-format +msgid "%(value)s octillion" +msgid_plural "%(value)s octillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:85 +#, python-format +msgid "%(value).1f nonillion" +msgid_plural "%(value).1f nonillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:86 +#, python-format +msgid "%(value)s nonillion" +msgid_plural "%(value)s nonillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:89 +#, python-format +msgid "%(value).1f decillion" +msgid_plural "%(value).1f decillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:90 +#, python-format +msgid "%(value)s decillion" +msgid_plural "%(value)s decillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:93 +#, python-format +msgid "%(value).1f googol" +msgid_plural "%(value).1f googol" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:94 +#, python-format +msgid "%(value)s googol" +msgid_plural "%(value)s googol" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:143 msgid "one" msgstr "üks" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "two" msgstr "kaks" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "three" msgstr "kolm" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "four" msgstr "neli" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "five" msgstr "viis" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "six" msgstr "kuus" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "seven" msgstr "seitse" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "eight" msgstr "kaheksa" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "nine" msgstr "üheksa" -#: templatetags/humanize.py:96 -msgid "today" -msgstr "täna" +#: templatetags/humanize.py:185 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s ago" +msgstr "" -#: templatetags/humanize.py:98 -msgid "tomorrow" -msgstr "homme" +#: templatetags/humanize.py:188 templatetags/humanize.py:210 +msgid "now" +msgstr "" -#: templatetags/humanize.py:100 -msgid "yesterday" -msgstr "eile" +#: templatetags/humanize.py:191 +#, python-format +msgid "a second ago" +msgid_plural "%(count)s seconds ago" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:196 +#, python-format +msgid "a minute ago" +msgid_plural "%(count)s minutes ago" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:201 +#, python-format +msgid "an hour ago" +msgid_plural "%(count)s hours ago" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:207 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s from now" +msgstr "" + +#: templatetags/humanize.py:213 +#, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:218 +#, python-format +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:223 +#, python-format +msgid "an hour from now" +msgid_plural "%(count)s hours from now" +msgstr[0] "" +msgstr[1] "" diff --git a/django/contrib/humanize/locale/eu/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/eu/LC_MESSAGES/django.mo index aff236ab37..0497e9881a 100644 Binary files a/django/contrib/humanize/locale/eu/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/eu/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/eu/LC_MESSAGES/django.po b/django/contrib/humanize/locale/eu/LC_MESSAGES/django.po index aa785021a1..8cbfd616ab 100644 --- a/django/contrib/humanize/locale/eu/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/eu/LC_MESSAGES/django.po @@ -1,42 +1,65 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Aitzol Naberan , 2011, 2012. +# Jannis Leidel , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:18-0400\n" -"PO-Revision-Date: 2011-03-04 18:39+0000\n" -"Last-Translator: aitzol \n" -"Language-Team: Basque \n" +"POT-Creation-Date: 2012-03-14 00:19-0700\n" +"PO-Revision-Date: 2012-03-09 10:28+0000\n" +"Last-Translator: Aitzol Naberan \n" +"Language-Team: Basque (http://www.transifex.net/projects/p/django/language/" +"eu/)\n" +"Language: eu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: eu\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: templatetags/humanize.py:19 +#: tests.py:108 templatetags/humanize.py:164 +msgid "today" +msgstr "gaur" + +#: tests.py:108 templatetags/humanize.py:168 +msgid "yesterday" +msgstr "atzo" + +#: tests.py:108 templatetags/humanize.py:166 +msgid "tomorrow" +msgstr "bihar" + +#: templatetags/humanize.py:24 msgid "th" msgstr "garren" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "st" msgstr "." -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "nd" msgstr "garren" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "rd" msgstr "garren" -#: templatetags/humanize.py:54 +#: templatetags/humanize.py:53 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" msgstr[0] "miloi %(value).1f " msgstr[1] "%(value).1f miloi" +#: templatetags/humanize.py:54 +#, python-format +msgid "%(value)s million" +msgid_plural "%(value)s million" +msgstr[0] "milioi %(value)s" +msgstr[1] "%(value)s milioi" + #: templatetags/humanize.py:57 #, python-format msgid "%(value).1f billion" @@ -44,57 +67,229 @@ msgid_plural "%(value).1f billion" msgstr[0] "biloi %(value).1f " msgstr[1] "%(value).1f biloi" -#: templatetags/humanize.py:60 +#: templatetags/humanize.py:58 +#, python-format +msgid "%(value)s billion" +msgid_plural "%(value)s billion" +msgstr[0] "bilioi %(value)s" +msgstr[1] "%(value)s bilioi" + +#: templatetags/humanize.py:61 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" msgstr[0] "triloi %(value).1f " msgstr[1] "%(value).1f triloi" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:62 +#, python-format +msgid "%(value)s trillion" +msgid_plural "%(value)s trillion" +msgstr[0] "trilioi %(value)s" +msgstr[1] "%(value)s trilioi" + +#: templatetags/humanize.py:65 +#, python-format +msgid "%(value).1f quadrillion" +msgid_plural "%(value).1f quadrillion" +msgstr[0] "kuatrilioi %(value).1f " +msgstr[1] "%(value).1f kuatrilioi" + +#: templatetags/humanize.py:66 +#, python-format +msgid "%(value)s quadrillion" +msgid_plural "%(value)s quadrillion" +msgstr[0] "kuatrilioi %(value)s" +msgstr[1] "%(value)s kuatrilioi" + +#: templatetags/humanize.py:69 +#, python-format +msgid "%(value).1f quintillion" +msgid_plural "%(value).1f quintillion" +msgstr[0] "kintilioi %(value).1f" +msgstr[1] "%(value).1f kintilioi" + +#: templatetags/humanize.py:70 +#, python-format +msgid "%(value)s quintillion" +msgid_plural "%(value)s quintillion" +msgstr[0] "kintilioi %(value)s" +msgstr[1] "%(value)s kintilioi" + +#: templatetags/humanize.py:73 +#, python-format +msgid "%(value).1f sextillion" +msgid_plural "%(value).1f sextillion" +msgstr[0] "sextilioi %(value).1f" +msgstr[1] "%(value).1f sextilioi" + +#: templatetags/humanize.py:74 +#, python-format +msgid "%(value)s sextillion" +msgid_plural "%(value)s sextillion" +msgstr[0] "sextilioi %(value)s" +msgstr[1] "%(value)s sextilioi" + +#: templatetags/humanize.py:77 +#, python-format +msgid "%(value).1f septillion" +msgid_plural "%(value).1f septillion" +msgstr[0] "septilioi %(value).1f" +msgstr[1] "%(value).1f septilioi" + +#: templatetags/humanize.py:78 +#, python-format +msgid "%(value)s septillion" +msgid_plural "%(value)s septillion" +msgstr[0] "septilioi %(value)s" +msgstr[1] "%(value)s septilioi" + +#: templatetags/humanize.py:81 +#, python-format +msgid "%(value).1f octillion" +msgid_plural "%(value).1f octillion" +msgstr[0] "octilioi %(value).1f" +msgstr[1] "%(value).1f octilioi" + +#: templatetags/humanize.py:82 +#, python-format +msgid "%(value)s octillion" +msgid_plural "%(value)s octillion" +msgstr[0] "octillioi %(value)s" +msgstr[1] " %(value)s octilioi" + +#: templatetags/humanize.py:85 +#, python-format +msgid "%(value).1f nonillion" +msgid_plural "%(value).1f nonillion" +msgstr[0] "nonilioi %(value).1f " +msgstr[1] "%(value).1f nonilioi" + +#: templatetags/humanize.py:86 +#, python-format +msgid "%(value)s nonillion" +msgid_plural "%(value)s nonillion" +msgstr[0] "nonilioi %(value)s" +msgstr[1] "%(value)s nonilioi" + +#: templatetags/humanize.py:89 +#, python-format +msgid "%(value).1f decillion" +msgid_plural "%(value).1f decillion" +msgstr[0] "dezilioi %(value).1f" +msgstr[1] "%(value).1f deziioi" + +#: templatetags/humanize.py:90 +#, python-format +msgid "%(value)s decillion" +msgid_plural "%(value)s decillion" +msgstr[0] "dezilioi %(value)s " +msgstr[1] "%(value)s dezilioi" + +#: templatetags/humanize.py:93 +#, python-format +msgid "%(value).1f googol" +msgid_plural "%(value).1f googol" +msgstr[0] "gugol %(value).1f" +msgstr[1] "%(value).1f gugol" + +#: templatetags/humanize.py:94 +#, python-format +msgid "%(value)s googol" +msgid_plural "%(value)s googol" +msgstr[0] "gugol %(value)s" +msgstr[1] "%(value)s gugol" + +#: templatetags/humanize.py:143 msgid "one" msgstr "bat" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "two" msgstr "bi" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "three" msgstr "hiru" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "four" msgstr "lau" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "five" msgstr "bost" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "six" msgstr "sei" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "seven" msgstr "zazpi" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "eight" msgstr "zortzi" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "nine" msgstr "bederatzi" -#: templatetags/humanize.py:96 -msgid "today" -msgstr "gaur" +#: templatetags/humanize.py:185 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s ago" +msgstr "duela %(delta)s" -#: templatetags/humanize.py:98 -msgid "tomorrow" -msgstr "bihar" +#: templatetags/humanize.py:188 templatetags/humanize.py:210 +msgid "now" +msgstr "orain" -#: templatetags/humanize.py:100 -msgid "yesterday" -msgstr "atzo" +#: templatetags/humanize.py:191 +#, python-format +msgid "a second ago" +msgid_plural "%(count)s seconds ago" +msgstr[0] "duela segundu bat" +msgstr[1] "duela %(count)s segundu" + +#: templatetags/humanize.py:196 +#, python-format +msgid "a minute ago" +msgid_plural "%(count)s minutes ago" +msgstr[0] "duela minutu bat" +msgstr[1] "duela %(count)s minutu " + +#: templatetags/humanize.py:201 +#, python-format +msgid "an hour ago" +msgid_plural "%(count)s hours ago" +msgstr[0] "duela ordubete" +msgstr[1] "duela %(count)s ordu" + +#: templatetags/humanize.py:207 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s from now" +msgstr "%(delta)s barru" + +#: templatetags/humanize.py:213 +#, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "segundu bat barru" +msgstr[1] "%(count)s segundu barru" + +#: templatetags/humanize.py:218 +#, python-format +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "minutu bat barru" +msgstr[1] "%(count)s minutu barru" + +#: templatetags/humanize.py:223 +#, python-format +msgid "an hour from now" +msgid_plural "%(count)s hours from now" +msgstr[0] "ordubete barru" +msgstr[1] "%(count)s ordu barru" diff --git a/django/contrib/humanize/locale/fa/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/fa/LC_MESSAGES/django.mo index 6db0ae0367..72fffafe98 100644 Binary files a/django/contrib/humanize/locale/fa/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/fa/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/fa/LC_MESSAGES/django.po b/django/contrib/humanize/locale/fa/LC_MESSAGES/django.po index a30e8899d1..dc16c7b927 100644 --- a/django/contrib/humanize/locale/fa/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/fa/LC_MESSAGES/django.po @@ -1,97 +1,266 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Jannis Leidel , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:18-0400\n" -"PO-Revision-Date: 2011-03-04 18:39+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Persian \n" +"POT-Creation-Date: 2012-03-14 00:19-0700\n" +"PO-Revision-Date: 2012-02-14 13:08+0000\n" +"Last-Translator: Jannis Leidel \n" +"Language-Team: Persian (http://www.transifex.net/projects/p/django/language/" +"fa/)\n" +"Language: fa\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: fa\n" "Plural-Forms: nplurals=1; plural=0\n" -#: templatetags/humanize.py:19 +#: tests.py:108 templatetags/humanize.py:164 +msgid "today" +msgstr "امروز" + +#: tests.py:108 templatetags/humanize.py:168 +msgid "yesterday" +msgstr "دیروز" + +#: tests.py:108 templatetags/humanize.py:166 +msgid "tomorrow" +msgstr "فردا" + +#: templatetags/humanize.py:24 msgid "th" msgstr "اُم" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "st" msgstr "اُم" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "nd" msgstr "اُم" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "rd" msgstr "اُم" -#: templatetags/humanize.py:54 +#: templatetags/humanize.py:53 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" msgstr[0] "%(value).1f میلیون" +#: templatetags/humanize.py:54 +#, python-format +msgid "%(value)s million" +msgid_plural "%(value)s million" +msgstr[0] "" + #: templatetags/humanize.py:57 #, python-format msgid "%(value).1f billion" msgid_plural "%(value).1f billion" msgstr[0] "%(value).1f بیلیون" -#: templatetags/humanize.py:60 +#: templatetags/humanize.py:58 +#, python-format +msgid "%(value)s billion" +msgid_plural "%(value)s billion" +msgstr[0] "" + +#: templatetags/humanize.py:61 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" msgstr[0] "%(value).1f تریلون" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:62 +#, python-format +msgid "%(value)s trillion" +msgid_plural "%(value)s trillion" +msgstr[0] "" + +#: templatetags/humanize.py:65 +#, python-format +msgid "%(value).1f quadrillion" +msgid_plural "%(value).1f quadrillion" +msgstr[0] "" + +#: templatetags/humanize.py:66 +#, python-format +msgid "%(value)s quadrillion" +msgid_plural "%(value)s quadrillion" +msgstr[0] "" + +#: templatetags/humanize.py:69 +#, python-format +msgid "%(value).1f quintillion" +msgid_plural "%(value).1f quintillion" +msgstr[0] "" + +#: templatetags/humanize.py:70 +#, python-format +msgid "%(value)s quintillion" +msgid_plural "%(value)s quintillion" +msgstr[0] "" + +#: templatetags/humanize.py:73 +#, python-format +msgid "%(value).1f sextillion" +msgid_plural "%(value).1f sextillion" +msgstr[0] "" + +#: templatetags/humanize.py:74 +#, python-format +msgid "%(value)s sextillion" +msgid_plural "%(value)s sextillion" +msgstr[0] "" + +#: templatetags/humanize.py:77 +#, python-format +msgid "%(value).1f septillion" +msgid_plural "%(value).1f septillion" +msgstr[0] "" + +#: templatetags/humanize.py:78 +#, python-format +msgid "%(value)s septillion" +msgid_plural "%(value)s septillion" +msgstr[0] "" + +#: templatetags/humanize.py:81 +#, python-format +msgid "%(value).1f octillion" +msgid_plural "%(value).1f octillion" +msgstr[0] "" + +#: templatetags/humanize.py:82 +#, python-format +msgid "%(value)s octillion" +msgid_plural "%(value)s octillion" +msgstr[0] "" + +#: templatetags/humanize.py:85 +#, python-format +msgid "%(value).1f nonillion" +msgid_plural "%(value).1f nonillion" +msgstr[0] "" + +#: templatetags/humanize.py:86 +#, python-format +msgid "%(value)s nonillion" +msgid_plural "%(value)s nonillion" +msgstr[0] "" + +#: templatetags/humanize.py:89 +#, python-format +msgid "%(value).1f decillion" +msgid_plural "%(value).1f decillion" +msgstr[0] "" + +#: templatetags/humanize.py:90 +#, python-format +msgid "%(value)s decillion" +msgid_plural "%(value)s decillion" +msgstr[0] "" + +#: templatetags/humanize.py:93 +#, python-format +msgid "%(value).1f googol" +msgid_plural "%(value).1f googol" +msgstr[0] "" + +#: templatetags/humanize.py:94 +#, python-format +msgid "%(value)s googol" +msgid_plural "%(value)s googol" +msgstr[0] "" + +#: templatetags/humanize.py:143 msgid "one" msgstr "یک" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "two" msgstr "دو" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "three" msgstr "سه" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "four" msgstr "چهار" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "five" msgstr "پنج" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "six" msgstr "شش" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "seven" msgstr "هفت" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "eight" msgstr "هشت" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "nine" msgstr "نُه" -#: templatetags/humanize.py:96 -msgid "today" -msgstr "امروز" +#: templatetags/humanize.py:185 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s ago" +msgstr "" -#: templatetags/humanize.py:98 -msgid "tomorrow" -msgstr "فردا" +#: templatetags/humanize.py:188 templatetags/humanize.py:210 +msgid "now" +msgstr "" -#: templatetags/humanize.py:100 -msgid "yesterday" -msgstr "دیروز" +#: templatetags/humanize.py:191 +#, python-format +msgid "a second ago" +msgid_plural "%(count)s seconds ago" +msgstr[0] "" + +#: templatetags/humanize.py:196 +#, python-format +msgid "a minute ago" +msgid_plural "%(count)s minutes ago" +msgstr[0] "" + +#: templatetags/humanize.py:201 +#, python-format +msgid "an hour ago" +msgid_plural "%(count)s hours ago" +msgstr[0] "" + +#: templatetags/humanize.py:207 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s from now" +msgstr "" + +#: templatetags/humanize.py:213 +#, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "" + +#: templatetags/humanize.py:218 +#, python-format +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "" + +#: templatetags/humanize.py:223 +#, python-format +msgid "an hour from now" +msgid_plural "%(count)s hours from now" +msgstr[0] "" diff --git a/django/contrib/humanize/locale/fi/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/fi/LC_MESSAGES/django.mo index 619de7b858..85121c5e60 100644 Binary files a/django/contrib/humanize/locale/fi/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/fi/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/fi/LC_MESSAGES/django.po b/django/contrib/humanize/locale/fi/LC_MESSAGES/django.po index d7e0842874..440d527d0e 100644 --- a/django/contrib/humanize/locale/fi/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/fi/LC_MESSAGES/django.po @@ -1,42 +1,65 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Antti Kaihola , 2011. +# Jannis Leidel , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:18-0400\n" -"PO-Revision-Date: 2011-03-04 18:39+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Finnish \n" +"POT-Creation-Date: 2012-03-14 00:19-0700\n" +"PO-Revision-Date: 2012-02-14 13:08+0000\n" +"Last-Translator: Antti Kaihola \n" +"Language-Team: Finnish (http://www.transifex.net/projects/p/django/language/" +"fi/)\n" +"Language: fi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: fi\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: templatetags/humanize.py:19 +#: tests.py:108 templatetags/humanize.py:164 +msgid "today" +msgstr "tänään" + +#: tests.py:108 templatetags/humanize.py:168 +msgid "yesterday" +msgstr "eilen" + +#: tests.py:108 templatetags/humanize.py:166 +msgid "tomorrow" +msgstr "huomenna" + +#: templatetags/humanize.py:24 msgid "th" msgstr "." -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "st" msgstr "." -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "nd" msgstr "." -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "rd" msgstr "." -#: templatetags/humanize.py:54 +#: templatetags/humanize.py:53 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" msgstr[0] "%(value).1f miljoona" msgstr[1] "%(value).1f miljoonaa" +#: templatetags/humanize.py:54 +#, python-format +msgid "%(value)s million" +msgid_plural "%(value)s million" +msgstr[0] "%(value)s miljoona" +msgstr[1] "%(value)s miljoonaa" + #: templatetags/humanize.py:57 #, python-format msgid "%(value).1f billion" @@ -44,57 +67,229 @@ msgid_plural "%(value).1f billion" msgstr[0] "%(value).1f miljardi" msgstr[1] "%(value).1f miljardia" -#: templatetags/humanize.py:60 +#: templatetags/humanize.py:58 +#, python-format +msgid "%(value)s billion" +msgid_plural "%(value)s billion" +msgstr[0] "%(value)s miljardi" +msgstr[1] "%(value)s miljardia" + +#: templatetags/humanize.py:61 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" msgstr[0] "%(value).1f biljoona" msgstr[1] "%(value).1f biljoonaa" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:62 +#, python-format +msgid "%(value)s trillion" +msgid_plural "%(value)s trillion" +msgstr[0] "%(value)s biljoona" +msgstr[1] "%(value)s biljoonaa" + +#: templatetags/humanize.py:65 +#, python-format +msgid "%(value).1f quadrillion" +msgid_plural "%(value).1f quadrillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:66 +#, python-format +msgid "%(value)s quadrillion" +msgid_plural "%(value)s quadrillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:69 +#, python-format +msgid "%(value).1f quintillion" +msgid_plural "%(value).1f quintillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:70 +#, python-format +msgid "%(value)s quintillion" +msgid_plural "%(value)s quintillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:73 +#, python-format +msgid "%(value).1f sextillion" +msgid_plural "%(value).1f sextillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:74 +#, python-format +msgid "%(value)s sextillion" +msgid_plural "%(value)s sextillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:77 +#, python-format +msgid "%(value).1f septillion" +msgid_plural "%(value).1f septillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:78 +#, python-format +msgid "%(value)s septillion" +msgid_plural "%(value)s septillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:81 +#, python-format +msgid "%(value).1f octillion" +msgid_plural "%(value).1f octillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:82 +#, python-format +msgid "%(value)s octillion" +msgid_plural "%(value)s octillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:85 +#, python-format +msgid "%(value).1f nonillion" +msgid_plural "%(value).1f nonillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:86 +#, python-format +msgid "%(value)s nonillion" +msgid_plural "%(value)s nonillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:89 +#, python-format +msgid "%(value).1f decillion" +msgid_plural "%(value).1f decillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:90 +#, python-format +msgid "%(value)s decillion" +msgid_plural "%(value)s decillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:93 +#, python-format +msgid "%(value).1f googol" +msgid_plural "%(value).1f googol" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:94 +#, python-format +msgid "%(value)s googol" +msgid_plural "%(value)s googol" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:143 msgid "one" msgstr "yksi" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "two" msgstr "kaksi" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "three" msgstr "kolme" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "four" msgstr "neljä" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "five" msgstr "viisi" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "six" msgstr "kuusi" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "seven" msgstr "seitsemän" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "eight" msgstr "kahdeksan" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "nine" msgstr "yhdeksän" -#: templatetags/humanize.py:96 -msgid "today" -msgstr "tänään" +#: templatetags/humanize.py:185 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s ago" +msgstr "%(delta)s sitten" -#: templatetags/humanize.py:98 -msgid "tomorrow" -msgstr "huomenna" +#: templatetags/humanize.py:188 templatetags/humanize.py:210 +msgid "now" +msgstr "nyt" -#: templatetags/humanize.py:100 -msgid "yesterday" -msgstr "eilen" +#: templatetags/humanize.py:191 +#, python-format +msgid "a second ago" +msgid_plural "%(count)s seconds ago" +msgstr[0] "sekunti sitten" +msgstr[1] "%(count)s sekuntia sitten" + +#: templatetags/humanize.py:196 +#, python-format +msgid "a minute ago" +msgid_plural "%(count)s minutes ago" +msgstr[0] "minuutti sitten" +msgstr[1] "%(count)s minuuttia sitten" + +#: templatetags/humanize.py:201 +#, python-format +msgid "an hour ago" +msgid_plural "%(count)s hours ago" +msgstr[0] "tunti sitten" +msgstr[1] "%(count)s tuntia sitten" + +#: templatetags/humanize.py:207 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s from now" +msgstr "%(delta)s tästä hetkestä" + +#: templatetags/humanize.py:213 +#, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "sekunnin kuluttua" +msgstr[1] "%(count)s sekunnin kuluttua" + +#: templatetags/humanize.py:218 +#, python-format +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "minuutin kuluttua" +msgstr[1] "%(count)s minuutin kuluttua" + +#: templatetags/humanize.py:223 +#, python-format +msgid "an hour from now" +msgid_plural "%(count)s hours from now" +msgstr[0] "tunnin kuluttua" +msgstr[1] "%(count)s tunnin kuluttua" diff --git a/django/contrib/humanize/locale/fr/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/fr/LC_MESSAGES/django.mo index 7a83c96bd7..fd04a3365a 100644 Binary files a/django/contrib/humanize/locale/fr/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/fr/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/fr/LC_MESSAGES/django.po b/django/contrib/humanize/locale/fr/LC_MESSAGES/django.po index 4bd5a4cefb..425ccdb839 100644 --- a/django/contrib/humanize/locale/fr/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/fr/LC_MESSAGES/django.po @@ -1,42 +1,65 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# , 2011. +# Jannis Leidel , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:18-0400\n" -"PO-Revision-Date: 2011-03-04 18:39+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: French \n" +"POT-Creation-Date: 2012-03-14 00:19-0700\n" +"PO-Revision-Date: 2012-02-14 13:08+0000\n" +"Last-Translator: claudep \n" +"Language-Team: French (http://www.transifex.net/projects/p/django/language/" +"fr/)\n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1)\n" -#: templatetags/humanize.py:19 +#: tests.py:108 templatetags/humanize.py:164 +msgid "today" +msgstr "aujourd'hui" + +#: tests.py:108 templatetags/humanize.py:168 +msgid "yesterday" +msgstr "hier" + +#: tests.py:108 templatetags/humanize.py:166 +msgid "tomorrow" +msgstr "demain" + +#: templatetags/humanize.py:24 msgid "th" msgstr "e" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "st" msgstr "er" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "nd" msgstr "e" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "rd" msgstr "e" -#: templatetags/humanize.py:54 +#: templatetags/humanize.py:53 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" msgstr[0] "%(value).1f million" msgstr[1] "%(value).1f millions" +#: templatetags/humanize.py:54 +#, python-format +msgid "%(value)s million" +msgid_plural "%(value)s million" +msgstr[0] "%(value)s million" +msgstr[1] "%(value)s millions" + #: templatetags/humanize.py:57 #, python-format msgid "%(value).1f billion" @@ -44,57 +67,229 @@ msgid_plural "%(value).1f billion" msgstr[0] "%(value).1f milliard" msgstr[1] "%(value).1f milliards" -#: templatetags/humanize.py:60 +#: templatetags/humanize.py:58 +#, python-format +msgid "%(value)s billion" +msgid_plural "%(value)s billion" +msgstr[0] "%(value)s milliard" +msgstr[1] "%(value)s milliards" + +#: templatetags/humanize.py:61 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" msgstr[0] "%(value).1f billion" msgstr[1] "%(value).1f billions" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:62 +#, python-format +msgid "%(value)s trillion" +msgid_plural "%(value)s trillion" +msgstr[0] "%(value)s billion" +msgstr[1] "%(value)s billions" + +#: templatetags/humanize.py:65 +#, python-format +msgid "%(value).1f quadrillion" +msgid_plural "%(value).1f quadrillion" +msgstr[0] "%(value).1f quadrillion" +msgstr[1] "%(value).1f quadrillions" + +#: templatetags/humanize.py:66 +#, python-format +msgid "%(value)s quadrillion" +msgid_plural "%(value)s quadrillion" +msgstr[0] "%(value)s quadrillion" +msgstr[1] "%(value)s quadrillions" + +#: templatetags/humanize.py:69 +#, python-format +msgid "%(value).1f quintillion" +msgid_plural "%(value).1f quintillion" +msgstr[0] "%(value).1f quintillion" +msgstr[1] "%(value).1f quintillions" + +#: templatetags/humanize.py:70 +#, python-format +msgid "%(value)s quintillion" +msgid_plural "%(value)s quintillion" +msgstr[0] "%(value)s quintillion" +msgstr[1] "%(value)s quintillions" + +#: templatetags/humanize.py:73 +#, python-format +msgid "%(value).1f sextillion" +msgid_plural "%(value).1f sextillion" +msgstr[0] "%(value).1f sextillion" +msgstr[1] "%(value).1f sextillions" + +#: templatetags/humanize.py:74 +#, python-format +msgid "%(value)s sextillion" +msgid_plural "%(value)s sextillion" +msgstr[0] "%(value)s sextillion" +msgstr[1] "%(value)s sextillion" + +#: templatetags/humanize.py:77 +#, python-format +msgid "%(value).1f septillion" +msgid_plural "%(value).1f septillion" +msgstr[0] "%(value).1f septillion" +msgstr[1] "%(value).1f septillions" + +#: templatetags/humanize.py:78 +#, python-format +msgid "%(value)s septillion" +msgid_plural "%(value)s septillion" +msgstr[0] "%(value)s septillion" +msgstr[1] "%(value)s septillions" + +#: templatetags/humanize.py:81 +#, python-format +msgid "%(value).1f octillion" +msgid_plural "%(value).1f octillion" +msgstr[0] "%(value).1f octillion" +msgstr[1] "%(value).1f octillions" + +#: templatetags/humanize.py:82 +#, python-format +msgid "%(value)s octillion" +msgid_plural "%(value)s octillion" +msgstr[0] "%(value)s octillion" +msgstr[1] "%(value)s octillions" + +#: templatetags/humanize.py:85 +#, python-format +msgid "%(value).1f nonillion" +msgid_plural "%(value).1f nonillion" +msgstr[0] "%(value).1f nonillion" +msgstr[1] "%(value).1f nonillions" + +#: templatetags/humanize.py:86 +#, python-format +msgid "%(value)s nonillion" +msgid_plural "%(value)s nonillion" +msgstr[0] "%(value)s nonillion" +msgstr[1] "%(value)s nonillions" + +#: templatetags/humanize.py:89 +#, python-format +msgid "%(value).1f decillion" +msgid_plural "%(value).1f decillion" +msgstr[0] "%(value).1f décillion" +msgstr[1] "%(value).1f décillions" + +#: templatetags/humanize.py:90 +#, python-format +msgid "%(value)s decillion" +msgid_plural "%(value)s decillion" +msgstr[0] "%(value)s décillion" +msgstr[1] "%(value)s décillions" + +#: templatetags/humanize.py:93 +#, python-format +msgid "%(value).1f googol" +msgid_plural "%(value).1f googol" +msgstr[0] "%(value).1f gogol" +msgstr[1] "%(value).1f gogols" + +#: templatetags/humanize.py:94 +#, python-format +msgid "%(value)s googol" +msgid_plural "%(value)s googol" +msgstr[0] "%(value)s gogol" +msgstr[1] "%(value)s gogols" + +#: templatetags/humanize.py:143 msgid "one" msgstr "un" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "two" msgstr "deux" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "three" msgstr "trois" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "four" msgstr "quatre" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "five" msgstr "cinq" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "six" msgstr "six" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "seven" msgstr "sept" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "eight" msgstr "huit" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "nine" msgstr "neuf" -#: templatetags/humanize.py:96 -msgid "today" -msgstr "aujourd'hui" +#: templatetags/humanize.py:185 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s ago" +msgstr "il y a %(delta)s" -#: templatetags/humanize.py:98 -msgid "tomorrow" -msgstr "demain" +#: templatetags/humanize.py:188 templatetags/humanize.py:210 +msgid "now" +msgstr "maintenant" -#: templatetags/humanize.py:100 -msgid "yesterday" -msgstr "hier" +#: templatetags/humanize.py:191 +#, python-format +msgid "a second ago" +msgid_plural "%(count)s seconds ago" +msgstr[0] "il y a une seconde" +msgstr[1] "il y a %(count)s secondes" + +#: templatetags/humanize.py:196 +#, python-format +msgid "a minute ago" +msgid_plural "%(count)s minutes ago" +msgstr[0] "il y a une minute" +msgstr[1] "il y a %(count)s minutes" + +#: templatetags/humanize.py:201 +#, python-format +msgid "an hour ago" +msgid_plural "%(count)s hours ago" +msgstr[0] "il y a une heure" +msgstr[1] "il y a %(count)s heures" + +#: templatetags/humanize.py:207 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s from now" +msgstr "dans %(delta)s" + +#: templatetags/humanize.py:213 +#, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "dans une seconde" +msgstr[1] "dans %(count)s secondes" + +#: templatetags/humanize.py:218 +#, python-format +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "dans une minute" +msgstr[1] "dans %(count)s minutes" + +#: templatetags/humanize.py:223 +#, python-format +msgid "an hour from now" +msgid_plural "%(count)s hours from now" +msgstr[0] "dans une heure" +msgstr[1] "dans %(count)s heures" diff --git a/django/contrib/humanize/locale/fy_NL/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/fy_NL/LC_MESSAGES/django.mo index 35e4d9216b..5438271b5f 100644 Binary files a/django/contrib/humanize/locale/fy_NL/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/fy_NL/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/fy_NL/LC_MESSAGES/django.po b/django/contrib/humanize/locale/fy_NL/LC_MESSAGES/django.po index e77a56518f..dcd08818f2 100644 --- a/django/contrib/humanize/locale/fy_NL/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/fy_NL/LC_MESSAGES/django.po @@ -4,39 +4,58 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:18-0400\n" +"POT-Creation-Date: 2012-03-14 00:19-0700\n" "PO-Revision-Date: 2011-03-15 15:28+0000\n" "Last-Translator: Django team\n" "Language-Team: English \n" +"Language: fy_NL\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: fy_NL\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: templatetags/humanize.py:19 +#: tests.py:108 templatetags/humanize.py:164 +msgid "today" +msgstr "" + +#: tests.py:108 templatetags/humanize.py:168 +msgid "yesterday" +msgstr "" + +#: tests.py:108 templatetags/humanize.py:166 +msgid "tomorrow" +msgstr "" + +#: templatetags/humanize.py:24 msgid "th" msgstr "" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "st" msgstr "" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "nd" msgstr "" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "rd" msgstr "" -#: templatetags/humanize.py:54 +#: templatetags/humanize.py:53 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" msgstr[0] "" msgstr[1] "" +#: templatetags/humanize.py:54 +#, python-format +msgid "%(value)s million" +msgid_plural "%(value)s million" +msgstr[0] "" +msgstr[1] "" + #: templatetags/humanize.py:57 #, python-format msgid "%(value).1f billion" @@ -44,57 +63,229 @@ msgid_plural "%(value).1f billion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:60 +#: templatetags/humanize.py:58 +#, python-format +msgid "%(value)s billion" +msgid_plural "%(value)s billion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:61 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:62 +#, python-format +msgid "%(value)s trillion" +msgid_plural "%(value)s trillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:65 +#, python-format +msgid "%(value).1f quadrillion" +msgid_plural "%(value).1f quadrillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:66 +#, python-format +msgid "%(value)s quadrillion" +msgid_plural "%(value)s quadrillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:69 +#, python-format +msgid "%(value).1f quintillion" +msgid_plural "%(value).1f quintillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:70 +#, python-format +msgid "%(value)s quintillion" +msgid_plural "%(value)s quintillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:73 +#, python-format +msgid "%(value).1f sextillion" +msgid_plural "%(value).1f sextillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:74 +#, python-format +msgid "%(value)s sextillion" +msgid_plural "%(value)s sextillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:77 +#, python-format +msgid "%(value).1f septillion" +msgid_plural "%(value).1f septillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:78 +#, python-format +msgid "%(value)s septillion" +msgid_plural "%(value)s septillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:81 +#, python-format +msgid "%(value).1f octillion" +msgid_plural "%(value).1f octillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:82 +#, python-format +msgid "%(value)s octillion" +msgid_plural "%(value)s octillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:85 +#, python-format +msgid "%(value).1f nonillion" +msgid_plural "%(value).1f nonillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:86 +#, python-format +msgid "%(value)s nonillion" +msgid_plural "%(value)s nonillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:89 +#, python-format +msgid "%(value).1f decillion" +msgid_plural "%(value).1f decillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:90 +#, python-format +msgid "%(value)s decillion" +msgid_plural "%(value)s decillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:93 +#, python-format +msgid "%(value).1f googol" +msgid_plural "%(value).1f googol" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:94 +#, python-format +msgid "%(value)s googol" +msgid_plural "%(value)s googol" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:143 msgid "one" msgstr "" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "two" msgstr "" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "three" msgstr "" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "four" msgstr "" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "five" msgstr "" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "six" msgstr "" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "seven" msgstr "" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "eight" msgstr "" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "nine" msgstr "" -#: templatetags/humanize.py:96 -msgid "today" +#: templatetags/humanize.py:185 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s ago" msgstr "" -#: templatetags/humanize.py:98 -msgid "tomorrow" +#: templatetags/humanize.py:188 templatetags/humanize.py:210 +msgid "now" msgstr "" -#: templatetags/humanize.py:100 -msgid "yesterday" +#: templatetags/humanize.py:191 +#, python-format +msgid "a second ago" +msgid_plural "%(count)s seconds ago" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:196 +#, python-format +msgid "a minute ago" +msgid_plural "%(count)s minutes ago" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:201 +#, python-format +msgid "an hour ago" +msgid_plural "%(count)s hours ago" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:207 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s from now" msgstr "" + +#: templatetags/humanize.py:213 +#, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:218 +#, python-format +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:223 +#, python-format +msgid "an hour from now" +msgid_plural "%(count)s hours from now" +msgstr[0] "" +msgstr[1] "" diff --git a/django/contrib/humanize/locale/ga/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/ga/LC_MESSAGES/django.mo index 74c699de5c..f6e74cdf5a 100644 Binary files a/django/contrib/humanize/locale/ga/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/ga/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/ga/LC_MESSAGES/django.po b/django/contrib/humanize/locale/ga/LC_MESSAGES/django.po index 35f5714768..1756f4eaec 100644 --- a/django/contrib/humanize/locale/ga/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/ga/LC_MESSAGES/django.po @@ -1,37 +1,53 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Jannis Leidel , 2011. +# Michael Thornhill , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:18-0400\n" -"PO-Revision-Date: 2011-03-08 17:07+0000\n" -"Last-Translator: mick \n" -"Language-Team: Irish \n" +"POT-Creation-Date: 2012-03-14 00:19-0700\n" +"PO-Revision-Date: 2012-02-14 13:08+0000\n" +"Last-Translator: Michael Thornhill \n" +"Language-Team: Irish (http://www.transifex.net/projects/p/django/language/" +"ga/)\n" +"Language: ga\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ga\n" "Plural-Forms: nplurals=5; plural=(n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : " "4)\n" -#: templatetags/humanize.py:19 +#: tests.py:108 templatetags/humanize.py:164 +msgid "today" +msgstr "inniu" + +#: tests.py:108 templatetags/humanize.py:168 +msgid "yesterday" +msgstr "inné" + +#: tests.py:108 templatetags/humanize.py:166 +msgid "tomorrow" +msgstr "amárach" + +#: templatetags/humanize.py:24 msgid "th" msgstr "ú" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "st" msgstr "ú" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "nd" msgstr "ú" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "rd" msgstr "ú" -#: templatetags/humanize.py:54 +#: templatetags/humanize.py:53 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" @@ -41,6 +57,16 @@ msgstr[2] "%(value).1f milliún" msgstr[3] "%(value).1f milliún" msgstr[4] "%(value).1f milliún" +#: templatetags/humanize.py:54 +#, python-format +msgid "%(value)s million" +msgid_plural "%(value)s million" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" + #: templatetags/humanize.py:57 #, python-format msgid "%(value).1f billion" @@ -51,7 +77,17 @@ msgstr[2] "%(value).1f billiún" msgstr[3] "%(value).1f billiún" msgstr[4] "%(value).1f billiún" -#: templatetags/humanize.py:60 +#: templatetags/humanize.py:58 +#, python-format +msgid "%(value)s billion" +msgid_plural "%(value)s billion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" + +#: templatetags/humanize.py:61 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" @@ -61,50 +97,284 @@ msgstr[2] "%(value).1f trilliún" msgstr[3] "%(value).1f trilliún" msgstr[4] "%(value).1f trilliún" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:62 +#, python-format +msgid "%(value)s trillion" +msgid_plural "%(value)s trillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" + +#: templatetags/humanize.py:65 +#, python-format +msgid "%(value).1f quadrillion" +msgid_plural "%(value).1f quadrillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" + +#: templatetags/humanize.py:66 +#, python-format +msgid "%(value)s quadrillion" +msgid_plural "%(value)s quadrillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" + +#: templatetags/humanize.py:69 +#, python-format +msgid "%(value).1f quintillion" +msgid_plural "%(value).1f quintillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" + +#: templatetags/humanize.py:70 +#, python-format +msgid "%(value)s quintillion" +msgid_plural "%(value)s quintillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" + +#: templatetags/humanize.py:73 +#, python-format +msgid "%(value).1f sextillion" +msgid_plural "%(value).1f sextillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" + +#: templatetags/humanize.py:74 +#, python-format +msgid "%(value)s sextillion" +msgid_plural "%(value)s sextillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" + +#: templatetags/humanize.py:77 +#, python-format +msgid "%(value).1f septillion" +msgid_plural "%(value).1f septillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" + +#: templatetags/humanize.py:78 +#, python-format +msgid "%(value)s septillion" +msgid_plural "%(value)s septillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" + +#: templatetags/humanize.py:81 +#, python-format +msgid "%(value).1f octillion" +msgid_plural "%(value).1f octillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" + +#: templatetags/humanize.py:82 +#, python-format +msgid "%(value)s octillion" +msgid_plural "%(value)s octillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" + +#: templatetags/humanize.py:85 +#, python-format +msgid "%(value).1f nonillion" +msgid_plural "%(value).1f nonillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" + +#: templatetags/humanize.py:86 +#, python-format +msgid "%(value)s nonillion" +msgid_plural "%(value)s nonillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" + +#: templatetags/humanize.py:89 +#, python-format +msgid "%(value).1f decillion" +msgid_plural "%(value).1f decillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" + +#: templatetags/humanize.py:90 +#, python-format +msgid "%(value)s decillion" +msgid_plural "%(value)s decillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" + +#: templatetags/humanize.py:93 +#, python-format +msgid "%(value).1f googol" +msgid_plural "%(value).1f googol" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" + +#: templatetags/humanize.py:94 +#, python-format +msgid "%(value)s googol" +msgid_plural "%(value)s googol" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" + +#: templatetags/humanize.py:143 msgid "one" msgstr "aon" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "two" msgstr "dó" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "three" msgstr "trí" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "four" msgstr "ceathair" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "five" msgstr "cúig" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "six" msgstr "sé" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "seven" msgstr "seacht" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "eight" msgstr "ocht" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "nine" msgstr "naoi" -#: templatetags/humanize.py:96 -msgid "today" -msgstr "inniu" +#: templatetags/humanize.py:185 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s ago" +msgstr "" -#: templatetags/humanize.py:98 -msgid "tomorrow" -msgstr "amárach" +#: templatetags/humanize.py:188 templatetags/humanize.py:210 +msgid "now" +msgstr "" -#: templatetags/humanize.py:100 -msgid "yesterday" -msgstr "inné" +#: templatetags/humanize.py:191 +#, python-format +msgid "a second ago" +msgid_plural "%(count)s seconds ago" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" + +#: templatetags/humanize.py:196 +#, python-format +msgid "a minute ago" +msgid_plural "%(count)s minutes ago" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" + +#: templatetags/humanize.py:201 +#, python-format +msgid "an hour ago" +msgid_plural "%(count)s hours ago" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" + +#: templatetags/humanize.py:207 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s from now" +msgstr "" + +#: templatetags/humanize.py:213 +#, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" + +#: templatetags/humanize.py:218 +#, python-format +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" + +#: templatetags/humanize.py:223 +#, python-format +msgid "an hour from now" +msgid_plural "%(count)s hours from now" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" diff --git a/django/contrib/humanize/locale/gl/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/gl/LC_MESSAGES/django.mo index d6278dd606..c94b504270 100644 Binary files a/django/contrib/humanize/locale/gl/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/gl/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/gl/LC_MESSAGES/django.po b/django/contrib/humanize/locale/gl/LC_MESSAGES/django.po index 521bbfad73..448a830073 100644 --- a/django/contrib/humanize/locale/gl/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/gl/LC_MESSAGES/django.po @@ -1,42 +1,66 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# fasouto , 2011. +# Jannis Leidel , 2011. +# Leandro Regueiro , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:18-0400\n" -"PO-Revision-Date: 2011-03-07 03:35+0000\n" -"Last-Translator: fasouto \n" -"Language-Team: Galician \n" +"POT-Creation-Date: 2012-03-14 00:19-0700\n" +"PO-Revision-Date: 2012-02-14 13:08+0000\n" +"Last-Translator: Leandro Regueiro \n" +"Language-Team: Galician (http://www.transifex.net/projects/p/django/language/" +"gl/)\n" +"Language: gl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: gl\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: templatetags/humanize.py:19 +#: tests.py:108 templatetags/humanize.py:164 +msgid "today" +msgstr "hoxe" + +#: tests.py:108 templatetags/humanize.py:168 +msgid "yesterday" +msgstr "onte" + +#: tests.py:108 templatetags/humanize.py:166 +msgid "tomorrow" +msgstr "mañá" + +#: templatetags/humanize.py:24 msgid "th" msgstr "º" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "st" msgstr "º" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "nd" msgstr "º" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "rd" msgstr "º" -#: templatetags/humanize.py:54 +#: templatetags/humanize.py:53 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" msgstr[0] "%(value).1f millón" msgstr[1] "%(value).1f millóns" +#: templatetags/humanize.py:54 +#, python-format +msgid "%(value)s million" +msgid_plural "%(value)s million" +msgstr[0] "%(value)s millón" +msgstr[1] "%(value)s millóns" + #: templatetags/humanize.py:57 #, python-format msgid "%(value).1f billion" @@ -44,57 +68,229 @@ msgid_plural "%(value).1f billion" msgstr[0] "%(value).1f mil millóns" msgstr[1] "%(value).1f miles de millóns" -#: templatetags/humanize.py:60 +#: templatetags/humanize.py:58 +#, python-format +msgid "%(value)s billion" +msgid_plural "%(value)s billion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:61 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" msgstr[0] "%(value).1f billón" msgstr[1] "%(value).1f billóns" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:62 +#, python-format +msgid "%(value)s trillion" +msgid_plural "%(value)s trillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:65 +#, python-format +msgid "%(value).1f quadrillion" +msgid_plural "%(value).1f quadrillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:66 +#, python-format +msgid "%(value)s quadrillion" +msgid_plural "%(value)s quadrillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:69 +#, python-format +msgid "%(value).1f quintillion" +msgid_plural "%(value).1f quintillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:70 +#, python-format +msgid "%(value)s quintillion" +msgid_plural "%(value)s quintillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:73 +#, python-format +msgid "%(value).1f sextillion" +msgid_plural "%(value).1f sextillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:74 +#, python-format +msgid "%(value)s sextillion" +msgid_plural "%(value)s sextillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:77 +#, python-format +msgid "%(value).1f septillion" +msgid_plural "%(value).1f septillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:78 +#, python-format +msgid "%(value)s septillion" +msgid_plural "%(value)s septillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:81 +#, python-format +msgid "%(value).1f octillion" +msgid_plural "%(value).1f octillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:82 +#, python-format +msgid "%(value)s octillion" +msgid_plural "%(value)s octillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:85 +#, python-format +msgid "%(value).1f nonillion" +msgid_plural "%(value).1f nonillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:86 +#, python-format +msgid "%(value)s nonillion" +msgid_plural "%(value)s nonillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:89 +#, python-format +msgid "%(value).1f decillion" +msgid_plural "%(value).1f decillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:90 +#, python-format +msgid "%(value)s decillion" +msgid_plural "%(value)s decillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:93 +#, python-format +msgid "%(value).1f googol" +msgid_plural "%(value).1f googol" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:94 +#, python-format +msgid "%(value)s googol" +msgid_plural "%(value)s googol" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:143 msgid "one" msgstr "un" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "two" msgstr "dous" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "three" msgstr "tres" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "four" msgstr "catro" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "five" msgstr "cinco" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "six" msgstr "seis" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "seven" msgstr "sete" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "eight" msgstr "oito" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "nine" msgstr "nove" -#: templatetags/humanize.py:96 -msgid "today" -msgstr "hoxe" +#: templatetags/humanize.py:185 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s ago" +msgstr "hai %(delta)s" -#: templatetags/humanize.py:98 -msgid "tomorrow" -msgstr "mañá" +#: templatetags/humanize.py:188 templatetags/humanize.py:210 +msgid "now" +msgstr "" -#: templatetags/humanize.py:100 -msgid "yesterday" -msgstr "onte" +#: templatetags/humanize.py:191 +#, python-format +msgid "a second ago" +msgid_plural "%(count)s seconds ago" +msgstr[0] "hai un segundo" +msgstr[1] "hai %(count)s segundos" + +#: templatetags/humanize.py:196 +#, python-format +msgid "a minute ago" +msgid_plural "%(count)s minutes ago" +msgstr[0] "hai un minuto" +msgstr[1] "hai %(count)s minutos" + +#: templatetags/humanize.py:201 +#, python-format +msgid "an hour ago" +msgid_plural "%(count)s hours ago" +msgstr[0] "hai unha hora" +msgstr[1] "hai %(count)s horas" + +#: templatetags/humanize.py:207 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s from now" +msgstr "" + +#: templatetags/humanize.py:213 +#, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:218 +#, python-format +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:223 +#, python-format +msgid "an hour from now" +msgid_plural "%(count)s hours from now" +msgstr[0] "" +msgstr[1] "" diff --git a/django/contrib/humanize/locale/he/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/he/LC_MESSAGES/django.mo index 75463c2015..1b88063475 100644 Binary files a/django/contrib/humanize/locale/he/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/he/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/he/LC_MESSAGES/django.po b/django/contrib/humanize/locale/he/LC_MESSAGES/django.po index 1c22e8443d..21e3cab554 100644 --- a/django/contrib/humanize/locale/he/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/he/LC_MESSAGES/django.po @@ -1,42 +1,65 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Alex Gaynor , 2011. +# Jannis Leidel , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:18-0400\n" -"PO-Revision-Date: 2011-03-04 18:39+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Hebrew <>\n" +"POT-Creation-Date: 2012-03-14 00:19-0700\n" +"PO-Revision-Date: 2012-02-14 13:08+0000\n" +"Last-Translator: Alex Gaynor \n" +"Language-Team: Hebrew (http://www.transifex.net/projects/p/django/language/" +"he/)\n" +"Language: he\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: he\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: templatetags/humanize.py:19 +#: tests.py:108 templatetags/humanize.py:164 +msgid "today" +msgstr "היום" + +#: tests.py:108 templatetags/humanize.py:168 +msgid "yesterday" +msgstr "אתמול" + +#: tests.py:108 templatetags/humanize.py:166 +msgid "tomorrow" +msgstr "מחר" + +#: templatetags/humanize.py:24 msgid "th" msgstr "רביעי" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "st" msgstr "ראשון" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "nd" msgstr "שני" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "rd" msgstr "שלישי" -#: templatetags/humanize.py:54 +#: templatetags/humanize.py:53 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" msgstr[0] "%(value).1f מיליון" msgstr[1] "%(value).1f מיליונים" +#: templatetags/humanize.py:54 +#, python-format +msgid "%(value)s million" +msgid_plural "%(value)s million" +msgstr[0] "%(value)s מיליון" +msgstr[1] "%(value)s מיליון" + #: templatetags/humanize.py:57 #, python-format msgid "%(value).1f billion" @@ -44,57 +67,229 @@ msgid_plural "%(value).1f billion" msgstr[0] "%(value).1f מיליארד" msgstr[1] "%(value).1f מיליארדים" -#: templatetags/humanize.py:60 +#: templatetags/humanize.py:58 +#, python-format +msgid "%(value)s billion" +msgid_plural "%(value)s billion" +msgstr[0] "%(value)s מיליארד" +msgstr[1] "%(value)s מיליארד" + +#: templatetags/humanize.py:61 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" msgstr[0] "%(value).1f טריליון" msgstr[1] "%(value).1f טריליונים" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:62 +#, python-format +msgid "%(value)s trillion" +msgid_plural "%(value)s trillion" +msgstr[0] "%(value)s טריליון" +msgstr[1] "%(value)s טריליון" + +#: templatetags/humanize.py:65 +#, python-format +msgid "%(value).1f quadrillion" +msgid_plural "%(value).1f quadrillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:66 +#, python-format +msgid "%(value)s quadrillion" +msgid_plural "%(value)s quadrillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:69 +#, python-format +msgid "%(value).1f quintillion" +msgid_plural "%(value).1f quintillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:70 +#, python-format +msgid "%(value)s quintillion" +msgid_plural "%(value)s quintillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:73 +#, python-format +msgid "%(value).1f sextillion" +msgid_plural "%(value).1f sextillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:74 +#, python-format +msgid "%(value)s sextillion" +msgid_plural "%(value)s sextillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:77 +#, python-format +msgid "%(value).1f septillion" +msgid_plural "%(value).1f septillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:78 +#, python-format +msgid "%(value)s septillion" +msgid_plural "%(value)s septillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:81 +#, python-format +msgid "%(value).1f octillion" +msgid_plural "%(value).1f octillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:82 +#, python-format +msgid "%(value)s octillion" +msgid_plural "%(value)s octillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:85 +#, python-format +msgid "%(value).1f nonillion" +msgid_plural "%(value).1f nonillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:86 +#, python-format +msgid "%(value)s nonillion" +msgid_plural "%(value)s nonillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:89 +#, python-format +msgid "%(value).1f decillion" +msgid_plural "%(value).1f decillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:90 +#, python-format +msgid "%(value)s decillion" +msgid_plural "%(value)s decillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:93 +#, python-format +msgid "%(value).1f googol" +msgid_plural "%(value).1f googol" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:94 +#, python-format +msgid "%(value)s googol" +msgid_plural "%(value)s googol" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:143 msgid "one" msgstr "אחד" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "two" msgstr "שניים" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "three" msgstr "שלושה" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "four" msgstr "ארבעה" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "five" msgstr "חמישה" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "six" msgstr "שישה" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "seven" msgstr "שבעה" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "eight" msgstr "שמונה" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "nine" msgstr "תשעה" -#: templatetags/humanize.py:96 -msgid "today" -msgstr "היום" +#: templatetags/humanize.py:185 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s ago" +msgstr "לפני %(delta)s" -#: templatetags/humanize.py:98 -msgid "tomorrow" -msgstr "מחר" +#: templatetags/humanize.py:188 templatetags/humanize.py:210 +msgid "now" +msgstr "עכשיו" -#: templatetags/humanize.py:100 -msgid "yesterday" -msgstr "אתמול" +#: templatetags/humanize.py:191 +#, python-format +msgid "a second ago" +msgid_plural "%(count)s seconds ago" +msgstr[0] "לפני שנייה" +msgstr[1] "לפני %(count)s שניות" + +#: templatetags/humanize.py:196 +#, python-format +msgid "a minute ago" +msgid_plural "%(count)s minutes ago" +msgstr[0] "לפני דקה" +msgstr[1] "לפני %(count)s דקות" + +#: templatetags/humanize.py:201 +#, python-format +msgid "an hour ago" +msgid_plural "%(count)s hours ago" +msgstr[0] "לפני שעה" +msgstr[1] "לפני %(count)s שעות" + +#: templatetags/humanize.py:207 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s from now" +msgstr "בעוד %(delta)s" + +#: templatetags/humanize.py:213 +#, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "בעוד שנייה" +msgstr[1] "בעוד %(count)s שניות" + +#: templatetags/humanize.py:218 +#, python-format +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "בעוד דקה" +msgstr[1] "בעוד %(count)s דקות" + +#: templatetags/humanize.py:223 +#, python-format +msgid "an hour from now" +msgid_plural "%(count)s hours from now" +msgstr[0] "בעוד שעה" +msgstr[1] "בעוד %(count)s שעות" diff --git a/django/contrib/humanize/locale/hi/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/hi/LC_MESSAGES/django.mo index 3176b7e3cb..136633afec 100644 Binary files a/django/contrib/humanize/locale/hi/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/hi/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/hi/LC_MESSAGES/django.po b/django/contrib/humanize/locale/hi/LC_MESSAGES/django.po index 268bde6913..2ccb2bb203 100644 --- a/django/contrib/humanize/locale/hi/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/hi/LC_MESSAGES/django.po @@ -1,100 +1,296 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# chandankumar(ciypro) , 2012. +# Jannis Leidel , 2011. +# Sandeep Satavlekar , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:18-0400\n" -"PO-Revision-Date: 2011-03-06 18:56+0000\n" -"Last-Translator: sandeepsatavlekar \n" -"Language-Team: Hindi \n" +"POT-Creation-Date: 2012-03-14 00:19-0700\n" +"PO-Revision-Date: 2012-03-04 08:26+0000\n" +"Last-Translator: Chandan kumar \n" +"Language-Team: Hindi (http://www.transifex.net/projects/p/django/language/" +"hi/)\n" +"Language: hi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: hi\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: templatetags/humanize.py:19 +#: tests.py:108 templatetags/humanize.py:164 +msgid "today" +msgstr "आज" + +#: tests.py:108 templatetags/humanize.py:168 +msgid "yesterday" +msgstr "कल (बीता)" + +#: tests.py:108 templatetags/humanize.py:166 +msgid "tomorrow" +msgstr "कल" + +#: templatetags/humanize.py:24 msgid "th" msgstr "वाँ" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "st" msgstr "ला" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "nd" msgstr "रा" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "rd" msgstr "रा" -#: templatetags/humanize.py:54 +#: templatetags/humanize.py:53 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%(value).1f मिलियन" +msgstr[1] "%(value).1f मिलियन" + +#: templatetags/humanize.py:54 +#, python-format +msgid "%(value)s million" +msgid_plural "%(value)s million" +msgstr[0] "%(value)s मिलियन" +msgstr[1] "%(value)s मिलियन" #: templatetags/humanize.py:57 #, python-format msgid "%(value).1f billion" msgid_plural "%(value).1f billion" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%(value).1f बिलियन" +msgstr[1] "%(value).1f बिलियन" -#: templatetags/humanize.py:60 +#: templatetags/humanize.py:58 +#, python-format +msgid "%(value)s billion" +msgid_plural "%(value)s billion" +msgstr[0] "%(value)s बिलियन" +msgstr[1] "%(value)s बिलियन" + +#: templatetags/humanize.py:61 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%(value).1f खरब" +msgstr[1] "%(value).1f खरब" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:62 +#, python-format +msgid "%(value)s trillion" +msgid_plural "%(value)s trillion" +msgstr[0] "%(value)s खरब" +msgstr[1] "%(value)s खरब" + +#: templatetags/humanize.py:65 +#, python-format +msgid "%(value).1f quadrillion" +msgid_plural "%(value).1f quadrillion" +msgstr[0] "%(value).1f करोड़ शंख" +msgstr[1] "%(value).1f करोड़ शंख" + +#: templatetags/humanize.py:66 +#, python-format +msgid "%(value)s quadrillion" +msgid_plural "%(value)s quadrillion" +msgstr[0] "%(value)s करोड़ शंख" +msgstr[1] "%(value)s करोड़ शंख" + +#: templatetags/humanize.py:69 +#, python-format +msgid "%(value).1f quintillion" +msgid_plural "%(value).1f quintillion" +msgstr[0] "%(value).1f कुइनतिलिअन " +msgstr[1] "%(value).1f कुइनतिलिअन " + +#: templatetags/humanize.py:70 +#, python-format +msgid "%(value)s quintillion" +msgid_plural "%(value)s quintillion" +msgstr[0] "%(value)s कुइनतिलिअन " +msgstr[1] "%(value)s कुइनतिलिअन " + +#: templatetags/humanize.py:73 +#, python-format +msgid "%(value).1f sextillion" +msgid_plural "%(value).1f sextillion" +msgstr[0] "%(value).1f सेक्सतिलियन" +msgstr[1] "%(value).1f सेक्सतिलियन" + +#: templatetags/humanize.py:74 +#, python-format +msgid "%(value)s sextillion" +msgid_plural "%(value)s sextillion" +msgstr[0] "%(value)s सेक्सतिलियन" +msgstr[1] "%(value)s सेक्सतिलियन" + +#: templatetags/humanize.py:77 +#, python-format +msgid "%(value).1f septillion" +msgid_plural "%(value).1f septillion" +msgstr[0] "%(value).1f सेपतिलियन " +msgstr[1] "%(value).1f सेपतिलियन " + +#: templatetags/humanize.py:78 +#, python-format +msgid "%(value)s septillion" +msgid_plural "%(value)s septillion" +msgstr[0] "%(value)s सेपतिलियन " +msgstr[1] "%(value)s सेपतिलियन " + +#: templatetags/humanize.py:81 +#, python-format +msgid "%(value).1f octillion" +msgid_plural "%(value).1f octillion" +msgstr[0] "%(value).1f ओकतिलियन " +msgstr[1] "%(value).1f ओकतिलियन " + +#: templatetags/humanize.py:82 +#, python-format +msgid "%(value)s octillion" +msgid_plural "%(value)s octillion" +msgstr[0] "%(value)s ओकतिलियन " +msgstr[1] "%(value)s ओकतिलियन " + +#: templatetags/humanize.py:85 +#, python-format +msgid "%(value).1f nonillion" +msgid_plural "%(value).1f nonillion" +msgstr[0] "%(value).1f नोनिलियन" +msgstr[1] "%(value).1f नोनिलियन" + +#: templatetags/humanize.py:86 +#, python-format +msgid "%(value)s nonillion" +msgid_plural "%(value)s nonillion" +msgstr[0] "%(value)s नोनिलियन" +msgstr[1] "%(value)s नोनिलियन" + +#: templatetags/humanize.py:89 +#, python-format +msgid "%(value).1f decillion" +msgid_plural "%(value).1f decillion" +msgstr[0] "%(value).1f देसीलियन" +msgstr[1] "%(value).1f देसीलियन" + +#: templatetags/humanize.py:90 +#, python-format +msgid "%(value)s decillion" +msgid_plural "%(value)s decillion" +msgstr[0] "%(value)s देसीलियन" +msgstr[1] "%(value)s देसीलियन" + +#: templatetags/humanize.py:93 +#, python-format +msgid "%(value).1f googol" +msgid_plural "%(value).1f googol" +msgstr[0] "%(value).1f गोगोल" +msgstr[1] "%(value).1f गोगोल" + +#: templatetags/humanize.py:94 +#, python-format +msgid "%(value)s googol" +msgid_plural "%(value)s googol" +msgstr[0] "%(value)s गोगोल" +msgstr[1] "%(value)s गोगोल" + +#: templatetags/humanize.py:143 msgid "one" msgstr "एक" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "two" msgstr "दो" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "three" msgstr "तीन" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "four" msgstr "चार" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "five" msgstr "पाँच" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "six" msgstr "छह" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "seven" msgstr "सात" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "eight" msgstr "आठ" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "nine" msgstr "नौ" -#: templatetags/humanize.py:96 -msgid "today" -msgstr "आज" +#: templatetags/humanize.py:185 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s ago" +msgstr "%(delta)s पहले" -#: templatetags/humanize.py:98 -msgid "tomorrow" -msgstr "कल" +#: templatetags/humanize.py:188 templatetags/humanize.py:210 +msgid "now" +msgstr "अभी" -#: templatetags/humanize.py:100 -msgid "yesterday" -msgstr "कल (बीता)" +#: templatetags/humanize.py:191 +#, python-format +msgid "a second ago" +msgid_plural "%(count)s seconds ago" +msgstr[0] "एक सेकेंड पहले" +msgstr[1] "%(count)s सेकेंड पहले" + +#: templatetags/humanize.py:196 +#, python-format +msgid "a minute ago" +msgid_plural "%(count)s minutes ago" +msgstr[0] " एक मिनट पहले" +msgstr[1] "%(count)s मिनट पहले" + +#: templatetags/humanize.py:201 +#, python-format +msgid "an hour ago" +msgid_plural "%(count)s hours ago" +msgstr[0] "एक घंटा पहले" +msgstr[1] "%(count)s घंटे पहले" + +#: templatetags/humanize.py:207 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s from now" +msgstr "%(delta)s अब से" + +#: templatetags/humanize.py:213 +#, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "अब से एक सेकेंड" +msgstr[1] "अब से %(count)s सेकेंड" + +#: templatetags/humanize.py:218 +#, python-format +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "अब से एक मिनट" +msgstr[1] "अब से %(count)s मिनट" + +#: templatetags/humanize.py:223 +#, python-format +msgid "an hour from now" +msgid_plural "%(count)s hours from now" +msgstr[0] "अब से एक घंटा" +msgstr[1] "अब से %(count)s घंटे" diff --git a/django/contrib/humanize/locale/hr/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/hr/LC_MESSAGES/django.mo index dc59c029c9..9924896e79 100644 Binary files a/django/contrib/humanize/locale/hr/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/hr/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/hr/LC_MESSAGES/django.po b/django/contrib/humanize/locale/hr/LC_MESSAGES/django.po index dde4e4229d..2607fb8ddf 100644 --- a/django/contrib/humanize/locale/hr/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/hr/LC_MESSAGES/django.po @@ -1,37 +1,52 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Jannis Leidel , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-20 21:08+0100\n" -"PO-Revision-Date: 2011-03-04 18:39+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Croatian <>\n" +"POT-Creation-Date: 2012-03-14 00:19-0700\n" +"PO-Revision-Date: 2012-02-14 13:08+0000\n" +"Last-Translator: Jannis Leidel \n" +"Language-Team: Croatian (http://www.transifex.net/projects/p/django/language/" +"hr/)\n" +"Language: hr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: hr\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" -"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n" -#: templatetags/humanize.py:19 +#: tests.py:108 templatetags/humanize.py:164 +msgid "today" +msgstr "danas" + +#: tests.py:108 templatetags/humanize.py:168 +msgid "yesterday" +msgstr "jučer" + +#: tests.py:108 templatetags/humanize.py:166 +msgid "tomorrow" +msgstr "sutra" + +#: templatetags/humanize.py:24 msgid "th" msgstr "th" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "st" msgstr "st" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "nd" msgstr "nd" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "rd" msgstr "rd" -#: templatetags/humanize.py:54 +#: templatetags/humanize.py:53 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" @@ -39,6 +54,14 @@ msgstr[0] "%(value).1f milijun" msgstr[1] "%(value).1f milijuna" msgstr[2] "%(value).1f milijuna" +#: templatetags/humanize.py:54 +#, python-format +msgid "%(value)s million" +msgid_plural "%(value)s million" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + #: templatetags/humanize.py:57 #, python-format msgid "%(value).1f billion" @@ -47,7 +70,15 @@ msgstr[0] "%(value).1f milijarda" msgstr[1] "%(value).1f milijarde" msgstr[2] "%(value).1f milijarde" -#: templatetags/humanize.py:60 +#: templatetags/humanize.py:58 +#, python-format +msgid "%(value)s billion" +msgid_plural "%(value)s billion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:61 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" @@ -55,50 +86,238 @@ msgstr[0] "%(value).1f bilion" msgstr[1] "%(value).1f biliona" msgstr[2] "%(value).1f bilion" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:62 +#, python-format +msgid "%(value)s trillion" +msgid_plural "%(value)s trillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:65 +#, python-format +msgid "%(value).1f quadrillion" +msgid_plural "%(value).1f quadrillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:66 +#, python-format +msgid "%(value)s quadrillion" +msgid_plural "%(value)s quadrillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:69 +#, python-format +msgid "%(value).1f quintillion" +msgid_plural "%(value).1f quintillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:70 +#, python-format +msgid "%(value)s quintillion" +msgid_plural "%(value)s quintillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:73 +#, python-format +msgid "%(value).1f sextillion" +msgid_plural "%(value).1f sextillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:74 +#, python-format +msgid "%(value)s sextillion" +msgid_plural "%(value)s sextillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:77 +#, python-format +msgid "%(value).1f septillion" +msgid_plural "%(value).1f septillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:78 +#, python-format +msgid "%(value)s septillion" +msgid_plural "%(value)s septillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:81 +#, python-format +msgid "%(value).1f octillion" +msgid_plural "%(value).1f octillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:82 +#, python-format +msgid "%(value)s octillion" +msgid_plural "%(value)s octillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:85 +#, python-format +msgid "%(value).1f nonillion" +msgid_plural "%(value).1f nonillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:86 +#, python-format +msgid "%(value)s nonillion" +msgid_plural "%(value)s nonillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:89 +#, python-format +msgid "%(value).1f decillion" +msgid_plural "%(value).1f decillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:90 +#, python-format +msgid "%(value)s decillion" +msgid_plural "%(value)s decillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:93 +#, python-format +msgid "%(value).1f googol" +msgid_plural "%(value).1f googol" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:94 +#, python-format +msgid "%(value)s googol" +msgid_plural "%(value)s googol" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:143 msgid "one" msgstr "jedan" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "two" msgstr "dva" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "three" msgstr "tri" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "four" msgstr "četiri" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "five" msgstr "pet" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "six" msgstr "šest" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "seven" msgstr "sedam" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "eight" msgstr "osam" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "nine" msgstr "devet" -#: templatetags/humanize.py:96 -msgid "today" -msgstr "danas" +#: templatetags/humanize.py:185 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s ago" +msgstr "" -#: templatetags/humanize.py:98 -msgid "tomorrow" -msgstr "sutra" +#: templatetags/humanize.py:188 templatetags/humanize.py:210 +msgid "now" +msgstr "" -#: templatetags/humanize.py:100 -msgid "yesterday" -msgstr "jučer" +#: templatetags/humanize.py:191 +#, python-format +msgid "a second ago" +msgid_plural "%(count)s seconds ago" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:196 +#, python-format +msgid "a minute ago" +msgid_plural "%(count)s minutes ago" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:201 +#, python-format +msgid "an hour ago" +msgid_plural "%(count)s hours ago" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:207 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s from now" +msgstr "" + +#: templatetags/humanize.py:213 +#, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:218 +#, python-format +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:223 +#, python-format +msgid "an hour from now" +msgid_plural "%(count)s hours from now" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" diff --git a/django/contrib/humanize/locale/hu/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/hu/LC_MESSAGES/django.mo index 6dce9967c0..5b9ef54e45 100644 Binary files a/django/contrib/humanize/locale/hu/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/hu/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/hu/LC_MESSAGES/django.po b/django/contrib/humanize/locale/hu/LC_MESSAGES/django.po index cebed0d409..ce5928269d 100644 --- a/django/contrib/humanize/locale/hu/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/hu/LC_MESSAGES/django.po @@ -1,42 +1,65 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Jannis Leidel , 2011. +# János Péter Ronkay , 2012. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:18-0400\n" -"PO-Revision-Date: 2011-03-04 18:39+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Hungarian <>\n" +"POT-Creation-Date: 2012-03-14 00:19-0700\n" +"PO-Revision-Date: 2012-03-06 11:23+0000\n" +"Last-Translator: János Péter Ronkay \n" +"Language-Team: Hungarian (http://www.transifex.net/projects/p/django/" +"language/hu/)\n" +"Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: hu\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: templatetags/humanize.py:19 +#: tests.py:108 templatetags/humanize.py:164 +msgid "today" +msgstr "ma" + +#: tests.py:108 templatetags/humanize.py:168 +msgid "yesterday" +msgstr "tegnap" + +#: tests.py:108 templatetags/humanize.py:166 +msgid "tomorrow" +msgstr "holnap" + +#: templatetags/humanize.py:24 msgid "th" msgstr "." -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "st" msgstr "." -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "nd" msgstr "." -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "rd" msgstr "." -#: templatetags/humanize.py:54 +#: templatetags/humanize.py:53 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" msgstr[0] "%(value)1f millió" msgstr[1] "%(value)1f millió" +#: templatetags/humanize.py:54 +#, python-format +msgid "%(value)s million" +msgid_plural "%(value)s million" +msgstr[0] "%(value)s millió" +msgstr[1] "%(value)s millió" + #: templatetags/humanize.py:57 #, python-format msgid "%(value).1f billion" @@ -44,57 +67,229 @@ msgid_plural "%(value).1f billion" msgstr[0] "%(value)1f milliárd" msgstr[1] "%(value)1f milliárd" -#: templatetags/humanize.py:60 +#: templatetags/humanize.py:58 +#, python-format +msgid "%(value)s billion" +msgid_plural "%(value)s billion" +msgstr[0] " %(value)s milliárd" +msgstr[1] " %(value)s milliárd" + +#: templatetags/humanize.py:61 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" msgstr[0] "%(value)1f trilliárd" msgstr[1] "%(value)1f trilliárd" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:62 +#, python-format +msgid "%(value)s trillion" +msgid_plural "%(value)s trillion" +msgstr[0] "%(value)s billió" +msgstr[1] "%(value)s billió" + +#: templatetags/humanize.py:65 +#, python-format +msgid "%(value).1f quadrillion" +msgid_plural "%(value).1f quadrillion" +msgstr[0] "%(value).1f billiárd" +msgstr[1] "%(value).1f billiárd" + +#: templatetags/humanize.py:66 +#, python-format +msgid "%(value)s quadrillion" +msgid_plural "%(value)s quadrillion" +msgstr[0] "%(value)s billiárd" +msgstr[1] "%(value)s billiárd" + +#: templatetags/humanize.py:69 +#, python-format +msgid "%(value).1f quintillion" +msgid_plural "%(value).1f quintillion" +msgstr[0] "%(value).1f trillió" +msgstr[1] "%(value).1f trillió" + +#: templatetags/humanize.py:70 +#, python-format +msgid "%(value)s quintillion" +msgid_plural "%(value)s quintillion" +msgstr[0] "%(value)s trillió" +msgstr[1] "%(value)s trillió" + +#: templatetags/humanize.py:73 +#, python-format +msgid "%(value).1f sextillion" +msgid_plural "%(value).1f sextillion" +msgstr[0] "%(value).1f trilliárd" +msgstr[1] "%(value).1f trilliárd" + +#: templatetags/humanize.py:74 +#, python-format +msgid "%(value)s sextillion" +msgid_plural "%(value)s sextillion" +msgstr[0] "%(value)s trilliárd" +msgstr[1] "%(value)s trilliárd" + +#: templatetags/humanize.py:77 +#, python-format +msgid "%(value).1f septillion" +msgid_plural "%(value).1f septillion" +msgstr[0] "%(value).1f kvadrillió" +msgstr[1] "%(value).1f kvadrillió" + +#: templatetags/humanize.py:78 +#, python-format +msgid "%(value)s septillion" +msgid_plural "%(value)s septillion" +msgstr[0] "%(value)s kvadrillió" +msgstr[1] "%(value)s kvadrillió" + +#: templatetags/humanize.py:81 +#, python-format +msgid "%(value).1f octillion" +msgid_plural "%(value).1f octillion" +msgstr[0] "%(value).1f kvadrilliárd" +msgstr[1] "%(value).1f kvadrilliárd" + +#: templatetags/humanize.py:82 +#, python-format +msgid "%(value)s octillion" +msgid_plural "%(value)s octillion" +msgstr[0] "%(value)s kvadrilliárd" +msgstr[1] "%(value)s kvadrilliárd" + +#: templatetags/humanize.py:85 +#, python-format +msgid "%(value).1f nonillion" +msgid_plural "%(value).1f nonillion" +msgstr[0] "%(value).1f kvintillió" +msgstr[1] "%(value).1f kvintillió" + +#: templatetags/humanize.py:86 +#, python-format +msgid "%(value)s nonillion" +msgid_plural "%(value)s nonillion" +msgstr[0] "%(value)s kvintillió" +msgstr[1] "%(value)s kvintillió" + +#: templatetags/humanize.py:89 +#, python-format +msgid "%(value).1f decillion" +msgid_plural "%(value).1f decillion" +msgstr[0] "%(value).1f kvintilliárd" +msgstr[1] "%(value).1f kvintilliárd" + +#: templatetags/humanize.py:90 +#, python-format +msgid "%(value)s decillion" +msgid_plural "%(value)s decillion" +msgstr[0] "%(value)s kvintilliárd" +msgstr[1] "%(value)s kvintilliárd" + +#: templatetags/humanize.py:93 +#, python-format +msgid "%(value).1f googol" +msgid_plural "%(value).1f googol" +msgstr[0] "%(value).1f googol" +msgstr[1] "%(value).1f googol" + +#: templatetags/humanize.py:94 +#, python-format +msgid "%(value)s googol" +msgid_plural "%(value)s googol" +msgstr[0] "%(value)s googol" +msgstr[1] "%(value)s googol" + +#: templatetags/humanize.py:143 msgid "one" msgstr "egy" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "two" msgstr "kettő" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "three" msgstr "három" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "four" msgstr "négy" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "five" msgstr "öt" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "six" msgstr "hat" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "seven" msgstr "hét" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "eight" msgstr "nyolc" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "nine" msgstr "kilenc" -#: templatetags/humanize.py:96 -msgid "today" -msgstr "ma" +#: templatetags/humanize.py:185 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s ago" +msgstr "" -#: templatetags/humanize.py:98 -msgid "tomorrow" -msgstr "holnap" +#: templatetags/humanize.py:188 templatetags/humanize.py:210 +msgid "now" +msgstr "most" -#: templatetags/humanize.py:100 -msgid "yesterday" -msgstr "tegnap" +#: templatetags/humanize.py:191 +#, python-format +msgid "a second ago" +msgid_plural "%(count)s seconds ago" +msgstr[0] "egy másodperccel ezelőtt" +msgstr[1] "%(count)s másodperccel ezelőtt" + +#: templatetags/humanize.py:196 +#, python-format +msgid "a minute ago" +msgid_plural "%(count)s minutes ago" +msgstr[0] "egy perccel ezelőtt" +msgstr[1] "%(count)s perccel ezelőtt" + +#: templatetags/humanize.py:201 +#, python-format +msgid "an hour ago" +msgid_plural "%(count)s hours ago" +msgstr[0] "egy órával ezelőtt" +msgstr[1] "%(count)s órával ezelőtt" + +#: templatetags/humanize.py:207 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s from now" +msgstr "" + +#: templatetags/humanize.py:213 +#, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "egy másodperccel ezután" +msgstr[1] "%(count)s másodperccel ezután" + +#: templatetags/humanize.py:218 +#, python-format +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "egy perccel ezután" +msgstr[1] "%(count)s perccel ezután" + +#: templatetags/humanize.py:223 +#, python-format +msgid "an hour from now" +msgid_plural "%(count)s hours from now" +msgstr[0] "egy órával ezután" +msgstr[1] "%(count)s órával ezután" diff --git a/django/contrib/humanize/locale/id/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/id/LC_MESSAGES/django.mo index 24a8dfd91d..cebed92646 100644 Binary files a/django/contrib/humanize/locale/id/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/id/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/id/LC_MESSAGES/django.po b/django/contrib/humanize/locale/id/LC_MESSAGES/django.po index d2e74092df..f7d994f5a1 100644 --- a/django/contrib/humanize/locale/id/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/id/LC_MESSAGES/django.po @@ -1,97 +1,267 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Jannis Leidel , 2011. +# , 2011, 2012. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:18-0400\n" -"PO-Revision-Date: 2011-03-04 18:39+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Indonesian \n" +"POT-Creation-Date: 2012-03-14 00:19-0700\n" +"PO-Revision-Date: 2012-03-06 20:12+0000\n" +"Last-Translator: rodin \n" +"Language-Team: Indonesian (http://www.transifex.net/projects/p/django/" +"language/id/)\n" +"Language: id\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: id\n" "Plural-Forms: nplurals=1; plural=0\n" -#: templatetags/humanize.py:19 +#: tests.py:108 templatetags/humanize.py:164 +msgid "today" +msgstr "hari ini" + +#: tests.py:108 templatetags/humanize.py:168 +msgid "yesterday" +msgstr "kemarin" + +#: tests.py:108 templatetags/humanize.py:166 +msgid "tomorrow" +msgstr "besok" + +#: templatetags/humanize.py:24 msgid "th" msgstr "th" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "st" msgstr "st" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "nd" msgstr "nd" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "rd" msgstr "rd" -#: templatetags/humanize.py:54 +#: templatetags/humanize.py:53 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" msgstr[0] "%(value).1f juta" +#: templatetags/humanize.py:54 +#, python-format +msgid "%(value)s million" +msgid_plural "%(value)s million" +msgstr[0] "%(value)s juta" + #: templatetags/humanize.py:57 #, python-format msgid "%(value).1f billion" msgid_plural "%(value).1f billion" msgstr[0] "%(value).1f milyar" -#: templatetags/humanize.py:60 +#: templatetags/humanize.py:58 +#, python-format +msgid "%(value)s billion" +msgid_plural "%(value)s billion" +msgstr[0] "%(value)s miliar" + +#: templatetags/humanize.py:61 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" msgstr[0] "%(value).1f trilyun" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:62 +#, python-format +msgid "%(value)s trillion" +msgid_plural "%(value)s trillion" +msgstr[0] "%(value)s triliun" + +#: templatetags/humanize.py:65 +#, python-format +msgid "%(value).1f quadrillion" +msgid_plural "%(value).1f quadrillion" +msgstr[0] "%(value).1f kuadriliun" + +#: templatetags/humanize.py:66 +#, python-format +msgid "%(value)s quadrillion" +msgid_plural "%(value)s quadrillion" +msgstr[0] "%(value)s kuadriliun" + +#: templatetags/humanize.py:69 +#, python-format +msgid "%(value).1f quintillion" +msgid_plural "%(value).1f quintillion" +msgstr[0] "%(value).1f kuintiliun" + +#: templatetags/humanize.py:70 +#, python-format +msgid "%(value)s quintillion" +msgid_plural "%(value)s quintillion" +msgstr[0] "%(value)s kuintiliun" + +#: templatetags/humanize.py:73 +#, python-format +msgid "%(value).1f sextillion" +msgid_plural "%(value).1f sextillion" +msgstr[0] "%(value).1f sekstiliun" + +#: templatetags/humanize.py:74 +#, python-format +msgid "%(value)s sextillion" +msgid_plural "%(value)s sextillion" +msgstr[0] "%(value)s sekstiliun" + +#: templatetags/humanize.py:77 +#, python-format +msgid "%(value).1f septillion" +msgid_plural "%(value).1f septillion" +msgstr[0] "%(value).1f septiliun" + +#: templatetags/humanize.py:78 +#, python-format +msgid "%(value)s septillion" +msgid_plural "%(value)s septillion" +msgstr[0] "%(value)s septiliun" + +#: templatetags/humanize.py:81 +#, python-format +msgid "%(value).1f octillion" +msgid_plural "%(value).1f octillion" +msgstr[0] "%(value).1f oktiliun" + +#: templatetags/humanize.py:82 +#, python-format +msgid "%(value)s octillion" +msgid_plural "%(value)s octillion" +msgstr[0] "%(value)s oktiliun" + +#: templatetags/humanize.py:85 +#, python-format +msgid "%(value).1f nonillion" +msgid_plural "%(value).1f nonillion" +msgstr[0] "%(value).1f noniliun" + +#: templatetags/humanize.py:86 +#, python-format +msgid "%(value)s nonillion" +msgid_plural "%(value)s nonillion" +msgstr[0] "%(value)s noniliun" + +#: templatetags/humanize.py:89 +#, python-format +msgid "%(value).1f decillion" +msgid_plural "%(value).1f decillion" +msgstr[0] "%(value).1f desiliun" + +#: templatetags/humanize.py:90 +#, python-format +msgid "%(value)s decillion" +msgid_plural "%(value)s decillion" +msgstr[0] "%(value)s desiliun" + +#: templatetags/humanize.py:93 +#, python-format +msgid "%(value).1f googol" +msgid_plural "%(value).1f googol" +msgstr[0] "%(value).1f googol" + +#: templatetags/humanize.py:94 +#, python-format +msgid "%(value)s googol" +msgid_plural "%(value)s googol" +msgstr[0] "%(value)s googol" + +#: templatetags/humanize.py:143 msgid "one" msgstr "satu" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "two" msgstr "dua" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "three" msgstr "tiga" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "four" msgstr "empat" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "five" msgstr "lima" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "six" msgstr "enam" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "seven" msgstr "tujuh" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "eight" msgstr "delapan" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "nine" msgstr "sembilan" -#: templatetags/humanize.py:96 -msgid "today" -msgstr "hari ini" +#: templatetags/humanize.py:185 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s ago" +msgstr "%(delta)s yang lalu" -#: templatetags/humanize.py:98 -msgid "tomorrow" -msgstr "besok" +#: templatetags/humanize.py:188 templatetags/humanize.py:210 +msgid "now" +msgstr "sekarang" -#: templatetags/humanize.py:100 -msgid "yesterday" -msgstr "kemarin" +#: templatetags/humanize.py:191 +#, python-format +msgid "a second ago" +msgid_plural "%(count)s seconds ago" +msgstr[0] "%(count)s detik yang lalu" + +#: templatetags/humanize.py:196 +#, python-format +msgid "a minute ago" +msgid_plural "%(count)s minutes ago" +msgstr[0] "%(count)s menit yang lalu" + +#: templatetags/humanize.py:201 +#, python-format +msgid "an hour ago" +msgid_plural "%(count)s hours ago" +msgstr[0] "%(count)s jam yang lalu" + +#: templatetags/humanize.py:207 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s from now" +msgstr "%(delta)s dari sekarang" + +#: templatetags/humanize.py:213 +#, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "%(count)s detik dari sekarang" + +#: templatetags/humanize.py:218 +#, python-format +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "%(count)s menit dari sekarang" + +#: templatetags/humanize.py:223 +#, python-format +msgid "an hour from now" +msgid_plural "%(count)s hours from now" +msgstr[0] "%(count)s jam dari sekarang" diff --git a/django/contrib/humanize/locale/is/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/is/LC_MESSAGES/django.mo index 4bdc50cbd9..907c8eff2b 100644 Binary files a/django/contrib/humanize/locale/is/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/is/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/is/LC_MESSAGES/django.po b/django/contrib/humanize/locale/is/LC_MESSAGES/django.po index 4c847f9eb6..ca6c99f3aa 100644 --- a/django/contrib/humanize/locale/is/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/is/LC_MESSAGES/django.po @@ -1,42 +1,66 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# , 2012. +# Hafsteinn Einarsson , 2012. +# Jannis Leidel , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:18-0400\n" -"PO-Revision-Date: 2011-03-04 18:39+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Icelandic \n" +"POT-Creation-Date: 2012-03-14 00:19-0700\n" +"PO-Revision-Date: 2012-02-17 18:46+0000\n" +"Last-Translator: gudmundur \n" +"Language-Team: Icelandic (http://www.transifex.net/projects/p/django/" +"language/is/)\n" +"Language: is\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: is\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: templatetags/humanize.py:19 +#: tests.py:108 templatetags/humanize.py:164 +msgid "today" +msgstr "í dag" + +#: tests.py:108 templatetags/humanize.py:168 +msgid "yesterday" +msgstr "gærdagur" + +#: tests.py:108 templatetags/humanize.py:166 +msgid "tomorrow" +msgstr "morgundagur" + +#: templatetags/humanize.py:24 msgid "th" msgstr "." -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "st" msgstr "." -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "nd" msgstr "." -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "rd" msgstr "." -#: templatetags/humanize.py:54 +#: templatetags/humanize.py:53 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" msgstr[0] "%(value).1f milljón" msgstr[1] "%(value).1f milljónir" +#: templatetags/humanize.py:54 +#, python-format +msgid "%(value)s million" +msgid_plural "%(value)s million" +msgstr[0] "%(value)s milljón" +msgstr[1] "%(value)s milljónir" + #: templatetags/humanize.py:57 #, python-format msgid "%(value).1f billion" @@ -44,57 +68,229 @@ msgid_plural "%(value).1f billion" msgstr[0] "%(value).1f milljarður" msgstr[1] "%(value).1f milljarðar" -#: templatetags/humanize.py:60 +#: templatetags/humanize.py:58 +#, python-format +msgid "%(value)s billion" +msgid_plural "%(value)s billion" +msgstr[0] "%(value)s milljarður" +msgstr[1] "%(value)s milljarðar" + +#: templatetags/humanize.py:61 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" msgstr[0] "%(value).1f billjarður" msgstr[1] "%(value).1f billjónir" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:62 +#, python-format +msgid "%(value)s trillion" +msgid_plural "%(value)s trillion" +msgstr[0] "%(value)s billjón" +msgstr[1] "%(value)s billjónir" + +#: templatetags/humanize.py:65 +#, python-format +msgid "%(value).1f quadrillion" +msgid_plural "%(value).1f quadrillion" +msgstr[0] "%(value).1f billjarður" +msgstr[1] "%(value).1f billjarðar" + +#: templatetags/humanize.py:66 +#, python-format +msgid "%(value)s quadrillion" +msgid_plural "%(value)s quadrillion" +msgstr[0] "%(value)s billjarður" +msgstr[1] "%(value)s billjarðar" + +#: templatetags/humanize.py:69 +#, python-format +msgid "%(value).1f quintillion" +msgid_plural "%(value).1f quintillion" +msgstr[0] "%(value).1f trilljón" +msgstr[1] "%(value).1f trilljónir" + +#: templatetags/humanize.py:70 +#, python-format +msgid "%(value)s quintillion" +msgid_plural "%(value)s quintillion" +msgstr[0] "%(value)s trilljón" +msgstr[1] "%(value)s trilljónir" + +#: templatetags/humanize.py:73 +#, python-format +msgid "%(value).1f sextillion" +msgid_plural "%(value).1f sextillion" +msgstr[0] "%(value).1f trilljarður" +msgstr[1] "%(value).1f trilljarðar" + +#: templatetags/humanize.py:74 +#, python-format +msgid "%(value)s sextillion" +msgid_plural "%(value)s sextillion" +msgstr[0] "%(value)s trilljarður" +msgstr[1] "%(value)s trilljarðar" + +#: templatetags/humanize.py:77 +#, python-format +msgid "%(value).1f septillion" +msgid_plural "%(value).1f septillion" +msgstr[0] "%(value).1f kvaðrilljón" +msgstr[1] "%(value).1f kvaðrilljónir" + +#: templatetags/humanize.py:78 +#, python-format +msgid "%(value)s septillion" +msgid_plural "%(value)s septillion" +msgstr[0] "%(value)s kvaðrilljón" +msgstr[1] "%(value)s kvaðrilljónir" + +#: templatetags/humanize.py:81 +#, python-format +msgid "%(value).1f octillion" +msgid_plural "%(value).1f octillion" +msgstr[0] "%(value).1f kvaðrilljarður" +msgstr[1] "%(value).1f kvaðrilljarðar" + +#: templatetags/humanize.py:82 +#, python-format +msgid "%(value)s octillion" +msgid_plural "%(value)s octillion" +msgstr[0] "%(value)s kvaðrilljarður" +msgstr[1] "%(value)s kvaðrilljarðar" + +#: templatetags/humanize.py:85 +#, python-format +msgid "%(value).1f nonillion" +msgid_plural "%(value).1f nonillion" +msgstr[0] "%(value).1f kvintilljón" +msgstr[1] "%(value).1f kvintilljónir" + +#: templatetags/humanize.py:86 +#, python-format +msgid "%(value)s nonillion" +msgid_plural "%(value)s nonillion" +msgstr[0] "%(value)s kvintilljón" +msgstr[1] "%(value)s kvintilljónir" + +#: templatetags/humanize.py:89 +#, python-format +msgid "%(value).1f decillion" +msgid_plural "%(value).1f decillion" +msgstr[0] "%(value).1f kvintilljarður" +msgstr[1] "%(value).1f kvintilljarðar" + +#: templatetags/humanize.py:90 +#, python-format +msgid "%(value)s decillion" +msgid_plural "%(value)s decillion" +msgstr[0] "%(value)s kvintilljarður" +msgstr[1] "%(value)s kvintilljarðar" + +#: templatetags/humanize.py:93 +#, python-format +msgid "%(value).1f googol" +msgid_plural "%(value).1f googol" +msgstr[0] "%(value).1f googol" +msgstr[1] "%(value).1f googol" + +#: templatetags/humanize.py:94 +#, python-format +msgid "%(value)s googol" +msgid_plural "%(value)s googol" +msgstr[0] "%(value)s googol" +msgstr[1] "%(value)s googol" + +#: templatetags/humanize.py:143 msgid "one" msgstr "einn" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "two" msgstr "tveir" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "three" msgstr "þrír" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "four" msgstr "fjórir" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "five" msgstr "fimm" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "six" msgstr "sex" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "seven" msgstr "sjö" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "eight" msgstr "átta" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "nine" msgstr "níu" -#: templatetags/humanize.py:96 -msgid "today" -msgstr "í dag" +#: templatetags/humanize.py:185 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s ago" +msgstr "%(delta)s síðan" -#: templatetags/humanize.py:98 -msgid "tomorrow" -msgstr "morgundagur" +#: templatetags/humanize.py:188 templatetags/humanize.py:210 +msgid "now" +msgstr "núna" -#: templatetags/humanize.py:100 -msgid "yesterday" -msgstr "gærdagur" +#: templatetags/humanize.py:191 +#, python-format +msgid "a second ago" +msgid_plural "%(count)s seconds ago" +msgstr[0] "fyrir sekúndu síðan" +msgstr[1] "%(count)s sekúndum síðan" + +#: templatetags/humanize.py:196 +#, python-format +msgid "a minute ago" +msgid_plural "%(count)s minutes ago" +msgstr[0] "fyrir mínútu síðan" +msgstr[1] "%(count)s mínútum síðan" + +#: templatetags/humanize.py:201 +#, python-format +msgid "an hour ago" +msgid_plural "%(count)s hours ago" +msgstr[0] "fyrir klukkustund" +msgstr[1] "fyrir %(count)s klukkustundum" + +#: templatetags/humanize.py:207 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s from now" +msgstr "eftir %(delta)s" + +#: templatetags/humanize.py:213 +#, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "eftir sekúndu" +msgstr[1] "eftir %(count)s sekúndur" + +#: templatetags/humanize.py:218 +#, python-format +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "eftir mínútu" +msgstr[1] "eftir %(count)s mínútur" + +#: templatetags/humanize.py:223 +#, python-format +msgid "an hour from now" +msgid_plural "%(count)s hours from now" +msgstr[0] "eftir klukkustund" +msgstr[1] "eftir %(count)s klukkustundir" diff --git a/django/contrib/humanize/locale/it/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/it/LC_MESSAGES/django.mo index d162192a34..1d2b3b582d 100644 Binary files a/django/contrib/humanize/locale/it/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/it/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/it/LC_MESSAGES/django.po b/django/contrib/humanize/locale/it/LC_MESSAGES/django.po index bf5c4dadb2..ff93cba363 100644 --- a/django/contrib/humanize/locale/it/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/it/LC_MESSAGES/django.po @@ -1,42 +1,67 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Federico Capoano , 2011. +# Jannis Leidel , 2011. +# , 2011. +# Nicola Larosa , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:18-0400\n" -"PO-Revision-Date: 2011-03-04 18:39+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Italian <>\n" +"POT-Creation-Date: 2012-03-14 00:19-0700\n" +"PO-Revision-Date: 2012-02-14 13:08+0000\n" +"Last-Translator: Nicola Larosa \n" +"Language-Team: Italian (http://www.transifex.net/projects/p/django/language/" +"it/)\n" +"Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: templatetags/humanize.py:19 +#: tests.py:108 templatetags/humanize.py:164 +msgid "today" +msgstr "oggi" + +#: tests.py:108 templatetags/humanize.py:168 +msgid "yesterday" +msgstr "ieri" + +#: tests.py:108 templatetags/humanize.py:166 +msgid "tomorrow" +msgstr "domani" + +#: templatetags/humanize.py:24 msgid "th" msgstr "º" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "st" msgstr "º" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "nd" msgstr "º" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "rd" msgstr "º" -#: templatetags/humanize.py:54 +#: templatetags/humanize.py:53 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" msgstr[0] "%(value).1f milione" msgstr[1] "%(value).1f milioni" +#: templatetags/humanize.py:54 +#, python-format +msgid "%(value)s million" +msgid_plural "%(value)s million" +msgstr[0] "%(value)s milione" +msgstr[1] "%(value)s milioni" + #: templatetags/humanize.py:57 #, python-format msgid "%(value).1f billion" @@ -44,57 +69,229 @@ msgid_plural "%(value).1f billion" msgstr[0] "%(value).1f miliardo" msgstr[1] "%(value).1f miliardi" -#: templatetags/humanize.py:60 +#: templatetags/humanize.py:58 +#, python-format +msgid "%(value)s billion" +msgid_plural "%(value)s billion" +msgstr[0] "%(value)s miliardo" +msgstr[1] "%(value)s miliardi" + +#: templatetags/humanize.py:61 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" msgstr[0] "%(value).1f migliaio di miliardi" msgstr[1] "%(value).1f migliaia di miliardi" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:62 +#, python-format +msgid "%(value)s trillion" +msgid_plural "%(value)s trillion" +msgstr[0] "%(value)s migliaio di miliardi" +msgstr[1] "%(value)s migliaia di miliardi" + +#: templatetags/humanize.py:65 +#, python-format +msgid "%(value).1f quadrillion" +msgid_plural "%(value).1f quadrillion" +msgstr[0] "%(value).1f milione di miliardi" +msgstr[1] "%(value).1f milioni di miliardi" + +#: templatetags/humanize.py:66 +#, python-format +msgid "%(value)s quadrillion" +msgid_plural "%(value)s quadrillion" +msgstr[0] "%(value)s milione di miliardi" +msgstr[1] "%(value)s milioni di miliardi" + +#: templatetags/humanize.py:69 +#, python-format +msgid "%(value).1f quintillion" +msgid_plural "%(value).1f quintillion" +msgstr[0] "%(value).1f miliardo di miliardi" +msgstr[1] "%(value).1f miliardi di miliardi" + +#: templatetags/humanize.py:70 +#, python-format +msgid "%(value)s quintillion" +msgid_plural "%(value)s quintillion" +msgstr[0] "%(value)s miliardo di miliardi" +msgstr[1] "%(value)s miliardi di miliardi" + +#: templatetags/humanize.py:73 +#, python-format +msgid "%(value).1f sextillion" +msgid_plural "%(value).1f sextillion" +msgstr[0] "%(value).1f migliaio di miliardi di miliardi" +msgstr[1] "%(value).1f migliaia di miliardi di miliardi" + +#: templatetags/humanize.py:74 +#, python-format +msgid "%(value)s sextillion" +msgid_plural "%(value)s sextillion" +msgstr[0] "%(value)s migliaio di miliardi di miliardi" +msgstr[1] "%(value)s migliaia di miliardi di miliardi" + +#: templatetags/humanize.py:77 +#, python-format +msgid "%(value).1f septillion" +msgid_plural "%(value).1f septillion" +msgstr[0] "%(value).1f milione di miliardi di miliardi" +msgstr[1] "%(value).1f milioni di miliardi di miliardi" + +#: templatetags/humanize.py:78 +#, python-format +msgid "%(value)s septillion" +msgid_plural "%(value)s septillion" +msgstr[0] "%(value)s milione di miliardi di miliardi" +msgstr[1] "%(value)s milioni di miliardi di miliardi" + +#: templatetags/humanize.py:81 +#, python-format +msgid "%(value).1f octillion" +msgid_plural "%(value).1f octillion" +msgstr[0] "%(value).1f miliardo di miliardi di miliardi" +msgstr[1] "%(value).1f miliardi di miliardi di miliardi" + +#: templatetags/humanize.py:82 +#, python-format +msgid "%(value)s octillion" +msgid_plural "%(value)s octillion" +msgstr[0] "%(value)s miliardo di miliardi di miliardi" +msgstr[1] "%(value)s miliardi di miliardi di miliardi" + +#: templatetags/humanize.py:85 +#, python-format +msgid "%(value).1f nonillion" +msgid_plural "%(value).1f nonillion" +msgstr[0] "%(value).1f migliaio di miliardi di miliardi di miliardi" +msgstr[1] "%(value).1f migliaioa di miliardi di miliardi di miliardi" + +#: templatetags/humanize.py:86 +#, python-format +msgid "%(value)s nonillion" +msgid_plural "%(value)s nonillion" +msgstr[0] "%(value)s migliaio di miliardi di miliardi di miliardi" +msgstr[1] "%(value)s migliaia di miliardi di miliardi di miliardi" + +#: templatetags/humanize.py:89 +#, python-format +msgid "%(value).1f decillion" +msgid_plural "%(value).1f decillion" +msgstr[0] "%(value).1f milione di miliardi di miliardi di miliardi" +msgstr[1] "%(value).1f milioni di miliardi di miliardi di miliardi" + +#: templatetags/humanize.py:90 +#, python-format +msgid "%(value)s decillion" +msgid_plural "%(value)s decillion" +msgstr[0] "%(value)s milione di miliardi di miliardi di miliardi" +msgstr[1] "%(value)s milioni di miliardi di miliardi di miliardi" + +#: templatetags/humanize.py:93 +#, python-format +msgid "%(value).1f googol" +msgid_plural "%(value).1f googol" +msgstr[0] "%(value).1f googol" +msgstr[1] "%(value).1f googol" + +#: templatetags/humanize.py:94 +#, python-format +msgid "%(value)s googol" +msgid_plural "%(value)s googol" +msgstr[0] "%(value)s googol" +msgstr[1] "%(value)s googol" + +#: templatetags/humanize.py:143 msgid "one" msgstr "uno" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "two" msgstr "due" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "three" msgstr "tre" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "four" msgstr "quattro" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "five" msgstr "cinque" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "six" msgstr "sei" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "seven" msgstr "sette" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "eight" msgstr "otto" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "nine" msgstr "nove" -#: templatetags/humanize.py:96 -msgid "today" -msgstr "oggi" +#: templatetags/humanize.py:185 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s ago" +msgstr "%(delta)s fa" -#: templatetags/humanize.py:98 -msgid "tomorrow" -msgstr "domani" +#: templatetags/humanize.py:188 templatetags/humanize.py:210 +msgid "now" +msgstr "adesso" -#: templatetags/humanize.py:100 -msgid "yesterday" -msgstr "ieri" +#: templatetags/humanize.py:191 +#, python-format +msgid "a second ago" +msgid_plural "%(count)s seconds ago" +msgstr[0] "un secondo fa" +msgstr[1] "%(count)s secondi fa" + +#: templatetags/humanize.py:196 +#, python-format +msgid "a minute ago" +msgid_plural "%(count)s minutes ago" +msgstr[0] "un minuto fa" +msgstr[1] "%(count)s minuti fa" + +#: templatetags/humanize.py:201 +#, python-format +msgid "an hour ago" +msgid_plural "%(count)s hours ago" +msgstr[0] "un'ora fa" +msgstr[1] "%(count)s ore fa" + +#: templatetags/humanize.py:207 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s from now" +msgstr "%(delta)s da adesso" + +#: templatetags/humanize.py:213 +#, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "un secondo da adesso" +msgstr[1] "%(count)s secondi da adesso" + +#: templatetags/humanize.py:218 +#, python-format +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "un minuto da adesso" +msgstr[1] "%(count)s minuti da adesso" + +#: templatetags/humanize.py:223 +#, python-format +msgid "an hour from now" +msgid_plural "%(count)s hours from now" +msgstr[0] "un'ora da adesso" +msgstr[1] "%(count)s ore da adesso" diff --git a/django/contrib/humanize/locale/ja/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/ja/LC_MESSAGES/django.mo index e317504d9a..489ad4af63 100644 Binary files a/django/contrib/humanize/locale/ja/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/ja/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/ja/LC_MESSAGES/django.po b/django/contrib/humanize/locale/ja/LC_MESSAGES/django.po index ddde0c1076..103f915104 100644 --- a/django/contrib/humanize/locale/ja/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/ja/LC_MESSAGES/django.po @@ -1,97 +1,267 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Jannis Leidel , 2011. +# Shinya Okano , 2012. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:18-0400\n" -"PO-Revision-Date: 2011-03-04 18:39+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Japanese \n" +"POT-Creation-Date: 2012-03-14 00:19-0700\n" +"PO-Revision-Date: 2012-03-08 14:27+0000\n" +"Last-Translator: Shinya Okano \n" +"Language-Team: Japanese (http://www.transifex.net/projects/p/django/language/" +"ja/)\n" +"Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ja\n" "Plural-Forms: nplurals=1; plural=0\n" -#: templatetags/humanize.py:19 +#: tests.py:108 templatetags/humanize.py:164 +msgid "today" +msgstr "今日" + +#: tests.py:108 templatetags/humanize.py:168 +msgid "yesterday" +msgstr "昨日" + +#: tests.py:108 templatetags/humanize.py:166 +msgid "tomorrow" +msgstr "明日" + +#: templatetags/humanize.py:24 msgid "th" msgstr "番目" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "st" msgstr "番目" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "nd" msgstr "番目" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "rd" msgstr "番目" -#: templatetags/humanize.py:54 +#: templatetags/humanize.py:53 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" msgstr[0] "%(value).1f 百万" +#: templatetags/humanize.py:54 +#, python-format +msgid "%(value)s million" +msgid_plural "%(value)s million" +msgstr[0] "" + #: templatetags/humanize.py:57 #, python-format msgid "%(value).1f billion" msgid_plural "%(value).1f billion" msgstr[0] "%(value).1f 十億" -#: templatetags/humanize.py:60 +#: templatetags/humanize.py:58 +#, python-format +msgid "%(value)s billion" +msgid_plural "%(value)s billion" +msgstr[0] "" + +#: templatetags/humanize.py:61 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" msgstr[0] "%(value).1f 兆" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:62 +#, python-format +msgid "%(value)s trillion" +msgid_plural "%(value)s trillion" +msgstr[0] "" + +#: templatetags/humanize.py:65 +#, python-format +msgid "%(value).1f quadrillion" +msgid_plural "%(value).1f quadrillion" +msgstr[0] "" + +#: templatetags/humanize.py:66 +#, python-format +msgid "%(value)s quadrillion" +msgid_plural "%(value)s quadrillion" +msgstr[0] "" + +#: templatetags/humanize.py:69 +#, python-format +msgid "%(value).1f quintillion" +msgid_plural "%(value).1f quintillion" +msgstr[0] "" + +#: templatetags/humanize.py:70 +#, python-format +msgid "%(value)s quintillion" +msgid_plural "%(value)s quintillion" +msgstr[0] "" + +#: templatetags/humanize.py:73 +#, python-format +msgid "%(value).1f sextillion" +msgid_plural "%(value).1f sextillion" +msgstr[0] "" + +#: templatetags/humanize.py:74 +#, python-format +msgid "%(value)s sextillion" +msgid_plural "%(value)s sextillion" +msgstr[0] "" + +#: templatetags/humanize.py:77 +#, python-format +msgid "%(value).1f septillion" +msgid_plural "%(value).1f septillion" +msgstr[0] "" + +#: templatetags/humanize.py:78 +#, python-format +msgid "%(value)s septillion" +msgid_plural "%(value)s septillion" +msgstr[0] "" + +#: templatetags/humanize.py:81 +#, python-format +msgid "%(value).1f octillion" +msgid_plural "%(value).1f octillion" +msgstr[0] "" + +#: templatetags/humanize.py:82 +#, python-format +msgid "%(value)s octillion" +msgid_plural "%(value)s octillion" +msgstr[0] "" + +#: templatetags/humanize.py:85 +#, python-format +msgid "%(value).1f nonillion" +msgid_plural "%(value).1f nonillion" +msgstr[0] "" + +#: templatetags/humanize.py:86 +#, python-format +msgid "%(value)s nonillion" +msgid_plural "%(value)s nonillion" +msgstr[0] "" + +#: templatetags/humanize.py:89 +#, python-format +msgid "%(value).1f decillion" +msgid_plural "%(value).1f decillion" +msgstr[0] "" + +#: templatetags/humanize.py:90 +#, python-format +msgid "%(value)s decillion" +msgid_plural "%(value)s decillion" +msgstr[0] "" + +#: templatetags/humanize.py:93 +#, python-format +msgid "%(value).1f googol" +msgid_plural "%(value).1f googol" +msgstr[0] "" + +#: templatetags/humanize.py:94 +#, python-format +msgid "%(value)s googol" +msgid_plural "%(value)s googol" +msgstr[0] "" + +#: templatetags/humanize.py:143 msgid "one" msgstr "1" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "two" msgstr "2" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "three" msgstr "3" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "four" msgstr "4" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "five" msgstr "5" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "six" msgstr "6" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "seven" msgstr "7" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "eight" msgstr "8" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "nine" msgstr "9" -#: templatetags/humanize.py:96 -msgid "today" -msgstr "今日" +#: templatetags/humanize.py:185 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s ago" +msgstr "%(delta)s前" -#: templatetags/humanize.py:98 -msgid "tomorrow" -msgstr "明日" +#: templatetags/humanize.py:188 templatetags/humanize.py:210 +msgid "now" +msgstr "今" -#: templatetags/humanize.py:100 -msgid "yesterday" -msgstr "昨日" +#: templatetags/humanize.py:191 +#, python-format +msgid "a second ago" +msgid_plural "%(count)s seconds ago" +msgstr[0] "%(count)s秒前" + +#: templatetags/humanize.py:196 +#, python-format +msgid "a minute ago" +msgid_plural "%(count)s minutes ago" +msgstr[0] "%(count)s分前" + +#: templatetags/humanize.py:201 +#, python-format +msgid "an hour ago" +msgid_plural "%(count)s hours ago" +msgstr[0] "%(count)s時間前" + +#: templatetags/humanize.py:207 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s from now" +msgstr "今から%(delta)s" + +#: templatetags/humanize.py:213 +#, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "今から%(count)s秒" + +#: templatetags/humanize.py:218 +#, python-format +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "今から%(count)s分" + +#: templatetags/humanize.py:223 +#, python-format +msgid "an hour from now" +msgid_plural "%(count)s hours from now" +msgstr[0] "今から%(count)s時間" diff --git a/django/contrib/humanize/locale/ka/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/ka/LC_MESSAGES/django.mo index 2a1b792bc5..43f12bdb54 100644 Binary files a/django/contrib/humanize/locale/ka/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/ka/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/ka/LC_MESSAGES/django.po b/django/contrib/humanize/locale/ka/LC_MESSAGES/django.po index fc1577dda1..ad1109cc4a 100644 --- a/django/contrib/humanize/locale/ka/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/ka/LC_MESSAGES/django.po @@ -1,97 +1,266 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Jannis Leidel , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:18-0400\n" -"PO-Revision-Date: 2011-03-04 18:39+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Georgian \n" +"POT-Creation-Date: 2012-03-14 00:19-0700\n" +"PO-Revision-Date: 2012-02-14 13:08+0000\n" +"Last-Translator: Jannis Leidel \n" +"Language-Team: Georgian (http://www.transifex.net/projects/p/django/language/" +"ka/)\n" +"Language: ka\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ka\n" "Plural-Forms: nplurals=1; plural=0\n" -#: templatetags/humanize.py:19 +#: tests.py:108 templatetags/humanize.py:164 +msgid "today" +msgstr "დღეს" + +#: tests.py:108 templatetags/humanize.py:168 +msgid "yesterday" +msgstr "გუშინ" + +#: tests.py:108 templatetags/humanize.py:166 +msgid "tomorrow" +msgstr "ხვალ" + +#: templatetags/humanize.py:24 msgid "th" msgstr "-ე" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "st" msgstr "-ლი" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "nd" msgstr "-ე" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "rd" msgstr "-ე" -#: templatetags/humanize.py:54 +#: templatetags/humanize.py:53 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" msgstr[0] "%(value).1f მილიონი" +#: templatetags/humanize.py:54 +#, python-format +msgid "%(value)s million" +msgid_plural "%(value)s million" +msgstr[0] "" + #: templatetags/humanize.py:57 #, python-format msgid "%(value).1f billion" msgid_plural "%(value).1f billion" msgstr[0] "%(value).1f მილიარდი" -#: templatetags/humanize.py:60 +#: templatetags/humanize.py:58 +#, python-format +msgid "%(value)s billion" +msgid_plural "%(value)s billion" +msgstr[0] "" + +#: templatetags/humanize.py:61 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" msgstr[0] "%(value).1f ტრილიონი" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:62 +#, python-format +msgid "%(value)s trillion" +msgid_plural "%(value)s trillion" +msgstr[0] "" + +#: templatetags/humanize.py:65 +#, python-format +msgid "%(value).1f quadrillion" +msgid_plural "%(value).1f quadrillion" +msgstr[0] "" + +#: templatetags/humanize.py:66 +#, python-format +msgid "%(value)s quadrillion" +msgid_plural "%(value)s quadrillion" +msgstr[0] "" + +#: templatetags/humanize.py:69 +#, python-format +msgid "%(value).1f quintillion" +msgid_plural "%(value).1f quintillion" +msgstr[0] "" + +#: templatetags/humanize.py:70 +#, python-format +msgid "%(value)s quintillion" +msgid_plural "%(value)s quintillion" +msgstr[0] "" + +#: templatetags/humanize.py:73 +#, python-format +msgid "%(value).1f sextillion" +msgid_plural "%(value).1f sextillion" +msgstr[0] "" + +#: templatetags/humanize.py:74 +#, python-format +msgid "%(value)s sextillion" +msgid_plural "%(value)s sextillion" +msgstr[0] "" + +#: templatetags/humanize.py:77 +#, python-format +msgid "%(value).1f septillion" +msgid_plural "%(value).1f septillion" +msgstr[0] "" + +#: templatetags/humanize.py:78 +#, python-format +msgid "%(value)s septillion" +msgid_plural "%(value)s septillion" +msgstr[0] "" + +#: templatetags/humanize.py:81 +#, python-format +msgid "%(value).1f octillion" +msgid_plural "%(value).1f octillion" +msgstr[0] "" + +#: templatetags/humanize.py:82 +#, python-format +msgid "%(value)s octillion" +msgid_plural "%(value)s octillion" +msgstr[0] "" + +#: templatetags/humanize.py:85 +#, python-format +msgid "%(value).1f nonillion" +msgid_plural "%(value).1f nonillion" +msgstr[0] "" + +#: templatetags/humanize.py:86 +#, python-format +msgid "%(value)s nonillion" +msgid_plural "%(value)s nonillion" +msgstr[0] "" + +#: templatetags/humanize.py:89 +#, python-format +msgid "%(value).1f decillion" +msgid_plural "%(value).1f decillion" +msgstr[0] "" + +#: templatetags/humanize.py:90 +#, python-format +msgid "%(value)s decillion" +msgid_plural "%(value)s decillion" +msgstr[0] "" + +#: templatetags/humanize.py:93 +#, python-format +msgid "%(value).1f googol" +msgid_plural "%(value).1f googol" +msgstr[0] "" + +#: templatetags/humanize.py:94 +#, python-format +msgid "%(value)s googol" +msgid_plural "%(value)s googol" +msgstr[0] "" + +#: templatetags/humanize.py:143 msgid "one" msgstr "ერთი" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "two" msgstr "ორი" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "three" msgstr "სამი" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "four" msgstr "ოთხი" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "five" msgstr "ხუთი" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "six" msgstr "ექვსი" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "seven" msgstr "შვიდი" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "eight" msgstr "რვა" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "nine" msgstr "ცხრა" -#: templatetags/humanize.py:96 -msgid "today" -msgstr "დღეს" +#: templatetags/humanize.py:185 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s ago" +msgstr "" -#: templatetags/humanize.py:98 -msgid "tomorrow" -msgstr "ხვალ" +#: templatetags/humanize.py:188 templatetags/humanize.py:210 +msgid "now" +msgstr "" -#: templatetags/humanize.py:100 -msgid "yesterday" -msgstr "გუშინ" +#: templatetags/humanize.py:191 +#, python-format +msgid "a second ago" +msgid_plural "%(count)s seconds ago" +msgstr[0] "" + +#: templatetags/humanize.py:196 +#, python-format +msgid "a minute ago" +msgid_plural "%(count)s minutes ago" +msgstr[0] "" + +#: templatetags/humanize.py:201 +#, python-format +msgid "an hour ago" +msgid_plural "%(count)s hours ago" +msgstr[0] "" + +#: templatetags/humanize.py:207 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s from now" +msgstr "" + +#: templatetags/humanize.py:213 +#, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "" + +#: templatetags/humanize.py:218 +#, python-format +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "" + +#: templatetags/humanize.py:223 +#, python-format +msgid "an hour from now" +msgid_plural "%(count)s hours from now" +msgstr[0] "" diff --git a/django/contrib/humanize/locale/km/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/km/LC_MESSAGES/django.mo index e3731543d8..48492d0d5e 100644 Binary files a/django/contrib/humanize/locale/km/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/km/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/km/LC_MESSAGES/django.po b/django/contrib/humanize/locale/km/LC_MESSAGES/django.po index e931bd4758..531f962c88 100644 --- a/django/contrib/humanize/locale/km/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/km/LC_MESSAGES/django.po @@ -4,94 +4,260 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:18-0400\n" +"POT-Creation-Date: 2012-03-14 00:19-0700\n" "PO-Revision-Date: 2011-03-15 15:28+0000\n" "Last-Translator: Django team\n" "Language-Team: English \n" +"Language: km\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: km\n" "Plural-Forms: nplurals=1; plural=0\n" -#: templatetags/humanize.py:19 +#: tests.py:108 templatetags/humanize.py:164 +msgid "today" +msgstr "" + +#: tests.py:108 templatetags/humanize.py:168 +msgid "yesterday" +msgstr "" + +#: tests.py:108 templatetags/humanize.py:166 +msgid "tomorrow" +msgstr "" + +#: templatetags/humanize.py:24 msgid "th" msgstr "" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "st" msgstr "" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "nd" msgstr "" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "rd" msgstr "" -#: templatetags/humanize.py:54 +#: templatetags/humanize.py:53 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" msgstr[0] "" +#: templatetags/humanize.py:54 +#, python-format +msgid "%(value)s million" +msgid_plural "%(value)s million" +msgstr[0] "" + #: templatetags/humanize.py:57 #, python-format msgid "%(value).1f billion" msgid_plural "%(value).1f billion" msgstr[0] "" -#: templatetags/humanize.py:60 +#: templatetags/humanize.py:58 +#, python-format +msgid "%(value)s billion" +msgid_plural "%(value)s billion" +msgstr[0] "" + +#: templatetags/humanize.py:61 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" msgstr[0] "" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:62 +#, python-format +msgid "%(value)s trillion" +msgid_plural "%(value)s trillion" +msgstr[0] "" + +#: templatetags/humanize.py:65 +#, python-format +msgid "%(value).1f quadrillion" +msgid_plural "%(value).1f quadrillion" +msgstr[0] "" + +#: templatetags/humanize.py:66 +#, python-format +msgid "%(value)s quadrillion" +msgid_plural "%(value)s quadrillion" +msgstr[0] "" + +#: templatetags/humanize.py:69 +#, python-format +msgid "%(value).1f quintillion" +msgid_plural "%(value).1f quintillion" +msgstr[0] "" + +#: templatetags/humanize.py:70 +#, python-format +msgid "%(value)s quintillion" +msgid_plural "%(value)s quintillion" +msgstr[0] "" + +#: templatetags/humanize.py:73 +#, python-format +msgid "%(value).1f sextillion" +msgid_plural "%(value).1f sextillion" +msgstr[0] "" + +#: templatetags/humanize.py:74 +#, python-format +msgid "%(value)s sextillion" +msgid_plural "%(value)s sextillion" +msgstr[0] "" + +#: templatetags/humanize.py:77 +#, python-format +msgid "%(value).1f septillion" +msgid_plural "%(value).1f septillion" +msgstr[0] "" + +#: templatetags/humanize.py:78 +#, python-format +msgid "%(value)s septillion" +msgid_plural "%(value)s septillion" +msgstr[0] "" + +#: templatetags/humanize.py:81 +#, python-format +msgid "%(value).1f octillion" +msgid_plural "%(value).1f octillion" +msgstr[0] "" + +#: templatetags/humanize.py:82 +#, python-format +msgid "%(value)s octillion" +msgid_plural "%(value)s octillion" +msgstr[0] "" + +#: templatetags/humanize.py:85 +#, python-format +msgid "%(value).1f nonillion" +msgid_plural "%(value).1f nonillion" +msgstr[0] "" + +#: templatetags/humanize.py:86 +#, python-format +msgid "%(value)s nonillion" +msgid_plural "%(value)s nonillion" +msgstr[0] "" + +#: templatetags/humanize.py:89 +#, python-format +msgid "%(value).1f decillion" +msgid_plural "%(value).1f decillion" +msgstr[0] "" + +#: templatetags/humanize.py:90 +#, python-format +msgid "%(value)s decillion" +msgid_plural "%(value)s decillion" +msgstr[0] "" + +#: templatetags/humanize.py:93 +#, python-format +msgid "%(value).1f googol" +msgid_plural "%(value).1f googol" +msgstr[0] "" + +#: templatetags/humanize.py:94 +#, python-format +msgid "%(value)s googol" +msgid_plural "%(value)s googol" +msgstr[0] "" + +#: templatetags/humanize.py:143 msgid "one" msgstr "" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "two" msgstr "" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "three" msgstr "" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "four" msgstr "" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "five" msgstr "" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "six" msgstr "" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "seven" msgstr "" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "eight" msgstr "" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "nine" msgstr "" -#: templatetags/humanize.py:96 -msgid "today" +#: templatetags/humanize.py:185 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s ago" msgstr "" -#: templatetags/humanize.py:98 -msgid "tomorrow" +#: templatetags/humanize.py:188 templatetags/humanize.py:210 +msgid "now" msgstr "" -#: templatetags/humanize.py:100 -msgid "yesterday" +#: templatetags/humanize.py:191 +#, python-format +msgid "a second ago" +msgid_plural "%(count)s seconds ago" +msgstr[0] "" + +#: templatetags/humanize.py:196 +#, python-format +msgid "a minute ago" +msgid_plural "%(count)s minutes ago" +msgstr[0] "" + +#: templatetags/humanize.py:201 +#, python-format +msgid "an hour ago" +msgid_plural "%(count)s hours ago" +msgstr[0] "" + +#: templatetags/humanize.py:207 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s from now" msgstr "" + +#: templatetags/humanize.py:213 +#, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "" + +#: templatetags/humanize.py:218 +#, python-format +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "" + +#: templatetags/humanize.py:223 +#, python-format +msgid "an hour from now" +msgid_plural "%(count)s hours from now" +msgstr[0] "" diff --git a/django/contrib/humanize/locale/kn/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/kn/LC_MESSAGES/django.mo index e09397a2e0..cc5359e940 100644 Binary files a/django/contrib/humanize/locale/kn/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/kn/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/kn/LC_MESSAGES/django.po b/django/contrib/humanize/locale/kn/LC_MESSAGES/django.po index 16a08a63a5..934e63cbad 100644 --- a/django/contrib/humanize/locale/kn/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/kn/LC_MESSAGES/django.po @@ -1,97 +1,265 @@ # This file is distributed under the same license as the Django package. # +# Translators: msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:18-0400\n" -"PO-Revision-Date: 2011-03-15 15:29+0000\n" +"POT-Creation-Date: 2012-03-14 00:19-0700\n" +"PO-Revision-Date: 2011-01-19 15:13+0000\n" "Last-Translator: Django team\n" -"Language-Team: Kannada \n" +"Language-Team: Kannada (http://www.transifex.net/projects/p/django/language/" +"kn/)\n" +"Language: kn\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: kn\n" "Plural-Forms: nplurals=1; plural=0\n" -#: templatetags/humanize.py:19 +#: tests.py:108 templatetags/humanize.py:164 +msgid "today" +msgstr "" + +#: tests.py:108 templatetags/humanize.py:168 +msgid "yesterday" +msgstr "" + +#: tests.py:108 templatetags/humanize.py:166 +msgid "tomorrow" +msgstr "" + +#: templatetags/humanize.py:24 msgid "th" msgstr "" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "st" msgstr "" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "nd" msgstr "" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "rd" msgstr "" -#: templatetags/humanize.py:54 +#: templatetags/humanize.py:53 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" msgstr[0] "" +#: templatetags/humanize.py:54 +#, python-format +msgid "%(value)s million" +msgid_plural "%(value)s million" +msgstr[0] "" + #: templatetags/humanize.py:57 #, python-format msgid "%(value).1f billion" msgid_plural "%(value).1f billion" msgstr[0] "" -#: templatetags/humanize.py:60 +#: templatetags/humanize.py:58 +#, python-format +msgid "%(value)s billion" +msgid_plural "%(value)s billion" +msgstr[0] "" + +#: templatetags/humanize.py:61 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" msgstr[0] "" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:62 +#, python-format +msgid "%(value)s trillion" +msgid_plural "%(value)s trillion" +msgstr[0] "" + +#: templatetags/humanize.py:65 +#, python-format +msgid "%(value).1f quadrillion" +msgid_plural "%(value).1f quadrillion" +msgstr[0] "" + +#: templatetags/humanize.py:66 +#, python-format +msgid "%(value)s quadrillion" +msgid_plural "%(value)s quadrillion" +msgstr[0] "" + +#: templatetags/humanize.py:69 +#, python-format +msgid "%(value).1f quintillion" +msgid_plural "%(value).1f quintillion" +msgstr[0] "" + +#: templatetags/humanize.py:70 +#, python-format +msgid "%(value)s quintillion" +msgid_plural "%(value)s quintillion" +msgstr[0] "" + +#: templatetags/humanize.py:73 +#, python-format +msgid "%(value).1f sextillion" +msgid_plural "%(value).1f sextillion" +msgstr[0] "" + +#: templatetags/humanize.py:74 +#, python-format +msgid "%(value)s sextillion" +msgid_plural "%(value)s sextillion" +msgstr[0] "" + +#: templatetags/humanize.py:77 +#, python-format +msgid "%(value).1f septillion" +msgid_plural "%(value).1f septillion" +msgstr[0] "" + +#: templatetags/humanize.py:78 +#, python-format +msgid "%(value)s septillion" +msgid_plural "%(value)s septillion" +msgstr[0] "" + +#: templatetags/humanize.py:81 +#, python-format +msgid "%(value).1f octillion" +msgid_plural "%(value).1f octillion" +msgstr[0] "" + +#: templatetags/humanize.py:82 +#, python-format +msgid "%(value)s octillion" +msgid_plural "%(value)s octillion" +msgstr[0] "" + +#: templatetags/humanize.py:85 +#, python-format +msgid "%(value).1f nonillion" +msgid_plural "%(value).1f nonillion" +msgstr[0] "" + +#: templatetags/humanize.py:86 +#, python-format +msgid "%(value)s nonillion" +msgid_plural "%(value)s nonillion" +msgstr[0] "" + +#: templatetags/humanize.py:89 +#, python-format +msgid "%(value).1f decillion" +msgid_plural "%(value).1f decillion" +msgstr[0] "" + +#: templatetags/humanize.py:90 +#, python-format +msgid "%(value)s decillion" +msgid_plural "%(value)s decillion" +msgstr[0] "" + +#: templatetags/humanize.py:93 +#, python-format +msgid "%(value).1f googol" +msgid_plural "%(value).1f googol" +msgstr[0] "" + +#: templatetags/humanize.py:94 +#, python-format +msgid "%(value)s googol" +msgid_plural "%(value)s googol" +msgstr[0] "" + +#: templatetags/humanize.py:143 msgid "one" msgstr "" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "two" msgstr "" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "three" msgstr "" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "four" msgstr "" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "five" msgstr "" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "six" msgstr "" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "seven" msgstr "" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "eight" msgstr "" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "nine" msgstr "" -#: templatetags/humanize.py:96 -msgid "today" +#: templatetags/humanize.py:185 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s ago" msgstr "" -#: templatetags/humanize.py:98 -msgid "tomorrow" +#: templatetags/humanize.py:188 templatetags/humanize.py:210 +msgid "now" msgstr "" -#: templatetags/humanize.py:100 -msgid "yesterday" +#: templatetags/humanize.py:191 +#, python-format +msgid "a second ago" +msgid_plural "%(count)s seconds ago" +msgstr[0] "" + +#: templatetags/humanize.py:196 +#, python-format +msgid "a minute ago" +msgid_plural "%(count)s minutes ago" +msgstr[0] "" + +#: templatetags/humanize.py:201 +#, python-format +msgid "an hour ago" +msgid_plural "%(count)s hours ago" +msgstr[0] "" + +#: templatetags/humanize.py:207 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s from now" msgstr "" + +#: templatetags/humanize.py:213 +#, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "" + +#: templatetags/humanize.py:218 +#, python-format +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "" + +#: templatetags/humanize.py:223 +#, python-format +msgid "an hour from now" +msgid_plural "%(count)s hours from now" +msgstr[0] "" diff --git a/django/contrib/humanize/locale/ko/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/ko/LC_MESSAGES/django.mo index 1c7b500785..bc65ee3bf7 100644 Binary files a/django/contrib/humanize/locale/ko/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/ko/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/ko/LC_MESSAGES/django.po b/django/contrib/humanize/locale/ko/LC_MESSAGES/django.po index 784bf2cc6a..e6c56321ef 100644 --- a/django/contrib/humanize/locale/ko/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/ko/LC_MESSAGES/django.po @@ -1,97 +1,266 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Jannis Leidel , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:18-0400\n" -"PO-Revision-Date: 2011-03-04 18:39+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Korean \n" +"POT-Creation-Date: 2012-03-14 00:19-0700\n" +"PO-Revision-Date: 2012-02-14 13:08+0000\n" +"Last-Translator: Jannis Leidel \n" +"Language-Team: Korean (http://www.transifex.net/projects/p/django/language/" +"ko/)\n" +"Language: ko\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ko\n" "Plural-Forms: nplurals=1; plural=0\n" -#: templatetags/humanize.py:19 +#: tests.py:108 templatetags/humanize.py:164 +msgid "today" +msgstr "오늘" + +#: tests.py:108 templatetags/humanize.py:168 +msgid "yesterday" +msgstr "어제" + +#: tests.py:108 templatetags/humanize.py:166 +msgid "tomorrow" +msgstr "내일" + +#: templatetags/humanize.py:24 msgid "th" msgstr "번째" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "st" msgstr "번째" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "nd" msgstr "번째" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "rd" msgstr "번째" -#: templatetags/humanize.py:54 +#: templatetags/humanize.py:53 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" msgstr[0] "%(value).1f백만" +#: templatetags/humanize.py:54 +#, python-format +msgid "%(value)s million" +msgid_plural "%(value)s million" +msgstr[0] "" + #: templatetags/humanize.py:57 #, python-format msgid "%(value).1f billion" msgid_plural "%(value).1f billion" msgstr[0] "%(value).1f십억" -#: templatetags/humanize.py:60 +#: templatetags/humanize.py:58 +#, python-format +msgid "%(value)s billion" +msgid_plural "%(value)s billion" +msgstr[0] "" + +#: templatetags/humanize.py:61 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" msgstr[0] "%(value).1f조" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:62 +#, python-format +msgid "%(value)s trillion" +msgid_plural "%(value)s trillion" +msgstr[0] "" + +#: templatetags/humanize.py:65 +#, python-format +msgid "%(value).1f quadrillion" +msgid_plural "%(value).1f quadrillion" +msgstr[0] "" + +#: templatetags/humanize.py:66 +#, python-format +msgid "%(value)s quadrillion" +msgid_plural "%(value)s quadrillion" +msgstr[0] "" + +#: templatetags/humanize.py:69 +#, python-format +msgid "%(value).1f quintillion" +msgid_plural "%(value).1f quintillion" +msgstr[0] "" + +#: templatetags/humanize.py:70 +#, python-format +msgid "%(value)s quintillion" +msgid_plural "%(value)s quintillion" +msgstr[0] "" + +#: templatetags/humanize.py:73 +#, python-format +msgid "%(value).1f sextillion" +msgid_plural "%(value).1f sextillion" +msgstr[0] "" + +#: templatetags/humanize.py:74 +#, python-format +msgid "%(value)s sextillion" +msgid_plural "%(value)s sextillion" +msgstr[0] "" + +#: templatetags/humanize.py:77 +#, python-format +msgid "%(value).1f septillion" +msgid_plural "%(value).1f septillion" +msgstr[0] "" + +#: templatetags/humanize.py:78 +#, python-format +msgid "%(value)s septillion" +msgid_plural "%(value)s septillion" +msgstr[0] "" + +#: templatetags/humanize.py:81 +#, python-format +msgid "%(value).1f octillion" +msgid_plural "%(value).1f octillion" +msgstr[0] "" + +#: templatetags/humanize.py:82 +#, python-format +msgid "%(value)s octillion" +msgid_plural "%(value)s octillion" +msgstr[0] "" + +#: templatetags/humanize.py:85 +#, python-format +msgid "%(value).1f nonillion" +msgid_plural "%(value).1f nonillion" +msgstr[0] "" + +#: templatetags/humanize.py:86 +#, python-format +msgid "%(value)s nonillion" +msgid_plural "%(value)s nonillion" +msgstr[0] "" + +#: templatetags/humanize.py:89 +#, python-format +msgid "%(value).1f decillion" +msgid_plural "%(value).1f decillion" +msgstr[0] "" + +#: templatetags/humanize.py:90 +#, python-format +msgid "%(value)s decillion" +msgid_plural "%(value)s decillion" +msgstr[0] "" + +#: templatetags/humanize.py:93 +#, python-format +msgid "%(value).1f googol" +msgid_plural "%(value).1f googol" +msgstr[0] "" + +#: templatetags/humanize.py:94 +#, python-format +msgid "%(value)s googol" +msgid_plural "%(value)s googol" +msgstr[0] "" + +#: templatetags/humanize.py:143 msgid "one" msgstr "1" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "two" msgstr "2" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "three" msgstr "3" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "four" msgstr "4" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "five" msgstr "5" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "six" msgstr "6" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "seven" msgstr "7" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "eight" msgstr "8" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "nine" msgstr "9" -#: templatetags/humanize.py:96 -msgid "today" -msgstr "오늘" +#: templatetags/humanize.py:185 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s ago" +msgstr "" -#: templatetags/humanize.py:98 -msgid "tomorrow" -msgstr "내일" +#: templatetags/humanize.py:188 templatetags/humanize.py:210 +msgid "now" +msgstr "" -#: templatetags/humanize.py:100 -msgid "yesterday" -msgstr "어제" +#: templatetags/humanize.py:191 +#, python-format +msgid "a second ago" +msgid_plural "%(count)s seconds ago" +msgstr[0] "" + +#: templatetags/humanize.py:196 +#, python-format +msgid "a minute ago" +msgid_plural "%(count)s minutes ago" +msgstr[0] "" + +#: templatetags/humanize.py:201 +#, python-format +msgid "an hour ago" +msgid_plural "%(count)s hours ago" +msgstr[0] "" + +#: templatetags/humanize.py:207 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s from now" +msgstr "" + +#: templatetags/humanize.py:213 +#, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "" + +#: templatetags/humanize.py:218 +#, python-format +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "" + +#: templatetags/humanize.py:223 +#, python-format +msgid "an hour from now" +msgid_plural "%(count)s hours from now" +msgstr[0] "" diff --git a/django/contrib/humanize/locale/lt/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/lt/LC_MESSAGES/django.mo index dd4eeab322..c5007479a6 100644 Binary files a/django/contrib/humanize/locale/lt/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/lt/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/lt/LC_MESSAGES/django.po b/django/contrib/humanize/locale/lt/LC_MESSAGES/django.po index 8f8fae7a66..972775a422 100644 --- a/django/contrib/humanize/locale/lt/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/lt/LC_MESSAGES/django.po @@ -1,37 +1,54 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Jannis Leidel , 2011. +# lauris , 2011. +# Simonas Simas , 2012. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:18-0400\n" -"PO-Revision-Date: 2011-03-06 09:19+0000\n" -"Last-Translator: lauris \n" -"Language-Team: Lithuanian \n" +"POT-Creation-Date: 2012-03-14 00:19-0700\n" +"PO-Revision-Date: 2012-03-09 16:51+0000\n" +"Last-Translator: Simonas Simas \n" +"Language-Team: Lithuanian (http://www.transifex.net/projects/p/django/" +"language/lt/)\n" +"Language: lt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: lt\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%" -"100<10 || n%100>=20) ? 1 : 2)\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n" +"%100<10 || n%100>=20) ? 1 : 2)\n" -#: templatetags/humanize.py:19 +#: tests.py:108 templatetags/humanize.py:164 +msgid "today" +msgstr "šiandien" + +#: tests.py:108 templatetags/humanize.py:168 +msgid "yesterday" +msgstr "vakar" + +#: tests.py:108 templatetags/humanize.py:166 +msgid "tomorrow" +msgstr "rytoj" + +#: templatetags/humanize.py:24 msgid "th" msgstr "-as" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "st" msgstr "-as" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "nd" msgstr "-as" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "rd" msgstr "-as" -#: templatetags/humanize.py:54 +#: templatetags/humanize.py:53 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" @@ -39,6 +56,14 @@ msgstr[0] "%(value).1f milijonas" msgstr[1] "%(value).1f milijonai" msgstr[2] "%(value).1f milijonai" +#: templatetags/humanize.py:54 +#, python-format +msgid "%(value)s million" +msgid_plural "%(value)s million" +msgstr[0] "%(value)s milijonas" +msgstr[1] "%(value)s milijonai" +msgstr[2] "%(value)s milijonų" + #: templatetags/humanize.py:57 #, python-format msgid "%(value).1f billion" @@ -47,7 +72,15 @@ msgstr[0] "%(value).1f milijardas" msgstr[1] "%(value).1f milijardai" msgstr[2] "%(value).1f milijardai" -#: templatetags/humanize.py:60 +#: templatetags/humanize.py:58 +#, python-format +msgid "%(value)s billion" +msgid_plural "%(value)s billion" +msgstr[0] "%(value)s milijardas" +msgstr[1] "%(value)s milijardai" +msgstr[2] "%(value)s milijardų" + +#: templatetags/humanize.py:61 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" @@ -55,50 +88,238 @@ msgstr[0] "%(value).1f trilijonas" msgstr[1] "%(value).1f trilijonai" msgstr[2] "%(value).1f trilijonai" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:62 +#, python-format +msgid "%(value)s trillion" +msgid_plural "%(value)s trillion" +msgstr[0] "%(value)s trilijonas" +msgstr[1] "%(value)s trilijonai" +msgstr[2] "%(value)s trilijonų" + +#: templatetags/humanize.py:65 +#, python-format +msgid "%(value).1f quadrillion" +msgid_plural "%(value).1f quadrillion" +msgstr[0] "%(value).1f kvadrilijonas" +msgstr[1] "%(value).1f kvadrilijonai" +msgstr[2] "%(value).1f kvadrilijonų" + +#: templatetags/humanize.py:66 +#, python-format +msgid "%(value)s quadrillion" +msgid_plural "%(value)s quadrillion" +msgstr[0] "%(value)s kvadrilijonas" +msgstr[1] "%(value)s kvadrilijonai" +msgstr[2] "%(value)s kvadrilijonų" + +#: templatetags/humanize.py:69 +#, python-format +msgid "%(value).1f quintillion" +msgid_plural "%(value).1f quintillion" +msgstr[0] "%(value).1f kvintilijonas" +msgstr[1] "%(value).1f kvintilijonai" +msgstr[2] "%(value).1f kvintilijonų" + +#: templatetags/humanize.py:70 +#, python-format +msgid "%(value)s quintillion" +msgid_plural "%(value)s quintillion" +msgstr[0] "%(value)s kvintilijonas" +msgstr[1] "%(value)s kvintilijonai" +msgstr[2] "%(value)s kvintilijonų" + +#: templatetags/humanize.py:73 +#, python-format +msgid "%(value).1f sextillion" +msgid_plural "%(value).1f sextillion" +msgstr[0] "%(value).1f sikstilijonas" +msgstr[1] "%(value).1f sikstilijonai" +msgstr[2] "%(value).1f sikstilijonų" + +#: templatetags/humanize.py:74 +#, python-format +msgid "%(value)s sextillion" +msgid_plural "%(value)s sextillion" +msgstr[0] "%(value)s sikstilijonas" +msgstr[1] "%(value)s sikstilijonai" +msgstr[2] "%(value)s sikstilijonų" + +#: templatetags/humanize.py:77 +#, python-format +msgid "%(value).1f septillion" +msgid_plural "%(value).1f septillion" +msgstr[0] "%(value).1f septilijonas" +msgstr[1] "%(value).1f septilijonai" +msgstr[2] "%(value).1f septilijonų" + +#: templatetags/humanize.py:78 +#, python-format +msgid "%(value)s septillion" +msgid_plural "%(value)s septillion" +msgstr[0] "%(value)s septilijonas" +msgstr[1] "%(value)s septilijonai" +msgstr[2] "%(value)s septilijonų" + +#: templatetags/humanize.py:81 +#, python-format +msgid "%(value).1f octillion" +msgid_plural "%(value).1f octillion" +msgstr[0] "%(value).1f oktilijonas" +msgstr[1] "%(value).1f oktilijonai" +msgstr[2] "%(value).1f oktilijonų" + +#: templatetags/humanize.py:82 +#, python-format +msgid "%(value)s octillion" +msgid_plural "%(value)s octillion" +msgstr[0] "%(value)s oktilijonas" +msgstr[1] "%(value)s oktilijonai" +msgstr[2] "%(value)s oktilijonų" + +#: templatetags/humanize.py:85 +#, python-format +msgid "%(value).1f nonillion" +msgid_plural "%(value).1f nonillion" +msgstr[0] "%(value).1f naintilijonas" +msgstr[1] "%(value).1f naintilijonai" +msgstr[2] "%(value).1f naintilijonų" + +#: templatetags/humanize.py:86 +#, python-format +msgid "%(value)s nonillion" +msgid_plural "%(value)s nonillion" +msgstr[0] "%(value)s naintilijonas" +msgstr[1] "%(value)s naintilijonai" +msgstr[2] "%(value)s naintilijonų" + +#: templatetags/humanize.py:89 +#, python-format +msgid "%(value).1f decillion" +msgid_plural "%(value).1f decillion" +msgstr[0] "%(value).1f decilijonas" +msgstr[1] "%(value).1f decilijonai" +msgstr[2] "%(value).1f decilijonų" + +#: templatetags/humanize.py:90 +#, python-format +msgid "%(value)s decillion" +msgid_plural "%(value)s decillion" +msgstr[0] "%(value)s decilijonas" +msgstr[1] "%(value)s decilijonai" +msgstr[2] "%(value)s decilijonų" + +#: templatetags/humanize.py:93 +#, python-format +msgid "%(value).1f googol" +msgid_plural "%(value).1f googol" +msgstr[0] "%(value).1f gugolas" +msgstr[1] "%(value).1f gugolai" +msgstr[2] "%(value).1f gugolų" + +#: templatetags/humanize.py:94 +#, python-format +msgid "%(value)s googol" +msgid_plural "%(value)s googol" +msgstr[0] "%(value)s gugolas" +msgstr[1] "%(value)s gugolai" +msgstr[2] "%(value)s gugolų" + +#: templatetags/humanize.py:143 msgid "one" msgstr "vienas" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "two" msgstr "du" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "three" msgstr "trys" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "four" msgstr "keturi" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "five" msgstr "penki" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "six" msgstr "šeši" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "seven" msgstr "septyni" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "eight" msgstr "aštuoni" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "nine" msgstr "devyni" -#: templatetags/humanize.py:96 -msgid "today" -msgstr "šiandien" +#: templatetags/humanize.py:185 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s ago" +msgstr "prieš %(delta)s" -#: templatetags/humanize.py:98 -msgid "tomorrow" -msgstr "rytoj" +#: templatetags/humanize.py:188 templatetags/humanize.py:210 +msgid "now" +msgstr "dabar" -#: templatetags/humanize.py:100 -msgid "yesterday" -msgstr "vakar" +#: templatetags/humanize.py:191 +#, python-format +msgid "a second ago" +msgid_plural "%(count)s seconds ago" +msgstr[0] "prieš sekundę" +msgstr[1] "prieš %(count)s sekundes" +msgstr[2] "prieš %(count)s sekundžių" + +#: templatetags/humanize.py:196 +#, python-format +msgid "a minute ago" +msgid_plural "%(count)s minutes ago" +msgstr[0] "prieš minutę" +msgstr[1] "prieš %(count)s minutes" +msgstr[2] "prieš %(count)s minučių" + +#: templatetags/humanize.py:201 +#, python-format +msgid "an hour ago" +msgid_plural "%(count)s hours ago" +msgstr[0] "prieš valandą" +msgstr[1] "prieš %(count)s valandas" +msgstr[2] "prieš %(count)s valandų" + +#: templatetags/humanize.py:207 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s from now" +msgstr "%(delta)s nuo dabar" + +#: templatetags/humanize.py:213 +#, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "sekundė nuo dabar" +msgstr[1] "%(count)s sekundės nuo dabar" +msgstr[2] "%(count)s sekundžių nuo dabar" + +#: templatetags/humanize.py:218 +#, python-format +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "minutė nuo dabar" +msgstr[1] "%(count)s minutės nuo dabar" +msgstr[2] "%(count)s minučių nuo dabar" + +#: templatetags/humanize.py:223 +#, python-format +msgid "an hour from now" +msgid_plural "%(count)s hours from now" +msgstr[0] "valanda nuo dabar" +msgstr[1] "%(count)s valandos nuo dabar" +msgstr[2] "%(count)s valandų nuo dabar" diff --git a/django/contrib/humanize/locale/lv/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/lv/LC_MESSAGES/django.mo index 0e9075008b..58e600af80 100644 Binary files a/django/contrib/humanize/locale/lv/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/lv/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/lv/LC_MESSAGES/django.po b/django/contrib/humanize/locale/lv/LC_MESSAGES/django.po index 95d2e5e6cf..dc66aad98c 100644 --- a/django/contrib/humanize/locale/lv/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/lv/LC_MESSAGES/django.po @@ -1,37 +1,52 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Jannis Leidel , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:18-0400\n" -"PO-Revision-Date: 2011-03-04 18:39+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Latvian \n" +"POT-Creation-Date: 2012-03-14 00:19-0700\n" +"PO-Revision-Date: 2012-02-14 13:08+0000\n" +"Last-Translator: Jannis Leidel \n" +"Language-Team: Latvian (http://www.transifex.net/projects/p/django/language/" +"lv/)\n" +"Language: lv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: lv\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : " "2)\n" -#: templatetags/humanize.py:19 +#: tests.py:108 templatetags/humanize.py:164 +msgid "today" +msgstr "šodien" + +#: tests.py:108 templatetags/humanize.py:168 +msgid "yesterday" +msgstr "vakar" + +#: tests.py:108 templatetags/humanize.py:166 +msgid "tomorrow" +msgstr "rīt" + +#: templatetags/humanize.py:24 msgid "th" msgstr "th" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "st" msgstr "st" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "nd" msgstr "nd" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "rd" msgstr "rd" -#: templatetags/humanize.py:54 +#: templatetags/humanize.py:53 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" @@ -39,6 +54,14 @@ msgstr[0] "%(value).1f miljons" msgstr[1] "%(value).1f miljoni" msgstr[2] "%(value).1f miljonu" +#: templatetags/humanize.py:54 +#, python-format +msgid "%(value)s million" +msgid_plural "%(value)s million" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + #: templatetags/humanize.py:57 #, python-format msgid "%(value).1f billion" @@ -47,7 +70,15 @@ msgstr[0] "%(value).1f miljards" msgstr[1] "%(value).1f miljardi" msgstr[2] "%(value).1f miljardu" -#: templatetags/humanize.py:60 +#: templatetags/humanize.py:58 +#, python-format +msgid "%(value)s billion" +msgid_plural "%(value)s billion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:61 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" @@ -55,50 +86,238 @@ msgstr[0] "%(value).1f triljons" msgstr[1] "%(value).1f triljoni" msgstr[2] "%(value).1f triljonu" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:62 +#, python-format +msgid "%(value)s trillion" +msgid_plural "%(value)s trillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:65 +#, python-format +msgid "%(value).1f quadrillion" +msgid_plural "%(value).1f quadrillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:66 +#, python-format +msgid "%(value)s quadrillion" +msgid_plural "%(value)s quadrillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:69 +#, python-format +msgid "%(value).1f quintillion" +msgid_plural "%(value).1f quintillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:70 +#, python-format +msgid "%(value)s quintillion" +msgid_plural "%(value)s quintillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:73 +#, python-format +msgid "%(value).1f sextillion" +msgid_plural "%(value).1f sextillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:74 +#, python-format +msgid "%(value)s sextillion" +msgid_plural "%(value)s sextillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:77 +#, python-format +msgid "%(value).1f septillion" +msgid_plural "%(value).1f septillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:78 +#, python-format +msgid "%(value)s septillion" +msgid_plural "%(value)s septillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:81 +#, python-format +msgid "%(value).1f octillion" +msgid_plural "%(value).1f octillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:82 +#, python-format +msgid "%(value)s octillion" +msgid_plural "%(value)s octillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:85 +#, python-format +msgid "%(value).1f nonillion" +msgid_plural "%(value).1f nonillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:86 +#, python-format +msgid "%(value)s nonillion" +msgid_plural "%(value)s nonillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:89 +#, python-format +msgid "%(value).1f decillion" +msgid_plural "%(value).1f decillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:90 +#, python-format +msgid "%(value)s decillion" +msgid_plural "%(value)s decillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:93 +#, python-format +msgid "%(value).1f googol" +msgid_plural "%(value).1f googol" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:94 +#, python-format +msgid "%(value)s googol" +msgid_plural "%(value)s googol" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:143 msgid "one" msgstr "viens" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "two" msgstr "divi" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "three" msgstr "trīs" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "four" msgstr "četri" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "five" msgstr "pieci" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "six" msgstr "seši" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "seven" msgstr "septiņi" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "eight" msgstr "astoņi" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "nine" msgstr "deviņi" -#: templatetags/humanize.py:96 -msgid "today" -msgstr "šodien" +#: templatetags/humanize.py:185 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s ago" +msgstr "" -#: templatetags/humanize.py:98 -msgid "tomorrow" -msgstr "rīt" +#: templatetags/humanize.py:188 templatetags/humanize.py:210 +msgid "now" +msgstr "" -#: templatetags/humanize.py:100 -msgid "yesterday" -msgstr "vakar" +#: templatetags/humanize.py:191 +#, python-format +msgid "a second ago" +msgid_plural "%(count)s seconds ago" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:196 +#, python-format +msgid "a minute ago" +msgid_plural "%(count)s minutes ago" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:201 +#, python-format +msgid "an hour ago" +msgid_plural "%(count)s hours ago" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:207 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s from now" +msgstr "" + +#: templatetags/humanize.py:213 +#, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:218 +#, python-format +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:223 +#, python-format +msgid "an hour from now" +msgid_plural "%(count)s hours from now" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" diff --git a/django/contrib/humanize/locale/mk/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/mk/LC_MESSAGES/django.mo index e28d8ac6a5..5c197d6092 100644 Binary files a/django/contrib/humanize/locale/mk/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/mk/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/mk/LC_MESSAGES/django.po b/django/contrib/humanize/locale/mk/LC_MESSAGES/django.po index 69e3891da9..4078610a5c 100644 --- a/django/contrib/humanize/locale/mk/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/mk/LC_MESSAGES/django.po @@ -1,42 +1,65 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Jannis Leidel , 2011. +# , 2011, 2012. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:18-0400\n" -"PO-Revision-Date: 2011-03-04 18:39+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Macedonian <>\n" +"POT-Creation-Date: 2012-03-14 00:19-0700\n" +"PO-Revision-Date: 2012-02-15 12:41+0000\n" +"Last-Translator: vvangelovski \n" +"Language-Team: Macedonian (http://www.transifex.net/projects/p/django/" +"language/mk/)\n" +"Language: mk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: mk\n" "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1\n" -#: templatetags/humanize.py:19 +#: tests.py:108 templatetags/humanize.py:164 +msgid "today" +msgstr "денеска" + +#: tests.py:108 templatetags/humanize.py:168 +msgid "yesterday" +msgstr "вчера" + +#: tests.py:108 templatetags/humanize.py:166 +msgid "tomorrow" +msgstr "утре" + +#: templatetags/humanize.py:24 msgid "th" msgstr "th" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "st" msgstr "st" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "nd" msgstr "nd" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "rd" msgstr "rd" -#: templatetags/humanize.py:54 +#: templatetags/humanize.py:53 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" msgstr[0] "%(value).1f милион" msgstr[1] "%(value).1f милион" +#: templatetags/humanize.py:54 +#, python-format +msgid "%(value)s million" +msgid_plural "%(value)s million" +msgstr[0] "%(value)s милион" +msgstr[1] "%(value)s милиони" + #: templatetags/humanize.py:57 #, python-format msgid "%(value).1f billion" @@ -44,57 +67,229 @@ msgid_plural "%(value).1f billion" msgstr[0] "%(value).1f милијарда" msgstr[1] "%(value).1f милијарда" -#: templatetags/humanize.py:60 +#: templatetags/humanize.py:58 +#, python-format +msgid "%(value)s billion" +msgid_plural "%(value)s billion" +msgstr[0] "%(value)s милијарда" +msgstr[1] "%(value)s милијарди" + +#: templatetags/humanize.py:61 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" msgstr[0] "%(value).1f трилион" msgstr[1] "%(value).1f трилион" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:62 +#, python-format +msgid "%(value)s trillion" +msgid_plural "%(value)s trillion" +msgstr[0] "%(value)s трилион" +msgstr[1] "%(value)s трилиони" + +#: templatetags/humanize.py:65 +#, python-format +msgid "%(value).1f quadrillion" +msgid_plural "%(value).1f quadrillion" +msgstr[0] "%(value).1f квадрилион" +msgstr[1] "%(value).1f квадрилиони" + +#: templatetags/humanize.py:66 +#, python-format +msgid "%(value)s quadrillion" +msgid_plural "%(value)s quadrillion" +msgstr[0] "%(value)s квадрилион" +msgstr[1] "%(value)s квадрилиони" + +#: templatetags/humanize.py:69 +#, python-format +msgid "%(value).1f quintillion" +msgid_plural "%(value).1f quintillion" +msgstr[0] "%(value).1f квинтилион" +msgstr[1] "%(value).1f квинтилиони" + +#: templatetags/humanize.py:70 +#, python-format +msgid "%(value)s quintillion" +msgid_plural "%(value)s quintillion" +msgstr[0] "%(value)s квинтилион" +msgstr[1] "%(value)s квинтилиони" + +#: templatetags/humanize.py:73 +#, python-format +msgid "%(value).1f sextillion" +msgid_plural "%(value).1f sextillion" +msgstr[0] "%(value).1f секстилион" +msgstr[1] "%(value).1f секстилиони" + +#: templatetags/humanize.py:74 +#, python-format +msgid "%(value)s sextillion" +msgid_plural "%(value)s sextillion" +msgstr[0] "%(value)s секстилион" +msgstr[1] "%(value)s секстилиони" + +#: templatetags/humanize.py:77 +#, python-format +msgid "%(value).1f septillion" +msgid_plural "%(value).1f septillion" +msgstr[0] "%(value).1f септилион" +msgstr[1] "%(value).1f септилиони" + +#: templatetags/humanize.py:78 +#, python-format +msgid "%(value)s septillion" +msgid_plural "%(value)s septillion" +msgstr[0] "%(value)s септилион" +msgstr[1] "%(value)s септилиони" + +#: templatetags/humanize.py:81 +#, python-format +msgid "%(value).1f octillion" +msgid_plural "%(value).1f octillion" +msgstr[0] "%(value).1f октилион" +msgstr[1] "%(value).1f октилиони" + +#: templatetags/humanize.py:82 +#, python-format +msgid "%(value)s octillion" +msgid_plural "%(value)s octillion" +msgstr[0] "%(value)s октилион" +msgstr[1] "%(value)s октилиони" + +#: templatetags/humanize.py:85 +#, python-format +msgid "%(value).1f nonillion" +msgid_plural "%(value).1f nonillion" +msgstr[0] "%(value).1f нонилион" +msgstr[1] "%(value).1f нонилиони" + +#: templatetags/humanize.py:86 +#, python-format +msgid "%(value)s nonillion" +msgid_plural "%(value)s nonillion" +msgstr[0] "%(value)s нонилион" +msgstr[1] "%(value)s нонилиони" + +#: templatetags/humanize.py:89 +#, python-format +msgid "%(value).1f decillion" +msgid_plural "%(value).1f decillion" +msgstr[0] "%(value).1f децилион" +msgstr[1] "%(value).1f децилиони" + +#: templatetags/humanize.py:90 +#, python-format +msgid "%(value)s decillion" +msgid_plural "%(value)s decillion" +msgstr[0] "%(value)s децилион" +msgstr[1] "%(value)s децилиони" + +#: templatetags/humanize.py:93 +#, python-format +msgid "%(value).1f googol" +msgid_plural "%(value).1f googol" +msgstr[0] "%(value).1f гугол" +msgstr[1] "%(value).1f гуголи" + +#: templatetags/humanize.py:94 +#, python-format +msgid "%(value)s googol" +msgid_plural "%(value)s googol" +msgstr[0] "%(value)s гугол" +msgstr[1] "%(value)s гуголи" + +#: templatetags/humanize.py:143 msgid "one" msgstr "еден" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "two" msgstr "два" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "three" msgstr "три" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "four" msgstr "четири" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "five" msgstr "пет" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "six" msgstr "шест" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "seven" msgstr "седум" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "eight" msgstr "осум" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "nine" msgstr "девет" -#: templatetags/humanize.py:96 -msgid "today" -msgstr "денеска" +#: templatetags/humanize.py:185 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s ago" +msgstr "пред %(delta)s" -#: templatetags/humanize.py:98 -msgid "tomorrow" -msgstr "утре" +#: templatetags/humanize.py:188 templatetags/humanize.py:210 +msgid "now" +msgstr "сега" -#: templatetags/humanize.py:100 -msgid "yesterday" -msgstr "вчера" +#: templatetags/humanize.py:191 +#, python-format +msgid "a second ago" +msgid_plural "%(count)s seconds ago" +msgstr[0] "пред една секунда" +msgstr[1] "пред %(count)s секунди" + +#: templatetags/humanize.py:196 +#, python-format +msgid "a minute ago" +msgid_plural "%(count)s minutes ago" +msgstr[0] "пред една минута" +msgstr[1] "пред %(count)s минути" + +#: templatetags/humanize.py:201 +#, python-format +msgid "an hour ago" +msgid_plural "%(count)s hours ago" +msgstr[0] "пред еден час" +msgstr[1] "пред %(count)s часа" + +#: templatetags/humanize.py:207 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s from now" +msgstr "за %(delta)s" + +#: templatetags/humanize.py:213 +#, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "за една секунда" +msgstr[1] "за %(count)s секунди" + +#: templatetags/humanize.py:218 +#, python-format +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "за една минута" +msgstr[1] "за %(count)s минути" + +#: templatetags/humanize.py:223 +#, python-format +msgid "an hour from now" +msgid_plural "%(count)s hours from now" +msgstr[0] "за еден час" +msgstr[1] "за %(count)s часа" diff --git a/django/contrib/humanize/locale/ml/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/ml/LC_MESSAGES/django.mo index 05cfebe54b..06d250d685 100644 Binary files a/django/contrib/humanize/locale/ml/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/ml/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/ml/LC_MESSAGES/django.po b/django/contrib/humanize/locale/ml/LC_MESSAGES/django.po index da69b99b97..b4774b33e7 100644 --- a/django/contrib/humanize/locale/ml/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/ml/LC_MESSAGES/django.po @@ -1,42 +1,65 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Jannis Leidel , 2011. +# Rajeesh Nair , 2012. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:18-0400\n" -"PO-Revision-Date: 2011-03-04 18:39+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Malayalam \n" +"POT-Creation-Date: 2012-03-14 00:19-0700\n" +"PO-Revision-Date: 2012-03-07 15:48+0000\n" +"Last-Translator: Rajeesh Nair \n" +"Language-Team: Malayalam (http://www.transifex.net/projects/p/django/" +"language/ml/)\n" +"Language: ml\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ml\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: templatetags/humanize.py:19 +#: tests.py:108 templatetags/humanize.py:164 +msgid "today" +msgstr "ഇന്ന്" + +#: tests.py:108 templatetags/humanize.py:168 +msgid "yesterday" +msgstr "ഇന്നലെ" + +#: tests.py:108 templatetags/humanize.py:166 +msgid "tomorrow" +msgstr "നാളെ" + +#: templatetags/humanize.py:24 msgid "th" msgstr "ആം" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "st" msgstr "ആം" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "nd" msgstr "ആം" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "rd" msgstr "ആം" -#: templatetags/humanize.py:54 +#: templatetags/humanize.py:53 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" msgstr[0] "%(value).1f മില്ല്യണ്‍ (ദശലക്ഷം)" msgstr[1] "%(value).1f മില്ല്യണ്‍ (ദശലക്ഷം)" +#: templatetags/humanize.py:54 +#, python-format +msgid "%(value)s million" +msgid_plural "%(value)s million" +msgstr[0] "%(value)s ദശലക്ഷം" +msgstr[1] "%(value)s ദശലക്ഷം" + #: templatetags/humanize.py:57 #, python-format msgid "%(value).1f billion" @@ -44,57 +67,229 @@ msgid_plural "%(value).1f billion" msgstr[0] "%(value).1f ബില്ല്യണ്‍ (ശതകോടി)" msgstr[1] "%(value).1f ബില്ല്യണ്‍ (ശതകോടി)" -#: templatetags/humanize.py:60 +#: templatetags/humanize.py:58 +#, python-format +msgid "%(value)s billion" +msgid_plural "%(value)s billion" +msgstr[0] "%(value)s ശതകോടി" +msgstr[1] "%(value)s ശതകോടി" + +#: templatetags/humanize.py:61 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" msgstr[0] "%(value).1f ട്രില്ല്യണ്‍ (ലക്ഷം കോടി)" msgstr[1] "%(value).1f ട്രില്ല്യണ്‍ (ലക്ഷം കോടി)" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:62 +#, python-format +msgid "%(value)s trillion" +msgid_plural "%(value)s trillion" +msgstr[0] "%(value)s ലക്ഷം കോടി" +msgstr[1] "%(value)s ലക്ഷം കോടി" + +#: templatetags/humanize.py:65 +#, python-format +msgid "%(value).1f quadrillion" +msgid_plural "%(value).1f quadrillion" +msgstr[0] "%(value).1f ക്വാഡ്രില്ല്യണ്‍" +msgstr[1] "%(value).1f ക്വാഡ്രില്ല്യണ്‍" + +#: templatetags/humanize.py:66 +#, python-format +msgid "%(value)s quadrillion" +msgid_plural "%(value)s quadrillion" +msgstr[0] "%(value)s ക്വാഡ്രില്ല്യണ്‍" +msgstr[1] "%(value)s ക്വാഡ്രില്ല്യണ്‍" + +#: templatetags/humanize.py:69 +#, python-format +msgid "%(value).1f quintillion" +msgid_plural "%(value).1f quintillion" +msgstr[0] "%(value).1f ക്വിന്റില്ല്യണ്‍" +msgstr[1] "%(value).1f ക്വിന്റില്ല്യണ്‍" + +#: templatetags/humanize.py:70 +#, python-format +msgid "%(value)s quintillion" +msgid_plural "%(value)s quintillion" +msgstr[0] "%(value)s ക്വിന്റില്ല്യണ്‍" +msgstr[1] "%(value)s ക്വിന്റില്ല്യണ്‍" + +#: templatetags/humanize.py:73 +#, python-format +msgid "%(value).1f sextillion" +msgid_plural "%(value).1f sextillion" +msgstr[0] "%(value).1f സെക്സ്റ്റില്ല്യണ്‍" +msgstr[1] "%(value).1f സെക്സ്റ്റില്ല്യണ്‍" + +#: templatetags/humanize.py:74 +#, python-format +msgid "%(value)s sextillion" +msgid_plural "%(value)s sextillion" +msgstr[0] "%(value)s സെക്സ്റ്റില്ല്യണ്‍" +msgstr[1] "%(value)s സെക്സ്റ്റില്ല്യണ്‍" + +#: templatetags/humanize.py:77 +#, python-format +msgid "%(value).1f septillion" +msgid_plural "%(value).1f septillion" +msgstr[0] "%(value).1f സെപ്റ്റില്ല്യണ്‍" +msgstr[1] "%(value).1f സെപ്റ്റില്ല്യണ്‍" + +#: templatetags/humanize.py:78 +#, python-format +msgid "%(value)s septillion" +msgid_plural "%(value)s septillion" +msgstr[0] "%(value)s സെപ്റ്റില്ല്യണ്‍" +msgstr[1] "%(value)s സെപ്റ്റില്ല്യണ്‍" + +#: templatetags/humanize.py:81 +#, python-format +msgid "%(value).1f octillion" +msgid_plural "%(value).1f octillion" +msgstr[0] "%(value).1f ഒക്റ്റില്ല്യണ്‍" +msgstr[1] "%(value).1f ഒക്റ്റില്ല്യണ്‍" + +#: templatetags/humanize.py:82 +#, python-format +msgid "%(value)s octillion" +msgid_plural "%(value)s octillion" +msgstr[0] "%(value)s ഒക്റ്റില്ല്യണ്‍" +msgstr[1] "%(value)s ഒക്റ്റില്ല്യണ്‍" + +#: templatetags/humanize.py:85 +#, python-format +msgid "%(value).1f nonillion" +msgid_plural "%(value).1f nonillion" +msgstr[0] "%(value).1f നോനില്ല്യണ്‍" +msgstr[1] "%(value).1f നോനില്ല്യണ്‍" + +#: templatetags/humanize.py:86 +#, python-format +msgid "%(value)s nonillion" +msgid_plural "%(value)s nonillion" +msgstr[0] "%(value)s നോനില്ല്യണ്‍" +msgstr[1] "%(value)s നോനില്ല്യണ്‍" + +#: templatetags/humanize.py:89 +#, python-format +msgid "%(value).1f decillion" +msgid_plural "%(value).1f decillion" +msgstr[0] "%(value).1f ഡെസില്ല്യണ്‍" +msgstr[1] "%(value).1f ഡെസില്ല്യണ്‍" + +#: templatetags/humanize.py:90 +#, python-format +msgid "%(value)s decillion" +msgid_plural "%(value)s decillion" +msgstr[0] "%(value)s ഡെസില്ല്യണ്‍" +msgstr[1] "%(value)s ഡെസില്ല്യണ്‍" + +#: templatetags/humanize.py:93 +#, python-format +msgid "%(value).1f googol" +msgid_plural "%(value).1f googol" +msgstr[0] "%(value).1f ഗൂഗോള്‍" +msgstr[1] "%(value).1f ഗൂഗോള്‍" + +#: templatetags/humanize.py:94 +#, python-format +msgid "%(value)s googol" +msgid_plural "%(value)s googol" +msgstr[0] "%(value)s ഗൂഗോള്‍" +msgstr[1] "%(value)s ഗൂഗോള്‍" + +#: templatetags/humanize.py:143 msgid "one" msgstr "ഒന്ന്" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "two" msgstr "രണ്ട്" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "three" msgstr "മൂന്ന്" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "four" msgstr "നാല്" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "five" msgstr "അഞ്ച്" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "six" msgstr "ആറ്" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "seven" msgstr "ഏഴ്" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "eight" msgstr "എട്ട്" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "nine" msgstr "ഒന്‍പത്" -#: templatetags/humanize.py:96 -msgid "today" -msgstr "ഇന്ന്" +#: templatetags/humanize.py:185 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s ago" +msgstr "%(delta)s മുമ്പ്" -#: templatetags/humanize.py:98 -msgid "tomorrow" -msgstr "നാളെ" +#: templatetags/humanize.py:188 templatetags/humanize.py:210 +msgid "now" +msgstr "ഇപ്പോള്‍" -#: templatetags/humanize.py:100 -msgid "yesterday" -msgstr "ഇന്നലെ" +#: templatetags/humanize.py:191 +#, python-format +msgid "a second ago" +msgid_plural "%(count)s seconds ago" +msgstr[0] "ഒരു സെക്കന്‍ഡ് മുമ്പ്" +msgstr[1] "%(count)s സെക്കന്‍ഡുകള്‍ മുമ്പ്" + +#: templatetags/humanize.py:196 +#, python-format +msgid "a minute ago" +msgid_plural "%(count)s minutes ago" +msgstr[0] "ഒരു മിനുറ്റ് മുമ്പ്" +msgstr[1] "%(count)s മിനുറ്റുകള്‍ മുമ്പ്" + +#: templatetags/humanize.py:201 +#, python-format +msgid "an hour ago" +msgid_plural "%(count)s hours ago" +msgstr[0] "ഒരു മണിക്കൂര്‍ മുമ്പ്" +msgstr[1] "%(count)s മണിക്കൂര്‍ മുമ്പ്" + +#: templatetags/humanize.py:207 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s from now" +msgstr "ഇപ്പോള്‍ മുതല്‍ %(delta)s" + +#: templatetags/humanize.py:213 +#, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "ഇപ്പോള്‍ മുതല്‍ ഒരു സെക്കന്‍ഡ്" +msgstr[1] "ഇപ്പോള്‍ മുതല്‍ %(count)s സെക്കന്‍ഡുകള്‍" + +#: templatetags/humanize.py:218 +#, python-format +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "ഇപ്പോള്‍ മുതല്‍ ഒരു മിനുട്ട്" +msgstr[1] "ഇപ്പോള്‍ മുതല്‍ %(count)s മിനുട്ടുകള്‍" + +#: templatetags/humanize.py:223 +#, python-format +msgid "an hour from now" +msgid_plural "%(count)s hours from now" +msgstr[0] "ഇപ്പോള്‍ മുതല്‍ ഒരു മണിക്കൂര്‍" +msgstr[1] "ഇപ്പോള്‍ മുതല്‍ %(count)s മണിക്കൂറുകള്‍" diff --git a/django/contrib/humanize/locale/mn/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/mn/LC_MESSAGES/django.mo index a907bb017a..972c331035 100644 Binary files a/django/contrib/humanize/locale/mn/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/mn/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/mn/LC_MESSAGES/django.po b/django/contrib/humanize/locale/mn/LC_MESSAGES/django.po index 278ed0e360..382d269244 100644 --- a/django/contrib/humanize/locale/mn/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/mn/LC_MESSAGES/django.po @@ -1,42 +1,65 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Jannis Leidel , 2011. +# Анхбаяр Анхаа , 2011, 2012. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:18-0400\n" -"PO-Revision-Date: 2011-03-04 18:39+0000\n" -"Last-Translator: Ankhbayar \n" -"Language-Team: Mongolian <>\n" +"POT-Creation-Date: 2012-03-14 00:19-0700\n" +"PO-Revision-Date: 2012-02-15 12:39+0000\n" +"Last-Translator: Анхбаяр Анхаа \n" +"Language-Team: Mongolian (http://www.transifex.net/projects/p/django/" +"language/mn/)\n" +"Language: mn\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: mn\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: templatetags/humanize.py:19 +#: tests.py:108 templatetags/humanize.py:164 +msgid "today" +msgstr "өнөөдөр" + +#: tests.py:108 templatetags/humanize.py:168 +msgid "yesterday" +msgstr "өчигдөр" + +#: tests.py:108 templatetags/humanize.py:166 +msgid "tomorrow" +msgstr "маргааш" + +#: templatetags/humanize.py:24 msgid "th" msgstr "-р" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "st" msgstr "-р" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "nd" msgstr "-р" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "rd" msgstr "-р" -#: templatetags/humanize.py:54 +#: templatetags/humanize.py:53 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" msgstr[0] "%(value).1f сая" msgstr[1] "%(value).1f сая" +#: templatetags/humanize.py:54 +#, python-format +msgid "%(value)s million" +msgid_plural "%(value)s million" +msgstr[0] "%(value)s сая" +msgstr[1] "%(value)s сая" + #: templatetags/humanize.py:57 #, python-format msgid "%(value).1f billion" @@ -44,57 +67,229 @@ msgid_plural "%(value).1f billion" msgstr[0] "%(value).1f тэр бум" msgstr[1] "%(value).1f тэр бум" -#: templatetags/humanize.py:60 +#: templatetags/humanize.py:58 +#, python-format +msgid "%(value)s billion" +msgid_plural "%(value)s billion" +msgstr[0] "%(value)s тэрбум" +msgstr[1] "%(value)s тэрбум" + +#: templatetags/humanize.py:61 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" msgstr[0] "%(value).1f их наяд" msgstr[1] "%(value).1f их наяд" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:62 +#, python-format +msgid "%(value)s trillion" +msgid_plural "%(value)s trillion" +msgstr[0] "%(value)s их наяд" +msgstr[1] "%(value)s их наяд" + +#: templatetags/humanize.py:65 +#, python-format +msgid "%(value).1f quadrillion" +msgid_plural "%(value).1f quadrillion" +msgstr[0] "%(value).1f их маш дэлэгмэл" +msgstr[1] "%(value).1f их маш дэлэгмэл" + +#: templatetags/humanize.py:66 +#, python-format +msgid "%(value)s quadrillion" +msgid_plural "%(value)s quadrillion" +msgstr[0] "%(value)s их маш дэлэгмэл" +msgstr[1] "%(value)s их маш дэлэгмэл" + +#: templatetags/humanize.py:69 +#, python-format +msgid "%(value).1f quintillion" +msgid_plural "%(value).1f quintillion" +msgstr[0] "%(value).1f их ингуумэл" +msgstr[1] "%(value).1f их ингуумэл" + +#: templatetags/humanize.py:70 +#, python-format +msgid "%(value)s quintillion" +msgid_plural "%(value)s quintillion" +msgstr[0] "%(value)s их ингуумэл" +msgstr[1] "%(value)s их ингуумэл" + +#: templatetags/humanize.py:73 +#, python-format +msgid "%(value).1f sextillion" +msgid_plural "%(value).1f sextillion" +msgstr[0] "%(value).1f ялгаруулагч" +msgstr[1] "%(value).1f ялгаруулагч" + +#: templatetags/humanize.py:74 +#, python-format +msgid "%(value)s sextillion" +msgid_plural "%(value)s sextillion" +msgstr[0] "%(value)s ялгаруулагч" +msgstr[1] "%(value)s ялгаруулагч" + +#: templatetags/humanize.py:77 +#, python-format +msgid "%(value).1f septillion" +msgid_plural "%(value).1f septillion" +msgstr[0] "%(value).1f их өвөр дээр" +msgstr[1] "%(value).1f их өвөр дээр" + +#: templatetags/humanize.py:78 +#, python-format +msgid "%(value)s septillion" +msgid_plural "%(value)s septillion" +msgstr[0] "%(value)s их өвөр дээр" +msgstr[1] "%(value)s их өвөр дээр" + +#: templatetags/humanize.py:81 +#, python-format +msgid "%(value).1f octillion" +msgid_plural "%(value).1f octillion" +msgstr[0] "%(value).1f хязгаар үзэгдэл" +msgstr[1] "%(value).1f хязгаар үзэгдэл" + +#: templatetags/humanize.py:82 +#, python-format +msgid "%(value)s octillion" +msgid_plural "%(value)s octillion" +msgstr[0] "%(value)s хязгаар үзэгдэл" +msgstr[1] "%(value)s хязгаар үзэгдэл" + +#: templatetags/humanize.py:85 +#, python-format +msgid "%(value).1f nonillion" +msgid_plural "%(value).1f nonillion" +msgstr[0] "%(value).1f их шалтгааны зүйл" +msgstr[1] "%(value).1f их шалтгааны зүйл" + +#: templatetags/humanize.py:86 +#, python-format +msgid "%(value)s nonillion" +msgid_plural "%(value)s nonillion" +msgstr[0] "%(value)s их шалтгааны зүйл" +msgstr[1] "%(value)s их шалтгааны зүйл" + +#: templatetags/humanize.py:89 +#, python-format +msgid "%(value).1f decillion" +msgid_plural "%(value).1f decillion" +msgstr[0] "%(value).1f эрхэт" +msgstr[1] "%(value).1f эрхэт" + +#: templatetags/humanize.py:90 +#, python-format +msgid "%(value)s decillion" +msgid_plural "%(value)s decillion" +msgstr[0] "%(value)s эрхэт" +msgstr[1] "%(value)s эрхэт" + +#: templatetags/humanize.py:93 +#, python-format +msgid "%(value).1f googol" +msgid_plural "%(value).1f googol" +msgstr[0] "%(value).1f googol" +msgstr[1] "%(value).1f googol" + +#: templatetags/humanize.py:94 +#, python-format +msgid "%(value)s googol" +msgid_plural "%(value)s googol" +msgstr[0] "%(value)s сэтгэшгүй" +msgstr[1] "%(value)s сэтгэшгүй" + +#: templatetags/humanize.py:143 msgid "one" msgstr "нэг" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "two" msgstr "хоёр" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "three" msgstr "гурав" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "four" msgstr "дөрөв" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "five" msgstr "тав" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "six" msgstr "зургаа" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "seven" msgstr "долоо" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "eight" msgstr "найм" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "nine" msgstr "ес" -#: templatetags/humanize.py:96 -msgid "today" -msgstr "өнөөдөр" +#: templatetags/humanize.py:185 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s ago" +msgstr "%(delta)s өмнө" -#: templatetags/humanize.py:98 -msgid "tomorrow" -msgstr "маргааш" +#: templatetags/humanize.py:188 templatetags/humanize.py:210 +msgid "now" +msgstr "одоо" -#: templatetags/humanize.py:100 -msgid "yesterday" -msgstr "өчигдөр" +#: templatetags/humanize.py:191 +#, python-format +msgid "a second ago" +msgid_plural "%(count)s seconds ago" +msgstr[0] "секундын өмнө" +msgstr[1] "%(count)s секундын өмнө" + +#: templatetags/humanize.py:196 +#, python-format +msgid "a minute ago" +msgid_plural "%(count)s minutes ago" +msgstr[0] "%(count)s минутын өмнө" +msgstr[1] "%(count)s минутын өмнө" + +#: templatetags/humanize.py:201 +#, python-format +msgid "an hour ago" +msgid_plural "%(count)s hours ago" +msgstr[0] "%(count)s цагын өмнө" +msgstr[1] "%(count)s цагын өмнө" + +#: templatetags/humanize.py:207 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s from now" +msgstr "%(delta)s дараа" + +#: templatetags/humanize.py:213 +#, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "секундын дараа" +msgstr[1] "%(count)s секундын дараа" + +#: templatetags/humanize.py:218 +#, python-format +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "минутын дараа" +msgstr[1] "%(count)s минутын дараа" + +#: templatetags/humanize.py:223 +#, python-format +msgid "an hour from now" +msgid_plural "%(count)s hours from now" +msgstr[0] "цагийн дараа" +msgstr[1] "%(count)s цагийн дараа" diff --git a/django/contrib/humanize/locale/nb/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/nb/LC_MESSAGES/django.mo index 80647908c5..19c28c3118 100644 Binary files a/django/contrib/humanize/locale/nb/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/nb/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/nb/LC_MESSAGES/django.po b/django/contrib/humanize/locale/nb/LC_MESSAGES/django.po index 591af2a488..f2a32a6a57 100644 --- a/django/contrib/humanize/locale/nb/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/nb/LC_MESSAGES/django.po @@ -1,42 +1,65 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Jannis Leidel , 2011. +# , 2012. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:18-0400\n" -"PO-Revision-Date: 2011-03-04 18:39+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Norwegian Bokmål <>\n" +"POT-Creation-Date: 2012-03-14 00:19-0700\n" +"PO-Revision-Date: 2012-03-08 14:27+0000\n" +"Last-Translator: jonklo \n" +"Language-Team: Norwegian Bokmål (http://www.transifex.net/projects/p/django/" +"language/nb/)\n" +"Language: nb\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: nb\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: templatetags/humanize.py:19 +#: tests.py:108 templatetags/humanize.py:164 +msgid "today" +msgstr "i dag" + +#: tests.py:108 templatetags/humanize.py:168 +msgid "yesterday" +msgstr "i går" + +#: tests.py:108 templatetags/humanize.py:166 +msgid "tomorrow" +msgstr "i morgen" + +#: templatetags/humanize.py:24 msgid "th" msgstr "." -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "st" msgstr "." -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "nd" msgstr "." -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "rd" msgstr "." -#: templatetags/humanize.py:54 +#: templatetags/humanize.py:53 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" msgstr[0] "%(value).1f million" msgstr[1] "%(value).1f millioner" +#: templatetags/humanize.py:54 +#, python-format +msgid "%(value)s million" +msgid_plural "%(value)s million" +msgstr[0] "%(value)s million" +msgstr[1] "%(value)s millioner" + #: templatetags/humanize.py:57 #, python-format msgid "%(value).1f billion" @@ -44,57 +67,229 @@ msgid_plural "%(value).1f billion" msgstr[0] "%(value).1f milliard" msgstr[1] "%(value).1f milliarder" -#: templatetags/humanize.py:60 +#: templatetags/humanize.py:58 +#, python-format +msgid "%(value)s billion" +msgid_plural "%(value)s billion" +msgstr[0] "%(value)s milliard" +msgstr[1] "%(value)s milliarder" + +#: templatetags/humanize.py:61 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" msgstr[0] "%(value).1f billion" msgstr[1] "%(value).1f billioner" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:62 +#, python-format +msgid "%(value)s trillion" +msgid_plural "%(value)s trillion" +msgstr[0] "%(value)s billion" +msgstr[1] "%(value)s billioner" + +#: templatetags/humanize.py:65 +#, python-format +msgid "%(value).1f quadrillion" +msgid_plural "%(value).1f quadrillion" +msgstr[0] "%(value).1f kvadrillion" +msgstr[1] "%(value).1f kvadrillioner" + +#: templatetags/humanize.py:66 +#, python-format +msgid "%(value)s quadrillion" +msgid_plural "%(value)s quadrillion" +msgstr[0] "%(value)s kvadrillion" +msgstr[1] "%(value)s kvadrillioner" + +#: templatetags/humanize.py:69 +#, python-format +msgid "%(value).1f quintillion" +msgid_plural "%(value).1f quintillion" +msgstr[0] "%(value).1f kvintillion" +msgstr[1] "%(value).1f kvintillioner" + +#: templatetags/humanize.py:70 +#, python-format +msgid "%(value)s quintillion" +msgid_plural "%(value)s quintillion" +msgstr[0] "%(value)s kvintillion" +msgstr[1] "%(value)s kvintillioner" + +#: templatetags/humanize.py:73 +#, python-format +msgid "%(value).1f sextillion" +msgid_plural "%(value).1f sextillion" +msgstr[0] "%(value).1f sekstillion" +msgstr[1] "%(value).1f sekstillioner" + +#: templatetags/humanize.py:74 +#, python-format +msgid "%(value)s sextillion" +msgid_plural "%(value)s sextillion" +msgstr[0] "%(value)s sekstillion" +msgstr[1] "%(value)s sekstillioner" + +#: templatetags/humanize.py:77 +#, python-format +msgid "%(value).1f septillion" +msgid_plural "%(value).1f septillion" +msgstr[0] "%(value).1f septillion" +msgstr[1] "%(value).1f septillioner" + +#: templatetags/humanize.py:78 +#, python-format +msgid "%(value)s septillion" +msgid_plural "%(value)s septillion" +msgstr[0] "%(value)s septillion" +msgstr[1] "%(value)s septillioner" + +#: templatetags/humanize.py:81 +#, python-format +msgid "%(value).1f octillion" +msgid_plural "%(value).1f octillion" +msgstr[0] "%(value).1f oktillion" +msgstr[1] "%(value).1f oktillioner" + +#: templatetags/humanize.py:82 +#, python-format +msgid "%(value)s octillion" +msgid_plural "%(value)s octillion" +msgstr[0] "%(value)s oktillion" +msgstr[1] "%(value)s oktillioner" + +#: templatetags/humanize.py:85 +#, python-format +msgid "%(value).1f nonillion" +msgid_plural "%(value).1f nonillion" +msgstr[0] "%(value).1f nonillion" +msgstr[1] "%(value).1f nonillioner" + +#: templatetags/humanize.py:86 +#, python-format +msgid "%(value)s nonillion" +msgid_plural "%(value)s nonillion" +msgstr[0] "%(value)s nonillion" +msgstr[1] "%(value)s nonillioner" + +#: templatetags/humanize.py:89 +#, python-format +msgid "%(value).1f decillion" +msgid_plural "%(value).1f decillion" +msgstr[0] "%(value).1f desillion" +msgstr[1] "%(value).1f desillioner" + +#: templatetags/humanize.py:90 +#, python-format +msgid "%(value)s decillion" +msgid_plural "%(value)s decillion" +msgstr[0] "%(value)s desillion" +msgstr[1] "%(value)s desillioner" + +#: templatetags/humanize.py:93 +#, python-format +msgid "%(value).1f googol" +msgid_plural "%(value).1f googol" +msgstr[0] "%(value).1f googol" +msgstr[1] "%(value).1f googoler" + +#: templatetags/humanize.py:94 +#, python-format +msgid "%(value)s googol" +msgid_plural "%(value)s googol" +msgstr[0] "%(value)s googol" +msgstr[1] "%(value)s googoler" + +#: templatetags/humanize.py:143 msgid "one" msgstr "én" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "two" msgstr "to" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "three" msgstr "tre" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "four" msgstr "fire" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "five" msgstr "fem" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "six" msgstr "seks" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "seven" msgstr "sju" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "eight" msgstr "åtte" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "nine" msgstr "ni" -#: templatetags/humanize.py:96 -msgid "today" -msgstr "i dag" +#: templatetags/humanize.py:185 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s ago" +msgstr "%(delta)s siden" -#: templatetags/humanize.py:98 -msgid "tomorrow" -msgstr "i morgen" +#: templatetags/humanize.py:188 templatetags/humanize.py:210 +msgid "now" +msgstr "nå" -#: templatetags/humanize.py:100 -msgid "yesterday" -msgstr "i går" +#: templatetags/humanize.py:191 +#, python-format +msgid "a second ago" +msgid_plural "%(count)s seconds ago" +msgstr[0] "ett sekund siden" +msgstr[1] "%(count)s sekunder siden" + +#: templatetags/humanize.py:196 +#, python-format +msgid "a minute ago" +msgid_plural "%(count)s minutes ago" +msgstr[0] "ett minutt siden" +msgstr[1] "%(count)s minutter siden" + +#: templatetags/humanize.py:201 +#, python-format +msgid "an hour ago" +msgid_plural "%(count)s hours ago" +msgstr[0] "en time siden" +msgstr[1] "%(count)s timer siden" + +#: templatetags/humanize.py:207 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s from now" +msgstr "%(delta)s fra nå" + +#: templatetags/humanize.py:213 +#, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "ett sekund fra nå" +msgstr[1] "%(count)s sekunder fra nå" + +#: templatetags/humanize.py:218 +#, python-format +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "ett minutt fra nå" +msgstr[1] "%(count)s minutter fra nå" + +#: templatetags/humanize.py:223 +#, python-format +msgid "an hour from now" +msgid_plural "%(count)s hours from now" +msgstr[0] "en time fra nå" +msgstr[1] "%(count)s timer fra nå" diff --git a/django/contrib/humanize/locale/nl/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/nl/LC_MESSAGES/django.mo index d103acc162..8caabe9eb6 100644 Binary files a/django/contrib/humanize/locale/nl/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/nl/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/nl/LC_MESSAGES/django.po b/django/contrib/humanize/locale/nl/LC_MESSAGES/django.po index 4457b47a7e..085a105c8a 100644 --- a/django/contrib/humanize/locale/nl/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/nl/LC_MESSAGES/django.po @@ -1,42 +1,66 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# , 2011, 2012. +# Jannis Leidel , 2011. +# Tino de Bruijn , 2012. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:18-0400\n" -"PO-Revision-Date: 2011-03-04 18:39+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Dutch <>\n" +"POT-Creation-Date: 2012-03-14 00:19-0700\n" +"PO-Revision-Date: 2012-03-07 19:59+0000\n" +"Last-Translator: Blue \n" +"Language-Team: Dutch (http://www.transifex.net/projects/p/django/language/" +"nl/)\n" +"Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: nl\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: templatetags/humanize.py:19 +#: tests.py:108 templatetags/humanize.py:164 +msgid "today" +msgstr "vandaag" + +#: tests.py:108 templatetags/humanize.py:168 +msgid "yesterday" +msgstr "gisteren" + +#: tests.py:108 templatetags/humanize.py:166 +msgid "tomorrow" +msgstr "morgen" + +#: templatetags/humanize.py:24 msgid "th" -msgstr "º" +msgstr "e" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "st" -msgstr "º" +msgstr "e" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "nd" -msgstr "º" +msgstr "e" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "rd" -msgstr "º" +msgstr "e" -#: templatetags/humanize.py:54 +#: templatetags/humanize.py:53 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" msgstr[0] "%(value).1f miljoen" msgstr[1] "%(value).1f miljoen" +#: templatetags/humanize.py:54 +#, python-format +msgid "%(value)s million" +msgid_plural "%(value)s million" +msgstr[0] "%(value)s miljoen" +msgstr[1] "%(value)s miljoen" + #: templatetags/humanize.py:57 #, python-format msgid "%(value).1f billion" @@ -44,57 +68,229 @@ msgid_plural "%(value).1f billion" msgstr[0] "%(value).1f miljard" msgstr[1] "%(value).1f miljard" -#: templatetags/humanize.py:60 +#: templatetags/humanize.py:58 +#, python-format +msgid "%(value)s billion" +msgid_plural "%(value)s billion" +msgstr[0] "%(value)s miljard" +msgstr[1] "%(value)s miljard" + +#: templatetags/humanize.py:61 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" msgstr[0] "%(value).1f biljoen" msgstr[1] "%(value).1f biljoen" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:62 +#, python-format +msgid "%(value)s trillion" +msgid_plural "%(value)s trillion" +msgstr[0] "%(value)s biljoen" +msgstr[1] "%(value)s biljoen" + +#: templatetags/humanize.py:65 +#, python-format +msgid "%(value).1f quadrillion" +msgid_plural "%(value).1f quadrillion" +msgstr[0] "%(value).1f biljard" +msgstr[1] "%(value).1f biljard" + +#: templatetags/humanize.py:66 +#, python-format +msgid "%(value)s quadrillion" +msgid_plural "%(value)s quadrillion" +msgstr[0] "%(value)s biljard" +msgstr[1] "%(value)s biljard" + +#: templatetags/humanize.py:69 +#, python-format +msgid "%(value).1f quintillion" +msgid_plural "%(value).1f quintillion" +msgstr[0] "%(value).1f triljoen" +msgstr[1] "%(value).1f triljoen" + +#: templatetags/humanize.py:70 +#, python-format +msgid "%(value)s quintillion" +msgid_plural "%(value)s quintillion" +msgstr[0] "%(value)s triljoen" +msgstr[1] "%(value)s triljoen" + +#: templatetags/humanize.py:73 +#, python-format +msgid "%(value).1f sextillion" +msgid_plural "%(value).1f sextillion" +msgstr[0] "%(value).1f triljard" +msgstr[1] "%(value).1f triljard" + +#: templatetags/humanize.py:74 +#, python-format +msgid "%(value)s sextillion" +msgid_plural "%(value)s sextillion" +msgstr[0] "%(value)s triljard" +msgstr[1] "%(value)s triljard" + +#: templatetags/humanize.py:77 +#, python-format +msgid "%(value).1f septillion" +msgid_plural "%(value).1f septillion" +msgstr[0] "%(value).1f quadriljoen" +msgstr[1] "%(value).1f quadriljoen" + +#: templatetags/humanize.py:78 +#, python-format +msgid "%(value)s septillion" +msgid_plural "%(value)s septillion" +msgstr[0] "%(value)s quadriljoen" +msgstr[1] "%(value)s quadriljoen" + +#: templatetags/humanize.py:81 +#, python-format +msgid "%(value).1f octillion" +msgid_plural "%(value).1f octillion" +msgstr[0] "%(value).1f quadriljard" +msgstr[1] "%(value).1f quadriljard" + +#: templatetags/humanize.py:82 +#, python-format +msgid "%(value)s octillion" +msgid_plural "%(value)s octillion" +msgstr[0] "%(value)s quadriljard" +msgstr[1] "%(value)s quadriljard" + +#: templatetags/humanize.py:85 +#, python-format +msgid "%(value).1f nonillion" +msgid_plural "%(value).1f nonillion" +msgstr[0] "%(value).1f quintiljoen" +msgstr[1] "%(value).1f quintiljoen" + +#: templatetags/humanize.py:86 +#, python-format +msgid "%(value)s nonillion" +msgid_plural "%(value)s nonillion" +msgstr[0] "%(value)s quintiljoen" +msgstr[1] "%(value)s quintiljoen" + +#: templatetags/humanize.py:89 +#, python-format +msgid "%(value).1f decillion" +msgid_plural "%(value).1f decillion" +msgstr[0] "%(value).1f quintiljard" +msgstr[1] "%(value).1f quintiljard" + +#: templatetags/humanize.py:90 +#, python-format +msgid "%(value)s decillion" +msgid_plural "%(value)s decillion" +msgstr[0] "%(value)s quintiljard" +msgstr[1] "%(value)s quintiljard" + +#: templatetags/humanize.py:93 +#, python-format +msgid "%(value).1f googol" +msgid_plural "%(value).1f googol" +msgstr[0] "%(value).1f googol" +msgstr[1] "%(value).1f googol" + +#: templatetags/humanize.py:94 +#, python-format +msgid "%(value)s googol" +msgid_plural "%(value)s googol" +msgstr[0] "%(value)s googol" +msgstr[1] "%(value)s googol" + +#: templatetags/humanize.py:143 msgid "one" msgstr "één" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "two" msgstr "twee" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "three" msgstr "drie" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "four" msgstr "vier" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "five" msgstr "vijf" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "six" msgstr "zes" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "seven" msgstr "zeven" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "eight" msgstr "acht" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "nine" msgstr "negen" -#: templatetags/humanize.py:96 -msgid "today" -msgstr "vandaag" +#: templatetags/humanize.py:185 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s ago" +msgstr "%(delta)s geleden" -#: templatetags/humanize.py:98 -msgid "tomorrow" -msgstr "morgen" +#: templatetags/humanize.py:188 templatetags/humanize.py:210 +msgid "now" +msgstr "nu" -#: templatetags/humanize.py:100 -msgid "yesterday" -msgstr "gisteren" +#: templatetags/humanize.py:191 +#, python-format +msgid "a second ago" +msgid_plural "%(count)s seconds ago" +msgstr[0] "een seconde geleden" +msgstr[1] "%(count)s seconden geleden" + +#: templatetags/humanize.py:196 +#, python-format +msgid "a minute ago" +msgid_plural "%(count)s minutes ago" +msgstr[0] "een minuut geleden" +msgstr[1] "%(count)s minuten geleden" + +#: templatetags/humanize.py:201 +#, python-format +msgid "an hour ago" +msgid_plural "%(count)s hours ago" +msgstr[0] "een uur geleden" +msgstr[1] "%(count)s uur geleden" + +#: templatetags/humanize.py:207 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s from now" +msgstr "%(delta)s van nu" + +#: templatetags/humanize.py:213 +#, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "een seconde van nu" +msgstr[1] "%(count)s seconden van nu" + +#: templatetags/humanize.py:218 +#, python-format +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "een minuut van nu" +msgstr[1] "%(count)s minuten van nu" + +#: templatetags/humanize.py:223 +#, python-format +msgid "an hour from now" +msgid_plural "%(count)s hours from now" +msgstr[0] "een uur geleden" +msgstr[1] "%(count)s uur van nu" diff --git a/django/contrib/humanize/locale/nn/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/nn/LC_MESSAGES/django.mo index 93e4fd49c6..290135e77c 100644 Binary files a/django/contrib/humanize/locale/nn/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/nn/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/nn/LC_MESSAGES/django.po b/django/contrib/humanize/locale/nn/LC_MESSAGES/django.po index 611c6c25e3..3d3fa52e3f 100644 --- a/django/contrib/humanize/locale/nn/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/nn/LC_MESSAGES/django.po @@ -1,42 +1,64 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Jannis Leidel , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:18-0400\n" -"PO-Revision-Date: 2011-03-04 18:39+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Norwegian Nynorsk \n" +"POT-Creation-Date: 2012-03-14 00:19-0700\n" +"PO-Revision-Date: 2012-02-14 13:08+0000\n" +"Last-Translator: Jannis Leidel \n" +"Language-Team: Norwegian Nynorsk (http://www.transifex.net/projects/p/django/" +"language/nn/)\n" +"Language: nn\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: nn\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: templatetags/humanize.py:19 +#: tests.py:108 templatetags/humanize.py:164 +msgid "today" +msgstr "i dag" + +#: tests.py:108 templatetags/humanize.py:168 +msgid "yesterday" +msgstr "i går" + +#: tests.py:108 templatetags/humanize.py:166 +msgid "tomorrow" +msgstr "i morgon" + +#: templatetags/humanize.py:24 msgid "th" msgstr "." -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "st" msgstr "." -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "nd" msgstr "." -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "rd" msgstr "." -#: templatetags/humanize.py:54 +#: templatetags/humanize.py:53 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" msgstr[0] "%(value).1f million" msgstr[1] "%(value).1f millionar" +#: templatetags/humanize.py:54 +#, python-format +msgid "%(value)s million" +msgid_plural "%(value)s million" +msgstr[0] "" +msgstr[1] "" + #: templatetags/humanize.py:57 #, python-format msgid "%(value).1f billion" @@ -44,57 +66,229 @@ msgid_plural "%(value).1f billion" msgstr[0] "%(value).1f milliard" msgstr[1] "%(value).1f milliardar" -#: templatetags/humanize.py:60 +#: templatetags/humanize.py:58 +#, python-format +msgid "%(value)s billion" +msgid_plural "%(value)s billion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:61 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" msgstr[0] "%(value).1f billion" msgstr[1] "%(value).1f billionar" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:62 +#, python-format +msgid "%(value)s trillion" +msgid_plural "%(value)s trillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:65 +#, python-format +msgid "%(value).1f quadrillion" +msgid_plural "%(value).1f quadrillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:66 +#, python-format +msgid "%(value)s quadrillion" +msgid_plural "%(value)s quadrillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:69 +#, python-format +msgid "%(value).1f quintillion" +msgid_plural "%(value).1f quintillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:70 +#, python-format +msgid "%(value)s quintillion" +msgid_plural "%(value)s quintillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:73 +#, python-format +msgid "%(value).1f sextillion" +msgid_plural "%(value).1f sextillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:74 +#, python-format +msgid "%(value)s sextillion" +msgid_plural "%(value)s sextillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:77 +#, python-format +msgid "%(value).1f septillion" +msgid_plural "%(value).1f septillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:78 +#, python-format +msgid "%(value)s septillion" +msgid_plural "%(value)s septillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:81 +#, python-format +msgid "%(value).1f octillion" +msgid_plural "%(value).1f octillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:82 +#, python-format +msgid "%(value)s octillion" +msgid_plural "%(value)s octillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:85 +#, python-format +msgid "%(value).1f nonillion" +msgid_plural "%(value).1f nonillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:86 +#, python-format +msgid "%(value)s nonillion" +msgid_plural "%(value)s nonillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:89 +#, python-format +msgid "%(value).1f decillion" +msgid_plural "%(value).1f decillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:90 +#, python-format +msgid "%(value)s decillion" +msgid_plural "%(value)s decillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:93 +#, python-format +msgid "%(value).1f googol" +msgid_plural "%(value).1f googol" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:94 +#, python-format +msgid "%(value)s googol" +msgid_plural "%(value)s googol" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:143 msgid "one" msgstr "éin" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "two" msgstr "to" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "three" msgstr "tre" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "four" msgstr "fire" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "five" msgstr "fem" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "six" msgstr "seks" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "seven" msgstr "sju" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "eight" msgstr "åtte" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "nine" msgstr "ni" -#: templatetags/humanize.py:96 -msgid "today" -msgstr "i dag" +#: templatetags/humanize.py:185 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s ago" +msgstr "" -#: templatetags/humanize.py:98 -msgid "tomorrow" -msgstr "i morgon" +#: templatetags/humanize.py:188 templatetags/humanize.py:210 +msgid "now" +msgstr "" -#: templatetags/humanize.py:100 -msgid "yesterday" -msgstr "i går" +#: templatetags/humanize.py:191 +#, python-format +msgid "a second ago" +msgid_plural "%(count)s seconds ago" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:196 +#, python-format +msgid "a minute ago" +msgid_plural "%(count)s minutes ago" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:201 +#, python-format +msgid "an hour ago" +msgid_plural "%(count)s hours ago" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:207 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s from now" +msgstr "" + +#: templatetags/humanize.py:213 +#, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:218 +#, python-format +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:223 +#, python-format +msgid "an hour from now" +msgid_plural "%(count)s hours from now" +msgstr[0] "" +msgstr[1] "" diff --git a/django/contrib/humanize/locale/pa/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/pa/LC_MESSAGES/django.mo index baf4ff0e56..e70085cbc0 100644 Binary files a/django/contrib/humanize/locale/pa/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/pa/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/pa/LC_MESSAGES/django.po b/django/contrib/humanize/locale/pa/LC_MESSAGES/django.po index 25b37bf04e..03c2929115 100644 --- a/django/contrib/humanize/locale/pa/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/pa/LC_MESSAGES/django.po @@ -1,42 +1,64 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Jannis Leidel , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:18-0400\n" -"PO-Revision-Date: 2011-03-04 18:39+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Panjabi (Punjabi) \n" +"POT-Creation-Date: 2012-03-14 00:19-0700\n" +"PO-Revision-Date: 2012-02-14 13:08+0000\n" +"Last-Translator: Jannis Leidel \n" +"Language-Team: Panjabi (Punjabi) (http://www.transifex.net/projects/p/django/" +"language/pa/)\n" +"Language: pa\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: pa\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: templatetags/humanize.py:19 +#: tests.py:108 templatetags/humanize.py:164 +msgid "today" +msgstr "ਅੱਜ" + +#: tests.py:108 templatetags/humanize.py:168 +msgid "yesterday" +msgstr "ਕੱਲ੍ਹ" + +#: tests.py:108 templatetags/humanize.py:166 +msgid "tomorrow" +msgstr "ਭਲਕੇ" + +#: templatetags/humanize.py:24 msgid "th" msgstr "ਵਾਂ" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "st" msgstr "ਲਾਂ" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "nd" msgstr "ਜਾ" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "rd" msgstr "ਜਾ" -#: templatetags/humanize.py:54 +#: templatetags/humanize.py:53 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" msgstr[0] "%(value).1f ਮਿਲੀਅਨ" msgstr[1] "%(value).1f ਮਿਲੀਅਨ" +#: templatetags/humanize.py:54 +#, python-format +msgid "%(value)s million" +msgid_plural "%(value)s million" +msgstr[0] "" +msgstr[1] "" + #: templatetags/humanize.py:57 #, python-format msgid "%(value).1f billion" @@ -44,57 +66,229 @@ msgid_plural "%(value).1f billion" msgstr[0] "%(value).1f ਬਿਲੀਅਨ" msgstr[1] "%(value).1f ਬਿਲੀਅਨ" -#: templatetags/humanize.py:60 +#: templatetags/humanize.py:58 +#, python-format +msgid "%(value)s billion" +msgid_plural "%(value)s billion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:61 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" msgstr[0] "%(value).1f ਟਰਲੀਅਨ" msgstr[1] "%(value).1f ਟਰਲੀਅਨ" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:62 +#, python-format +msgid "%(value)s trillion" +msgid_plural "%(value)s trillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:65 +#, python-format +msgid "%(value).1f quadrillion" +msgid_plural "%(value).1f quadrillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:66 +#, python-format +msgid "%(value)s quadrillion" +msgid_plural "%(value)s quadrillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:69 +#, python-format +msgid "%(value).1f quintillion" +msgid_plural "%(value).1f quintillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:70 +#, python-format +msgid "%(value)s quintillion" +msgid_plural "%(value)s quintillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:73 +#, python-format +msgid "%(value).1f sextillion" +msgid_plural "%(value).1f sextillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:74 +#, python-format +msgid "%(value)s sextillion" +msgid_plural "%(value)s sextillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:77 +#, python-format +msgid "%(value).1f septillion" +msgid_plural "%(value).1f septillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:78 +#, python-format +msgid "%(value)s septillion" +msgid_plural "%(value)s septillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:81 +#, python-format +msgid "%(value).1f octillion" +msgid_plural "%(value).1f octillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:82 +#, python-format +msgid "%(value)s octillion" +msgid_plural "%(value)s octillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:85 +#, python-format +msgid "%(value).1f nonillion" +msgid_plural "%(value).1f nonillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:86 +#, python-format +msgid "%(value)s nonillion" +msgid_plural "%(value)s nonillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:89 +#, python-format +msgid "%(value).1f decillion" +msgid_plural "%(value).1f decillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:90 +#, python-format +msgid "%(value)s decillion" +msgid_plural "%(value)s decillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:93 +#, python-format +msgid "%(value).1f googol" +msgid_plural "%(value).1f googol" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:94 +#, python-format +msgid "%(value)s googol" +msgid_plural "%(value)s googol" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:143 msgid "one" msgstr "ਇੱਕ" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "two" msgstr "ਦੋ" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "three" msgstr "ਤਿੰਨ" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "four" msgstr "ਚਾਰ" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "five" msgstr "ਪੰਜ" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "six" msgstr "ਛੇ" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "seven" msgstr "ਸੱਤ" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "eight" msgstr "ਅੱਠ" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "nine" msgstr "ਨੌ" -#: templatetags/humanize.py:96 -msgid "today" -msgstr "ਅੱਜ" +#: templatetags/humanize.py:185 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s ago" +msgstr "" -#: templatetags/humanize.py:98 -msgid "tomorrow" -msgstr "ਭਲਕੇ" +#: templatetags/humanize.py:188 templatetags/humanize.py:210 +msgid "now" +msgstr "" -#: templatetags/humanize.py:100 -msgid "yesterday" -msgstr "ਕੱਲ੍ਹ" +#: templatetags/humanize.py:191 +#, python-format +msgid "a second ago" +msgid_plural "%(count)s seconds ago" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:196 +#, python-format +msgid "a minute ago" +msgid_plural "%(count)s minutes ago" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:201 +#, python-format +msgid "an hour ago" +msgid_plural "%(count)s hours ago" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:207 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s from now" +msgstr "" + +#: templatetags/humanize.py:213 +#, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:218 +#, python-format +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:223 +#, python-format +msgid "an hour from now" +msgid_plural "%(count)s hours from now" +msgstr[0] "" +msgstr[1] "" diff --git a/django/contrib/humanize/locale/pl/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/pl/LC_MESSAGES/django.mo index 0b12848156..da651482a6 100644 Binary files a/django/contrib/humanize/locale/pl/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/pl/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/pl/LC_MESSAGES/django.po b/django/contrib/humanize/locale/pl/LC_MESSAGES/django.po index 3f79a7d6e9..7fae0509ba 100644 --- a/django/contrib/humanize/locale/pl/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/pl/LC_MESSAGES/django.po @@ -1,37 +1,53 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# , 2011. +# Jannis Leidel , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:18-0400\n" -"PO-Revision-Date: 2011-03-04 18:39+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Polish <>\n" +"POT-Creation-Date: 2012-03-14 00:19-0700\n" +"PO-Revision-Date: 2012-02-14 13:08+0000\n" +"Last-Translator: angularcircle \n" +"Language-Team: Polish (http://www.transifex.net/projects/p/django/language/" +"pl/)\n" +"Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: pl\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2)\n" -#: templatetags/humanize.py:19 +#: tests.py:108 templatetags/humanize.py:164 +msgid "today" +msgstr "dzisiaj" + +#: tests.py:108 templatetags/humanize.py:168 +msgid "yesterday" +msgstr "wczoraj" + +#: tests.py:108 templatetags/humanize.py:166 +msgid "tomorrow" +msgstr "jutro" + +#: templatetags/humanize.py:24 msgid "th" msgstr "-y" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "st" msgstr "-szy" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "nd" msgstr "-gi" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "rd" msgstr "-ci" -#: templatetags/humanize.py:54 +#: templatetags/humanize.py:53 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" @@ -39,6 +55,14 @@ msgstr[0] "%(value).1f milion" msgstr[1] "%(value).1f miliony" msgstr[2] "%(value).1f milionów" +#: templatetags/humanize.py:54 +#, python-format +msgid "%(value)s million" +msgid_plural "%(value)s million" +msgstr[0] "%(value)s milion" +msgstr[1] "%(value)s miliony" +msgstr[2] "%(value)s milionów" + #: templatetags/humanize.py:57 #, python-format msgid "%(value).1f billion" @@ -47,7 +71,15 @@ msgstr[0] "%(value).1f miliard" msgstr[1] "%(value).1f miliardy" msgstr[2] "%(value).1f miliardów" -#: templatetags/humanize.py:60 +#: templatetags/humanize.py:58 +#, python-format +msgid "%(value)s billion" +msgid_plural "%(value)s billion" +msgstr[0] "%(value)s miliard" +msgstr[1] "%(value)s miliardy" +msgstr[2] "%(value)s miliardów" + +#: templatetags/humanize.py:61 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" @@ -55,50 +87,238 @@ msgstr[0] "%(value).1f bilion" msgstr[1] "%(value).1f biliony" msgstr[2] "%(value).1f bilionów" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:62 +#, python-format +msgid "%(value)s trillion" +msgid_plural "%(value)s trillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:65 +#, python-format +msgid "%(value).1f quadrillion" +msgid_plural "%(value).1f quadrillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:66 +#, python-format +msgid "%(value)s quadrillion" +msgid_plural "%(value)s quadrillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:69 +#, python-format +msgid "%(value).1f quintillion" +msgid_plural "%(value).1f quintillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:70 +#, python-format +msgid "%(value)s quintillion" +msgid_plural "%(value)s quintillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:73 +#, python-format +msgid "%(value).1f sextillion" +msgid_plural "%(value).1f sextillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:74 +#, python-format +msgid "%(value)s sextillion" +msgid_plural "%(value)s sextillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:77 +#, python-format +msgid "%(value).1f septillion" +msgid_plural "%(value).1f septillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:78 +#, python-format +msgid "%(value)s septillion" +msgid_plural "%(value)s septillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:81 +#, python-format +msgid "%(value).1f octillion" +msgid_plural "%(value).1f octillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:82 +#, python-format +msgid "%(value)s octillion" +msgid_plural "%(value)s octillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:85 +#, python-format +msgid "%(value).1f nonillion" +msgid_plural "%(value).1f nonillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:86 +#, python-format +msgid "%(value)s nonillion" +msgid_plural "%(value)s nonillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:89 +#, python-format +msgid "%(value).1f decillion" +msgid_plural "%(value).1f decillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:90 +#, python-format +msgid "%(value)s decillion" +msgid_plural "%(value)s decillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:93 +#, python-format +msgid "%(value).1f googol" +msgid_plural "%(value).1f googol" +msgstr[0] "%(value).1f googol" +msgstr[1] "%(value).1f googole" +msgstr[2] "%(value).1f googolów" + +#: templatetags/humanize.py:94 +#, python-format +msgid "%(value)s googol" +msgid_plural "%(value)s googol" +msgstr[0] "%(value)s googol" +msgstr[1] "%(value)s googole" +msgstr[2] "%(value)s googolów" + +#: templatetags/humanize.py:143 msgid "one" msgstr "jeden" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "two" msgstr "dwa" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "three" msgstr "trzy" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "four" msgstr "cztery" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "five" msgstr "pięć" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "six" msgstr "sześć" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "seven" msgstr "siedem" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "eight" msgstr "osiem" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "nine" msgstr "dziewięć" -#: templatetags/humanize.py:96 -msgid "today" -msgstr "dzisiaj" +#: templatetags/humanize.py:185 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s ago" +msgstr "%(delta)s temu" -#: templatetags/humanize.py:98 -msgid "tomorrow" -msgstr "jutro" +#: templatetags/humanize.py:188 templatetags/humanize.py:210 +msgid "now" +msgstr "teraz" -#: templatetags/humanize.py:100 -msgid "yesterday" -msgstr "wczoraj" +#: templatetags/humanize.py:191 +#, python-format +msgid "a second ago" +msgid_plural "%(count)s seconds ago" +msgstr[0] "sekundę temu" +msgstr[1] "%(count)s sekundy temu" +msgstr[2] "%(count)s sekund temu" + +#: templatetags/humanize.py:196 +#, python-format +msgid "a minute ago" +msgid_plural "%(count)s minutes ago" +msgstr[0] "minutę temu" +msgstr[1] "%(count)s minuty temu" +msgstr[2] "%(count)s minut temu" + +#: templatetags/humanize.py:201 +#, python-format +msgid "an hour ago" +msgid_plural "%(count)s hours ago" +msgstr[0] "godzinę temu" +msgstr[1] "%(count)s godzin temu" +msgstr[2] "%(count)s godziny temu" + +#: templatetags/humanize.py:207 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s from now" +msgstr "za %(delta)s " + +#: templatetags/humanize.py:213 +#, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "za sekundę" +msgstr[1] "za %(count)s sekundy" +msgstr[2] "za %(count)s sekund" + +#: templatetags/humanize.py:218 +#, python-format +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "za minutę" +msgstr[1] "za %(count)s minuty" +msgstr[2] "za %(count)s minut" + +#: templatetags/humanize.py:223 +#, python-format +msgid "an hour from now" +msgid_plural "%(count)s hours from now" +msgstr[0] "za godzinę" +msgstr[1] "za %(count)s godziny" +msgstr[2] "za %(count)s godzin" diff --git a/django/contrib/humanize/locale/pt/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/pt/LC_MESSAGES/django.mo index 5b43c02be2..60de6e928c 100644 Binary files a/django/contrib/humanize/locale/pt/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/pt/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/pt/LC_MESSAGES/django.po b/django/contrib/humanize/locale/pt/LC_MESSAGES/django.po index 66501dbf45..b0ba086621 100644 --- a/django/contrib/humanize/locale/pt/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/pt/LC_MESSAGES/django.po @@ -1,42 +1,64 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Jannis Leidel , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:18-0400\n" -"PO-Revision-Date: 2011-03-04 18:39+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Portuguese <>\n" +"POT-Creation-Date: 2012-03-14 00:19-0700\n" +"PO-Revision-Date: 2012-02-14 13:08+0000\n" +"Last-Translator: Jannis Leidel \n" +"Language-Team: Portuguese (http://www.transifex.net/projects/p/django/" +"language/pt/)\n" +"Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: pt\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: templatetags/humanize.py:19 +#: tests.py:108 templatetags/humanize.py:164 +msgid "today" +msgstr "hoje" + +#: tests.py:108 templatetags/humanize.py:168 +msgid "yesterday" +msgstr "ontem" + +#: tests.py:108 templatetags/humanize.py:166 +msgid "tomorrow" +msgstr "amanhã" + +#: templatetags/humanize.py:24 msgid "th" msgstr "º" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "st" msgstr "º" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "nd" msgstr "º" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "rd" msgstr "º" -#: templatetags/humanize.py:54 +#: templatetags/humanize.py:53 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" msgstr[0] "%(value).1f milhão" msgstr[1] "%(value).1f milhões" +#: templatetags/humanize.py:54 +#, python-format +msgid "%(value)s million" +msgid_plural "%(value)s million" +msgstr[0] "" +msgstr[1] "" + #: templatetags/humanize.py:57 #, python-format msgid "%(value).1f billion" @@ -44,57 +66,229 @@ msgid_plural "%(value).1f billion" msgstr[0] "%(value).1f bilião" msgstr[1] "%(value).1f biliões" -#: templatetags/humanize.py:60 +#: templatetags/humanize.py:58 +#, python-format +msgid "%(value)s billion" +msgid_plural "%(value)s billion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:61 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" msgstr[0] "%(value).1f trilião" msgstr[1] "%(value).1f triliões" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:62 +#, python-format +msgid "%(value)s trillion" +msgid_plural "%(value)s trillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:65 +#, python-format +msgid "%(value).1f quadrillion" +msgid_plural "%(value).1f quadrillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:66 +#, python-format +msgid "%(value)s quadrillion" +msgid_plural "%(value)s quadrillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:69 +#, python-format +msgid "%(value).1f quintillion" +msgid_plural "%(value).1f quintillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:70 +#, python-format +msgid "%(value)s quintillion" +msgid_plural "%(value)s quintillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:73 +#, python-format +msgid "%(value).1f sextillion" +msgid_plural "%(value).1f sextillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:74 +#, python-format +msgid "%(value)s sextillion" +msgid_plural "%(value)s sextillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:77 +#, python-format +msgid "%(value).1f septillion" +msgid_plural "%(value).1f septillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:78 +#, python-format +msgid "%(value)s septillion" +msgid_plural "%(value)s septillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:81 +#, python-format +msgid "%(value).1f octillion" +msgid_plural "%(value).1f octillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:82 +#, python-format +msgid "%(value)s octillion" +msgid_plural "%(value)s octillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:85 +#, python-format +msgid "%(value).1f nonillion" +msgid_plural "%(value).1f nonillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:86 +#, python-format +msgid "%(value)s nonillion" +msgid_plural "%(value)s nonillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:89 +#, python-format +msgid "%(value).1f decillion" +msgid_plural "%(value).1f decillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:90 +#, python-format +msgid "%(value)s decillion" +msgid_plural "%(value)s decillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:93 +#, python-format +msgid "%(value).1f googol" +msgid_plural "%(value).1f googol" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:94 +#, python-format +msgid "%(value)s googol" +msgid_plural "%(value)s googol" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:143 msgid "one" msgstr "um" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "two" msgstr "dois" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "three" msgstr "três" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "four" msgstr "quatro" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "five" msgstr "cinco" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "six" msgstr "seis" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "seven" msgstr "sete" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "eight" msgstr "oito" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "nine" msgstr "nove" -#: templatetags/humanize.py:96 -msgid "today" -msgstr "hoje" +#: templatetags/humanize.py:185 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s ago" +msgstr "" -#: templatetags/humanize.py:98 -msgid "tomorrow" -msgstr "amanhã" +#: templatetags/humanize.py:188 templatetags/humanize.py:210 +msgid "now" +msgstr "" -#: templatetags/humanize.py:100 -msgid "yesterday" -msgstr "ontem" +#: templatetags/humanize.py:191 +#, python-format +msgid "a second ago" +msgid_plural "%(count)s seconds ago" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:196 +#, python-format +msgid "a minute ago" +msgid_plural "%(count)s minutes ago" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:201 +#, python-format +msgid "an hour ago" +msgid_plural "%(count)s hours ago" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:207 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s from now" +msgstr "" + +#: templatetags/humanize.py:213 +#, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:218 +#, python-format +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:223 +#, python-format +msgid "an hour from now" +msgid_plural "%(count)s hours from now" +msgstr[0] "" +msgstr[1] "" diff --git a/django/contrib/humanize/locale/pt_BR/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/pt_BR/LC_MESSAGES/django.mo index 200081bd5c..fddf65ba0e 100644 Binary files a/django/contrib/humanize/locale/pt_BR/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/pt_BR/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/pt_BR/LC_MESSAGES/django.po b/django/contrib/humanize/locale/pt_BR/LC_MESSAGES/django.po index 1415420461..95ea208813 100644 --- a/django/contrib/humanize/locale/pt_BR/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/pt_BR/LC_MESSAGES/django.po @@ -1,43 +1,65 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Jannis Leidel , 2011. +# Sandro , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:18-0400\n" -"PO-Revision-Date: 2011-03-04 18:39+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Portuguese (Brazilian) \n" +"Language-Team: Portuguese (Brazil) \n" +"Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: pt_BR\n" "Plural-Forms: nplurals=2; plural=(n > 1)\n" -#: templatetags/humanize.py:19 +#: tests.py:108 templatetags/humanize.py:164 +msgid "today" +msgstr "hoje" + +#: tests.py:108 templatetags/humanize.py:168 +msgid "yesterday" +msgstr "ontem" + +#: tests.py:108 templatetags/humanize.py:166 +msgid "tomorrow" +msgstr "amanhã" + +#: templatetags/humanize.py:24 msgid "th" msgstr "º" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "st" msgstr "º" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "nd" msgstr "º" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "rd" msgstr "º" -#: templatetags/humanize.py:54 +#: templatetags/humanize.py:53 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" msgstr[0] "%(value).1f milhão" msgstr[1] "%(value).1f milhões" +#: templatetags/humanize.py:54 +#, python-format +msgid "%(value)s million" +msgid_plural "%(value)s million" +msgstr[0] "%(value)s milhão" +msgstr[1] "%(value)s milhões" + #: templatetags/humanize.py:57 #, python-format msgid "%(value).1f billion" @@ -45,57 +67,229 @@ msgid_plural "%(value).1f billion" msgstr[0] "%(value).1f bilhão" msgstr[1] "%(value).1f bilhões" -#: templatetags/humanize.py:60 +#: templatetags/humanize.py:58 +#, python-format +msgid "%(value)s billion" +msgid_plural "%(value)s billion" +msgstr[0] "%(value)s bilhão" +msgstr[1] "%(value)s bilhões" + +#: templatetags/humanize.py:61 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" msgstr[0] "%(value).1f trilhão" msgstr[1] "%(value).1f trilhões" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:62 +#, python-format +msgid "%(value)s trillion" +msgid_plural "%(value)s trillion" +msgstr[0] "%(value)s trilhão" +msgstr[1] "%(value)s trilhões" + +#: templatetags/humanize.py:65 +#, python-format +msgid "%(value).1f quadrillion" +msgid_plural "%(value).1f quadrillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:66 +#, python-format +msgid "%(value)s quadrillion" +msgid_plural "%(value)s quadrillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:69 +#, python-format +msgid "%(value).1f quintillion" +msgid_plural "%(value).1f quintillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:70 +#, python-format +msgid "%(value)s quintillion" +msgid_plural "%(value)s quintillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:73 +#, python-format +msgid "%(value).1f sextillion" +msgid_plural "%(value).1f sextillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:74 +#, python-format +msgid "%(value)s sextillion" +msgid_plural "%(value)s sextillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:77 +#, python-format +msgid "%(value).1f septillion" +msgid_plural "%(value).1f septillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:78 +#, python-format +msgid "%(value)s septillion" +msgid_plural "%(value)s septillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:81 +#, python-format +msgid "%(value).1f octillion" +msgid_plural "%(value).1f octillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:82 +#, python-format +msgid "%(value)s octillion" +msgid_plural "%(value)s octillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:85 +#, python-format +msgid "%(value).1f nonillion" +msgid_plural "%(value).1f nonillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:86 +#, python-format +msgid "%(value)s nonillion" +msgid_plural "%(value)s nonillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:89 +#, python-format +msgid "%(value).1f decillion" +msgid_plural "%(value).1f decillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:90 +#, python-format +msgid "%(value)s decillion" +msgid_plural "%(value)s decillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:93 +#, python-format +msgid "%(value).1f googol" +msgid_plural "%(value).1f googol" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:94 +#, python-format +msgid "%(value)s googol" +msgid_plural "%(value)s googol" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:143 msgid "one" msgstr "um" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "two" msgstr "dois" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "three" msgstr "três" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "four" msgstr "quatro" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "five" msgstr "cinco" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "six" msgstr "seis" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "seven" msgstr "sete" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "eight" msgstr "oito" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "nine" msgstr "nove" -#: templatetags/humanize.py:96 -msgid "today" -msgstr "hoje" +#: templatetags/humanize.py:185 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s ago" +msgstr "%(delta)s atrás" -#: templatetags/humanize.py:98 -msgid "tomorrow" -msgstr "amanhã" +#: templatetags/humanize.py:188 templatetags/humanize.py:210 +msgid "now" +msgstr "agora" -#: templatetags/humanize.py:100 -msgid "yesterday" -msgstr "ontem" +#: templatetags/humanize.py:191 +#, python-format +msgid "a second ago" +msgid_plural "%(count)s seconds ago" +msgstr[0] "há 1 segundo" +msgstr[1] "há %(count)s segundos" + +#: templatetags/humanize.py:196 +#, python-format +msgid "a minute ago" +msgid_plural "%(count)s minutes ago" +msgstr[0] "há 1 minuto" +msgstr[1] "há %(count)s minutos" + +#: templatetags/humanize.py:201 +#, python-format +msgid "an hour ago" +msgid_plural "%(count)s hours ago" +msgstr[0] "há 1 hora" +msgstr[1] "há %(count)s horas" + +#: templatetags/humanize.py:207 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s from now" +msgstr "%(delta)s a partir de agora" + +#: templatetags/humanize.py:213 +#, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "1 segundo a partir de agora" +msgstr[1] "%(count)s segundos a partir de agora" + +#: templatetags/humanize.py:218 +#, python-format +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "1 minuto a partir de agora" +msgstr[1] "%(count)s minutos a partir de agora" + +#: templatetags/humanize.py:223 +#, python-format +msgid "an hour from now" +msgid_plural "%(count)s hours from now" +msgstr[0] "1 hora a partir de agora" +msgstr[1] "%(count)s horas a partir de agora" diff --git a/django/contrib/humanize/locale/ro/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/ro/LC_MESSAGES/django.mo index 7478fa5766..b379cdad6c 100644 Binary files a/django/contrib/humanize/locale/ro/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/ro/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/ro/LC_MESSAGES/django.po b/django/contrib/humanize/locale/ro/LC_MESSAGES/django.po index f5489d02e9..a4da93f494 100644 --- a/django/contrib/humanize/locale/ro/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/ro/LC_MESSAGES/django.po @@ -1,37 +1,54 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Daniel Ursache-Dogariu , 2011. +# Jannis Leidel , 2011. +# , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:18-0400\n" -"PO-Revision-Date: 2011-03-14 17:12+0000\n" -"Last-Translator: danniel \n" -"Language-Team: Romanian \n" +"POT-Creation-Date: 2012-03-14 00:19-0700\n" +"PO-Revision-Date: 2012-02-14 13:08+0000\n" +"Last-Translator: sorin \n" +"Language-Team: Romanian (http://www.transifex.net/projects/p/django/language/" +"ro/)\n" +"Language: ro\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ro\n" "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?" "2:1))\n" -#: templatetags/humanize.py:19 +#: tests.py:108 templatetags/humanize.py:164 +msgid "today" +msgstr "astăzi" + +#: tests.py:108 templatetags/humanize.py:168 +msgid "yesterday" +msgstr "ieri" + +#: tests.py:108 templatetags/humanize.py:166 +msgid "tomorrow" +msgstr "mâine" + +#: templatetags/humanize.py:24 msgid "th" msgstr "ul" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "st" msgstr "ul" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "nd" msgstr "lea" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "rd" msgstr "lea" -#: templatetags/humanize.py:54 +#: templatetags/humanize.py:53 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" @@ -39,6 +56,14 @@ msgstr[0] "%(value).1f milion" msgstr[1] "%(value).1f milioane" msgstr[2] "%(value).1f de milione" +#: templatetags/humanize.py:54 +#, python-format +msgid "%(value)s million" +msgid_plural "%(value)s million" +msgstr[0] "%(value)s milion" +msgstr[1] "%(value)s milioane" +msgstr[2] "%(value)s de milioane" + #: templatetags/humanize.py:57 #, python-format msgid "%(value).1f billion" @@ -47,7 +72,15 @@ msgstr[0] "%(value).1f miliard" msgstr[1] "%(value).1f miliarde" msgstr[2] "%(value).1f de miliarde" -#: templatetags/humanize.py:60 +#: templatetags/humanize.py:58 +#, python-format +msgid "%(value)s billion" +msgid_plural "%(value)s billion" +msgstr[0] "%(value)s miliard" +msgstr[1] "%(value)s miliarde" +msgstr[2] "%(value)s de miliarde" + +#: templatetags/humanize.py:61 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" @@ -55,50 +88,238 @@ msgstr[0] "%(value).1f trilion" msgstr[1] "%(value).1f trilioane" msgstr[2] "%(value).1f de trilioane" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:62 +#, python-format +msgid "%(value)s trillion" +msgid_plural "%(value)s trillion" +msgstr[0] "%(value)s trilion" +msgstr[1] "%(value)s trilioane" +msgstr[2] "%(value)s de trilioane" + +#: templatetags/humanize.py:65 +#, python-format +msgid "%(value).1f quadrillion" +msgid_plural "%(value).1f quadrillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:66 +#, python-format +msgid "%(value)s quadrillion" +msgid_plural "%(value)s quadrillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:69 +#, python-format +msgid "%(value).1f quintillion" +msgid_plural "%(value).1f quintillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:70 +#, python-format +msgid "%(value)s quintillion" +msgid_plural "%(value)s quintillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:73 +#, python-format +msgid "%(value).1f sextillion" +msgid_plural "%(value).1f sextillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:74 +#, python-format +msgid "%(value)s sextillion" +msgid_plural "%(value)s sextillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:77 +#, python-format +msgid "%(value).1f septillion" +msgid_plural "%(value).1f septillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:78 +#, python-format +msgid "%(value)s septillion" +msgid_plural "%(value)s septillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:81 +#, python-format +msgid "%(value).1f octillion" +msgid_plural "%(value).1f octillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:82 +#, python-format +msgid "%(value)s octillion" +msgid_plural "%(value)s octillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:85 +#, python-format +msgid "%(value).1f nonillion" +msgid_plural "%(value).1f nonillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:86 +#, python-format +msgid "%(value)s nonillion" +msgid_plural "%(value)s nonillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:89 +#, python-format +msgid "%(value).1f decillion" +msgid_plural "%(value).1f decillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:90 +#, python-format +msgid "%(value)s decillion" +msgid_plural "%(value)s decillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:93 +#, python-format +msgid "%(value).1f googol" +msgid_plural "%(value).1f googol" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:94 +#, python-format +msgid "%(value)s googol" +msgid_plural "%(value)s googol" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:143 msgid "one" msgstr "unu" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "two" msgstr "doi" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "three" msgstr "trei" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "four" msgstr "patru" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "five" msgstr "cinci" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "six" msgstr "șase" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "seven" msgstr "șapte" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "eight" msgstr "opt" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "nine" msgstr "nouă" -#: templatetags/humanize.py:96 -msgid "today" -msgstr "astăzi" +#: templatetags/humanize.py:185 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s ago" +msgstr "acum %(delta)s" -#: templatetags/humanize.py:98 -msgid "tomorrow" -msgstr "mâine" +#: templatetags/humanize.py:188 templatetags/humanize.py:210 +msgid "now" +msgstr "acum" -#: templatetags/humanize.py:100 -msgid "yesterday" -msgstr "ieri" +#: templatetags/humanize.py:191 +#, python-format +msgid "a second ago" +msgid_plural "%(count)s seconds ago" +msgstr[0] "acum o secundă" +msgstr[1] "acum %(count)s secunde" +msgstr[2] "" + +#: templatetags/humanize.py:196 +#, python-format +msgid "a minute ago" +msgid_plural "%(count)s minutes ago" +msgstr[0] "acum un minut" +msgstr[1] "acum %(count)s minute " +msgstr[2] "acum %(count)s de minute " + +#: templatetags/humanize.py:201 +#, python-format +msgid "an hour ago" +msgid_plural "%(count)s hours ago" +msgstr[0] "acum o oră" +msgstr[1] "acum %(count)s ore" +msgstr[2] "acum %(count)s de ore" + +#: templatetags/humanize.py:207 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s from now" +msgstr "%(delta)s de acum" + +#: templatetags/humanize.py:213 +#, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "o secundă de acum" +msgstr[1] "%(count)s secunde de acum" +msgstr[2] "%(count)s de secunde de acum" + +#: templatetags/humanize.py:218 +#, python-format +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "un minut de acum" +msgstr[1] "%(count)s minute de acum" +msgstr[2] "%(count)s de ore de acum" + +#: templatetags/humanize.py:223 +#, python-format +msgid "an hour from now" +msgid_plural "%(count)s hours from now" +msgstr[0] "o oră de acum" +msgstr[1] "%(count)s ore de acum" +msgstr[2] "%(count)s de ore de acum" diff --git a/django/contrib/humanize/locale/ru/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/ru/LC_MESSAGES/django.mo index 85b41a84a3..9fcdb887a1 100644 Binary files a/django/contrib/humanize/locale/ru/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/ru/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/ru/LC_MESSAGES/django.po b/django/contrib/humanize/locale/ru/LC_MESSAGES/django.po index 21bdd1eea7..61a31d4ad6 100644 --- a/django/contrib/humanize/locale/ru/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/ru/LC_MESSAGES/django.po @@ -1,44 +1,69 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Dimmus , 2011. +# Eugene MechanisM , 2012. +# Jannis Leidel , 2011. +# Алексей Борискин , 2012. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-20 21:08+0100\n" -"PO-Revision-Date: 2011-03-04 18:39+0000\n" -"Last-Translator: Dimmus \n" -"Language-Team: Russian <>\n" +"POT-Creation-Date: 2012-03-14 00:19-0700\n" +"PO-Revision-Date: 2012-03-07 08:58+0000\n" +"Last-Translator: Алексей Борискин \n" +"Language-Team: Russian (http://www.transifex.net/projects/p/django/language/" +"ru/)\n" +"Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ru\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" -"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" -#: templatetags/humanize.py:19 +#: tests.py:108 templatetags/humanize.py:164 +msgid "today" +msgstr "сегодня" + +#: tests.py:108 templatetags/humanize.py:168 +msgid "yesterday" +msgstr "вчера" + +#: tests.py:108 templatetags/humanize.py:166 +msgid "tomorrow" +msgstr "завтра" + +#: templatetags/humanize.py:24 msgid "th" msgstr "ий" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "st" msgstr "ый" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "nd" msgstr "ой" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "rd" msgstr "ий" -#: templatetags/humanize.py:54 +#: templatetags/humanize.py:53 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" msgstr[0] "%(value).1f миллион" msgstr[1] "%(value).1f миллиона" -msgstr[2] "%(value).1f миллиона" -msgstr[3] "%(value).1f миллиона" +msgstr[2] "%(value).1f миллионов" + +#: templatetags/humanize.py:54 +#, python-format +msgid "%(value)s million" +msgid_plural "%(value)s million" +msgstr[0] "%(value)s миллион" +msgstr[1] "%(value)s миллиона" +msgstr[2] "%(value)s миллионов" #: templatetags/humanize.py:57 #, python-format @@ -46,62 +71,256 @@ msgid "%(value).1f billion" msgid_plural "%(value).1f billion" msgstr[0] "%(value).1f миллиард" msgstr[1] "%(value).1f миллиарда" -msgstr[2] "%(value).1f миллиарда" -msgstr[3] "%(value).1f миллиарда" +msgstr[2] "%(value).1f миллиардов" -#: templatetags/humanize.py:60 +#: templatetags/humanize.py:58 +#, python-format +msgid "%(value)s billion" +msgid_plural "%(value)s billion" +msgstr[0] "%(value)s миллиард" +msgstr[1] "%(value)s миллиарда" +msgstr[2] "%(value)s миллиардов" + +#: templatetags/humanize.py:61 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" msgstr[0] "%(value).1f триллион" msgstr[1] "%(value).1f триллиона" -msgstr[2] "%(value).1f триллиона" -msgstr[3] "%(value).1f триллиона" +msgstr[2] "%(value).1f триллионов" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:62 +#, python-format +msgid "%(value)s trillion" +msgid_plural "%(value)s trillion" +msgstr[0] "%(value)s триллион" +msgstr[1] "%(value)s триллиона" +msgstr[2] "%(value)s триллионов" + +#: templatetags/humanize.py:65 +#, python-format +msgid "%(value).1f quadrillion" +msgid_plural "%(value).1f quadrillion" +msgstr[0] "%(value).1f квадриллион" +msgstr[1] "%(value).1f квадриллиона" +msgstr[2] "%(value).1f квадриллионов" + +#: templatetags/humanize.py:66 +#, python-format +msgid "%(value)s quadrillion" +msgid_plural "%(value)s quadrillion" +msgstr[0] "%(value)s квадриллион" +msgstr[1] "%(value)s квадриллиона" +msgstr[2] "%(value)s квадриллионов" + +#: templatetags/humanize.py:69 +#, python-format +msgid "%(value).1f quintillion" +msgid_plural "%(value).1f quintillion" +msgstr[0] "%(value).1f квинтиллион" +msgstr[1] "%(value).1f квинтиллиона" +msgstr[2] "%(value).1f квинтиллионов" + +#: templatetags/humanize.py:70 +#, python-format +msgid "%(value)s quintillion" +msgid_plural "%(value)s quintillion" +msgstr[0] "%(value)s квинтиллион" +msgstr[1] "%(value)s квинтиллиона" +msgstr[2] "%(value)s квинтиллионов" + +#: templatetags/humanize.py:73 +#, python-format +msgid "%(value).1f sextillion" +msgid_plural "%(value).1f sextillion" +msgstr[0] "%(value).1f секстиллион" +msgstr[1] "%(value).1f секстиллиона" +msgstr[2] "%(value).1f секстиллионов" + +#: templatetags/humanize.py:74 +#, python-format +msgid "%(value)s sextillion" +msgid_plural "%(value)s sextillion" +msgstr[0] "%(value)s секстиллион" +msgstr[1] "%(value)s секстиллиона" +msgstr[2] "%(value)s секстиллионов" + +#: templatetags/humanize.py:77 +#, python-format +msgid "%(value).1f septillion" +msgid_plural "%(value).1f septillion" +msgstr[0] "%(value).1f септиллион" +msgstr[1] "%(value).1f септиллиона" +msgstr[2] "%(value).1f септиллионов" + +#: templatetags/humanize.py:78 +#, python-format +msgid "%(value)s septillion" +msgid_plural "%(value)s septillion" +msgstr[0] "%(value)s септиллион" +msgstr[1] "%(value)s септиллиона" +msgstr[2] "%(value)s септиллионов" + +#: templatetags/humanize.py:81 +#, python-format +msgid "%(value).1f octillion" +msgid_plural "%(value).1f octillion" +msgstr[0] "%(value).1f октиллион" +msgstr[1] "%(value).1f октиллиона" +msgstr[2] "%(value).1f октиллионов" + +#: templatetags/humanize.py:82 +#, python-format +msgid "%(value)s octillion" +msgid_plural "%(value)s octillion" +msgstr[0] "%(value)s октиллион" +msgstr[1] "%(value)s октиллиона" +msgstr[2] "%(value)s октиллионов" + +#: templatetags/humanize.py:85 +#, python-format +msgid "%(value).1f nonillion" +msgid_plural "%(value).1f nonillion" +msgstr[0] "%(value).1f нониллион" +msgstr[1] "%(value).1f нониллиона" +msgstr[2] "%(value).1f нониллионов" + +#: templatetags/humanize.py:86 +#, python-format +msgid "%(value)s nonillion" +msgid_plural "%(value)s nonillion" +msgstr[0] "%(value)s нониллион" +msgstr[1] "%(value)s нониллиона" +msgstr[2] "%(value)s нониллионов" + +#: templatetags/humanize.py:89 +#, python-format +msgid "%(value).1f decillion" +msgid_plural "%(value).1f decillion" +msgstr[0] "%(value).1f дециллион" +msgstr[1] "%(value).1f дециллиона" +msgstr[2] "%(value).1f дециллионов" + +#: templatetags/humanize.py:90 +#, python-format +msgid "%(value)s decillion" +msgid_plural "%(value)s decillion" +msgstr[0] "%(value)s дециллион" +msgstr[1] "%(value)s дециллиона" +msgstr[2] "%(value)s дециллионов" + +#: templatetags/humanize.py:93 +#, python-format +msgid "%(value).1f googol" +msgid_plural "%(value).1f googol" +msgstr[0] "%(value).1f гугол" +msgstr[1] "%(value).1f гугола" +msgstr[2] "%(value).1f гуголов" + +#: templatetags/humanize.py:94 +#, python-format +msgid "%(value)s googol" +msgid_plural "%(value)s googol" +msgstr[0] "%(value)s гугол" +msgstr[1] "%(value)s гугола" +msgstr[2] "%(value)s гуголов" + +#: templatetags/humanize.py:143 msgid "one" msgstr "один" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "two" msgstr "два" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "three" msgstr "три" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "four" msgstr "четыре" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "five" msgstr "пять" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "six" msgstr "шесть" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "seven" msgstr "семь" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "eight" msgstr "восемь" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "nine" msgstr "девять" -#: templatetags/humanize.py:96 -msgid "today" -msgstr "сегодня" +#: templatetags/humanize.py:185 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s ago" +msgstr "%(delta)s назад" -#: templatetags/humanize.py:98 -msgid "tomorrow" -msgstr "завтра" +#: templatetags/humanize.py:188 templatetags/humanize.py:210 +msgid "now" +msgstr "сейчас" -#: templatetags/humanize.py:100 -msgid "yesterday" -msgstr "вчера" +#: templatetags/humanize.py:191 +#, python-format +msgid "a second ago" +msgid_plural "%(count)s seconds ago" +msgstr[0] "%(count)s секунду назад" +msgstr[1] "%(count)s секунды назад" +msgstr[2] "%(count)s секунд назад" + +#: templatetags/humanize.py:196 +#, python-format +msgid "a minute ago" +msgid_plural "%(count)s minutes ago" +msgstr[0] "%(count)s минуту назад" +msgstr[1] "%(count)s минуты назад" +msgstr[2] "%(count)s минут назад" + +#: templatetags/humanize.py:201 +#, python-format +msgid "an hour ago" +msgid_plural "%(count)s hours ago" +msgstr[0] "%(count)s час назад" +msgstr[1] "%(count)s часа назад" +msgstr[2] "%(count)s часов назад" + +#: templatetags/humanize.py:207 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s from now" +msgstr "через %(delta)s" + +#: templatetags/humanize.py:213 +#, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "через %(count)s секунду" +msgstr[1] "через %(count)s секунды" +msgstr[2] "через %(count)s секунд" + +#: templatetags/humanize.py:218 +#, python-format +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "через %(count)s минуту" +msgstr[1] "через %(count)s минуты" +msgstr[2] "через %(count)s минут" + +#: templatetags/humanize.py:223 +#, python-format +msgid "an hour from now" +msgid_plural "%(count)s hours from now" +msgstr[0] "через %(count)s час" +msgstr[1] "через %(count)s часа" +msgstr[2] "через %(count)s часов" diff --git a/django/contrib/humanize/locale/sk/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/sk/LC_MESSAGES/django.mo index 1cbc2b7fa5..0a4d1c04c7 100644 Binary files a/django/contrib/humanize/locale/sk/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/sk/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/sk/LC_MESSAGES/django.po b/django/contrib/humanize/locale/sk/LC_MESSAGES/django.po index 7d82fb67de..451a42d69e 100644 --- a/django/contrib/humanize/locale/sk/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/sk/LC_MESSAGES/django.po @@ -1,36 +1,52 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Jannis Leidel , 2011. +# Marian Andre , 2012. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:18-0400\n" -"PO-Revision-Date: 2011-03-04 18:39+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Slovak \n" +"POT-Creation-Date: 2012-03-14 00:19-0700\n" +"PO-Revision-Date: 2012-02-14 13:08+0000\n" +"Last-Translator: Marian Andre \n" +"Language-Team: Slovak (http://www.transifex.net/projects/p/django/language/" +"sk/)\n" +"Language: sk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: sk\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n" -#: templatetags/humanize.py:19 +#: tests.py:108 templatetags/humanize.py:164 +msgid "today" +msgstr "dnes" + +#: tests.py:108 templatetags/humanize.py:168 +msgid "yesterday" +msgstr "včera" + +#: tests.py:108 templatetags/humanize.py:166 +msgid "tomorrow" +msgstr "zajtra" + +#: templatetags/humanize.py:24 msgid "th" msgstr "th" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "st" msgstr "st" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "nd" msgstr "nd" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "rd" msgstr "rd" -#: templatetags/humanize.py:54 +#: templatetags/humanize.py:53 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" @@ -38,6 +54,14 @@ msgstr[0] "%(value).1f milión" msgstr[1] "%(value).1f milióny" msgstr[2] "%(value).1f miliónov" +#: templatetags/humanize.py:54 +#, python-format +msgid "%(value)s million" +msgid_plural "%(value)s million" +msgstr[0] " %(value)s milión" +msgstr[1] " %(value)s milióny" +msgstr[2] " %(value)s miliónov" + #: templatetags/humanize.py:57 #, python-format msgid "%(value).1f billion" @@ -46,7 +70,15 @@ msgstr[0] "%(value).1f miliárda" msgstr[1] "%(value).1f miliardy" msgstr[2] "%(value).1f miliárd" -#: templatetags/humanize.py:60 +#: templatetags/humanize.py:58 +#, python-format +msgid "%(value)s billion" +msgid_plural "%(value)s billion" +msgstr[0] " %(value)s miliarda" +msgstr[1] " %(value)s miliardy" +msgstr[2] " %(value)s miliárd" + +#: templatetags/humanize.py:61 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" @@ -54,50 +86,238 @@ msgstr[0] "%(value).1f bilión" msgstr[1] "%(value).1f bilióny" msgstr[2] "%(value).1f biliónov" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:62 +#, python-format +msgid "%(value)s trillion" +msgid_plural "%(value)s trillion" +msgstr[0] "%(value)s bilión" +msgstr[1] "%(value)s bilióny" +msgstr[2] "%(value)s biliónov" + +#: templatetags/humanize.py:65 +#, python-format +msgid "%(value).1f quadrillion" +msgid_plural "%(value).1f quadrillion" +msgstr[0] "%(value).1f biliardy" +msgstr[1] "%(value).1f biliardy" +msgstr[2] "%(value).1f biliárd" + +#: templatetags/humanize.py:66 +#, python-format +msgid "%(value)s quadrillion" +msgid_plural "%(value)s quadrillion" +msgstr[0] "%(value)s biliarda" +msgstr[1] "%(value)s biliardy" +msgstr[2] "%(value)s biliárd" + +#: templatetags/humanize.py:69 +#, python-format +msgid "%(value).1f quintillion" +msgid_plural "%(value).1f quintillion" +msgstr[0] "%(value).1f triliónu" +msgstr[1] "%(value).1f triliónu" +msgstr[2] "%(value).1f triliónu" + +#: templatetags/humanize.py:70 +#, python-format +msgid "%(value)s quintillion" +msgid_plural "%(value)s quintillion" +msgstr[0] "%(value)s trilión" +msgstr[1] "%(value)s trilióny" +msgstr[2] "%(value)s triliónov" + +#: templatetags/humanize.py:73 +#, python-format +msgid "%(value).1f sextillion" +msgid_plural "%(value).1f sextillion" +msgstr[0] "%(value).1f triliardy" +msgstr[1] "%(value).1f triliardy" +msgstr[2] "%(value).1f triliárd" + +#: templatetags/humanize.py:74 +#, python-format +msgid "%(value)s sextillion" +msgid_plural "%(value)s sextillion" +msgstr[0] "%(value)s triliarda" +msgstr[1] "%(value)s triliardy" +msgstr[2] "%(value)s triliárd" + +#: templatetags/humanize.py:77 +#, python-format +msgid "%(value).1f septillion" +msgid_plural "%(value).1f septillion" +msgstr[0] "%(value).1f kvadriliónu" +msgstr[1] "%(value).1f kvadriliónu" +msgstr[2] "%(value).1f kvadriliónov" + +#: templatetags/humanize.py:78 +#, python-format +msgid "%(value)s septillion" +msgid_plural "%(value)s septillion" +msgstr[0] "%(value)s kvadrilión" +msgstr[1] "%(value)s kvadrilióny" +msgstr[2] "%(value)s kvadriliónov" + +#: templatetags/humanize.py:81 +#, python-format +msgid "%(value).1f octillion" +msgid_plural "%(value).1f octillion" +msgstr[0] "%(value).1f kvadriliardy" +msgstr[1] "%(value).1f kvadriliardy" +msgstr[2] "%(value).1f kvadriliárd" + +#: templatetags/humanize.py:82 +#, python-format +msgid "%(value)s octillion" +msgid_plural "%(value)s octillion" +msgstr[0] "%(value)s kvadriliarda" +msgstr[1] "%(value)s kvadriliardy" +msgstr[2] "%(value)s kvadriliárd" + +#: templatetags/humanize.py:85 +#, python-format +msgid "%(value).1f nonillion" +msgid_plural "%(value).1f nonillion" +msgstr[0] "%(value).1f kvintiliónu" +msgstr[1] "%(value).1f kvintiliónu" +msgstr[2] "%(value).1f kvintiliónov" + +#: templatetags/humanize.py:86 +#, python-format +msgid "%(value)s nonillion" +msgid_plural "%(value)s nonillion" +msgstr[0] "%(value)s kvintilión" +msgstr[1] "%(value)s kvintilióny" +msgstr[2] "%(value)s kvintiliónov" + +#: templatetags/humanize.py:89 +#, python-format +msgid "%(value).1f decillion" +msgid_plural "%(value).1f decillion" +msgstr[0] "%(value).1f kvintiliardy" +msgstr[1] "%(value).1f kvintiliardy" +msgstr[2] "%(value).1f kvintiliárd" + +#: templatetags/humanize.py:90 +#, python-format +msgid "%(value)s decillion" +msgid_plural "%(value)s decillion" +msgstr[0] "%(value)s kvintiliarda" +msgstr[1] "%(value)s kvintiliardy" +msgstr[2] "%(value)s kvintiliárd" + +#: templatetags/humanize.py:93 +#, python-format +msgid "%(value).1f googol" +msgid_plural "%(value).1f googol" +msgstr[0] "%(value).1f googol" +msgstr[1] "%(value).1f googol" +msgstr[2] "%(value).1f googol" + +#: templatetags/humanize.py:94 +#, python-format +msgid "%(value)s googol" +msgid_plural "%(value)s googol" +msgstr[0] "%(value)s googol" +msgstr[1] "%(value)s googol" +msgstr[2] "%(value)s googol" + +#: templatetags/humanize.py:143 msgid "one" msgstr "jeden" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "two" msgstr "dva" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "three" msgstr "tri" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "four" msgstr "štyri" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "five" msgstr "päť" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "six" msgstr "šesť" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "seven" msgstr "sedem" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "eight" msgstr "osem" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "nine" msgstr "deväť" -#: templatetags/humanize.py:96 -msgid "today" -msgstr "dnes" +#: templatetags/humanize.py:185 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s ago" +msgstr "pred %(delta)s" -#: templatetags/humanize.py:98 -msgid "tomorrow" -msgstr "zajtra" +#: templatetags/humanize.py:188 templatetags/humanize.py:210 +msgid "now" +msgstr "teraz" -#: templatetags/humanize.py:100 -msgid "yesterday" -msgstr "včera" +#: templatetags/humanize.py:191 +#, python-format +msgid "a second ago" +msgid_plural "%(count)s seconds ago" +msgstr[0] "pred sekundou" +msgstr[1] "pred %(count)s sekundami" +msgstr[2] "pred %(count)s sekundami" + +#: templatetags/humanize.py:196 +#, python-format +msgid "a minute ago" +msgid_plural "%(count)s minutes ago" +msgstr[0] "pred minútou" +msgstr[1] "pred %(count)s minútami" +msgstr[2] "pred %(count)s minútami" + +#: templatetags/humanize.py:201 +#, python-format +msgid "an hour ago" +msgid_plural "%(count)s hours ago" +msgstr[0] "pred hodinou" +msgstr[1] "pred %(count)s hodinami" +msgstr[2] "pred %(count)s hodinami" + +#: templatetags/humanize.py:207 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s from now" +msgstr "%(delta)s odteraz" + +#: templatetags/humanize.py:213 +#, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "sekundu odteraz" +msgstr[1] "%(count)s sekundy odteraz" +msgstr[2] "%(count)s sekúnd odteraz" + +#: templatetags/humanize.py:218 +#, python-format +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "minútu odteraz" +msgstr[1] "%(count)s minúty odteraz" +msgstr[2] "%(count)s minút odteraz" + +#: templatetags/humanize.py:223 +#, python-format +msgid "an hour from now" +msgid_plural "%(count)s hours from now" +msgstr[0] "hodinu odteraz" +msgstr[1] "%(count)s hodiny odteraz" +msgstr[2] "%(count)s hodín odteraz" diff --git a/django/contrib/humanize/locale/sl/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/sl/LC_MESSAGES/django.mo index dc17ceddfe..1cb838cda4 100644 Binary files a/django/contrib/humanize/locale/sl/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/sl/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/sl/LC_MESSAGES/django.po b/django/contrib/humanize/locale/sl/LC_MESSAGES/django.po index cf6e79e10b..7a75cf60fd 100644 --- a/django/contrib/humanize/locale/sl/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/sl/LC_MESSAGES/django.po @@ -1,37 +1,55 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Jannis Leidel , 2011. +# Jure Cuhalev , 2011. +# , 2011. +# zejn , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:18-0400\n" -"PO-Revision-Date: 2011-03-04 18:39+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Slovenian \n" +"POT-Creation-Date: 2012-03-14 00:19-0700\n" +"PO-Revision-Date: 2012-02-14 13:08+0000\n" +"Last-Translator: zejn \n" +"Language-Team: Slovenian (http://www.transifex.net/projects/p/django/" +"language/sl/)\n" +"Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: sl\n" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" "%100==4 ? 2 : 3)\n" -#: templatetags/humanize.py:19 +#: tests.py:108 templatetags/humanize.py:164 +msgid "today" +msgstr "danes" + +#: tests.py:108 templatetags/humanize.py:168 +msgid "yesterday" +msgstr "včeraj" + +#: tests.py:108 templatetags/humanize.py:166 +msgid "tomorrow" +msgstr "jutri" + +#: templatetags/humanize.py:24 msgid "th" msgstr "th" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "st" msgstr "st" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "nd" msgstr "nd" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "rd" msgstr "rd" -#: templatetags/humanize.py:54 +#: templatetags/humanize.py:53 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" @@ -40,6 +58,15 @@ msgstr[1] "%(value).1f milijona" msgstr[2] "%(value).1f milijoni" msgstr[3] "%(value).1f milijonov" +#: templatetags/humanize.py:54 +#, python-format +msgid "%(value)s million" +msgid_plural "%(value)s million" +msgstr[0] "%(value)s milijon" +msgstr[1] "%(value)s milijona" +msgstr[2] "%(value)s milijoni" +msgstr[3] "%(value)s milijonov" + #: templatetags/humanize.py:57 #, python-format msgid "%(value).1f billion" @@ -49,7 +76,16 @@ msgstr[1] "%(value).1f miljardi" msgstr[2] "%(value).1f miljarde" msgstr[3] "%(value).1f miljard" -#: templatetags/humanize.py:60 +#: templatetags/humanize.py:58 +#, python-format +msgid "%(value)s billion" +msgid_plural "%(value)s billion" +msgstr[0] "%(value)s miljarda" +msgstr[1] "%(value)s miljardi" +msgstr[2] "%(value)s miljarde" +msgstr[3] "%(value)s miljard" + +#: templatetags/humanize.py:61 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" @@ -58,50 +94,261 @@ msgstr[1] "%(value).1f triljona" msgstr[2] "%(value).1f triljoni" msgstr[3] "%(value).1f triljonov" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:62 +#, python-format +msgid "%(value)s trillion" +msgid_plural "%(value)s trillion" +msgstr[0] "%(value)s triljon" +msgstr[1] "%(value)s triljona" +msgstr[2] "%(value)s triljoni" +msgstr[3] "%(value)s triljonov" + +#: templatetags/humanize.py:65 +#, python-format +msgid "%(value).1f quadrillion" +msgid_plural "%(value).1f quadrillion" +msgstr[0] "%(value).1f kvadrilijon" +msgstr[1] "%(value).1f kvadrilijona" +msgstr[2] "%(value).1f kvadrilijoni" +msgstr[3] "%(value).1f kvadrilijonov" + +#: templatetags/humanize.py:66 +#, python-format +msgid "%(value)s quadrillion" +msgid_plural "%(value)s quadrillion" +msgstr[0] "%(value)s kvadrilijon" +msgstr[1] "%(value)s kvadrilijona" +msgstr[2] "%(value)s kvadrilijoni" +msgstr[3] "%(value)s kvadrilijonov" + +#: templatetags/humanize.py:69 +#, python-format +msgid "%(value).1f quintillion" +msgid_plural "%(value).1f quintillion" +msgstr[0] "%(value).1f kvintilijon" +msgstr[1] "%(value).1f kvintilijona" +msgstr[2] "%(value).1f kvintilijoni" +msgstr[3] "%(value).1f kvintilijonov" + +#: templatetags/humanize.py:70 +#, python-format +msgid "%(value)s quintillion" +msgid_plural "%(value)s quintillion" +msgstr[0] "%(value)s kvintilijon" +msgstr[1] "%(value)s kvintilijona" +msgstr[2] "%(value)s kvintilijoni" +msgstr[3] "%(value)s kvintilijonov" + +#: templatetags/humanize.py:73 +#, python-format +msgid "%(value).1f sextillion" +msgid_plural "%(value).1f sextillion" +msgstr[0] "%(value).1f sekstilijon" +msgstr[1] "%(value).1f sekstilijona" +msgstr[2] "%(value).1f sekstilijoni" +msgstr[3] "%(value).1f sekstilijonov" + +#: templatetags/humanize.py:74 +#, python-format +msgid "%(value)s sextillion" +msgid_plural "%(value)s sextillion" +msgstr[0] "%(value)s sekstilijon" +msgstr[1] "%(value)s sekstilijona" +msgstr[2] "%(value)s sekstilijoni" +msgstr[3] "%(value)s sekstilijonov" + +#: templatetags/humanize.py:77 +#, python-format +msgid "%(value).1f septillion" +msgid_plural "%(value).1f septillion" +msgstr[0] "%(value).1f septilijon" +msgstr[1] "%(value).1f septilijona" +msgstr[2] "%(value).1f septilijoni" +msgstr[3] "%(value).1f septilijonov" + +#: templatetags/humanize.py:78 +#, python-format +msgid "%(value)s septillion" +msgid_plural "%(value)s septillion" +msgstr[0] "%(value)s septilijon" +msgstr[1] "%(value)s septilijona" +msgstr[2] "%(value)s septilijon" +msgstr[3] "%(value)s septilijonov" + +#: templatetags/humanize.py:81 +#, python-format +msgid "%(value).1f octillion" +msgid_plural "%(value).1f octillion" +msgstr[0] "%(value).1f oktilijon" +msgstr[1] "%(value).1f oktilijona" +msgstr[2] "%(value).1f oktilijoni" +msgstr[3] "%(value).1f oktilijonov" + +#: templatetags/humanize.py:82 +#, python-format +msgid "%(value)s octillion" +msgid_plural "%(value)s octillion" +msgstr[0] "%(value)s oktilijon" +msgstr[1] "%(value)s oktilijona" +msgstr[2] "%(value)s oktilijoni" +msgstr[3] "%(value)s oktilijonov" + +#: templatetags/humanize.py:85 +#, python-format +msgid "%(value).1f nonillion" +msgid_plural "%(value).1f nonillion" +msgstr[0] "%(value).1f nonilijon" +msgstr[1] "%(value).1f nonilijona" +msgstr[2] "%(value).1f nonilijoni" +msgstr[3] "%(value).1f nonilijonov" + +#: templatetags/humanize.py:86 +#, python-format +msgid "%(value)s nonillion" +msgid_plural "%(value)s nonillion" +msgstr[0] "%(value)s nonilijon" +msgstr[1] "%(value)s nonilijona" +msgstr[2] "%(value)s nonilijon" +msgstr[3] "%(value)s nonilijonov" + +#: templatetags/humanize.py:89 +#, python-format +msgid "%(value).1f decillion" +msgid_plural "%(value).1f decillion" +msgstr[0] "%(value).1f decilijon" +msgstr[1] "%(value).1f decilijona" +msgstr[2] "%(value).1f decilijoni" +msgstr[3] "%(value).1f decilijonov" + +#: templatetags/humanize.py:90 +#, python-format +msgid "%(value)s decillion" +msgid_plural "%(value)s decillion" +msgstr[0] "%(value)s decilijon" +msgstr[1] "%(value)s decilijona" +msgstr[2] "%(value)s decilijoni" +msgstr[3] "%(value)s decilijonov" + +#: templatetags/humanize.py:93 +#, python-format +msgid "%(value).1f googol" +msgid_plural "%(value).1f googol" +msgstr[0] "%(value).1f googol" +msgstr[1] "%(value).1f googola" +msgstr[2] "%(value).1f googoli" +msgstr[3] "%(value).1f googolov" + +#: templatetags/humanize.py:94 +#, python-format +msgid "%(value)s googol" +msgid_plural "%(value)s googol" +msgstr[0] "%(value)s googol" +msgstr[1] "%(value)s googola" +msgstr[2] "%(value)s googoli" +msgstr[3] "%(value)s googolov" + +#: templatetags/humanize.py:143 msgid "one" msgstr "ena" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "two" msgstr "dva" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "three" msgstr "tri" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "four" msgstr "štiri" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "five" msgstr "pet" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "six" msgstr "šest" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "seven" msgstr "sedem" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "eight" msgstr "osem" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "nine" msgstr "devet" -#: templatetags/humanize.py:96 -msgid "today" -msgstr "danes" +#: templatetags/humanize.py:185 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s ago" +msgstr "Pred %(delta)s" -#: templatetags/humanize.py:98 -msgid "tomorrow" -msgstr "jutri" +#: templatetags/humanize.py:188 templatetags/humanize.py:210 +msgid "now" +msgstr "zdaj" -#: templatetags/humanize.py:100 -msgid "yesterday" -msgstr "včeraj" +#: templatetags/humanize.py:191 +#, python-format +msgid "a second ago" +msgid_plural "%(count)s seconds ago" +msgstr[0] "pred sekundo" +msgstr[1] "" +msgstr[2] "pred %(count)s sekundami" +msgstr[3] "pred %(count)s sekundami" + +#: templatetags/humanize.py:196 +#, python-format +msgid "a minute ago" +msgid_plural "%(count)s minutes ago" +msgstr[0] "pred minuto" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "pred minuto" + +#: templatetags/humanize.py:201 +#, python-format +msgid "an hour ago" +msgid_plural "%(count)s hours ago" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "pred eno uro" + +#: templatetags/humanize.py:207 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s from now" +msgstr "čez %(delta)s" + +#: templatetags/humanize.py:213 +#, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "čez sekundo" +msgstr[1] "" +msgstr[2] "čez %(count)s sekunde" +msgstr[3] "čez %(count)s sekund" + +#: templatetags/humanize.py:218 +#, python-format +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "čez minuto" +msgstr[1] "" +msgstr[2] "čez %(count)s minute" +msgstr[3] "čez %(count)s minut" + +#: templatetags/humanize.py:223 +#, python-format +msgid "an hour from now" +msgid_plural "%(count)s hours from now" +msgstr[0] "čez eno uro" +msgstr[1] "" +msgstr[2] "čez %(count)s ure" +msgstr[3] "čez %(count)s ur" diff --git a/django/contrib/humanize/locale/sq/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/sq/LC_MESSAGES/django.mo index 42a74f7e1d..cf96fc6a8c 100644 Binary files a/django/contrib/humanize/locale/sq/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/sq/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/sq/LC_MESSAGES/django.po b/django/contrib/humanize/locale/sq/LC_MESSAGES/django.po index c2784ad01f..bc5c7f2d0e 100644 --- a/django/contrib/humanize/locale/sq/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/sq/LC_MESSAGES/django.po @@ -1,42 +1,64 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Besnik , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:18-0400\n" -"PO-Revision-Date: 2011-03-04 18:39+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Albanian \n" +"POT-Creation-Date: 2012-03-14 00:19-0700\n" +"PO-Revision-Date: 2012-02-14 13:08+0000\n" +"Last-Translator: Jannis Leidel \n" +"Language-Team: Albanian (http://www.transifex.net/projects/p/django/language/" +"sq/)\n" +"Language: sq\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: sq\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: templatetags/humanize.py:19 +#: tests.py:108 templatetags/humanize.py:164 +msgid "today" +msgstr "sot" + +#: tests.py:108 templatetags/humanize.py:168 +msgid "yesterday" +msgstr "dje" + +#: tests.py:108 templatetags/humanize.py:166 +msgid "tomorrow" +msgstr "nesër" + +#: templatetags/humanize.py:24 msgid "th" msgstr "" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "st" msgstr "" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "nd" msgstr "" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "rd" msgstr "" -#: templatetags/humanize.py:54 +#: templatetags/humanize.py:53 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" msgstr[0] "%(value).1f milion" msgstr[1] "%(value).1f milionë" +#: templatetags/humanize.py:54 +#, python-format +msgid "%(value)s million" +msgid_plural "%(value)s million" +msgstr[0] "" +msgstr[1] "" + #: templatetags/humanize.py:57 #, python-format msgid "%(value).1f billion" @@ -44,57 +66,229 @@ msgid_plural "%(value).1f billion" msgstr[0] "%(value).1f miliard" msgstr[1] "%(value).1f miliardë" -#: templatetags/humanize.py:60 +#: templatetags/humanize.py:58 +#, python-format +msgid "%(value)s billion" +msgid_plural "%(value)s billion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:61 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" msgstr[0] "%(value).1f trilion" msgstr[1] "%(value).1f trilionë" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:62 +#, python-format +msgid "%(value)s trillion" +msgid_plural "%(value)s trillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:65 +#, python-format +msgid "%(value).1f quadrillion" +msgid_plural "%(value).1f quadrillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:66 +#, python-format +msgid "%(value)s quadrillion" +msgid_plural "%(value)s quadrillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:69 +#, python-format +msgid "%(value).1f quintillion" +msgid_plural "%(value).1f quintillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:70 +#, python-format +msgid "%(value)s quintillion" +msgid_plural "%(value)s quintillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:73 +#, python-format +msgid "%(value).1f sextillion" +msgid_plural "%(value).1f sextillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:74 +#, python-format +msgid "%(value)s sextillion" +msgid_plural "%(value)s sextillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:77 +#, python-format +msgid "%(value).1f septillion" +msgid_plural "%(value).1f septillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:78 +#, python-format +msgid "%(value)s septillion" +msgid_plural "%(value)s septillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:81 +#, python-format +msgid "%(value).1f octillion" +msgid_plural "%(value).1f octillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:82 +#, python-format +msgid "%(value)s octillion" +msgid_plural "%(value)s octillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:85 +#, python-format +msgid "%(value).1f nonillion" +msgid_plural "%(value).1f nonillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:86 +#, python-format +msgid "%(value)s nonillion" +msgid_plural "%(value)s nonillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:89 +#, python-format +msgid "%(value).1f decillion" +msgid_plural "%(value).1f decillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:90 +#, python-format +msgid "%(value)s decillion" +msgid_plural "%(value)s decillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:93 +#, python-format +msgid "%(value).1f googol" +msgid_plural "%(value).1f googol" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:94 +#, python-format +msgid "%(value)s googol" +msgid_plural "%(value)s googol" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:143 msgid "one" msgstr "një" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "two" msgstr "dy" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "three" msgstr "tre" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "four" msgstr "katër" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "five" msgstr "pesë" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "six" msgstr "gjashtë" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "seven" msgstr "shtatë" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "eight" msgstr "tetë" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "nine" msgstr "nëntë" -#: templatetags/humanize.py:96 -msgid "today" -msgstr "sot" +#: templatetags/humanize.py:185 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s ago" +msgstr "" -#: templatetags/humanize.py:98 -msgid "tomorrow" -msgstr "nesër" +#: templatetags/humanize.py:188 templatetags/humanize.py:210 +msgid "now" +msgstr "" -#: templatetags/humanize.py:100 -msgid "yesterday" -msgstr "dje" +#: templatetags/humanize.py:191 +#, python-format +msgid "a second ago" +msgid_plural "%(count)s seconds ago" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:196 +#, python-format +msgid "a minute ago" +msgid_plural "%(count)s minutes ago" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:201 +#, python-format +msgid "an hour ago" +msgid_plural "%(count)s hours ago" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:207 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s from now" +msgstr "" + +#: templatetags/humanize.py:213 +#, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:218 +#, python-format +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:223 +#, python-format +msgid "an hour from now" +msgid_plural "%(count)s hours from now" +msgstr[0] "" +msgstr[1] "" diff --git a/django/contrib/humanize/locale/sr/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/sr/LC_MESSAGES/django.mo index aef8a7547f..e6e8aa9f8c 100644 Binary files a/django/contrib/humanize/locale/sr/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/sr/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/sr/LC_MESSAGES/django.po b/django/contrib/humanize/locale/sr/LC_MESSAGES/django.po index 3c09c91609..a2697e8c19 100644 --- a/django/contrib/humanize/locale/sr/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/sr/LC_MESSAGES/django.po @@ -1,37 +1,53 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Jannis Leidel , 2011. +# Janos Guljas , 2011, 2012. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:18-0400\n" -"PO-Revision-Date: 2011-03-04 18:39+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Serbian \n" +"POT-Creation-Date: 2012-03-14 00:19-0700\n" +"PO-Revision-Date: 2012-02-20 15:05+0000\n" +"Last-Translator: Janos Guljas \n" +"Language-Team: Serbian (http://www.transifex.net/projects/p/django/language/" +"sr/)\n" +"Language: sr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: sr\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" -"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" -#: templatetags/humanize.py:19 +#: tests.py:108 templatetags/humanize.py:164 +msgid "today" +msgstr "десет" + +#: tests.py:108 templatetags/humanize.py:168 +msgid "yesterday" +msgstr "јуче" + +#: tests.py:108 templatetags/humanize.py:166 +msgid "tomorrow" +msgstr "сутра" + +#: templatetags/humanize.py:24 msgid "th" msgstr "-и" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "st" msgstr "-ви" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "nd" msgstr "-и" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "rd" msgstr "-и" -#: templatetags/humanize.py:54 +#: templatetags/humanize.py:53 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" @@ -39,6 +55,14 @@ msgstr[0] "%(value).1f милион" msgstr[1] "%(value).1f милиона" msgstr[2] "%(value).1f милиона" +#: templatetags/humanize.py:54 +#, python-format +msgid "%(value)s million" +msgid_plural "%(value)s million" +msgstr[0] "%(value)s милион" +msgstr[1] "%(value)s милиона" +msgstr[2] "%(value)s милиона" + #: templatetags/humanize.py:57 #, python-format msgid "%(value).1f billion" @@ -47,7 +71,15 @@ msgstr[0] "%(value).1f билион" msgstr[1] "%(value).1f билиона" msgstr[2] "%(value).1f билиона" -#: templatetags/humanize.py:60 +#: templatetags/humanize.py:58 +#, python-format +msgid "%(value)s billion" +msgid_plural "%(value)s billion" +msgstr[0] "%(value)s билион" +msgstr[1] "%(value)s билиона" +msgstr[2] "%(value)s билиона" + +#: templatetags/humanize.py:61 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" @@ -55,50 +87,238 @@ msgstr[0] "%(value).1f трилион" msgstr[1] "%(value).1f трилиона" msgstr[2] "%(value).1f трилиона" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:62 +#, python-format +msgid "%(value)s trillion" +msgid_plural "%(value)s trillion" +msgstr[0] "%(value)s трилион" +msgstr[1] "%(value)s трилиона" +msgstr[2] "%(value)s трилиона" + +#: templatetags/humanize.py:65 +#, python-format +msgid "%(value).1f quadrillion" +msgid_plural "%(value).1f quadrillion" +msgstr[0] "%(value).1f квадрилион" +msgstr[1] "%(value).1f квадрилиона" +msgstr[2] "%(value).1f квадрилиона" + +#: templatetags/humanize.py:66 +#, python-format +msgid "%(value)s quadrillion" +msgid_plural "%(value)s quadrillion" +msgstr[0] "%(value)s квадрилион" +msgstr[1] "%(value)s квадрилиона" +msgstr[2] "%(value)s квадрилиона" + +#: templatetags/humanize.py:69 +#, python-format +msgid "%(value).1f quintillion" +msgid_plural "%(value).1f quintillion" +msgstr[0] "%(value).1f квинтилион" +msgstr[1] "%(value).1f квинтилиона" +msgstr[2] "%(value).1f квинтилиона" + +#: templatetags/humanize.py:70 +#, python-format +msgid "%(value)s quintillion" +msgid_plural "%(value)s quintillion" +msgstr[0] "%(value)s квинтилион" +msgstr[1] "%(value)s квинтилиона" +msgstr[2] "%(value)s квинтилиона" + +#: templatetags/humanize.py:73 +#, python-format +msgid "%(value).1f sextillion" +msgid_plural "%(value).1f sextillion" +msgstr[0] "%(value).1f секстилион" +msgstr[1] "%(value).1f секстилиона" +msgstr[2] "%(value).1f секстилиона" + +#: templatetags/humanize.py:74 +#, python-format +msgid "%(value)s sextillion" +msgid_plural "%(value)s sextillion" +msgstr[0] "%(value)s секстилион" +msgstr[1] "%(value)s секстилиона" +msgstr[2] "%(value)s секстилиона" + +#: templatetags/humanize.py:77 +#, python-format +msgid "%(value).1f septillion" +msgid_plural "%(value).1f septillion" +msgstr[0] "%(value).1f септилион" +msgstr[1] "%(value).1f септилиона" +msgstr[2] "%(value).1f септилиона" + +#: templatetags/humanize.py:78 +#, python-format +msgid "%(value)s septillion" +msgid_plural "%(value)s septillion" +msgstr[0] "%(value)s септилион" +msgstr[1] "%(value)s септилиона" +msgstr[2] "%(value)s септилиона" + +#: templatetags/humanize.py:81 +#, python-format +msgid "%(value).1f octillion" +msgid_plural "%(value).1f octillion" +msgstr[0] "%(value).1f окталион" +msgstr[1] "%(value).1f окталиона" +msgstr[2] "%(value).1f окталиона" + +#: templatetags/humanize.py:82 +#, python-format +msgid "%(value)s octillion" +msgid_plural "%(value)s octillion" +msgstr[0] "%(value)s окталион" +msgstr[1] "%(value)s окталиона" +msgstr[2] "%(value)s окталиона" + +#: templatetags/humanize.py:85 +#, python-format +msgid "%(value).1f nonillion" +msgid_plural "%(value).1f nonillion" +msgstr[0] "%(value).1f нонилион" +msgstr[1] "%(value).1f нонилиона" +msgstr[2] "%(value).1f нонилиона" + +#: templatetags/humanize.py:86 +#, python-format +msgid "%(value)s nonillion" +msgid_plural "%(value)s nonillion" +msgstr[0] "%(value)s нонилион" +msgstr[1] "%(value)s нонилиона" +msgstr[2] "%(value)s нонилиона" + +#: templatetags/humanize.py:89 +#, python-format +msgid "%(value).1f decillion" +msgid_plural "%(value).1f decillion" +msgstr[0] "%(value).1f дектилион" +msgstr[1] "%(value).1f дектилиона" +msgstr[2] "%(value).1f дектилиона" + +#: templatetags/humanize.py:90 +#, python-format +msgid "%(value)s decillion" +msgid_plural "%(value)s decillion" +msgstr[0] "%(value)s дектилион" +msgstr[1] "%(value)s дектилиона" +msgstr[2] "%(value)s дектилиона" + +#: templatetags/humanize.py:93 +#, python-format +msgid "%(value).1f googol" +msgid_plural "%(value).1f googol" +msgstr[0] "%(value).1f гугол" +msgstr[1] "%(value).1f гугола" +msgstr[2] "%(value).1f гугола" + +#: templatetags/humanize.py:94 +#, python-format +msgid "%(value)s googol" +msgid_plural "%(value)s googol" +msgstr[0] "%(value)s гугол" +msgstr[1] "%(value)s гугола" +msgstr[2] "%(value)s гугола" + +#: templatetags/humanize.py:143 msgid "one" msgstr "један" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "two" msgstr "два" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "three" msgstr "три" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "four" msgstr "четири" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "five" msgstr "пет" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "six" msgstr "шест" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "seven" msgstr "седам" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "eight" msgstr "осам" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "nine" msgstr "девет" -#: templatetags/humanize.py:96 -msgid "today" -msgstr "десет" +#: templatetags/humanize.py:185 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s ago" +msgstr "пре %(delta)s" -#: templatetags/humanize.py:98 -msgid "tomorrow" -msgstr "сутра" +#: templatetags/humanize.py:188 templatetags/humanize.py:210 +msgid "now" +msgstr "сада" -#: templatetags/humanize.py:100 -msgid "yesterday" -msgstr "јуче" +#: templatetags/humanize.py:191 +#, python-format +msgid "a second ago" +msgid_plural "%(count)s seconds ago" +msgstr[0] "пре једне секунде" +msgstr[1] "пре %(count)s секунде" +msgstr[2] "пре %(count)s секунди" + +#: templatetags/humanize.py:196 +#, python-format +msgid "a minute ago" +msgid_plural "%(count)s minutes ago" +msgstr[0] "пре једног минута" +msgstr[1] "пре %(count)s минута" +msgstr[2] "пре %(count)s минута" + +#: templatetags/humanize.py:201 +#, python-format +msgid "an hour ago" +msgid_plural "%(count)s hours ago" +msgstr[0] "пре једног сата" +msgstr[1] "пре %(count)s сата" +msgstr[2] "пре %(count)s сати" + +#: templatetags/humanize.py:207 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s from now" +msgstr "за %(delta)s" + +#: templatetags/humanize.py:213 +#, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "за једну секунду" +msgstr[1] "за %(count)s секунде" +msgstr[2] "за %(count)s секунди" + +#: templatetags/humanize.py:218 +#, python-format +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "за један минут" +msgstr[1] "за %(count)s минута" +msgstr[2] "за %(count)s минута" + +#: templatetags/humanize.py:223 +#, python-format +msgid "an hour from now" +msgid_plural "%(count)s hours from now" +msgstr[0] "за један сат" +msgstr[1] "за %(count)s сата" +msgstr[2] "за %(count)s сати" diff --git a/django/contrib/humanize/locale/sr_Latn/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/sr_Latn/LC_MESSAGES/django.mo index 7fa06ca557..5d8b997263 100644 Binary files a/django/contrib/humanize/locale/sr_Latn/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/sr_Latn/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/sr_Latn/LC_MESSAGES/django.po b/django/contrib/humanize/locale/sr_Latn/LC_MESSAGES/django.po index 4482c7bcf5..6a178dbf73 100644 --- a/django/contrib/humanize/locale/sr_Latn/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/sr_Latn/LC_MESSAGES/django.po @@ -4,34 +4,46 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:18-0400\n" +"POT-Creation-Date: 2012-03-14 00:19-0700\n" "PO-Revision-Date: 2011-03-04 18:39+0000\n" "Last-Translator: Jannis \n" "Language-Team: Serbian (Latin) \n" +"Language: sr@latin\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: sr@latin\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" -"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" -#: templatetags/humanize.py:19 +#: tests.py:108 templatetags/humanize.py:164 +msgid "today" +msgstr "deset" + +#: tests.py:108 templatetags/humanize.py:168 +msgid "yesterday" +msgstr "juče" + +#: tests.py:108 templatetags/humanize.py:166 +msgid "tomorrow" +msgstr "sutra" + +#: templatetags/humanize.py:24 msgid "th" msgstr "-i" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "st" msgstr "-vi" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "nd" msgstr "-i" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "rd" msgstr "-i" -#: templatetags/humanize.py:54 +#: templatetags/humanize.py:53 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" @@ -39,6 +51,14 @@ msgstr[0] "%(value).1f milion" msgstr[1] "%(value).1f miliona" msgstr[2] "%(value).1f miliona" +#: templatetags/humanize.py:54 +#, fuzzy, python-format +msgid "%(value)s million" +msgid_plural "%(value)s million" +msgstr[0] "%(value).1f milion" +msgstr[1] "%(value).1f miliona" +msgstr[2] "%(value).1f miliona" + #: templatetags/humanize.py:57 #, python-format msgid "%(value).1f billion" @@ -47,7 +67,15 @@ msgstr[0] "%(value).1f bilion" msgstr[1] "%(value).1f biliona" msgstr[2] "%(value).1f biliona" -#: templatetags/humanize.py:60 +#: templatetags/humanize.py:58 +#, fuzzy, python-format +msgid "%(value)s billion" +msgid_plural "%(value)s billion" +msgstr[0] "%(value).1f bilion" +msgstr[1] "%(value).1f biliona" +msgstr[2] "%(value).1f biliona" + +#: templatetags/humanize.py:61 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" @@ -55,50 +83,238 @@ msgstr[0] "%(value).1f trilion" msgstr[1] "%(value).1f triliona" msgstr[2] "%(value).1f triliona" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:62 +#, fuzzy, python-format +msgid "%(value)s trillion" +msgid_plural "%(value)s trillion" +msgstr[0] "%(value).1f trilion" +msgstr[1] "%(value).1f triliona" +msgstr[2] "%(value).1f triliona" + +#: templatetags/humanize.py:65 +#, fuzzy, python-format +msgid "%(value).1f quadrillion" +msgid_plural "%(value).1f quadrillion" +msgstr[0] "%(value).1f trilion" +msgstr[1] "%(value).1f triliona" +msgstr[2] "%(value).1f triliona" + +#: templatetags/humanize.py:66 +#, fuzzy, python-format +msgid "%(value)s quadrillion" +msgid_plural "%(value)s quadrillion" +msgstr[0] "%(value).1f trilion" +msgstr[1] "%(value).1f triliona" +msgstr[2] "%(value).1f triliona" + +#: templatetags/humanize.py:69 +#, fuzzy, python-format +msgid "%(value).1f quintillion" +msgid_plural "%(value).1f quintillion" +msgstr[0] "%(value).1f trilion" +msgstr[1] "%(value).1f triliona" +msgstr[2] "%(value).1f triliona" + +#: templatetags/humanize.py:70 +#, fuzzy, python-format +msgid "%(value)s quintillion" +msgid_plural "%(value)s quintillion" +msgstr[0] "%(value).1f trilion" +msgstr[1] "%(value).1f triliona" +msgstr[2] "%(value).1f triliona" + +#: templatetags/humanize.py:73 +#, fuzzy, python-format +msgid "%(value).1f sextillion" +msgid_plural "%(value).1f sextillion" +msgstr[0] "%(value).1f trilion" +msgstr[1] "%(value).1f triliona" +msgstr[2] "%(value).1f triliona" + +#: templatetags/humanize.py:74 +#, fuzzy, python-format +msgid "%(value)s sextillion" +msgid_plural "%(value)s sextillion" +msgstr[0] "%(value).1f trilion" +msgstr[1] "%(value).1f triliona" +msgstr[2] "%(value).1f triliona" + +#: templatetags/humanize.py:77 +#, fuzzy, python-format +msgid "%(value).1f septillion" +msgid_plural "%(value).1f septillion" +msgstr[0] "%(value).1f trilion" +msgstr[1] "%(value).1f triliona" +msgstr[2] "%(value).1f triliona" + +#: templatetags/humanize.py:78 +#, fuzzy, python-format +msgid "%(value)s septillion" +msgid_plural "%(value)s septillion" +msgstr[0] "%(value).1f trilion" +msgstr[1] "%(value).1f triliona" +msgstr[2] "%(value).1f triliona" + +#: templatetags/humanize.py:81 +#, fuzzy, python-format +msgid "%(value).1f octillion" +msgid_plural "%(value).1f octillion" +msgstr[0] "%(value).1f trilion" +msgstr[1] "%(value).1f triliona" +msgstr[2] "%(value).1f triliona" + +#: templatetags/humanize.py:82 +#, fuzzy, python-format +msgid "%(value)s octillion" +msgid_plural "%(value)s octillion" +msgstr[0] "%(value).1f trilion" +msgstr[1] "%(value).1f triliona" +msgstr[2] "%(value).1f triliona" + +#: templatetags/humanize.py:85 +#, fuzzy, python-format +msgid "%(value).1f nonillion" +msgid_plural "%(value).1f nonillion" +msgstr[0] "%(value).1f milion" +msgstr[1] "%(value).1f miliona" +msgstr[2] "%(value).1f miliona" + +#: templatetags/humanize.py:86 +#, fuzzy, python-format +msgid "%(value)s nonillion" +msgid_plural "%(value)s nonillion" +msgstr[0] "%(value).1f milion" +msgstr[1] "%(value).1f miliona" +msgstr[2] "%(value).1f miliona" + +#: templatetags/humanize.py:89 +#, fuzzy, python-format +msgid "%(value).1f decillion" +msgid_plural "%(value).1f decillion" +msgstr[0] "%(value).1f milion" +msgstr[1] "%(value).1f miliona" +msgstr[2] "%(value).1f miliona" + +#: templatetags/humanize.py:90 +#, fuzzy, python-format +msgid "%(value)s decillion" +msgid_plural "%(value)s decillion" +msgstr[0] "%(value).1f milion" +msgstr[1] "%(value).1f miliona" +msgstr[2] "%(value).1f miliona" + +#: templatetags/humanize.py:93 +#, fuzzy, python-format +msgid "%(value).1f googol" +msgid_plural "%(value).1f googol" +msgstr[0] "%(value).1f milion" +msgstr[1] "%(value).1f miliona" +msgstr[2] "%(value).1f miliona" + +#: templatetags/humanize.py:94 +#, python-format +msgid "%(value)s googol" +msgid_plural "%(value)s googol" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:143 msgid "one" msgstr "jedan" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "two" msgstr "dva" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "three" msgstr "tri" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "four" msgstr "četiri" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "five" msgstr "pet" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "six" msgstr "šest" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "seven" msgstr "sedam" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "eight" msgstr "osam" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "nine" msgstr "devet" -#: templatetags/humanize.py:96 -msgid "today" -msgstr "deset" +#: templatetags/humanize.py:185 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s ago" +msgstr "" -#: templatetags/humanize.py:98 -msgid "tomorrow" -msgstr "sutra" +#: templatetags/humanize.py:188 templatetags/humanize.py:210 +msgid "now" +msgstr "" -#: templatetags/humanize.py:100 -msgid "yesterday" -msgstr "juče" +#: templatetags/humanize.py:191 +#, python-format +msgid "a second ago" +msgid_plural "%(count)s seconds ago" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:196 +#, python-format +msgid "a minute ago" +msgid_plural "%(count)s minutes ago" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:201 +#, python-format +msgid "an hour ago" +msgid_plural "%(count)s hours ago" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:207 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s from now" +msgstr "" + +#: templatetags/humanize.py:213 +#, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:218 +#, python-format +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:223 +#, python-format +msgid "an hour from now" +msgid_plural "%(count)s hours from now" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" diff --git a/django/contrib/humanize/locale/sv/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/sv/LC_MESSAGES/django.mo index dbec4dc565..4db04555f7 100644 Binary files a/django/contrib/humanize/locale/sv/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/sv/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/sv/LC_MESSAGES/django.po b/django/contrib/humanize/locale/sv/LC_MESSAGES/django.po index 9d77dc47c2..1312488cb2 100644 --- a/django/contrib/humanize/locale/sv/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/sv/LC_MESSAGES/django.po @@ -1,42 +1,65 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Andreas Pelme , 2011, 2012. +# Jannis Leidel , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:18-0400\n" -"PO-Revision-Date: 2011-03-04 18:39+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Swedish <>\n" +"POT-Creation-Date: 2012-03-14 00:19-0700\n" +"PO-Revision-Date: 2012-03-06 20:29+0000\n" +"Last-Translator: Andreas Pelme \n" +"Language-Team: Swedish (http://www.transifex.net/projects/p/django/language/" +"sv/)\n" +"Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: sv\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: templatetags/humanize.py:19 +#: tests.py:108 templatetags/humanize.py:164 +msgid "today" +msgstr "idag" + +#: tests.py:108 templatetags/humanize.py:168 +msgid "yesterday" +msgstr "igår" + +#: tests.py:108 templatetags/humanize.py:166 +msgid "tomorrow" +msgstr "imorgon" + +#: templatetags/humanize.py:24 msgid "th" msgstr ":a" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "st" msgstr ":a" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "nd" msgstr ":e" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "rd" msgstr ":e" -#: templatetags/humanize.py:54 +#: templatetags/humanize.py:53 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" msgstr[0] "%(value).1f miljon" msgstr[1] "%(value).1f miljoner" +#: templatetags/humanize.py:54 +#, python-format +msgid "%(value)s million" +msgid_plural "%(value)s million" +msgstr[0] "%(value)s miljon" +msgstr[1] "%(value)s miljoner" + #: templatetags/humanize.py:57 #, python-format msgid "%(value).1f billion" @@ -44,57 +67,229 @@ msgid_plural "%(value).1f billion" msgstr[0] "%(value)1.f miljard" msgstr[1] "%(value)1.f miljarder" -#: templatetags/humanize.py:60 +#: templatetags/humanize.py:58 +#, python-format +msgid "%(value)s billion" +msgid_plural "%(value)s billion" +msgstr[0] "%(value)s miljard" +msgstr[1] "%(value)s miljarder" + +#: templatetags/humanize.py:61 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" msgstr[0] "%(value)1.f biljon" msgstr[1] "%(value)1.f biljoner" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:62 +#, python-format +msgid "%(value)s trillion" +msgid_plural "%(value)s trillion" +msgstr[0] "%(value)s triljon" +msgstr[1] "%(value)s triljoner" + +#: templatetags/humanize.py:65 +#, python-format +msgid "%(value).1f quadrillion" +msgid_plural "%(value).1f quadrillion" +msgstr[0] "%(value).1f biljard" +msgstr[1] "%(value).1f biljarder" + +#: templatetags/humanize.py:66 +#, python-format +msgid "%(value)s quadrillion" +msgid_plural "%(value)s quadrillion" +msgstr[0] "%(value)s biljard" +msgstr[1] "%(value)s biljarder" + +#: templatetags/humanize.py:69 +#, python-format +msgid "%(value).1f quintillion" +msgid_plural "%(value).1f quintillion" +msgstr[0] "%(value).1f kvintiljon" +msgstr[1] "%(value).1f kvintiljoner" + +#: templatetags/humanize.py:70 +#, python-format +msgid "%(value)s quintillion" +msgid_plural "%(value)s quintillion" +msgstr[0] "%(value)s kvintiljon" +msgstr[1] "%(value)s kvintiljoner" + +#: templatetags/humanize.py:73 +#, python-format +msgid "%(value).1f sextillion" +msgid_plural "%(value).1f sextillion" +msgstr[0] "%(value).1f triljard" +msgstr[1] "%(value).1f triljarder" + +#: templatetags/humanize.py:74 +#, python-format +msgid "%(value)s sextillion" +msgid_plural "%(value)s sextillion" +msgstr[0] "%(value)s triljard" +msgstr[1] "%(value)s triljarder" + +#: templatetags/humanize.py:77 +#, python-format +msgid "%(value).1f septillion" +msgid_plural "%(value).1f septillion" +msgstr[0] "%(value).1f kvadriljon" +msgstr[1] "%(value).1f kvadriljoner" + +#: templatetags/humanize.py:78 +#, python-format +msgid "%(value)s septillion" +msgid_plural "%(value)s septillion" +msgstr[0] "%(value)s kvadriljon" +msgstr[1] "%(value)s kvadriljoner" + +#: templatetags/humanize.py:81 +#, python-format +msgid "%(value).1f octillion" +msgid_plural "%(value).1f octillion" +msgstr[0] "%(value).1f kvadriljard" +msgstr[1] "%(value).1f kvadriljarder" + +#: templatetags/humanize.py:82 +#, python-format +msgid "%(value)s octillion" +msgid_plural "%(value)s octillion" +msgstr[0] "%(value)s kvadriljard" +msgstr[1] "%(value)s kvadriljarder" + +#: templatetags/humanize.py:85 +#, python-format +msgid "%(value).1f nonillion" +msgid_plural "%(value).1f nonillion" +msgstr[0] "%(value).1f kvintiljon" +msgstr[1] "%(value).1f kvintiljoner" + +#: templatetags/humanize.py:86 +#, python-format +msgid "%(value)s nonillion" +msgid_plural "%(value)s nonillion" +msgstr[0] "%(value)s kvintiljon" +msgstr[1] "%(value)s kvintiljoner" + +#: templatetags/humanize.py:89 +#, python-format +msgid "%(value).1f decillion" +msgid_plural "%(value).1f decillion" +msgstr[0] "%(value).1f kvintiljard" +msgstr[1] "%(value).1f kvintiljarder" + +#: templatetags/humanize.py:90 +#, python-format +msgid "%(value)s decillion" +msgid_plural "%(value)s decillion" +msgstr[0] "%(value)s kvintiljard" +msgstr[1] "%(value)s kvintiljarder" + +#: templatetags/humanize.py:93 +#, python-format +msgid "%(value).1f googol" +msgid_plural "%(value).1f googol" +msgstr[0] "%(value).1f googol" +msgstr[1] "%(value).1f googoler" + +#: templatetags/humanize.py:94 +#, python-format +msgid "%(value)s googol" +msgid_plural "%(value)s googol" +msgstr[0] "%(value)s googol" +msgstr[1] "%(value)s googoler" + +#: templatetags/humanize.py:143 msgid "one" msgstr "ett" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "two" msgstr "två" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "three" msgstr "tre" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "four" msgstr "fyra" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "five" msgstr "fem" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "six" msgstr "sex" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "seven" msgstr "sju" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "eight" msgstr "åtta" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "nine" msgstr "nio" -#: templatetags/humanize.py:96 -msgid "today" -msgstr "idag" +#: templatetags/humanize.py:185 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s ago" +msgstr "%(delta)s sedan" -#: templatetags/humanize.py:98 -msgid "tomorrow" -msgstr "imorgon" +#: templatetags/humanize.py:188 templatetags/humanize.py:210 +msgid "now" +msgstr "nu" -#: templatetags/humanize.py:100 -msgid "yesterday" -msgstr "igår" +#: templatetags/humanize.py:191 +#, python-format +msgid "a second ago" +msgid_plural "%(count)s seconds ago" +msgstr[0] "en sekund sedan" +msgstr[1] "%(count)s sekunder sedan" + +#: templatetags/humanize.py:196 +#, python-format +msgid "a minute ago" +msgid_plural "%(count)s minutes ago" +msgstr[0] "en minut sedan" +msgstr[1] "%(count)s minuter sedan" + +#: templatetags/humanize.py:201 +#, python-format +msgid "an hour ago" +msgid_plural "%(count)s hours ago" +msgstr[0] "en timma sedan" +msgstr[1] "%(count)s timmar sedan" + +#: templatetags/humanize.py:207 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s from now" +msgstr "%(delta)s från nu" + +#: templatetags/humanize.py:213 +#, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "en sekund från nu" +msgstr[1] "%(count)s sekunder från nu" + +#: templatetags/humanize.py:218 +#, python-format +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "en minut från nu" +msgstr[1] "%(count)s minuter från nu" + +#: templatetags/humanize.py:223 +#, python-format +msgid "an hour from now" +msgid_plural "%(count)s hours from now" +msgstr[0] "en timma från nu" +msgstr[1] "%(count)s timmar från nu" diff --git a/django/contrib/humanize/locale/ta/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/ta/LC_MESSAGES/django.mo index 5f6a32f589..0d85225212 100644 Binary files a/django/contrib/humanize/locale/ta/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/ta/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/ta/LC_MESSAGES/django.po b/django/contrib/humanize/locale/ta/LC_MESSAGES/django.po index aa51b889dc..3af574885d 100644 --- a/django/contrib/humanize/locale/ta/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/ta/LC_MESSAGES/django.po @@ -1,42 +1,63 @@ # This file is distributed under the same license as the Django package. # +# Translators: msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:18-0400\n" -"PO-Revision-Date: 2011-03-15 15:28+0000\n" +"POT-Creation-Date: 2012-03-14 00:19-0700\n" +"PO-Revision-Date: 2011-01-19 15:13+0000\n" "Last-Translator: Django team\n" -"Language-Team: Tamil \n" +"Language-Team: Tamil (http://www.transifex.net/projects/p/django/language/" +"ta/)\n" +"Language: ta\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ta\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: templatetags/humanize.py:19 +#: tests.py:108 templatetags/humanize.py:164 +msgid "today" +msgstr "" + +#: tests.py:108 templatetags/humanize.py:168 +msgid "yesterday" +msgstr "" + +#: tests.py:108 templatetags/humanize.py:166 +msgid "tomorrow" +msgstr "" + +#: templatetags/humanize.py:24 msgid "th" msgstr "" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "st" msgstr "" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "nd" msgstr "" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "rd" msgstr "" -#: templatetags/humanize.py:54 +#: templatetags/humanize.py:53 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" msgstr[0] "" msgstr[1] "" +#: templatetags/humanize.py:54 +#, python-format +msgid "%(value)s million" +msgid_plural "%(value)s million" +msgstr[0] "" +msgstr[1] "" + #: templatetags/humanize.py:57 #, python-format msgid "%(value).1f billion" @@ -44,57 +65,229 @@ msgid_plural "%(value).1f billion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:60 +#: templatetags/humanize.py:58 +#, python-format +msgid "%(value)s billion" +msgid_plural "%(value)s billion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:61 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:62 +#, python-format +msgid "%(value)s trillion" +msgid_plural "%(value)s trillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:65 +#, python-format +msgid "%(value).1f quadrillion" +msgid_plural "%(value).1f quadrillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:66 +#, python-format +msgid "%(value)s quadrillion" +msgid_plural "%(value)s quadrillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:69 +#, python-format +msgid "%(value).1f quintillion" +msgid_plural "%(value).1f quintillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:70 +#, python-format +msgid "%(value)s quintillion" +msgid_plural "%(value)s quintillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:73 +#, python-format +msgid "%(value).1f sextillion" +msgid_plural "%(value).1f sextillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:74 +#, python-format +msgid "%(value)s sextillion" +msgid_plural "%(value)s sextillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:77 +#, python-format +msgid "%(value).1f septillion" +msgid_plural "%(value).1f septillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:78 +#, python-format +msgid "%(value)s septillion" +msgid_plural "%(value)s septillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:81 +#, python-format +msgid "%(value).1f octillion" +msgid_plural "%(value).1f octillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:82 +#, python-format +msgid "%(value)s octillion" +msgid_plural "%(value)s octillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:85 +#, python-format +msgid "%(value).1f nonillion" +msgid_plural "%(value).1f nonillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:86 +#, python-format +msgid "%(value)s nonillion" +msgid_plural "%(value)s nonillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:89 +#, python-format +msgid "%(value).1f decillion" +msgid_plural "%(value).1f decillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:90 +#, python-format +msgid "%(value)s decillion" +msgid_plural "%(value)s decillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:93 +#, python-format +msgid "%(value).1f googol" +msgid_plural "%(value).1f googol" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:94 +#, python-format +msgid "%(value)s googol" +msgid_plural "%(value)s googol" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:143 msgid "one" msgstr "" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "two" msgstr "" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "three" msgstr "" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "four" msgstr "" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "five" msgstr "" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "six" msgstr "" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "seven" msgstr "" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "eight" msgstr "" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "nine" msgstr "" -#: templatetags/humanize.py:96 -msgid "today" +#: templatetags/humanize.py:185 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s ago" msgstr "" -#: templatetags/humanize.py:98 -msgid "tomorrow" +#: templatetags/humanize.py:188 templatetags/humanize.py:210 +msgid "now" msgstr "" -#: templatetags/humanize.py:100 -msgid "yesterday" +#: templatetags/humanize.py:191 +#, python-format +msgid "a second ago" +msgid_plural "%(count)s seconds ago" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:196 +#, python-format +msgid "a minute ago" +msgid_plural "%(count)s minutes ago" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:201 +#, python-format +msgid "an hour ago" +msgid_plural "%(count)s hours ago" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:207 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s from now" msgstr "" + +#: templatetags/humanize.py:213 +#, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:218 +#, python-format +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:223 +#, python-format +msgid "an hour from now" +msgid_plural "%(count)s hours from now" +msgstr[0] "" +msgstr[1] "" diff --git a/django/contrib/humanize/locale/te/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/te/LC_MESSAGES/django.mo index f6eee33041..f3c77a14a2 100644 Binary files a/django/contrib/humanize/locale/te/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/te/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/te/LC_MESSAGES/django.po b/django/contrib/humanize/locale/te/LC_MESSAGES/django.po index e7a849accf..7d6ab1624e 100644 --- a/django/contrib/humanize/locale/te/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/te/LC_MESSAGES/django.po @@ -1,42 +1,66 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# bhaskar teja yerneni , 2011. +# Jannis Leidel , 2011. +# , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:18-0400\n" -"PO-Revision-Date: 2011-03-04 18:39+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Telugu <>\n" +"POT-Creation-Date: 2012-03-14 00:19-0700\n" +"PO-Revision-Date: 2012-02-14 13:08+0000\n" +"Last-Translator: bhaskar teja yerneni \n" +"Language-Team: Telugu (http://www.transifex.net/projects/p/django/language/" +"te/)\n" +"Language: te\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: te\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: templatetags/humanize.py:19 +#: tests.py:108 templatetags/humanize.py:164 +msgid "today" +msgstr "ఈ రోజు" + +#: tests.py:108 templatetags/humanize.py:168 +msgid "yesterday" +msgstr "నిన్న" + +#: tests.py:108 templatetags/humanize.py:166 +msgid "tomorrow" +msgstr "రెపు" + +#: templatetags/humanize.py:24 msgid "th" msgstr "వ" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "st" msgstr "వ" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "nd" msgstr "వ" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "rd" msgstr "వ" -#: templatetags/humanize.py:54 +#: templatetags/humanize.py:53 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" msgstr[0] "" msgstr[1] "" +#: templatetags/humanize.py:54 +#, python-format +msgid "%(value)s million" +msgid_plural "%(value)s million" +msgstr[0] "" +msgstr[1] "" + #: templatetags/humanize.py:57 #, python-format msgid "%(value).1f billion" @@ -44,57 +68,229 @@ msgid_plural "%(value).1f billion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:60 +#: templatetags/humanize.py:58 +#, python-format +msgid "%(value)s billion" +msgid_plural "%(value)s billion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:61 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:62 +#, python-format +msgid "%(value)s trillion" +msgid_plural "%(value)s trillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:65 +#, python-format +msgid "%(value).1f quadrillion" +msgid_plural "%(value).1f quadrillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:66 +#, python-format +msgid "%(value)s quadrillion" +msgid_plural "%(value)s quadrillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:69 +#, python-format +msgid "%(value).1f quintillion" +msgid_plural "%(value).1f quintillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:70 +#, python-format +msgid "%(value)s quintillion" +msgid_plural "%(value)s quintillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:73 +#, python-format +msgid "%(value).1f sextillion" +msgid_plural "%(value).1f sextillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:74 +#, python-format +msgid "%(value)s sextillion" +msgid_plural "%(value)s sextillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:77 +#, python-format +msgid "%(value).1f septillion" +msgid_plural "%(value).1f septillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:78 +#, python-format +msgid "%(value)s septillion" +msgid_plural "%(value)s septillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:81 +#, python-format +msgid "%(value).1f octillion" +msgid_plural "%(value).1f octillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:82 +#, python-format +msgid "%(value)s octillion" +msgid_plural "%(value)s octillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:85 +#, python-format +msgid "%(value).1f nonillion" +msgid_plural "%(value).1f nonillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:86 +#, python-format +msgid "%(value)s nonillion" +msgid_plural "%(value)s nonillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:89 +#, python-format +msgid "%(value).1f decillion" +msgid_plural "%(value).1f decillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:90 +#, python-format +msgid "%(value)s decillion" +msgid_plural "%(value)s decillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:93 +#, python-format +msgid "%(value).1f googol" +msgid_plural "%(value).1f googol" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:94 +#, python-format +msgid "%(value)s googol" +msgid_plural "%(value)s googol" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:143 msgid "one" msgstr "ఒక్కటి" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "two" msgstr "రెండు" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "three" msgstr "మూడు" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "four" msgstr "నాలుగు" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "five" msgstr "ఐదు" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "six" msgstr "ఆరు" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "seven" msgstr "ఏడు" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "eight" -msgstr "యెనిమిధి" +msgstr "ఎనిమిది " -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "nine" msgstr "తొమ్మిది" -#: templatetags/humanize.py:96 -msgid "today" -msgstr "ఈ రోజు" +#: templatetags/humanize.py:185 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s ago" +msgstr "%(delta)s క్రితము" -#: templatetags/humanize.py:98 -msgid "tomorrow" -msgstr "రెపు" +#: templatetags/humanize.py:188 templatetags/humanize.py:210 +msgid "now" +msgstr "ఇప్పుడు " -#: templatetags/humanize.py:100 -msgid "yesterday" -msgstr "నిన్న" +#: templatetags/humanize.py:191 +#, python-format +msgid "a second ago" +msgid_plural "%(count)s seconds ago" +msgstr[0] "ఒక క్షణం క్రితము " +msgstr[1] "%(count)s క్షణాలు క్రితము " + +#: templatetags/humanize.py:196 +#, python-format +msgid "a minute ago" +msgid_plural "%(count)s minutes ago" +msgstr[0] "ఒక నిముషము క్రితము " +msgstr[1] "%(count)s నిముషాల క్రితము " + +#: templatetags/humanize.py:201 +#, python-format +msgid "an hour ago" +msgid_plural "%(count)s hours ago" +msgstr[0] "ఒక గంట క్రితము " +msgstr[1] "%(count)s గంటల క్రితము " + +#: templatetags/humanize.py:207 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s from now" +msgstr "ఇప్పటినుండి %(delta)s కు" + +#: templatetags/humanize.py:213 +#, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "ఒక క్షణములో " +msgstr[1] "%(count)s క్షణాలో " + +#: templatetags/humanize.py:218 +#, python-format +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "ఒక నిముషములో " +msgstr[1] "%(count)s నిముషాలో " + +#: templatetags/humanize.py:223 +#, python-format +msgid "an hour from now" +msgid_plural "%(count)s hours from now" +msgstr[0] "ఒక గంట సమయములో " +msgstr[1] "%(count)s గంటల సమయము లో " diff --git a/django/contrib/humanize/locale/th/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/th/LC_MESSAGES/django.mo index 88347f8467..4043e1affe 100644 Binary files a/django/contrib/humanize/locale/th/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/th/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/th/LC_MESSAGES/django.po b/django/contrib/humanize/locale/th/LC_MESSAGES/django.po index 1629abca19..d1b59f6571 100644 --- a/django/contrib/humanize/locale/th/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/th/LC_MESSAGES/django.po @@ -1,97 +1,268 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Jannis Leidel , 2011. +# Kowit Charoenratchatabhan , 2012. +# Vichai Vongvorakul , 2012. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:18-0400\n" -"PO-Revision-Date: 2011-03-04 18:39+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Thai <>\n" +"POT-Creation-Date: 2012-03-14 00:19-0700\n" +"PO-Revision-Date: 2012-02-14 13:08+0000\n" +"Last-Translator: Vichai Vongvorakul \n" +"Language-Team: Thai (http://www.transifex.net/projects/p/django/language/" +"th/)\n" +"Language: th\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: th\n" "Plural-Forms: nplurals=1; plural=0\n" -#: templatetags/humanize.py:19 +#: tests.py:108 templatetags/humanize.py:164 +msgid "today" +msgstr "วันนี้" + +#: tests.py:108 templatetags/humanize.py:168 +msgid "yesterday" +msgstr "เมื่อวานนี้" + +#: tests.py:108 templatetags/humanize.py:166 +msgid "tomorrow" +msgstr "พรุ่งนี้" + +#: templatetags/humanize.py:24 msgid "th" msgstr "th" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "st" msgstr "st" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "nd" msgstr "nd" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "rd" msgstr "rd" -#: templatetags/humanize.py:54 +#: templatetags/humanize.py:53 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" msgstr[0] "%(value).1f หนึ่งล้าน" +#: templatetags/humanize.py:54 +#, python-format +msgid "%(value)s million" +msgid_plural "%(value)s million" +msgstr[0] "%(value)s ล้าน" + #: templatetags/humanize.py:57 #, python-format msgid "%(value).1f billion" msgid_plural "%(value).1f billion" msgstr[0] "%(value).1f สิบล้าน" -#: templatetags/humanize.py:60 +#: templatetags/humanize.py:58 +#, python-format +msgid "%(value)s billion" +msgid_plural "%(value)s billion" +msgstr[0] "%(value)s พันล้าน" + +#: templatetags/humanize.py:61 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" msgstr[0] "%(value).1f ร้อยล้าน" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:62 +#, python-format +msgid "%(value)s trillion" +msgid_plural "%(value)s trillion" +msgstr[0] " %(value)s ล้านล้าน" + +#: templatetags/humanize.py:65 +#, python-format +msgid "%(value).1f quadrillion" +msgid_plural "%(value).1f quadrillion" +msgstr[0] "%(value).1f quadrillion" + +#: templatetags/humanize.py:66 +#, python-format +msgid "%(value)s quadrillion" +msgid_plural "%(value)s quadrillion" +msgstr[0] "%(value)s quadrillion" + +#: templatetags/humanize.py:69 +#, python-format +msgid "%(value).1f quintillion" +msgid_plural "%(value).1f quintillion" +msgstr[0] "%(value).1f quintillion" + +#: templatetags/humanize.py:70 +#, python-format +msgid "%(value)s quintillion" +msgid_plural "%(value)s quintillion" +msgstr[0] "%(value)s quintillion" + +#: templatetags/humanize.py:73 +#, python-format +msgid "%(value).1f sextillion" +msgid_plural "%(value).1f sextillion" +msgstr[0] "%(value).1f sextillion" + +#: templatetags/humanize.py:74 +#, python-format +msgid "%(value)s sextillion" +msgid_plural "%(value)s sextillion" +msgstr[0] "%(value)s sextillion" + +#: templatetags/humanize.py:77 +#, python-format +msgid "%(value).1f septillion" +msgid_plural "%(value).1f septillion" +msgstr[0] "%(value).1f septillion" + +#: templatetags/humanize.py:78 +#, python-format +msgid "%(value)s septillion" +msgid_plural "%(value)s septillion" +msgstr[0] "%(value)s septillion" + +#: templatetags/humanize.py:81 +#, python-format +msgid "%(value).1f octillion" +msgid_plural "%(value).1f octillion" +msgstr[0] "%(value).1f octillion" + +#: templatetags/humanize.py:82 +#, python-format +msgid "%(value)s octillion" +msgid_plural "%(value)s octillion" +msgstr[0] "%(value)s octillion" + +#: templatetags/humanize.py:85 +#, python-format +msgid "%(value).1f nonillion" +msgid_plural "%(value).1f nonillion" +msgstr[0] "%(value).1f nonillion" + +#: templatetags/humanize.py:86 +#, python-format +msgid "%(value)s nonillion" +msgid_plural "%(value)s nonillion" +msgstr[0] "%(value)s nonillion" + +#: templatetags/humanize.py:89 +#, python-format +msgid "%(value).1f decillion" +msgid_plural "%(value).1f decillion" +msgstr[0] "%(value).1f decillion" + +#: templatetags/humanize.py:90 +#, python-format +msgid "%(value)s decillion" +msgid_plural "%(value)s decillion" +msgstr[0] "%(value)s decillion" + +#: templatetags/humanize.py:93 +#, python-format +msgid "%(value).1f googol" +msgid_plural "%(value).1f googol" +msgstr[0] "%(value).1f googol" + +#: templatetags/humanize.py:94 +#, python-format +msgid "%(value)s googol" +msgid_plural "%(value)s googol" +msgstr[0] "%(value)s googol" + +#: templatetags/humanize.py:143 msgid "one" msgstr "หนึ่ง" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "two" msgstr "สอง" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "three" msgstr "สาม" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "four" msgstr "สี่" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "five" msgstr "ห้า" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "six" msgstr "หก" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "seven" msgstr "เจ็ด" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "eight" msgstr "แปด" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "nine" msgstr "เก้า" -#: templatetags/humanize.py:96 -msgid "today" -msgstr "วันนี้" +#: templatetags/humanize.py:185 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s ago" +msgstr " %(delta)s ที่ผ่านมา" -#: templatetags/humanize.py:98 -msgid "tomorrow" -msgstr "พรุ่งนี้" +#: templatetags/humanize.py:188 templatetags/humanize.py:210 +msgid "now" +msgstr "ขณะนี้" -#: templatetags/humanize.py:100 -msgid "yesterday" -msgstr "เมื่อวานนี้" +#: templatetags/humanize.py:191 +#, python-format +msgid "a second ago" +msgid_plural "%(count)s seconds ago" +msgstr[0] "%(count)s วินาทีที่ผ่านมา" + +#: templatetags/humanize.py:196 +#, python-format +msgid "a minute ago" +msgid_plural "%(count)s minutes ago" +msgstr[0] "%(count)s นาทีที่แล้ว" + +#: templatetags/humanize.py:201 +#, python-format +msgid "an hour ago" +msgid_plural "%(count)s hours ago" +msgstr[0] "%(count)s ชั่วโมงที่แล้ว" + +#: templatetags/humanize.py:207 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s from now" +msgstr "%(delta)s จากนี้" + +#: templatetags/humanize.py:213 +#, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "%(count)s วินาทีต่อจากนี้" + +#: templatetags/humanize.py:218 +#, python-format +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] " %(count)s นาทีต่อจากนี้" + +#: templatetags/humanize.py:223 +#, python-format +msgid "an hour from now" +msgid_plural "%(count)s hours from now" +msgstr[0] "%(count)s ชั่วโมงต่อจากนี้" diff --git a/django/contrib/humanize/locale/tr/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/tr/LC_MESSAGES/django.mo index 6656d3a4a0..5e06065e53 100644 Binary files a/django/contrib/humanize/locale/tr/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/tr/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/tr/LC_MESSAGES/django.po b/django/contrib/humanize/locale/tr/LC_MESSAGES/django.po index c828d7f090..8a6561b83d 100644 --- a/django/contrib/humanize/locale/tr/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/tr/LC_MESSAGES/django.po @@ -1,97 +1,268 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Jannis Leidel , 2011. +# Metin Amiroff , 2012. +# Murat Sahin , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:18-0400\n" -"PO-Revision-Date: 2011-03-04 18:39+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Turkish \n" +"POT-Creation-Date: 2012-03-14 00:19-0700\n" +"PO-Revision-Date: 2012-03-10 14:53+0000\n" +"Last-Translator: Metin Amiroff \n" +"Language-Team: Turkish (http://www.transifex.net/projects/p/django/language/" +"tr/)\n" +"Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: tr\n" "Plural-Forms: nplurals=1; plural=0\n" -#: templatetags/humanize.py:19 +#: tests.py:108 templatetags/humanize.py:164 +msgid "today" +msgstr "bugün" + +#: tests.py:108 templatetags/humanize.py:168 +msgid "yesterday" +msgstr "dün" + +#: tests.py:108 templatetags/humanize.py:166 +msgid "tomorrow" +msgstr "yarın" + +#: templatetags/humanize.py:24 msgid "th" msgstr "." -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "st" msgstr "." -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "nd" msgstr "." -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "rd" msgstr "." -#: templatetags/humanize.py:54 +#: templatetags/humanize.py:53 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" msgstr[0] "%(value).1f milyon" +#: templatetags/humanize.py:54 +#, python-format +msgid "%(value)s million" +msgid_plural "%(value)s million" +msgstr[0] "%(value)s milyon" + #: templatetags/humanize.py:57 #, python-format msgid "%(value).1f billion" msgid_plural "%(value).1f billion" msgstr[0] "%(value).1f milyar" -#: templatetags/humanize.py:60 +#: templatetags/humanize.py:58 +#, python-format +msgid "%(value)s billion" +msgid_plural "%(value)s billion" +msgstr[0] "%(value)s milyar" + +#: templatetags/humanize.py:61 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" msgstr[0] "%(value).1f trilyon" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:62 +#, python-format +msgid "%(value)s trillion" +msgid_plural "%(value)s trillion" +msgstr[0] "%(value)s trilyon" + +#: templatetags/humanize.py:65 +#, python-format +msgid "%(value).1f quadrillion" +msgid_plural "%(value).1f quadrillion" +msgstr[0] "%(value).1f katrilyon" + +#: templatetags/humanize.py:66 +#, python-format +msgid "%(value)s quadrillion" +msgid_plural "%(value)s quadrillion" +msgstr[0] "%(value)s katrilyon" + +#: templatetags/humanize.py:69 +#, python-format +msgid "%(value).1f quintillion" +msgid_plural "%(value).1f quintillion" +msgstr[0] "%(value).1f kentilyon" + +#: templatetags/humanize.py:70 +#, python-format +msgid "%(value)s quintillion" +msgid_plural "%(value)s quintillion" +msgstr[0] "%(value)s kentilyon" + +#: templatetags/humanize.py:73 +#, python-format +msgid "%(value).1f sextillion" +msgid_plural "%(value).1f sextillion" +msgstr[0] "%(value).1f seksilyon" + +#: templatetags/humanize.py:74 +#, python-format +msgid "%(value)s sextillion" +msgid_plural "%(value)s sextillion" +msgstr[0] "%(value)s seksilyon" + +#: templatetags/humanize.py:77 +#, python-format +msgid "%(value).1f septillion" +msgid_plural "%(value).1f septillion" +msgstr[0] "%(value).1f septilyon" + +#: templatetags/humanize.py:78 +#, python-format +msgid "%(value)s septillion" +msgid_plural "%(value)s septillion" +msgstr[0] "%(value)s septilyon" + +#: templatetags/humanize.py:81 +#, python-format +msgid "%(value).1f octillion" +msgid_plural "%(value).1f octillion" +msgstr[0] "%(value).1f oktilyon" + +#: templatetags/humanize.py:82 +#, python-format +msgid "%(value)s octillion" +msgid_plural "%(value)s octillion" +msgstr[0] "%(value)s oktilyon" + +#: templatetags/humanize.py:85 +#, python-format +msgid "%(value).1f nonillion" +msgid_plural "%(value).1f nonillion" +msgstr[0] "%(value).1f nonilyon" + +#: templatetags/humanize.py:86 +#, python-format +msgid "%(value)s nonillion" +msgid_plural "%(value)s nonillion" +msgstr[0] "%(value)s nonilyon" + +#: templatetags/humanize.py:89 +#, python-format +msgid "%(value).1f decillion" +msgid_plural "%(value).1f decillion" +msgstr[0] "%(value).1f desilyon" + +#: templatetags/humanize.py:90 +#, python-format +msgid "%(value)s decillion" +msgid_plural "%(value)s decillion" +msgstr[0] "%(value)s desilyon" + +#: templatetags/humanize.py:93 +#, python-format +msgid "%(value).1f googol" +msgid_plural "%(value).1f googol" +msgstr[0] "%(value).1f googol" + +#: templatetags/humanize.py:94 +#, python-format +msgid "%(value)s googol" +msgid_plural "%(value)s googol" +msgstr[0] "%(value)s googol" + +#: templatetags/humanize.py:143 msgid "one" msgstr "bir" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "two" msgstr "iki" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "three" msgstr "üç" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "four" msgstr "dört" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "five" msgstr "beş" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "six" msgstr "altı" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "seven" msgstr "yedi" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "eight" msgstr "sekiz" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "nine" msgstr "dokuz" -#: templatetags/humanize.py:96 -msgid "today" -msgstr "bugün" +#: templatetags/humanize.py:185 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s ago" +msgstr "%(delta)s önce" -#: templatetags/humanize.py:98 -msgid "tomorrow" -msgstr "yarın" +#: templatetags/humanize.py:188 templatetags/humanize.py:210 +msgid "now" +msgstr "şimdi" -#: templatetags/humanize.py:100 -msgid "yesterday" -msgstr "dün" +#: templatetags/humanize.py:191 +#, python-format +msgid "a second ago" +msgid_plural "%(count)s seconds ago" +msgstr[0] "%(count)s saniye önce" + +#: templatetags/humanize.py:196 +#, python-format +msgid "a minute ago" +msgid_plural "%(count)s minutes ago" +msgstr[0] "%(count)s dakika önce" + +#: templatetags/humanize.py:201 +#, python-format +msgid "an hour ago" +msgid_plural "%(count)s hours ago" +msgstr[0] "%(count)s saat önce" + +#: templatetags/humanize.py:207 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s from now" +msgstr "şu andan %(delta)s" + +#: templatetags/humanize.py:213 +#, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "şu andan %(count)s saniye sonra" + +#: templatetags/humanize.py:218 +#, python-format +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "şu andan %(count)s dakika sonra" + +#: templatetags/humanize.py:223 +#, python-format +msgid "an hour from now" +msgid_plural "%(count)s hours from now" +msgstr[0] "şu andan %(count)s saat sonra" diff --git a/django/contrib/humanize/locale/uk/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/uk/LC_MESSAGES/django.mo index 5e753cd6e7..da61af4acd 100644 Binary files a/django/contrib/humanize/locale/uk/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/uk/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/uk/LC_MESSAGES/django.po b/django/contrib/humanize/locale/uk/LC_MESSAGES/django.po index 23800d9d5f..f669cb556b 100644 --- a/django/contrib/humanize/locale/uk/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/uk/LC_MESSAGES/django.po @@ -1,37 +1,54 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Jannis Leidel , 2011. +# Sergey Lysach , 2012. +# Андрей Костенко , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:18-0400\n" -"PO-Revision-Date: 2011-03-05 10:39+0000\n" -"Last-Translator: GuGu \n" -"Language-Team: Ukrainian <>\n" +"POT-Creation-Date: 2012-03-14 00:19-0700\n" +"PO-Revision-Date: 2012-03-11 17:52+0000\n" +"Last-Translator: Sergey Lysach \n" +"Language-Team: Ukrainian (http://www.transifex.net/projects/p/django/" +"language/uk/)\n" +"Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: uk\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" -"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" -#: templatetags/humanize.py:19 +#: tests.py:108 templatetags/humanize.py:164 +msgid "today" +msgstr "сьогодні" + +#: tests.py:108 templatetags/humanize.py:168 +msgid "yesterday" +msgstr "вчора" + +#: tests.py:108 templatetags/humanize.py:166 +msgid "tomorrow" +msgstr "завтра" + +#: templatetags/humanize.py:24 msgid "th" msgstr "ий" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "st" msgstr "ий" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "nd" msgstr "ій" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "rd" msgstr "ий" -#: templatetags/humanize.py:54 +#: templatetags/humanize.py:53 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" @@ -39,6 +56,14 @@ msgstr[0] "%(value).1f мільйон" msgstr[1] "%(value).1f мільйони" msgstr[2] "%(value).1f мільйонів" +#: templatetags/humanize.py:54 +#, python-format +msgid "%(value)s million" +msgid_plural "%(value)s million" +msgstr[0] "%(value)s мільйон" +msgstr[1] "%(value)s мільйони" +msgstr[2] "%(value)s мільйонів" + #: templatetags/humanize.py:57 #, python-format msgid "%(value).1f billion" @@ -47,7 +72,15 @@ msgstr[0] "%(value).1f мільярд" msgstr[1] "%(value).1f мільярди" msgstr[2] "%(value).1f мільярдів" -#: templatetags/humanize.py:60 +#: templatetags/humanize.py:58 +#, python-format +msgid "%(value)s billion" +msgid_plural "%(value)s billion" +msgstr[0] "%(value)s мільярд" +msgstr[1] "%(value)s мільярди" +msgstr[2] "%(value)s мільярдів" + +#: templatetags/humanize.py:61 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" @@ -55,50 +88,238 @@ msgstr[0] "%(value).1f трильйон" msgstr[1] "%(value).1f трильйони" msgstr[2] "%(value).1f трильйонів" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:62 +#, python-format +msgid "%(value)s trillion" +msgid_plural "%(value)s trillion" +msgstr[0] "%(value)s трильйон" +msgstr[1] "%(value)s трильйони" +msgstr[2] "%(value)s трильйонів" + +#: templatetags/humanize.py:65 +#, python-format +msgid "%(value).1f quadrillion" +msgid_plural "%(value).1f quadrillion" +msgstr[0] "%(value).1f квадрильйон" +msgstr[1] "%(value).1f квадрильйони" +msgstr[2] "%(value).1f квадрильйонів" + +#: templatetags/humanize.py:66 +#, python-format +msgid "%(value)s quadrillion" +msgid_plural "%(value)s quadrillion" +msgstr[0] "%(value)s квадрильйон" +msgstr[1] "%(value)s квадрильйони" +msgstr[2] "%(value)s квадрильйонів" + +#: templatetags/humanize.py:69 +#, python-format +msgid "%(value).1f quintillion" +msgid_plural "%(value).1f quintillion" +msgstr[0] "%(value).1f квінтильйон" +msgstr[1] "%(value).1f квінтильйона" +msgstr[2] "%(value).1f квінтильйонів" + +#: templatetags/humanize.py:70 +#, python-format +msgid "%(value)s quintillion" +msgid_plural "%(value)s quintillion" +msgstr[0] "%(value)s квінтильйон" +msgstr[1] "%(value)s квінтильйона" +msgstr[2] "%(value)s квінтильйонів" + +#: templatetags/humanize.py:73 +#, python-format +msgid "%(value).1f sextillion" +msgid_plural "%(value).1f sextillion" +msgstr[0] "%(value).1f секстильйон" +msgstr[1] "%(value).1f секстильйона" +msgstr[2] "%(value).1f секстильйонів" + +#: templatetags/humanize.py:74 +#, python-format +msgid "%(value)s sextillion" +msgid_plural "%(value)s sextillion" +msgstr[0] "%(value)s секстильйон" +msgstr[1] "%(value)s секстильйона" +msgstr[2] "%(value)s секстильйонів" + +#: templatetags/humanize.py:77 +#, python-format +msgid "%(value).1f septillion" +msgid_plural "%(value).1f septillion" +msgstr[0] "%(value).1f септильйон" +msgstr[1] "%(value).1f септильйона" +msgstr[2] "%(value).1f септильйонів" + +#: templatetags/humanize.py:78 +#, python-format +msgid "%(value)s septillion" +msgid_plural "%(value)s septillion" +msgstr[0] "%(value)s септильйон" +msgstr[1] "%(value)s септильйона" +msgstr[2] "%(value)s септильйонів" + +#: templatetags/humanize.py:81 +#, python-format +msgid "%(value).1f octillion" +msgid_plural "%(value).1f octillion" +msgstr[0] "%(value).1f октильйон" +msgstr[1] "%(value).1f октильйони" +msgstr[2] "%(value).1f октильйонів" + +#: templatetags/humanize.py:82 +#, python-format +msgid "%(value)s octillion" +msgid_plural "%(value)s octillion" +msgstr[0] "%(value)s октильйон" +msgstr[1] "%(value)s октильйони" +msgstr[2] "%(value)s октильйонів" + +#: templatetags/humanize.py:85 +#, python-format +msgid "%(value).1f nonillion" +msgid_plural "%(value).1f nonillion" +msgstr[0] "%(value).1f нонільйон" +msgstr[1] "%(value).1f нонільйони" +msgstr[2] "%(value).1f нонільйонів" + +#: templatetags/humanize.py:86 +#, python-format +msgid "%(value)s nonillion" +msgid_plural "%(value)s nonillion" +msgstr[0] "%(value)s нонільйон" +msgstr[1] "%(value)s нонільйони" +msgstr[2] "%(value)s нонільйонів" + +#: templatetags/humanize.py:89 +#, python-format +msgid "%(value).1f decillion" +msgid_plural "%(value).1f decillion" +msgstr[0] "%(value).1f децильйон" +msgstr[1] "%(value).1f децильйони" +msgstr[2] "%(value).1f децильйонів" + +#: templatetags/humanize.py:90 +#, python-format +msgid "%(value)s decillion" +msgid_plural "%(value)s decillion" +msgstr[0] "%(value)s децильйон" +msgstr[1] "%(value)s децильйони" +msgstr[2] "%(value)s децильйонів" + +#: templatetags/humanize.py:93 +#, python-format +msgid "%(value).1f googol" +msgid_plural "%(value).1f googol" +msgstr[0] "%(value).1f гугол" +msgstr[1] "%(value).1f гуголі" +msgstr[2] "%(value).1f гуголів" + +#: templatetags/humanize.py:94 +#, python-format +msgid "%(value)s googol" +msgid_plural "%(value)s googol" +msgstr[0] "%(value)s гугол" +msgstr[1] "%(value)s гуголі" +msgstr[2] "%(value)s гуголів" + +#: templatetags/humanize.py:143 msgid "one" msgstr "один" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "two" msgstr "два" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "three" msgstr "три" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "four" msgstr "чотири" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "five" msgstr "п'ять" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "six" msgstr "шість" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "seven" msgstr "сім" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "eight" msgstr "вісім" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "nine" msgstr "дев'ять" -#: templatetags/humanize.py:96 -msgid "today" -msgstr "сьогодні" +#: templatetags/humanize.py:185 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s ago" +msgstr "%(delta)s тому" -#: templatetags/humanize.py:98 -msgid "tomorrow" -msgstr "завтра" +#: templatetags/humanize.py:188 templatetags/humanize.py:210 +msgid "now" +msgstr "зараз" -#: templatetags/humanize.py:100 -msgid "yesterday" -msgstr "вчора" +#: templatetags/humanize.py:191 +#, python-format +msgid "a second ago" +msgid_plural "%(count)s seconds ago" +msgstr[0] "секунду тому" +msgstr[1] "%(count)s секунди тому" +msgstr[2] "%(count)s секунд тому" + +#: templatetags/humanize.py:196 +#, python-format +msgid "a minute ago" +msgid_plural "%(count)s minutes ago" +msgstr[0] "хвилину тому" +msgstr[1] "%(count)s хвилини тому" +msgstr[2] "%(count)s хвилин тому" + +#: templatetags/humanize.py:201 +#, python-format +msgid "an hour ago" +msgid_plural "%(count)s hours ago" +msgstr[0] "годину тому" +msgstr[1] "%(count)s години тому" +msgstr[2] "%(count)s годин тому" + +#: templatetags/humanize.py:207 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s from now" +msgstr "через %(delta)s" + +#: templatetags/humanize.py:213 +#, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "через секунду" +msgstr[1] "через %(count)s секунди" +msgstr[2] "через %(count)s секунд" + +#: templatetags/humanize.py:218 +#, python-format +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "через хвилину" +msgstr[1] "через %(count)s хвилини" +msgstr[2] "через %(count)s хвилин" + +#: templatetags/humanize.py:223 +#, python-format +msgid "an hour from now" +msgid_plural "%(count)s hours from now" +msgstr[0] "через годину" +msgstr[1] "через %(count)s години" +msgstr[2] "через %(count)s годин" diff --git a/django/contrib/humanize/locale/ur/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/ur/LC_MESSAGES/django.mo index abaea07c99..0c3173ad26 100644 Binary files a/django/contrib/humanize/locale/ur/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/ur/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/ur/LC_MESSAGES/django.po b/django/contrib/humanize/locale/ur/LC_MESSAGES/django.po index 184791289f..2620ea008b 100644 --- a/django/contrib/humanize/locale/ur/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/ur/LC_MESSAGES/django.po @@ -1,42 +1,64 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Mansoorulhaq Mansoor , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:18-0400\n" -"PO-Revision-Date: 2011-03-04 18:39+0000\n" -"Last-Translator: Mansoorulhaq \n" -"Language-Team: Urdu \n" +"POT-Creation-Date: 2012-03-14 00:19-0700\n" +"PO-Revision-Date: 2012-02-14 13:08+0000\n" +"Last-Translator: Mansoorulhaq Mansoor \n" +"Language-Team: Urdu (http://www.transifex.net/projects/p/django/language/" +"ur/)\n" +"Language: ur\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ur\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: templatetags/humanize.py:19 +#: tests.py:108 templatetags/humanize.py:164 +msgid "today" +msgstr "آج" + +#: tests.py:108 templatetags/humanize.py:168 +msgid "yesterday" +msgstr "گزستہ کل" + +#: tests.py:108 templatetags/humanize.py:166 +msgid "tomorrow" +msgstr "آئندہ کل" + +#: templatetags/humanize.py:24 msgid "th" msgstr "واں" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "st" msgstr "پہلا" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "nd" msgstr "دوسرا" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "rd" msgstr "تیسرا" -#: templatetags/humanize.py:54 +#: templatetags/humanize.py:53 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" msgstr[0] "%(value).1f ملین" msgstr[1] "%(value).1f ملین" +#: templatetags/humanize.py:54 +#, python-format +msgid "%(value)s million" +msgid_plural "%(value)s million" +msgstr[0] "" +msgstr[1] "" + #: templatetags/humanize.py:57 #, python-format msgid "%(value).1f billion" @@ -44,57 +66,229 @@ msgid_plural "%(value).1f billion" msgstr[0] "%(value).1f بلین" msgstr[1] "%(value).1f بلین" -#: templatetags/humanize.py:60 +#: templatetags/humanize.py:58 +#, python-format +msgid "%(value)s billion" +msgid_plural "%(value)s billion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:61 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" msgstr[0] "%(value).1f ٹریلین" msgstr[1] "%(value).1f ٹریلین" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:62 +#, python-format +msgid "%(value)s trillion" +msgid_plural "%(value)s trillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:65 +#, python-format +msgid "%(value).1f quadrillion" +msgid_plural "%(value).1f quadrillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:66 +#, python-format +msgid "%(value)s quadrillion" +msgid_plural "%(value)s quadrillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:69 +#, python-format +msgid "%(value).1f quintillion" +msgid_plural "%(value).1f quintillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:70 +#, python-format +msgid "%(value)s quintillion" +msgid_plural "%(value)s quintillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:73 +#, python-format +msgid "%(value).1f sextillion" +msgid_plural "%(value).1f sextillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:74 +#, python-format +msgid "%(value)s sextillion" +msgid_plural "%(value)s sextillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:77 +#, python-format +msgid "%(value).1f septillion" +msgid_plural "%(value).1f septillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:78 +#, python-format +msgid "%(value)s septillion" +msgid_plural "%(value)s septillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:81 +#, python-format +msgid "%(value).1f octillion" +msgid_plural "%(value).1f octillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:82 +#, python-format +msgid "%(value)s octillion" +msgid_plural "%(value)s octillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:85 +#, python-format +msgid "%(value).1f nonillion" +msgid_plural "%(value).1f nonillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:86 +#, python-format +msgid "%(value)s nonillion" +msgid_plural "%(value)s nonillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:89 +#, python-format +msgid "%(value).1f decillion" +msgid_plural "%(value).1f decillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:90 +#, python-format +msgid "%(value)s decillion" +msgid_plural "%(value)s decillion" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:93 +#, python-format +msgid "%(value).1f googol" +msgid_plural "%(value).1f googol" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:94 +#, python-format +msgid "%(value)s googol" +msgid_plural "%(value)s googol" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:143 msgid "one" msgstr "ایک" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "two" msgstr "دو" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "three" msgstr "تین" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "four" msgstr "چار" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "five" msgstr "پانچ" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "six" msgstr "چھ" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "seven" msgstr "سات" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "eight" msgstr "آتھ" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "nine" msgstr "نو" -#: templatetags/humanize.py:96 -msgid "today" -msgstr "آج" +#: templatetags/humanize.py:185 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s ago" +msgstr "" -#: templatetags/humanize.py:98 -msgid "tomorrow" -msgstr "آئندہ کل" +#: templatetags/humanize.py:188 templatetags/humanize.py:210 +msgid "now" +msgstr "" -#: templatetags/humanize.py:100 -msgid "yesterday" -msgstr "گزستہ کل" +#: templatetags/humanize.py:191 +#, python-format +msgid "a second ago" +msgid_plural "%(count)s seconds ago" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:196 +#, python-format +msgid "a minute ago" +msgid_plural "%(count)s minutes ago" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:201 +#, python-format +msgid "an hour ago" +msgid_plural "%(count)s hours ago" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:207 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s from now" +msgstr "" + +#: templatetags/humanize.py:213 +#, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:218 +#, python-format +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:223 +#, python-format +msgid "an hour from now" +msgid_plural "%(count)s hours from now" +msgstr[0] "" +msgstr[1] "" diff --git a/django/contrib/humanize/locale/vi/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/vi/LC_MESSAGES/django.mo index 4b764f29aa..94002dcc46 100644 Binary files a/django/contrib/humanize/locale/vi/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/vi/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/vi/LC_MESSAGES/django.po b/django/contrib/humanize/locale/vi/LC_MESSAGES/django.po index 682780f5dc..6e1d1f12b5 100644 --- a/django/contrib/humanize/locale/vi/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/vi/LC_MESSAGES/django.po @@ -1,97 +1,266 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Jannis Leidel , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:18-0400\n" -"PO-Revision-Date: 2011-03-04 18:39+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Vietnamese \n" +"POT-Creation-Date: 2012-03-14 00:19-0700\n" +"PO-Revision-Date: 2012-02-14 13:08+0000\n" +"Last-Translator: Jannis Leidel \n" +"Language-Team: Vietnamese (http://www.transifex.net/projects/p/django/" +"language/vi/)\n" +"Language: vi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: vi\n" "Plural-Forms: nplurals=1; plural=0\n" -#: templatetags/humanize.py:19 +#: tests.py:108 templatetags/humanize.py:164 +msgid "today" +msgstr "Hôm nay" + +#: tests.py:108 templatetags/humanize.py:168 +msgid "yesterday" +msgstr "Hôm qua" + +#: tests.py:108 templatetags/humanize.py:166 +msgid "tomorrow" +msgstr "Ngày mai" + +#: templatetags/humanize.py:24 msgid "th" msgstr "th" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "st" msgstr "st" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "nd" msgstr "nd" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "rd" msgstr "rd" -#: templatetags/humanize.py:54 +#: templatetags/humanize.py:53 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" msgstr[0] "" +#: templatetags/humanize.py:54 +#, python-format +msgid "%(value)s million" +msgid_plural "%(value)s million" +msgstr[0] "" + #: templatetags/humanize.py:57 #, python-format msgid "%(value).1f billion" msgid_plural "%(value).1f billion" msgstr[0] "" -#: templatetags/humanize.py:60 +#: templatetags/humanize.py:58 +#, python-format +msgid "%(value)s billion" +msgid_plural "%(value)s billion" +msgstr[0] "" + +#: templatetags/humanize.py:61 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" msgstr[0] "" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:62 +#, python-format +msgid "%(value)s trillion" +msgid_plural "%(value)s trillion" +msgstr[0] "" + +#: templatetags/humanize.py:65 +#, python-format +msgid "%(value).1f quadrillion" +msgid_plural "%(value).1f quadrillion" +msgstr[0] "" + +#: templatetags/humanize.py:66 +#, python-format +msgid "%(value)s quadrillion" +msgid_plural "%(value)s quadrillion" +msgstr[0] "" + +#: templatetags/humanize.py:69 +#, python-format +msgid "%(value).1f quintillion" +msgid_plural "%(value).1f quintillion" +msgstr[0] "" + +#: templatetags/humanize.py:70 +#, python-format +msgid "%(value)s quintillion" +msgid_plural "%(value)s quintillion" +msgstr[0] "" + +#: templatetags/humanize.py:73 +#, python-format +msgid "%(value).1f sextillion" +msgid_plural "%(value).1f sextillion" +msgstr[0] "" + +#: templatetags/humanize.py:74 +#, python-format +msgid "%(value)s sextillion" +msgid_plural "%(value)s sextillion" +msgstr[0] "" + +#: templatetags/humanize.py:77 +#, python-format +msgid "%(value).1f septillion" +msgid_plural "%(value).1f septillion" +msgstr[0] "" + +#: templatetags/humanize.py:78 +#, python-format +msgid "%(value)s septillion" +msgid_plural "%(value)s septillion" +msgstr[0] "" + +#: templatetags/humanize.py:81 +#, python-format +msgid "%(value).1f octillion" +msgid_plural "%(value).1f octillion" +msgstr[0] "" + +#: templatetags/humanize.py:82 +#, python-format +msgid "%(value)s octillion" +msgid_plural "%(value)s octillion" +msgstr[0] "" + +#: templatetags/humanize.py:85 +#, python-format +msgid "%(value).1f nonillion" +msgid_plural "%(value).1f nonillion" +msgstr[0] "" + +#: templatetags/humanize.py:86 +#, python-format +msgid "%(value)s nonillion" +msgid_plural "%(value)s nonillion" +msgstr[0] "" + +#: templatetags/humanize.py:89 +#, python-format +msgid "%(value).1f decillion" +msgid_plural "%(value).1f decillion" +msgstr[0] "" + +#: templatetags/humanize.py:90 +#, python-format +msgid "%(value)s decillion" +msgid_plural "%(value)s decillion" +msgstr[0] "" + +#: templatetags/humanize.py:93 +#, python-format +msgid "%(value).1f googol" +msgid_plural "%(value).1f googol" +msgstr[0] "" + +#: templatetags/humanize.py:94 +#, python-format +msgid "%(value)s googol" +msgid_plural "%(value)s googol" +msgstr[0] "" + +#: templatetags/humanize.py:143 msgid "one" msgstr "Một" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "two" msgstr "Hai" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "three" msgstr "Ba" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "four" msgstr "Bốn" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "five" msgstr "Năm" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "six" msgstr "Sáu" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "seven" msgstr "Bảy" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "eight" msgstr "Tám" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "nine" msgstr "Chín" -#: templatetags/humanize.py:96 -msgid "today" -msgstr "Hôm nay" +#: templatetags/humanize.py:185 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s ago" +msgstr "" -#: templatetags/humanize.py:98 -msgid "tomorrow" -msgstr "Ngày mai" +#: templatetags/humanize.py:188 templatetags/humanize.py:210 +msgid "now" +msgstr "" -#: templatetags/humanize.py:100 -msgid "yesterday" -msgstr "Hôm qua" +#: templatetags/humanize.py:191 +#, python-format +msgid "a second ago" +msgid_plural "%(count)s seconds ago" +msgstr[0] "" + +#: templatetags/humanize.py:196 +#, python-format +msgid "a minute ago" +msgid_plural "%(count)s minutes ago" +msgstr[0] "" + +#: templatetags/humanize.py:201 +#, python-format +msgid "an hour ago" +msgid_plural "%(count)s hours ago" +msgstr[0] "" + +#: templatetags/humanize.py:207 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s from now" +msgstr "" + +#: templatetags/humanize.py:213 +#, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "" + +#: templatetags/humanize.py:218 +#, python-format +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "" + +#: templatetags/humanize.py:223 +#, python-format +msgid "an hour from now" +msgid_plural "%(count)s hours from now" +msgstr[0] "" diff --git a/django/contrib/humanize/locale/zh_CN/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/zh_CN/LC_MESSAGES/django.mo index 76a5a7dc12..0230140533 100644 Binary files a/django/contrib/humanize/locale/zh_CN/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/zh_CN/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/zh_CN/LC_MESSAGES/django.po b/django/contrib/humanize/locale/zh_CN/LC_MESSAGES/django.po index 599208f0af..92c70962e5 100644 --- a/django/contrib/humanize/locale/zh_CN/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/zh_CN/LC_MESSAGES/django.po @@ -1,97 +1,267 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Jannis Leidel , 2011. +# Ziang Song , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:18-0400\n" -"PO-Revision-Date: 2011-03-04 18:39+0000\n" -"Last-Translator: Jannis \n" -"Language-Team: Chinese (China) \n" +"POT-Creation-Date: 2012-03-14 00:19-0700\n" +"PO-Revision-Date: 2012-02-14 13:08+0000\n" +"Last-Translator: Ziang Song \n" +"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/django/" +"language/zh_CN/)\n" +"Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0\n" -#: templatetags/humanize.py:19 +#: tests.py:108 templatetags/humanize.py:164 +msgid "today" +msgstr "今天" + +#: tests.py:108 templatetags/humanize.py:168 +msgid "yesterday" +msgstr "昨天" + +#: tests.py:108 templatetags/humanize.py:166 +msgid "tomorrow" +msgstr "明天" + +#: templatetags/humanize.py:24 msgid "th" msgstr "th" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "st" msgstr "st" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "nd" msgstr "nd" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "rd" msgstr "rd" -#: templatetags/humanize.py:54 +#: templatetags/humanize.py:53 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" msgstr[0] "%(value).1f 百万" +#: templatetags/humanize.py:54 +#, python-format +msgid "%(value)s million" +msgid_plural "%(value)s million" +msgstr[0] "%(value)s 百万" + #: templatetags/humanize.py:57 #, python-format msgid "%(value).1f billion" msgid_plural "%(value).1f billion" msgstr[0] "%(value).1f 十亿" -#: templatetags/humanize.py:60 +#: templatetags/humanize.py:58 +#, python-format +msgid "%(value)s billion" +msgid_plural "%(value)s billion" +msgstr[0] "%(value)s 十亿" + +#: templatetags/humanize.py:61 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" msgstr[0] "%(value).1f 万亿" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:62 +#, python-format +msgid "%(value)s trillion" +msgid_plural "%(value)s trillion" +msgstr[0] "%(value)s 万亿" + +#: templatetags/humanize.py:65 +#, python-format +msgid "%(value).1f quadrillion" +msgid_plural "%(value).1f quadrillion" +msgstr[0] "" + +#: templatetags/humanize.py:66 +#, python-format +msgid "%(value)s quadrillion" +msgid_plural "%(value)s quadrillion" +msgstr[0] "" + +#: templatetags/humanize.py:69 +#, python-format +msgid "%(value).1f quintillion" +msgid_plural "%(value).1f quintillion" +msgstr[0] "" + +#: templatetags/humanize.py:70 +#, python-format +msgid "%(value)s quintillion" +msgid_plural "%(value)s quintillion" +msgstr[0] "" + +#: templatetags/humanize.py:73 +#, python-format +msgid "%(value).1f sextillion" +msgid_plural "%(value).1f sextillion" +msgstr[0] "" + +#: templatetags/humanize.py:74 +#, python-format +msgid "%(value)s sextillion" +msgid_plural "%(value)s sextillion" +msgstr[0] "" + +#: templatetags/humanize.py:77 +#, python-format +msgid "%(value).1f septillion" +msgid_plural "%(value).1f septillion" +msgstr[0] "" + +#: templatetags/humanize.py:78 +#, python-format +msgid "%(value)s septillion" +msgid_plural "%(value)s septillion" +msgstr[0] "" + +#: templatetags/humanize.py:81 +#, python-format +msgid "%(value).1f octillion" +msgid_plural "%(value).1f octillion" +msgstr[0] "" + +#: templatetags/humanize.py:82 +#, python-format +msgid "%(value)s octillion" +msgid_plural "%(value)s octillion" +msgstr[0] "" + +#: templatetags/humanize.py:85 +#, python-format +msgid "%(value).1f nonillion" +msgid_plural "%(value).1f nonillion" +msgstr[0] "" + +#: templatetags/humanize.py:86 +#, python-format +msgid "%(value)s nonillion" +msgid_plural "%(value)s nonillion" +msgstr[0] "" + +#: templatetags/humanize.py:89 +#, python-format +msgid "%(value).1f decillion" +msgid_plural "%(value).1f decillion" +msgstr[0] "" + +#: templatetags/humanize.py:90 +#, python-format +msgid "%(value)s decillion" +msgid_plural "%(value)s decillion" +msgstr[0] "" + +#: templatetags/humanize.py:93 +#, python-format +msgid "%(value).1f googol" +msgid_plural "%(value).1f googol" +msgstr[0] "" + +#: templatetags/humanize.py:94 +#, python-format +msgid "%(value)s googol" +msgid_plural "%(value)s googol" +msgstr[0] "" + +#: templatetags/humanize.py:143 msgid "one" msgstr "一" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "two" msgstr "二" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "three" msgstr "三" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "four" msgstr "四" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "five" msgstr "五" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "six" msgstr "六" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "seven" msgstr "七" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "eight" msgstr "八" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "nine" msgstr "九" -#: templatetags/humanize.py:96 -msgid "today" -msgstr "今天" +#: templatetags/humanize.py:185 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s ago" +msgstr "%(delta)s 之前" -#: templatetags/humanize.py:98 -msgid "tomorrow" -msgstr "明天" +#: templatetags/humanize.py:188 templatetags/humanize.py:210 +msgid "now" +msgstr "现在" -#: templatetags/humanize.py:100 -msgid "yesterday" -msgstr "昨天" +#: templatetags/humanize.py:191 +#, python-format +msgid "a second ago" +msgid_plural "%(count)s seconds ago" +msgstr[0] "%(count)s 秒钟之前" + +#: templatetags/humanize.py:196 +#, python-format +msgid "a minute ago" +msgid_plural "%(count)s minutes ago" +msgstr[0] "%(count)s 分钟之前" + +#: templatetags/humanize.py:201 +#, python-format +msgid "an hour ago" +msgid_plural "%(count)s hours ago" +msgstr[0] "%(count)s 小时之前" + +#: templatetags/humanize.py:207 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s from now" +msgstr "%(delta)s 之后" + +#: templatetags/humanize.py:213 +#, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "%(count)s 秒钟之后" + +#: templatetags/humanize.py:218 +#, python-format +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "%(count)s 分钟之后" + +#: templatetags/humanize.py:223 +#, python-format +msgid "an hour from now" +msgid_plural "%(count)s hours from now" +msgstr[0] "%(count)s 小时之后" diff --git a/django/contrib/humanize/locale/zh_TW/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/zh_TW/LC_MESSAGES/django.mo index 77cf0c6e2a..0f24502f04 100644 Binary files a/django/contrib/humanize/locale/zh_TW/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/zh_TW/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/zh_TW/LC_MESSAGES/django.po b/django/contrib/humanize/locale/zh_TW/LC_MESSAGES/django.po index f72877f643..f3062e9918 100644 --- a/django/contrib/humanize/locale/zh_TW/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/zh_TW/LC_MESSAGES/django.po @@ -1,97 +1,267 @@ # This file is distributed under the same license as the Django package. # +# Translators: +# Jannis Leidel , 2011. +# tcc , 2011. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-15 13:18-0400\n" -"PO-Revision-Date: 2011-03-04 18:39+0000\n" +"POT-Creation-Date: 2012-03-14 00:19-0700\n" +"PO-Revision-Date: 2012-02-14 13:08+0000\n" "Last-Translator: tcc \n" -"Language-Team: Chinese (Taiwan) \n" +"Language-Team: Chinese (Taiwan) (http://www.transifex.net/projects/p/django/" +"language/zh_TW/)\n" +"Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: zh_TW\n" "Plural-Forms: nplurals=1; plural=0\n" -#: templatetags/humanize.py:19 +#: tests.py:108 templatetags/humanize.py:164 +msgid "today" +msgstr "今天" + +#: tests.py:108 templatetags/humanize.py:168 +msgid "yesterday" +msgstr "昨天" + +#: tests.py:108 templatetags/humanize.py:166 +msgid "tomorrow" +msgstr "明天" + +#: templatetags/humanize.py:24 msgid "th" msgstr "th" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "st" msgstr "st" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "nd" msgstr "nd" -#: templatetags/humanize.py:19 +#: templatetags/humanize.py:24 msgid "rd" msgstr "rd" -#: templatetags/humanize.py:54 +#: templatetags/humanize.py:53 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" msgstr[0] "%(value).1f 百萬" +#: templatetags/humanize.py:54 +#, python-format +msgid "%(value)s million" +msgid_plural "%(value)s million" +msgstr[0] "" + #: templatetags/humanize.py:57 #, python-format msgid "%(value).1f billion" msgid_plural "%(value).1f billion" msgstr[0] "%(value).1f 十億" -#: templatetags/humanize.py:60 +#: templatetags/humanize.py:58 +#, python-format +msgid "%(value)s billion" +msgid_plural "%(value)s billion" +msgstr[0] "" + +#: templatetags/humanize.py:61 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" msgstr[0] "%(value).1f 兆" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:62 +#, python-format +msgid "%(value)s trillion" +msgid_plural "%(value)s trillion" +msgstr[0] "" + +#: templatetags/humanize.py:65 +#, python-format +msgid "%(value).1f quadrillion" +msgid_plural "%(value).1f quadrillion" +msgstr[0] "" + +#: templatetags/humanize.py:66 +#, python-format +msgid "%(value)s quadrillion" +msgid_plural "%(value)s quadrillion" +msgstr[0] "" + +#: templatetags/humanize.py:69 +#, python-format +msgid "%(value).1f quintillion" +msgid_plural "%(value).1f quintillion" +msgstr[0] "" + +#: templatetags/humanize.py:70 +#, python-format +msgid "%(value)s quintillion" +msgid_plural "%(value)s quintillion" +msgstr[0] "" + +#: templatetags/humanize.py:73 +#, python-format +msgid "%(value).1f sextillion" +msgid_plural "%(value).1f sextillion" +msgstr[0] "" + +#: templatetags/humanize.py:74 +#, python-format +msgid "%(value)s sextillion" +msgid_plural "%(value)s sextillion" +msgstr[0] "" + +#: templatetags/humanize.py:77 +#, python-format +msgid "%(value).1f septillion" +msgid_plural "%(value).1f septillion" +msgstr[0] "" + +#: templatetags/humanize.py:78 +#, python-format +msgid "%(value)s septillion" +msgid_plural "%(value)s septillion" +msgstr[0] "" + +#: templatetags/humanize.py:81 +#, python-format +msgid "%(value).1f octillion" +msgid_plural "%(value).1f octillion" +msgstr[0] "" + +#: templatetags/humanize.py:82 +#, python-format +msgid "%(value)s octillion" +msgid_plural "%(value)s octillion" +msgstr[0] "" + +#: templatetags/humanize.py:85 +#, python-format +msgid "%(value).1f nonillion" +msgid_plural "%(value).1f nonillion" +msgstr[0] "" + +#: templatetags/humanize.py:86 +#, python-format +msgid "%(value)s nonillion" +msgid_plural "%(value)s nonillion" +msgstr[0] "" + +#: templatetags/humanize.py:89 +#, python-format +msgid "%(value).1f decillion" +msgid_plural "%(value).1f decillion" +msgstr[0] "" + +#: templatetags/humanize.py:90 +#, python-format +msgid "%(value)s decillion" +msgid_plural "%(value)s decillion" +msgstr[0] "" + +#: templatetags/humanize.py:93 +#, python-format +msgid "%(value).1f googol" +msgid_plural "%(value).1f googol" +msgstr[0] "" + +#: templatetags/humanize.py:94 +#, python-format +msgid "%(value)s googol" +msgid_plural "%(value)s googol" +msgstr[0] "" + +#: templatetags/humanize.py:143 msgid "one" msgstr "一" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "two" msgstr "二" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "three" msgstr "三" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "four" msgstr "四" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "five" msgstr "五" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "six" msgstr "六" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "seven" msgstr "七" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "eight" msgstr "八" -#: templatetags/humanize.py:76 +#: templatetags/humanize.py:143 msgid "nine" msgstr "九" -#: templatetags/humanize.py:96 -msgid "today" -msgstr "今天" +#: templatetags/humanize.py:185 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s ago" +msgstr "" -#: templatetags/humanize.py:98 -msgid "tomorrow" -msgstr "明天" +#: templatetags/humanize.py:188 templatetags/humanize.py:210 +msgid "now" +msgstr "" -#: templatetags/humanize.py:100 -msgid "yesterday" -msgstr "昨天" +#: templatetags/humanize.py:191 +#, python-format +msgid "a second ago" +msgid_plural "%(count)s seconds ago" +msgstr[0] "" + +#: templatetags/humanize.py:196 +#, python-format +msgid "a minute ago" +msgid_plural "%(count)s minutes ago" +msgstr[0] "" + +#: templatetags/humanize.py:201 +#, python-format +msgid "an hour ago" +msgid_plural "%(count)s hours ago" +msgstr[0] "" + +#: templatetags/humanize.py:207 +#, python-format +msgctxt "naturaltime" +msgid "%(delta)s from now" +msgstr "" + +#: templatetags/humanize.py:213 +#, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "" + +#: templatetags/humanize.py:218 +#, python-format +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "" + +#: templatetags/humanize.py:223 +#, python-format +msgid "an hour from now" +msgid_plural "%(count)s hours from now" +msgstr[0] ""