diff --git a/django/contrib/humanize/locale/ar/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/ar/LC_MESSAGES/django.mo index a058286e9d..611d4b3d70 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 4ab2c0ce20..51c0cece62 100644 --- a/django/contrib/humanize/locale/ar/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/ar/LC_MESSAGES/django.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-18 23:10+0200\n" -"PO-Revision-Date: 2013-10-28 09:56+0000\n" -"Last-Translator: dado_eyad \n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-11-16 09:36+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Arabic (http://www.transifex.com/projects/p/django/language/" "ar/)\n" "MIME-Version: 1.0\n" @@ -336,11 +336,12 @@ msgstr "%(delta)s مضت" msgid "now" msgstr "الآن" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:198 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:201 #, python-format msgid "a second ago" -msgid_plural "%(count)s\\u00a0seconds ago" +msgid_plural "%(count)s seconds ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" @@ -348,11 +349,12 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:204 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 #, python-format msgid "a minute ago" -msgid_plural "%(count)s\\u00a0minutes ago" +msgid_plural "%(count)s minutes ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" @@ -360,11 +362,12 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:210 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 #, python-format msgid "an hour ago" -msgid_plural "%(count)s\\u00a0hours ago" +msgid_plural "%(count)s hours ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" @@ -378,23 +381,12 @@ msgctxt "naturaltime" msgid "%(delta)s from now" msgstr "%(delta)s من الآن" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:223 -#, python-format -msgid "a second from now" -msgid_plural "%(count)s\\u00a0seconds from now" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" -msgstr[4] "" -msgstr[5] "" - -#. Translators: \\u00a0 is non-breaking space +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. #: templatetags/humanize.py:229 #, python-format -msgid "a minute from now" -msgid_plural "%(count)s\\u00a0minutes from now" +msgid "a second from now" +msgid_plural "%(count)s seconds from now" msgstr[0] "" msgstr[1] "" msgstr[2] "" @@ -402,11 +394,25 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:235 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 #, python-format -msgid "an hour from now" -msgid_plural "%(count)s\\u00a0hours from now" +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 +#, 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/az/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/az/LC_MESSAGES/django.mo index 0757571f8a..2afe890d1b 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 45bc9609cf..3b5fad93c2 100644 --- a/django/contrib/humanize/locale/az/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/az/LC_MESSAGES/django.po @@ -2,13 +2,14 @@ # # Translators: # Ali Ismayilov , 2011 +# claudep , 2013 msgid "" msgstr "" "Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-18 23:10+0200\n" -"PO-Revision-Date: 2013-05-19 08:23+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-11-16 09:36+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Azerbaijani (http://www.transifex.com/projects/p/django/" "language/az/)\n" "MIME-Version: 1.0\n" @@ -223,32 +224,29 @@ msgstr "%(delta)s əvvəl" msgid "now" msgstr "indi" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:198 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:201 #, python-format msgid "a second ago" -msgid_plural "%(count)s\\u00a0seconds ago" -msgstr[0] "" -"one: bir saniyə əvvəl\n" -"other: %(count)s saniyə əvvəl" +msgid_plural "%(count)s seconds ago" +msgstr[0] "%(count)s saniyə əvvəl" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:204 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 #, python-format msgid "a minute ago" -msgid_plural "%(count)s\\u00a0minutes ago" -msgstr[0] "" -"one: bir dəqiqə əvvəl\n" -"other: %(count)s dəqiqə əvvəl" +msgid_plural "%(count)s minutes ago" +msgstr[0] "%(count)s dəqiqə əvvəl" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:210 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 #, python-format msgid "an hour ago" -msgid_plural "%(count)s\\u00a0hours ago" -msgstr[0] "" -"one: bir saat əvvəl\n" -"other: %(count)s saat əvvəl" +msgid_plural "%(count)s hours ago" +msgstr[0] "%(count)s saat əvvəl" #: templatetags/humanize.py:216 #, python-format @@ -256,29 +254,26 @@ msgctxt "naturaltime" msgid "%(delta)s from now" msgstr "%(delta)s sonra" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:223 -#, python-format -msgid "a second from now" -msgid_plural "%(count)s\\u00a0seconds from now" -msgstr[0] "" -"one: bir saniyə sonra\n" -"other: %(count)s saniyə sonra" - -#. Translators: \\u00a0 is non-breaking space +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. #: templatetags/humanize.py:229 #, python-format -msgid "a minute from now" -msgid_plural "%(count)s\\u00a0minutes from now" -msgstr[0] "" -"one: bir dəqiqə sonra\n" -"other: %(count)s dəqiqə sonra" +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "%(count)s saniyə sonra" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:235 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 +#, python-format +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "%(count)s dəqiqə sonra" + +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 #, python-format msgid "an hour from now" -msgid_plural "%(count)s\\u00a0hours from now" -msgstr[0] "" -"one: bir saat sonra\n" -"other: %(count)s saat sonra" +msgid_plural "%(count)s hours from now" +msgstr[0] "%(count)s saat sonra" diff --git a/django/contrib/humanize/locale/be/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/be/LC_MESSAGES/django.mo index 4d863f4e44..1f5f74ad09 100644 Binary files a/django/contrib/humanize/locale/be/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/be/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/be/LC_MESSAGES/django.po b/django/contrib/humanize/locale/be/LC_MESSAGES/django.po index 2f092b3d98..e12f4ce0f4 100644 --- a/django/contrib/humanize/locale/be/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/be/LC_MESSAGES/django.po @@ -5,9 +5,9 @@ msgid "" msgstr "" "Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-18 23:10+0200\n" -"PO-Revision-Date: 2013-05-19 08:23+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-11-16 09:37+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Belarusian (http://www.transifex.com/projects/p/django/" "language/be/)\n" "MIME-Version: 1.0\n" @@ -289,31 +289,34 @@ msgstr "%(delta)s таму" msgid "now" msgstr "зараз" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:198 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:201 #, python-format msgid "a second ago" -msgid_plural "%(count)s\\u00a0seconds ago" +msgid_plural "%(count)s seconds ago" msgstr[0] "%(count)s сэкунду таму" msgstr[1] "%(count)s сэкунды таму" msgstr[2] "%(count)s сэкундаў таму" msgstr[3] "%(count)s сэкундаў таму" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:204 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 #, python-format msgid "a minute ago" -msgid_plural "%(count)s\\u00a0minutes ago" +msgid_plural "%(count)s minutes ago" msgstr[0] "%(count)s хвіліну таму" msgstr[1] "%(count)s хвіліны таму" msgstr[2] "%(count)s хвілінаў таму" msgstr[3] "%(count)s хвілінаў таму" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:210 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 #, python-format msgid "an hour ago" -msgid_plural "%(count)s\\u00a0hours ago" +msgid_plural "%(count)s hours ago" msgstr[0] "%(count)s гадзіну таму" msgstr[1] "%(count)s гадзіны таму" msgstr[2] "%(count)s гадзінаў таму" @@ -325,31 +328,34 @@ msgctxt "naturaltime" msgid "%(delta)s from now" msgstr "праз %(delta)s" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:223 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:229 #, python-format msgid "a second from now" -msgid_plural "%(count)s\\u00a0seconds from now" +msgid_plural "%(count)s seconds from now" msgstr[0] "праз %(count)s сэкунду" msgstr[1] "праз %(count)s сэкунды" msgstr[2] "праз %(count)s сэкундаў" msgstr[3] "праз %(count)s сэкундаў" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:229 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 #, python-format msgid "a minute from now" -msgid_plural "%(count)s\\u00a0minutes from now" +msgid_plural "%(count)s minutes from now" msgstr[0] "праз %(count)s хвіліну" msgstr[1] "праз %(count)s хвіліны" msgstr[2] "праз %(count)s хвілінаў" msgstr[3] "праз %(count)s хвілінаў" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:235 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 #, python-format msgid "an hour from now" -msgid_plural "%(count)s\\u00a0hours 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/bg/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/bg/LC_MESSAGES/django.mo index 2db537eeb7..26859273be 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 2b06eeae17..5ba1aabb36 100644 --- a/django/contrib/humanize/locale/bg/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/bg/LC_MESSAGES/django.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-18 23:10+0200\n" -"PO-Revision-Date: 2013-05-19 08:23+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-11-16 09:37+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Bulgarian (http://www.transifex.com/projects/p/django/" "language/bg/)\n" "MIME-Version: 1.0\n" @@ -247,27 +247,30 @@ msgstr "преди %(delta)s" msgid "now" msgstr "сега" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:198 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:201 #, python-format msgid "a second ago" -msgid_plural "%(count)s\\u00a0seconds ago" +msgid_plural "%(count)s seconds ago" msgstr[0] "преди секунда" msgstr[1] "преди %(count)s секунди" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:204 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 #, python-format msgid "a minute ago" -msgid_plural "%(count)s\\u00a0minutes ago" +msgid_plural "%(count)s minutes ago" msgstr[0] "преди минута" msgstr[1] "преди %(count)s минути" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:210 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 #, python-format msgid "an hour ago" -msgid_plural "%(count)s\\u00a0hours ago" +msgid_plural "%(count)s hours ago" msgstr[0] "преди час" msgstr[1] "преди %(count)s часа" @@ -277,26 +280,29 @@ msgctxt "naturaltime" msgid "%(delta)s from now" msgstr "%(delta)s от сега" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:223 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:229 #, python-format msgid "a second from now" -msgid_plural "%(count)s\\u00a0seconds from now" +msgid_plural "%(count)s seconds from now" msgstr[0] "секунда от сега" msgstr[1] "%(count)s секунди от сега" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:229 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 #, python-format msgid "a minute from now" -msgid_plural "%(count)s\\u00a0minutes from now" +msgid_plural "%(count)s minutes from now" msgstr[0] "минута от сега" msgstr[1] "%(count)s минути от сега" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:235 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 #, python-format msgid "an hour from now" -msgid_plural "%(count)s\\u00a0hours from now" +msgid_plural "%(count)s hours from now" msgstr[0] "час от сега" msgstr[1] "%(count)s часа от сега" diff --git a/django/contrib/humanize/locale/bn/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/bn/LC_MESSAGES/django.mo index 5781721c96..632c1c74c3 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 1ad667378b..ffb3e1a01d 100644 --- a/django/contrib/humanize/locale/bn/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/bn/LC_MESSAGES/django.po @@ -6,9 +6,9 @@ msgid "" msgstr "" "Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-18 23:10+0200\n" -"PO-Revision-Date: 2013-05-19 08:23+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-11-16 09:37+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Bengali (http://www.transifex.com/projects/p/django/language/" "bn/)\n" "MIME-Version: 1.0\n" @@ -245,27 +245,30 @@ msgstr "" msgid "now" msgstr "" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:198 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:201 #, python-format msgid "a second ago" -msgid_plural "%(count)s\\u00a0seconds ago" +msgid_plural "%(count)s seconds ago" msgstr[0] "" msgstr[1] "" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:204 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 #, python-format msgid "a minute ago" -msgid_plural "%(count)s\\u00a0minutes ago" +msgid_plural "%(count)s minutes ago" msgstr[0] "" msgstr[1] "" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:210 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 #, python-format msgid "an hour ago" -msgid_plural "%(count)s\\u00a0hours ago" +msgid_plural "%(count)s hours ago" msgstr[0] "" msgstr[1] "" @@ -275,26 +278,29 @@ msgctxt "naturaltime" msgid "%(delta)s from now" msgstr "" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:223 -#, python-format -msgid "a second from now" -msgid_plural "%(count)s\\u00a0seconds from now" -msgstr[0] "" -msgstr[1] "" - -#. Translators: \\u00a0 is non-breaking space +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. #: templatetags/humanize.py:229 #, python-format -msgid "a minute from now" -msgid_plural "%(count)s\\u00a0minutes from now" +msgid "a second from now" +msgid_plural "%(count)s seconds from now" msgstr[0] "" msgstr[1] "" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:235 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 #, python-format -msgid "an hour from now" -msgid_plural "%(count)s\\u00a0hours from now" +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "" +msgstr[1] "" + +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 +#, 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/br/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/br/LC_MESSAGES/django.mo index d12200d20c..49b5e323c6 100644 Binary files a/django/contrib/humanize/locale/br/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/br/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/br/LC_MESSAGES/django.po b/django/contrib/humanize/locale/br/LC_MESSAGES/django.po index e1c2d14c03..583321ce20 100644 --- a/django/contrib/humanize/locale/br/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/br/LC_MESSAGES/django.po @@ -6,9 +6,9 @@ msgid "" msgstr "" "Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-18 23:10+0200\n" -"PO-Revision-Date: 2013-05-19 08:23+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-11-16 09:37+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Breton (http://www.transifex.com/projects/p/django/language/" "br/)\n" "MIME-Version: 1.0\n" @@ -245,27 +245,30 @@ msgstr "%(delta)s zo" msgid "now" msgstr "bremañ" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:198 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:201 #, python-format msgid "a second ago" -msgid_plural "%(count)s\\u00a0seconds ago" +msgid_plural "%(count)s seconds ago" msgstr[0] "un eilenn zo" msgstr[1] "%(count)s eilenn zo" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:204 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 #, python-format msgid "a minute ago" -msgid_plural "%(count)s\\u00a0minutes ago" +msgid_plural "%(count)s minutes ago" msgstr[0] "ur vunutenn zo" msgstr[1] "%(count)s munut zo" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:210 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 #, python-format msgid "an hour ago" -msgid_plural "%(count)s\\u00a0hours ago" +msgid_plural "%(count)s hours ago" msgstr[0] "un eurvezh zo" msgstr[1] "%(count)s eurvezh zo" @@ -275,26 +278,29 @@ msgctxt "naturaltime" msgid "%(delta)s from now" msgstr "a-benn %(delta)s " -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:223 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:229 #, python-format msgid "a second from now" -msgid_plural "%(count)s\\u00a0seconds from now" +msgid_plural "%(count)s seconds from now" msgstr[0] "a-benn un eilenn" msgstr[1] "a-benn %(count)s eilenn" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:229 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 #, python-format msgid "a minute from now" -msgid_plural "%(count)s\\u00a0minutes from now" +msgid_plural "%(count)s minutes from now" msgstr[0] "a-benn ur vunutenn" msgstr[1] "a-benn %(count)s munut" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:235 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 #, python-format msgid "an hour from now" -msgid_plural "%(count)s\\u00a0hours from now" +msgid_plural "%(count)s hours from now" msgstr[0] "a-benn un eurvezh" msgstr[1] "a-benn %(count)s eurvezh" diff --git a/django/contrib/humanize/locale/bs/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/bs/LC_MESSAGES/django.mo index a2af212d78..491cce5994 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 f1326f8ff2..bfa01f426f 100644 --- a/django/contrib/humanize/locale/bs/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/bs/LC_MESSAGES/django.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-18 23:10+0200\n" -"PO-Revision-Date: 2013-05-19 08:23+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-11-16 09:37+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Bosnian (http://www.transifex.com/projects/p/django/language/" "bs/)\n" "MIME-Version: 1.0\n" @@ -269,29 +269,32 @@ msgstr "" msgid "now" msgstr "" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:198 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:201 #, python-format msgid "a second ago" -msgid_plural "%(count)s\\u00a0seconds ago" +msgid_plural "%(count)s seconds ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:204 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 #, python-format msgid "a minute ago" -msgid_plural "%(count)s\\u00a0minutes ago" +msgid_plural "%(count)s minutes ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:210 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 #, python-format msgid "an hour ago" -msgid_plural "%(count)s\\u00a0hours ago" +msgid_plural "%(count)s hours ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" @@ -302,29 +305,32 @@ msgctxt "naturaltime" msgid "%(delta)s from now" msgstr "" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:223 -#, python-format -msgid "a second from now" -msgid_plural "%(count)s\\u00a0seconds from now" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" - -#. Translators: \\u00a0 is non-breaking space +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. #: templatetags/humanize.py:229 #, python-format -msgid "a minute from now" -msgid_plural "%(count)s\\u00a0minutes from now" +msgid "a second from now" +msgid_plural "%(count)s seconds from now" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:235 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 #, python-format -msgid "an hour from now" -msgid_plural "%(count)s\\u00a0hours from now" +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 +#, 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 0cb19aecad..8fdd7ec405 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 2ea65f8943..98f843a03e 100644 --- a/django/contrib/humanize/locale/ca/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/ca/LC_MESSAGES/django.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-18 23:10+0200\n" -"PO-Revision-Date: 2013-05-19 08:23+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-11-16 09:36+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Catalan (http://www.transifex.com/projects/p/django/language/" "ca/)\n" "MIME-Version: 1.0\n" @@ -247,27 +247,30 @@ msgstr "fa %(delta)s" msgid "now" msgstr "ara" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:198 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:201 #, python-format msgid "a second ago" -msgid_plural "%(count)s\\u00a0seconds ago" +msgid_plural "%(count)s seconds ago" msgstr[0] "fa un segon" msgstr[1] "fa %(count)s segons" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:204 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 #, python-format msgid "a minute ago" -msgid_plural "%(count)s\\u00a0minutes ago" +msgid_plural "%(count)s minutes ago" msgstr[0] "fa un minut" msgstr[1] "fa %(count)s minuts" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:210 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 #, python-format msgid "an hour ago" -msgid_plural "%(count)s\\u00a0hours ago" +msgid_plural "%(count)s hours ago" msgstr[0] "fa una hora" msgstr[1] "fa %(count)s hores" @@ -277,26 +280,29 @@ msgctxt "naturaltime" msgid "%(delta)s from now" msgstr "%(delta)s des d'ara" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:223 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:229 #, python-format msgid "a second from now" -msgid_plural "%(count)s\\u00a0seconds from now" +msgid_plural "%(count)s seconds from now" msgstr[0] "d'aquí a un segon" msgstr[1] "d'aquí a %(count)s segons" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:229 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 #, python-format msgid "a minute from now" -msgid_plural "%(count)s\\u00a0minutes from now" +msgid_plural "%(count)s minutes from now" msgstr[0] "d'aquí a un minut" msgstr[1] "d'aquí a %(count)s minuts" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:235 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 #, python-format msgid "an hour from now" -msgid_plural "%(count)s\\u00a0hours 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 56ef5e6af6..2891946dfe 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 04d1abba6e..8dd29ac259 100644 --- a/django/contrib/humanize/locale/cs/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/cs/LC_MESSAGES/django.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-18 23:10+0200\n" -"PO-Revision-Date: 2013-05-19 08:23+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-11-16 09:36+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Czech (http://www.transifex.com/projects/p/django/language/" "cs/)\n" "MIME-Version: 1.0\n" @@ -268,29 +268,32 @@ msgstr "%(delta)s v minulosti" msgid "now" msgstr "nyní" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:198 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:201 #, python-format msgid "a second ago" -msgid_plural "%(count)s\\u00a0seconds 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" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:204 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 #, python-format msgid "a minute ago" -msgid_plural "%(count)s\\u00a0minutes 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" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:210 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 #, python-format msgid "an hour ago" -msgid_plural "%(count)s\\u00a0hours 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" @@ -301,29 +304,32 @@ msgctxt "naturaltime" msgid "%(delta)s from now" msgstr "%(delta)s v budoucnosti" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:223 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:229 #, python-format msgid "a second from now" -msgid_plural "%(count)s\\u00a0seconds 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" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:229 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 #, python-format msgid "a minute from now" -msgid_plural "%(count)s\\u00a0minutes 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" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:235 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 #, python-format msgid "an hour from now" -msgid_plural "%(count)s\\u00a0hours 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 2b8a5bee9a..167c5cd358 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 2b102a079f..81f2463afb 100644 --- a/django/contrib/humanize/locale/cy/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/cy/LC_MESSAGES/django.po @@ -3,10 +3,10 @@ # Translators: msgid "" msgstr "" -"Project-Id-Version: Django\n" +"Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-10-15 10:57+0200\n" -"PO-Revision-Date: 2011-01-19 15:13+0000\n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-04-24 18:40+0000\n" "Last-Translator: Django team\n" "Language-Team: Welsh (http://www.transifex.com/projects/p/django/language/" "cy/)\n" @@ -17,35 +17,35 @@ msgstr "" "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != " "11) ? 2 : 3;\n" -#: tests.py:125 templatetags/humanize.py:167 +#: tests.py:135 templatetags/humanize.py:168 msgid "today" msgstr "" -#: tests.py:125 templatetags/humanize.py:171 +#: tests.py:135 templatetags/humanize.py:172 msgid "yesterday" msgstr "" -#: tests.py:125 templatetags/humanize.py:169 +#: tests.py:135 templatetags/humanize.py:170 msgid "tomorrow" msgstr "" -#: templatetags/humanize.py:25 +#: templatetags/humanize.py:26 msgid "th" msgstr "" -#: templatetags/humanize.py:25 +#: templatetags/humanize.py:26 msgid "st" msgstr "" -#: templatetags/humanize.py:25 +#: templatetags/humanize.py:26 msgid "nd" msgstr "" -#: templatetags/humanize.py:25 +#: templatetags/humanize.py:26 msgid "rd" msgstr "" -#: templatetags/humanize.py:54 +#: templatetags/humanize.py:55 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" @@ -54,7 +54,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templatetags/humanize.py:55 +#: templatetags/humanize.py:56 #, python-format msgid "%(value)s million" msgid_plural "%(value)s million" @@ -63,7 +63,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templatetags/humanize.py:58 +#: templatetags/humanize.py:59 #, python-format msgid "%(value).1f billion" msgid_plural "%(value).1f billion" @@ -72,7 +72,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templatetags/humanize.py:59 +#: templatetags/humanize.py:60 #, python-format msgid "%(value)s billion" msgid_plural "%(value)s billion" @@ -81,7 +81,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templatetags/humanize.py:62 +#: templatetags/humanize.py:63 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" @@ -90,7 +90,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templatetags/humanize.py:63 +#: templatetags/humanize.py:64 #, python-format msgid "%(value)s trillion" msgid_plural "%(value)s trillion" @@ -99,7 +99,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templatetags/humanize.py:66 +#: templatetags/humanize.py:67 #, python-format msgid "%(value).1f quadrillion" msgid_plural "%(value).1f quadrillion" @@ -108,7 +108,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templatetags/humanize.py:67 +#: templatetags/humanize.py:68 #, python-format msgid "%(value)s quadrillion" msgid_plural "%(value)s quadrillion" @@ -117,7 +117,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templatetags/humanize.py:70 +#: templatetags/humanize.py:71 #, python-format msgid "%(value).1f quintillion" msgid_plural "%(value).1f quintillion" @@ -126,7 +126,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templatetags/humanize.py:71 +#: templatetags/humanize.py:72 #, python-format msgid "%(value)s quintillion" msgid_plural "%(value)s quintillion" @@ -135,7 +135,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templatetags/humanize.py:74 +#: templatetags/humanize.py:75 #, python-format msgid "%(value).1f sextillion" msgid_plural "%(value).1f sextillion" @@ -144,7 +144,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templatetags/humanize.py:75 +#: templatetags/humanize.py:76 #, python-format msgid "%(value)s sextillion" msgid_plural "%(value)s sextillion" @@ -153,7 +153,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templatetags/humanize.py:78 +#: templatetags/humanize.py:79 #, python-format msgid "%(value).1f septillion" msgid_plural "%(value).1f septillion" @@ -162,7 +162,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templatetags/humanize.py:79 +#: templatetags/humanize.py:80 #, python-format msgid "%(value)s septillion" msgid_plural "%(value)s septillion" @@ -171,7 +171,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templatetags/humanize.py:82 +#: templatetags/humanize.py:83 #, python-format msgid "%(value).1f octillion" msgid_plural "%(value).1f octillion" @@ -180,7 +180,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templatetags/humanize.py:83 +#: templatetags/humanize.py:84 #, python-format msgid "%(value)s octillion" msgid_plural "%(value)s octillion" @@ -189,7 +189,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templatetags/humanize.py:86 +#: templatetags/humanize.py:87 #, python-format msgid "%(value).1f nonillion" msgid_plural "%(value).1f nonillion" @@ -198,7 +198,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templatetags/humanize.py:87 +#: templatetags/humanize.py:88 #, python-format msgid "%(value)s nonillion" msgid_plural "%(value)s nonillion" @@ -207,7 +207,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templatetags/humanize.py:90 +#: templatetags/humanize.py:91 #, python-format msgid "%(value).1f decillion" msgid_plural "%(value).1f decillion" @@ -216,7 +216,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templatetags/humanize.py:91 +#: templatetags/humanize.py:92 #, python-format msgid "%(value)s decillion" msgid_plural "%(value)s decillion" @@ -225,7 +225,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templatetags/humanize.py:94 +#: templatetags/humanize.py:95 #, python-format msgid "%(value).1f googol" msgid_plural "%(value).1f googol" @@ -234,7 +234,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templatetags/humanize.py:95 +#: templatetags/humanize.py:96 #, python-format msgid "%(value)s googol" msgid_plural "%(value)s googol" @@ -243,107 +243,119 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templatetags/humanize.py:144 +#: templatetags/humanize.py:145 msgid "one" msgstr "" -#: templatetags/humanize.py:144 +#: templatetags/humanize.py:145 msgid "two" msgstr "" -#: templatetags/humanize.py:144 +#: templatetags/humanize.py:145 msgid "three" msgstr "" -#: templatetags/humanize.py:144 +#: templatetags/humanize.py:145 msgid "four" msgstr "" -#: templatetags/humanize.py:144 +#: templatetags/humanize.py:145 msgid "five" msgstr "" -#: templatetags/humanize.py:144 +#: templatetags/humanize.py:145 msgid "six" msgstr "" -#: templatetags/humanize.py:144 +#: templatetags/humanize.py:145 msgid "seven" msgstr "" -#: templatetags/humanize.py:144 +#: templatetags/humanize.py:145 msgid "eight" msgstr "" -#: templatetags/humanize.py:144 +#: templatetags/humanize.py:145 msgid "nine" msgstr "" -#: templatetags/humanize.py:190 +#: templatetags/humanize.py:191 #, python-format msgctxt "naturaltime" msgid "%(delta)s ago" msgstr "" -#: templatetags/humanize.py:193 templatetags/humanize.py:215 +#: templatetags/humanize.py:194 templatetags/humanize.py:219 msgid "now" msgstr "" -#: templatetags/humanize.py:196 -#, python-format -msgid "a second ago" -msgid_plural "%(count)s seconds ago" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. #: templatetags/humanize.py:201 #, python-format -msgid "a minute ago" -msgid_plural "%(count)s minutes ago" +msgid "a second ago" +msgid_plural "%(count)s seconds ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templatetags/humanize.py:206 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 +#, python-format +msgid "a minute ago" +msgid_plural "%(count)s minutes ago" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 #, python-format msgid "an hour ago" -msgid_plural "%(count)s hours ago" +msgid_plural "%(count)s hours ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templatetags/humanize.py:212 +#: templatetags/humanize.py:216 #, python-format msgctxt "naturaltime" msgid "%(delta)s from now" msgstr "" -#: templatetags/humanize.py:218 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:229 #, python-format msgid "a second from now" -msgid_plural "%(count)s seconds from now" +msgid_plural "%(count)s seconds from now" msgstr[0] "" msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templatetags/humanize.py:223 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 #, python-format msgid "a minute from now" -msgid_plural "%(count)s minutes from now" +msgid_plural "%(count)s minutes from now" msgstr[0] "" msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templatetags/humanize.py:228 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 #, python-format msgid "an hour from now" -msgid_plural "%(count)s hours from now" +msgid_plural "%(count)s hours from now" msgstr[0] "" msgstr[1] "" msgstr[2] "" diff --git a/django/contrib/humanize/locale/da/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/da/LC_MESSAGES/django.mo index 1e9747a11a..c4efde18c7 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 1b09475ebf..c4376d6d08 100644 --- a/django/contrib/humanize/locale/da/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/da/LC_MESSAGES/django.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-18 23:10+0200\n" -"PO-Revision-Date: 2013-05-19 08:23+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-11-16 09:36+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Danish (http://www.transifex.com/projects/p/django/language/" "da/)\n" "MIME-Version: 1.0\n" @@ -246,27 +246,30 @@ msgstr "%(delta)s siden" msgid "now" msgstr "nu" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:198 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:201 #, python-format msgid "a second ago" -msgid_plural "%(count)s\\u00a0seconds ago" +msgid_plural "%(count)s seconds ago" msgstr[0] "et sekund siden" msgstr[1] "%(count)s sekunder siden" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:204 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 #, python-format msgid "a minute ago" -msgid_plural "%(count)s\\u00a0minutes ago" +msgid_plural "%(count)s minutes ago" msgstr[0] "et minut siden" msgstr[1] "%(count)s minutter siden" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:210 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 #, python-format msgid "an hour ago" -msgid_plural "%(count)s\\u00a0hours ago" +msgid_plural "%(count)s hours ago" msgstr[0] "en time siden" msgstr[1] "%(count)s timer siden" @@ -276,26 +279,29 @@ msgctxt "naturaltime" msgid "%(delta)s from now" msgstr "%(delta)s fra nu af" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:223 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:229 #, python-format msgid "a second from now" -msgid_plural "%(count)s\\u00a0seconds from now" +msgid_plural "%(count)s seconds from now" msgstr[0] "et sekund fra nu af" msgstr[1] "%(count)s sekunder fra nu af" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:229 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 #, python-format msgid "a minute from now" -msgid_plural "%(count)s\\u00a0minutes from now" +msgid_plural "%(count)s minutes from now" msgstr[0] "et minut fra nu af" msgstr[1] "%(count)s minutter fra nu af" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:235 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 #, python-format msgid "an hour from now" -msgid_plural "%(count)s\\u00a0hours 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 f3fb7e914a..0223b7d4d4 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 2b1996099b..1a217d4f25 100644 --- a/django/contrib/humanize/locale/de/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/de/LC_MESSAGES/django.po @@ -2,14 +2,15 @@ # # Translators: # André Hagenbruch , 2011 +# claudep , 2013 # Jannis Leidel , 2011,2013 msgid "" msgstr "" "Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-18 23:10+0200\n" -"PO-Revision-Date: 2013-06-14 15:03+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-11-16 16:43+0000\n" +"Last-Translator: claudep \n" "Language-Team: German (http://www.transifex.com/projects/p/django/language/" "de/)\n" "MIME-Version: 1.0\n" @@ -246,29 +247,32 @@ msgstr "vor %(delta)s" msgid "now" msgstr "jetzt" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:198 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:201 #, python-format msgid "a second ago" -msgid_plural "%(count)s\\u00a0seconds ago" +msgid_plural "%(count)s seconds ago" msgstr[0] "vor einer Sekunde" -msgstr[1] "vor %(count)s\\u00a0Sekunden" +msgstr[1] "vor %(count)s Sekunden" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:204 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 #, python-format msgid "a minute ago" -msgid_plural "%(count)s\\u00a0minutes ago" +msgid_plural "%(count)s minutes ago" msgstr[0] "vor einer Minute" -msgstr[1] "vor %(count)s\\u00a0Minuten" +msgstr[1] "vor %(count)s Minuten" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:210 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 #, python-format msgid "an hour ago" -msgid_plural "%(count)s\\u00a0hours ago" +msgid_plural "%(count)s hours ago" msgstr[0] "vor einer Stunde" -msgstr[1] "vor %(count)s\\u00a0Stunden" +msgstr[1] "vor %(count)s Stunden" #: templatetags/humanize.py:216 #, python-format @@ -276,26 +280,29 @@ msgctxt "naturaltime" msgid "%(delta)s from now" msgstr "in %(delta)s" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:223 -#, python-format -msgid "a second from now" -msgid_plural "%(count)s\\u00a0seconds from now" -msgstr[0] "in einer Sekunde" -msgstr[1] "in %(count)s\\u00a0Sekunden" - -#. Translators: \\u00a0 is non-breaking space +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. #: templatetags/humanize.py:229 #, python-format -msgid "a minute from now" -msgid_plural "%(count)s\\u00a0minutes from now" -msgstr[0] "in einer Minute" -msgstr[1] "in %(count)s\\u00a0Minuten" +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "in einer Sekunde" +msgstr[1] "in %(count)s Sekunden" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:235 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 +#, 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" + +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 #, python-format msgid "an hour from now" -msgid_plural "%(count)s\\u00a0hours from now" +msgid_plural "%(count)s hours from now" msgstr[0] "in einer Stunde" -msgstr[1] "in %(count)s\\u00a0Stunden" +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 2de211a647..1f4de96572 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 7e4c3a1a21..c3444a69e3 100644 --- a/django/contrib/humanize/locale/el/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/el/LC_MESSAGES/django.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-18 23:10+0200\n" -"PO-Revision-Date: 2013-05-19 08:23+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-11-16 09:36+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Greek (http://www.transifex.com/projects/p/django/language/" "el/)\n" "MIME-Version: 1.0\n" @@ -247,27 +247,30 @@ msgstr "πριν από %(delta)s" msgid "now" msgstr "τώρα" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:198 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:201 #, python-format msgid "a second ago" -msgid_plural "%(count)s\\u00a0seconds ago" +msgid_plural "%(count)s seconds ago" msgstr[0] "πριν από ένα δευτερόλεπτο" msgstr[1] "πριν από %(count)s δευτερόλεπτα" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:204 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 #, python-format msgid "a minute ago" -msgid_plural "%(count)s\\u00a0minutes ago" +msgid_plural "%(count)s minutes ago" msgstr[0] "πριν από ένα λεπτό" msgstr[1] "πριν από %(count)s λεπτά" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:210 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 #, python-format msgid "an hour ago" -msgid_plural "%(count)s\\u00a0hours ago" +msgid_plural "%(count)s hours ago" msgstr[0] "πριν από μια ώρα" msgstr[1] "πριν από %(count)s ώρες" @@ -277,26 +280,29 @@ msgctxt "naturaltime" msgid "%(delta)s from now" msgstr "σε %(delta)s" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:223 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:229 #, python-format msgid "a second from now" -msgid_plural "%(count)s\\u00a0seconds from now" +msgid_plural "%(count)s seconds from now" msgstr[0] "σε ένα δευτερόλεπτο" msgstr[1] "σε %(count)s δευτερόλεπτα" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:229 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 #, python-format msgid "a minute from now" -msgid_plural "%(count)s\\u00a0minutes from now" +msgid_plural "%(count)s minutes from now" msgstr[0] "σε ένα λεπτό" msgstr[1] "σε %(count)s λεπτά" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:235 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 #, python-format msgid "an hour from now" -msgid_plural "%(count)s\\u00a0hours 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 6b66dc33df..9be9f7ad45 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_GB/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/en_GB/LC_MESSAGES/django.mo index 7243859407..476f77039f 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 8aee2891f4..76b922851c 100644 --- a/django/contrib/humanize/locale/en_GB/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/en_GB/LC_MESSAGES/django.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-18 23:10+0200\n" -"PO-Revision-Date: 2013-05-19 08:23+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-11-16 09:36+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/" "django/language/en_GB/)\n" "MIME-Version: 1.0\n" @@ -246,27 +246,30 @@ msgstr "%(delta)s ago" msgid "now" msgstr "now" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:198 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:201 #, python-format msgid "a second ago" -msgid_plural "%(count)s\\u00a0seconds ago" +msgid_plural "%(count)s seconds ago" msgstr[0] "a second ago" msgstr[1] "%(count)s seconds ago" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:204 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 #, python-format msgid "a minute ago" -msgid_plural "%(count)s\\u00a0minutes ago" +msgid_plural "%(count)s minutes ago" msgstr[0] "a minute ago" msgstr[1] "%(count)s minutes ago" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:210 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 #, python-format msgid "an hour ago" -msgid_plural "%(count)s\\u00a0hours ago" +msgid_plural "%(count)s hours ago" msgstr[0] "an hour ago" msgstr[1] "%(count)s hours ago" @@ -276,26 +279,29 @@ msgctxt "naturaltime" msgid "%(delta)s from now" msgstr "%(delta)s from now" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:223 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:229 #, python-format msgid "a second from now" -msgid_plural "%(count)s\\u00a0seconds from now" +msgid_plural "%(count)s seconds from now" msgstr[0] "a second from now" msgstr[1] "%(count)s seconds from now" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:229 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 #, python-format msgid "a minute from now" -msgid_plural "%(count)s\\u00a0minutes from now" +msgid_plural "%(count)s minutes from now" msgstr[0] "a minute from now" msgstr[1] "%(count)s minutes from now" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:235 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 #, python-format msgid "an hour from now" -msgid_plural "%(count)s\\u00a0hours 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/eo/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/eo/LC_MESSAGES/django.mo index af3797c4bc..0bd556abf6 100644 Binary files a/django/contrib/humanize/locale/eo/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/eo/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/eo/LC_MESSAGES/django.po b/django/contrib/humanize/locale/eo/LC_MESSAGES/django.po index 986f2379ea..83228c25f3 100644 --- a/django/contrib/humanize/locale/eo/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/eo/LC_MESSAGES/django.po @@ -5,9 +5,9 @@ msgid "" msgstr "" "Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-18 23:10+0200\n" -"PO-Revision-Date: 2013-05-19 08:23+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-11-16 09:36+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Esperanto (http://www.transifex.com/projects/p/django/" "language/eo/)\n" "MIME-Version: 1.0\n" @@ -244,27 +244,30 @@ msgstr "%(delta)s antaŭe" msgid "now" msgstr "nun" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:198 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:201 #, python-format msgid "a second ago" -msgid_plural "%(count)s\\u00a0seconds ago" +msgid_plural "%(count)s seconds ago" msgstr[0] "unu sekundo antaŭe" msgstr[1] "%(count)s sekundoj antaŭe" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:204 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 #, python-format msgid "a minute ago" -msgid_plural "%(count)s\\u00a0minutes ago" +msgid_plural "%(count)s minutes ago" msgstr[0] "unu minuto antaŭe" msgstr[1] "%(count)s minutoj antaŭe" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:210 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 #, python-format msgid "an hour ago" -msgid_plural "%(count)s\\u00a0hours ago" +msgid_plural "%(count)s hours ago" msgstr[0] "unu horo antaŭe" msgstr[1] "%(count)s horoj antaŭe" @@ -274,26 +277,29 @@ msgctxt "naturaltime" msgid "%(delta)s from now" msgstr "%(delta)s ekde nun" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:223 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:229 #, python-format msgid "a second from now" -msgid_plural "%(count)s\\u00a0seconds from now" +msgid_plural "%(count)s seconds from now" msgstr[0] "unu sekundo ekde nun" msgstr[1] "%(count)s sekundoj ekde nun" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:229 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 #, python-format msgid "a minute from now" -msgid_plural "%(count)s\\u00a0minutes from now" +msgid_plural "%(count)s minutes from now" msgstr[0] "unu minuto ekde nun" msgstr[1] "%(count)s minutoj ekde nun" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:235 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 #, python-format msgid "an hour from now" -msgid_plural "%(count)s\\u00a0hours from now" +msgid_plural "%(count)s hours from now" msgstr[0] "unu horo ekde nun" msgstr[1] "%(count)s horoj ekde nun" diff --git a/django/contrib/humanize/locale/es/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/es/LC_MESSAGES/django.mo index 21262b5440..5ed790e2cb 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 80632700a5..ae576e048c 100644 --- a/django/contrib/humanize/locale/es/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/es/LC_MESSAGES/django.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-18 23:10+0200\n" -"PO-Revision-Date: 2013-05-19 08:23+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-11-16 09:36+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Spanish (http://www.transifex.com/projects/p/django/language/" "es/)\n" "MIME-Version: 1.0\n" @@ -247,27 +247,30 @@ msgstr "hace %(delta)s" msgid "now" msgstr "ahora" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:198 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:201 #, python-format msgid "a second ago" -msgid_plural "%(count)s\\u00a0seconds ago" +msgid_plural "%(count)s seconds ago" msgstr[0] "hace un segundo" msgstr[1] "hace %(count)s segundos" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:204 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 #, python-format msgid "a minute ago" -msgid_plural "%(count)s\\u00a0minutes ago" +msgid_plural "%(count)s minutes ago" msgstr[0] "hace un minuto" msgstr[1] "hace %(count)s minutos " -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:210 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 #, python-format msgid "an hour ago" -msgid_plural "%(count)s\\u00a0hours ago" +msgid_plural "%(count)s hours ago" msgstr[0] "hace una hora" msgstr[1] "hace %(count)s horas" @@ -277,26 +280,29 @@ msgctxt "naturaltime" msgid "%(delta)s from now" msgstr "%(delta)s a partir de ahora" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:223 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:229 #, python-format msgid "a second from now" -msgid_plural "%(count)s\\u00a0seconds 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" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:229 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 #, python-format msgid "a minute from now" -msgid_plural "%(count)s\\u00a0minutes 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" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:235 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 #, python-format msgid "an hour from now" -msgid_plural "%(count)s\\u00a0hours 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 4d318bae25..2d88898c2e 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 f9e50fea58..fc4b6f5ac7 100644 --- a/django/contrib/humanize/locale/es_AR/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/es_AR/LC_MESSAGES/django.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-18 23:10+0200\n" -"PO-Revision-Date: 2013-05-19 08:23+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-11-16 09:36+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/" "django/language/es_AR/)\n" "MIME-Version: 1.0\n" @@ -246,27 +246,30 @@ msgstr "hace %(delta)s" msgid "now" msgstr "ahora" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:198 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:201 #, python-format msgid "a second ago" -msgid_plural "%(count)s\\u00a0seconds ago" +msgid_plural "%(count)s seconds ago" msgstr[0] "hace un segundo" msgstr[1] "hace %(count)s segundos" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:204 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 #, python-format msgid "a minute ago" -msgid_plural "%(count)s\\u00a0minutes ago" +msgid_plural "%(count)s minutes ago" msgstr[0] "hace un minuto" msgstr[1] "hace %(count)s minutos" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:210 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 #, python-format msgid "an hour ago" -msgid_plural "%(count)s\\u00a0hours ago" +msgid_plural "%(count)s hours ago" msgstr[0] "hace una hora" msgstr[1] "hace %(count)s horas" @@ -276,26 +279,29 @@ msgctxt "naturaltime" msgid "%(delta)s from now" msgstr "dentro de %(delta)s" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:223 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:229 #, python-format msgid "a second from now" -msgid_plural "%(count)s\\u00a0seconds from now" +msgid_plural "%(count)s seconds from now" msgstr[0] "dentro de un segundo" msgstr[1] "dentro de %(count)s segundos" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:229 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 #, python-format msgid "a minute from now" -msgid_plural "%(count)s\\u00a0minutes from now" +msgid_plural "%(count)s minutes from now" msgstr[0] "dentro de un minuto" msgstr[1] "dentro de %(count)s minutos" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:235 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 #, python-format msgid "an hour from now" -msgid_plural "%(count)s\\u00a0hours from now" +msgid_plural "%(count)s hours from now" msgstr[0] "dentro de una hora" msgstr[1] "dentro de %(count)s horas" 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 f1e53d475a..07be7ffbbf 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 c22fcbb8a6..77f66d8057 100644 --- a/django/contrib/humanize/locale/es_MX/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/es_MX/LC_MESSAGES/django.po @@ -6,9 +6,9 @@ msgid "" msgstr "" "Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-18 23:10+0200\n" -"PO-Revision-Date: 2013-07-03 14:33+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-11-16 09:37+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/django/" "language/es_MX/)\n" "MIME-Version: 1.0\n" @@ -245,27 +245,30 @@ msgstr "hace %(delta)s" msgid "now" msgstr "ahora" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:198 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:201 #, python-format msgid "a second ago" -msgid_plural "%(count)s\\u00a0seconds ago" +msgid_plural "%(count)s seconds ago" msgstr[0] "hace un segundo" msgstr[1] "hace %(count)s segundos" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:204 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 #, python-format msgid "a minute ago" -msgid_plural "%(count)s\\u00a0minutes ago" +msgid_plural "%(count)s minutes ago" msgstr[0] "Hace un minuto" msgstr[1] "Hace %(count)s minutos" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:210 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 #, python-format msgid "an hour ago" -msgid_plural "%(count)s\\u00a0hours ago" +msgid_plural "%(count)s hours ago" msgstr[0] "Hace una hora" msgstr[1] "Hace %(count)s horas" @@ -275,26 +278,29 @@ msgctxt "naturaltime" msgid "%(delta)s from now" msgstr "%(delta)s a partir de ahora" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:223 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:229 #, python-format msgid "a second from now" -msgid_plural "%(count)s\\u00a0seconds 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" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:229 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 #, python-format msgid "a minute from now" -msgid_plural "%(count)s\\u00a0minutes 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" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:235 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 #, python-format msgid "an hour from now" -msgid_plural "%(count)s\\u00a0hours 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 39afeaf104..6dd3ecb516 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 cfb981ec2b..e9f8d2f3d5 100644 --- a/django/contrib/humanize/locale/et/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/et/LC_MESSAGES/django.po @@ -1,13 +1,15 @@ # This file is distributed under the same license as the Django package. # # Translators: +# claudep , 2013 # Jannis Leidel , 2011 +# jannolii , 2013 msgid "" msgstr "" "Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-18 23:10+0200\n" -"PO-Revision-Date: 2013-05-19 08:23+0000\n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-11-16 16:55+0000\n" "Last-Translator: claudep \n" "Language-Team: Estonian (http://www.transifex.com/projects/p/django/language/" "et/)\n" @@ -49,155 +51,155 @@ msgstr "." #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" -msgstr[0] "%(value).1f miljon" -msgstr[1] "%(value).11f miljonit" +msgstr[0] "%(value).1f miljonit" +msgstr[1] "%(value).1f miljonit" #: templatetags/humanize.py:56 #, python-format msgid "%(value)s million" msgid_plural "%(value)s million" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%(value)s miljon" +msgstr[1] "%(value)s miljonit" #: templatetags/humanize.py:59 #, python-format msgid "%(value).1f billion" msgid_plural "%(value).1f billion" -msgstr[0] "%(value).1f miljard" +msgstr[0] "%(value).1f miljardit" msgstr[1] "%(value).1f miljardit" #: templatetags/humanize.py:60 #, python-format msgid "%(value)s billion" msgid_plural "%(value)s billion" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%(value)s miljard" +msgstr[1] "%(value)s miljardit" #: templatetags/humanize.py:63 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" -msgstr[0] "%(value).1f triljon" +msgstr[0] "%(value).1f triljonit" msgstr[1] "%(value).1f triljonit" #: templatetags/humanize.py:64 #, python-format msgid "%(value)s trillion" msgid_plural "%(value)s trillion" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%(value)s triljon" +msgstr[1] "%(value)s triljonit" #: templatetags/humanize.py:67 #, python-format msgid "%(value).1f quadrillion" msgid_plural "%(value).1f quadrillion" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%(value).1f kvadriljonit" +msgstr[1] "%(value).1f kvadriljonit" #: templatetags/humanize.py:68 #, python-format msgid "%(value)s quadrillion" msgid_plural "%(value)s quadrillion" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%(value)s kvadriljon" +msgstr[1] "%(value)s kvadriljonit" #: templatetags/humanize.py:71 #, python-format msgid "%(value).1f quintillion" msgid_plural "%(value).1f quintillion" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%(value).1f kvintiljonit" +msgstr[1] "%(value).1f kvintiljonit" #: templatetags/humanize.py:72 #, python-format msgid "%(value)s quintillion" msgid_plural "%(value)s quintillion" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%(value)s kvintiljon" +msgstr[1] "%(value)s kvintiljonit" #: templatetags/humanize.py:75 #, python-format msgid "%(value).1f sextillion" msgid_plural "%(value).1f sextillion" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%(value).1f sekstiljonit" +msgstr[1] "%(value).1f sekstiljonit" #: templatetags/humanize.py:76 #, python-format msgid "%(value)s sextillion" msgid_plural "%(value)s sextillion" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%(value)s sekstiljon" +msgstr[1] "%(value)s sekstiljonit" #: templatetags/humanize.py:79 #, python-format msgid "%(value).1f septillion" msgid_plural "%(value).1f septillion" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%(value).1f septiljonit" +msgstr[1] "%(value).1f septiljonit" #: templatetags/humanize.py:80 #, python-format msgid "%(value)s septillion" msgid_plural "%(value)s septillion" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%(value)s septiljon" +msgstr[1] "%(value)s septiljonit" #: templatetags/humanize.py:83 #, python-format msgid "%(value).1f octillion" msgid_plural "%(value).1f octillion" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%(value).1f oktiljonit" +msgstr[1] "%(value).1f oktiljonit" #: templatetags/humanize.py:84 #, python-format msgid "%(value)s octillion" msgid_plural "%(value)s octillion" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%(value)s oktiljon" +msgstr[1] "%(value)s oktiljonit" #: templatetags/humanize.py:87 #, python-format msgid "%(value).1f nonillion" msgid_plural "%(value).1f nonillion" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%(value).1f noniljonit" +msgstr[1] "%(value).1f noniljonit" #: templatetags/humanize.py:88 #, python-format msgid "%(value)s nonillion" msgid_plural "%(value)s nonillion" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%(value)s noniljon" +msgstr[1] "%(value)s noniljonit" #: templatetags/humanize.py:91 #, python-format msgid "%(value).1f decillion" msgid_plural "%(value).1f decillion" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%(value).1f detsiljonit" +msgstr[1] "%(value).1f detsiljonit" #: templatetags/humanize.py:92 #, python-format msgid "%(value)s decillion" msgid_plural "%(value)s decillion" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%(value)s detsiljon" +msgstr[1] "%(value)s detsiljonit" #: templatetags/humanize.py:95 #, python-format msgid "%(value).1f googol" msgid_plural "%(value).1f googol" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%(value).1f googolit" +msgstr[1] "%(value).1f googolit" #: templatetags/humanize.py:96 #, python-format msgid "%(value)s googol" msgid_plural "%(value)s googol" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%(value)s googol" +msgstr[1] "%(value)s googolit" #: templatetags/humanize.py:145 msgid "one" @@ -239,62 +241,68 @@ msgstr "üheksa" #, python-format msgctxt "naturaltime" msgid "%(delta)s ago" -msgstr "" +msgstr "%(delta)s tagasi" #: templatetags/humanize.py:194 templatetags/humanize.py:219 msgid "now" -msgstr "" +msgstr "praegu" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:198 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:201 #, python-format msgid "a second ago" -msgid_plural "%(count)s\\u00a0seconds ago" -msgstr[0] "" -msgstr[1] "" +msgid_plural "%(count)s seconds ago" +msgstr[0] "sekund tagasi" +msgstr[1] "%(count)s sekundit tagasi" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:204 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 #, python-format msgid "a minute ago" -msgid_plural "%(count)s\\u00a0minutes ago" -msgstr[0] "" -msgstr[1] "" +msgid_plural "%(count)s minutes ago" +msgstr[0] "minut tagasi" +msgstr[1] "%(count)s minutit tagasi" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:210 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 #, python-format msgid "an hour ago" -msgid_plural "%(count)s\\u00a0hours ago" -msgstr[0] "" -msgstr[1] "" +msgid_plural "%(count)s hours ago" +msgstr[0] "tund tagasi" +msgstr[1] "%(count)s tundi tagasi" #: templatetags/humanize.py:216 #, python-format msgctxt "naturaltime" msgid "%(delta)s from now" -msgstr "" +msgstr "%(delta)s praegusest hetkest" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:223 -#, python-format -msgid "a second from now" -msgid_plural "%(count)s\\u00a0seconds from now" -msgstr[0] "" -msgstr[1] "" - -#. Translators: \\u00a0 is non-breaking space +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. #: templatetags/humanize.py:229 #, python-format -msgid "a minute from now" -msgid_plural "%(count)s\\u00a0minutes from now" -msgstr[0] "" -msgstr[1] "" +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "sekund praegusest hetkest" +msgstr[1] "%(count)s sekundit praegusest hetkest" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:235 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 +#, python-format +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "minut praegusest hetkest" +msgstr[1] "%(count)s minutit praegusest hetkest" + +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 #, python-format msgid "an hour from now" -msgid_plural "%(count)s\\u00a0hours from now" -msgstr[0] "" -msgstr[1] "" +msgid_plural "%(count)s hours from now" +msgstr[0] "tund praegusest hetkest" +msgstr[1] "%(count)s tundi praegusest hetkest" diff --git a/django/contrib/humanize/locale/eu/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/eu/LC_MESSAGES/django.mo index 9739116a88..5a82559e75 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 50fef36da6..736129ed5c 100644 --- a/django/contrib/humanize/locale/eu/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/eu/LC_MESSAGES/django.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-18 23:10+0200\n" -"PO-Revision-Date: 2013-05-19 08:23+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-11-16 09:36+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Basque (http://www.transifex.com/projects/p/django/language/" "eu/)\n" "MIME-Version: 1.0\n" @@ -246,27 +246,30 @@ msgstr "duela %(delta)s" msgid "now" msgstr "orain" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:198 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:201 #, python-format msgid "a second ago" -msgid_plural "%(count)s\\u00a0seconds ago" +msgid_plural "%(count)s seconds ago" msgstr[0] "duela segundu bat" msgstr[1] "duela %(count)s segundu" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:204 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 #, python-format msgid "a minute ago" -msgid_plural "%(count)s\\u00a0minutes ago" +msgid_plural "%(count)s minutes ago" msgstr[0] "duela minutu bat" msgstr[1] "duela %(count)s minutu " -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:210 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 #, python-format msgid "an hour ago" -msgid_plural "%(count)s\\u00a0hours ago" +msgid_plural "%(count)s hours ago" msgstr[0] "duela ordubete" msgstr[1] "duela %(count)s ordu" @@ -276,26 +279,29 @@ msgctxt "naturaltime" msgid "%(delta)s from now" msgstr "%(delta)s barru" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:223 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:229 #, python-format msgid "a second from now" -msgid_plural "%(count)s\\u00a0seconds from now" +msgid_plural "%(count)s seconds from now" msgstr[0] "segundu bat barru" msgstr[1] "%(count)s segundu barru" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:229 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 #, python-format msgid "a minute from now" -msgid_plural "%(count)s\\u00a0minutes from now" +msgid_plural "%(count)s minutes from now" msgstr[0] "minutu bat barru" msgstr[1] "%(count)s minutu barru" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:235 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 #, python-format msgid "an hour from now" -msgid_plural "%(count)s\\u00a0hours 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 cb594b1cc5..ece1efeeae 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 ca43ec4b81..8b5b97e187 100644 --- a/django/contrib/humanize/locale/fa/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/fa/LC_MESSAGES/django.po @@ -3,13 +3,14 @@ # Translators: # Ali Nikneshan , 2012 # Alireza Savand , 2012 +# claudep , 2013 # Jannis Leidel , 2011 msgid "" msgstr "" "Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-18 23:10+0200\n" -"PO-Revision-Date: 2013-05-19 08:23+0000\n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-11-16 16:49+0000\n" "Last-Translator: claudep \n" "Language-Team: Persian (http://www.transifex.com/projects/p/django/language/" "fa/)\n" @@ -225,27 +226,28 @@ msgstr "%(delta)s قبل" msgid "now" msgstr "اکنون" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:198 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:201 #, python-format msgid "a second ago" -msgid_plural "%(count)s\\u00a0seconds ago" +msgid_plural "%(count)s seconds ago" msgstr[0] "%(count)s ثانیه پیش" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:204 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 #, python-format msgid "a minute ago" -msgid_plural "%(count)s\\u00a0minutes ago" -msgstr[0] "" -"%(count)s دقیقه پیش\n" -" " +msgid_plural "%(count)s minutes ago" +msgstr[0] "%(count)s دقیقه پیش" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:210 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 #, python-format msgid "an hour ago" -msgid_plural "%(count)s\\u00a0hours ago" +msgid_plural "%(count)s hours ago" msgstr[0] "%(count)s ساعت پیش" #: templatetags/humanize.py:216 @@ -254,23 +256,26 @@ msgctxt "naturaltime" msgid "%(delta)s from now" msgstr "%(delta)s از الان" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:223 -#, python-format -msgid "a second from now" -msgid_plural "%(count)s\\u00a0seconds from now" -msgstr[0] "%(count)s ثانیه بعد" - -#. Translators: \\u00a0 is non-breaking space +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. #: templatetags/humanize.py:229 #, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "%(count)s ثانیه بعد" + +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 +#, python-format msgid "a minute from now" -msgid_plural "%(count)s\\u00a0minutes from now" +msgid_plural "%(count)s minutes from now" msgstr[0] "%(count)s دقیقه بعد" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:235 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 #, python-format msgid "an hour from now" -msgid_plural "%(count)s\\u00a0hours from now" +msgid_plural "%(count)s hours from now" msgstr[0] "%(count)s ساعت بعد" diff --git a/django/contrib/humanize/locale/fi/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/fi/LC_MESSAGES/django.mo index 722cad8d15..bfb2bf517a 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 6a27bbc37d..032f6e2157 100644 --- a/django/contrib/humanize/locale/fi/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/fi/LC_MESSAGES/django.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-18 23:10+0200\n" -"PO-Revision-Date: 2013-05-19 08:23+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-11-16 09:36+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Finnish (http://www.transifex.com/projects/p/django/language/" "fi/)\n" "MIME-Version: 1.0\n" @@ -246,27 +246,30 @@ msgstr "%(delta)s sitten" msgid "now" msgstr "nyt" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:198 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:201 #, python-format msgid "a second ago" -msgid_plural "%(count)s\\u00a0seconds ago" +msgid_plural "%(count)s seconds ago" msgstr[0] "sekunti sitten" msgstr[1] "%(count)s sekuntia sitten" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:204 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 #, python-format msgid "a minute ago" -msgid_plural "%(count)s\\u00a0minutes ago" +msgid_plural "%(count)s minutes ago" msgstr[0] "minuutti sitten" msgstr[1] "%(count)s minuuttia sitten" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:210 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 #, python-format msgid "an hour ago" -msgid_plural "%(count)s\\u00a0hours ago" +msgid_plural "%(count)s hours ago" msgstr[0] "tunti sitten" msgstr[1] "%(count)s tuntia sitten" @@ -276,26 +279,29 @@ msgctxt "naturaltime" msgid "%(delta)s from now" msgstr "%(delta)s tästä hetkestä" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:223 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:229 #, python-format msgid "a second from now" -msgid_plural "%(count)s\\u00a0seconds from now" +msgid_plural "%(count)s seconds from now" msgstr[0] "sekunnin kuluttua" msgstr[1] "%(count)s sekunnin kuluttua" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:229 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 #, python-format msgid "a minute from now" -msgid_plural "%(count)s\\u00a0minutes from now" +msgid_plural "%(count)s minutes from now" msgstr[0] "minuutin kuluttua" msgstr[1] "%(count)s minuutin kuluttua" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:235 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 #, python-format msgid "an hour from now" -msgid_plural "%(count)s\\u00a0hours 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 0b12505765..42c2f8df1b 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 4b9e9c52aa..e1b764a25f 100644 --- a/django/contrib/humanize/locale/fr/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/fr/LC_MESSAGES/django.po @@ -1,14 +1,15 @@ # This file is distributed under the same license as the Django package. # # Translators: +# claudep , 2013 # claudep , 2011 # Jannis Leidel , 2011 msgid "" msgstr "" "Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-18 23:10+0200\n" -"PO-Revision-Date: 2013-05-19 08:23+0000\n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-11-16 16:51+0000\n" "Last-Translator: claudep \n" "Language-Team: French (http://www.transifex.com/projects/p/django/language/" "fr/)\n" @@ -246,27 +247,30 @@ msgstr "il y a %(delta)s" msgid "now" msgstr "maintenant" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:198 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:201 #, python-format msgid "a second ago" -msgid_plural "%(count)s\\u00a0seconds ago" +msgid_plural "%(count)s seconds ago" msgstr[0] "il y a une seconde" -msgstr[1] "il y a %(count)s secondes" +msgstr[1] "il y a %(count)s secondes" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:204 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 #, python-format msgid "a minute ago" -msgid_plural "%(count)s\\u00a0minutes ago" +msgid_plural "%(count)s minutes ago" msgstr[0] "il y a une minute" msgstr[1] "il y a %(count)s minutes" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:210 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 #, python-format msgid "an hour ago" -msgid_plural "%(count)s\\u00a0hours ago" +msgid_plural "%(count)s hours ago" msgstr[0] "il y a une heure" msgstr[1] "il y a %(count)s heures" @@ -276,26 +280,29 @@ msgctxt "naturaltime" msgid "%(delta)s from now" msgstr "dans %(delta)s" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:223 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:229 #, python-format msgid "a second from now" -msgid_plural "%(count)s\\u00a0seconds from now" +msgid_plural "%(count)s seconds from now" msgstr[0] "dans une seconde" msgstr[1] "dans %(count)s secondes" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:229 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 #, python-format msgid "a minute from now" -msgid_plural "%(count)s\\u00a0minutes from now" +msgid_plural "%(count)s minutes from now" msgstr[0] "dans une minute" msgstr[1] "dans %(count)s minutes" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:235 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 #, python-format msgid "an hour from now" -msgid_plural "%(count)s\\u00a0hours 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 83e0b34884..a70d0eea6d 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 8b203f31d5..171f4c2dab 100644 --- a/django/contrib/humanize/locale/fy_NL/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/fy_NL/LC_MESSAGES/django.po @@ -1,291 +1,305 @@ # This file is distributed under the same license as the Django package. # +# Translators: msgid "" msgstr "" -"Project-Id-Version: Django\n" +"Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-03-23 02:41+0100\n" -"PO-Revision-Date: 2011-03-15 15:28+0000\n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-04-24 18:40+0000\n" "Last-Translator: Django team\n" -"Language-Team: English \n" -"Language: fy_NL\n" +"Language-Team: Western Frisian (Netherlands) (http://www.transifex.com/" +"projects/p/django/language/fy_NL/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Language: fy_NL\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: tests.py:108 templatetags/humanize.py:164 +#: tests.py:135 templatetags/humanize.py:168 msgid "today" msgstr "" -#: tests.py:108 templatetags/humanize.py:168 +#: tests.py:135 templatetags/humanize.py:172 msgid "yesterday" msgstr "" -#: tests.py:108 templatetags/humanize.py:166 +#: tests.py:135 templatetags/humanize.py:170 msgid "tomorrow" msgstr "" -#: templatetags/humanize.py:24 +#: templatetags/humanize.py:26 msgid "th" msgstr "" -#: templatetags/humanize.py:24 +#: templatetags/humanize.py:26 msgid "st" msgstr "" -#: templatetags/humanize.py:24 +#: templatetags/humanize.py:26 msgid "nd" msgstr "" -#: templatetags/humanize.py:24 +#: templatetags/humanize.py:26 msgid "rd" msgstr "" -#: templatetags/humanize.py:53 +#: templatetags/humanize.py:55 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:54 +#: templatetags/humanize.py:56 #, python-format msgid "%(value)s million" msgid_plural "%(value)s million" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:57 +#: templatetags/humanize.py:59 #, python-format msgid "%(value).1f billion" msgid_plural "%(value).1f billion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:58 +#: templatetags/humanize.py:60 #, python-format msgid "%(value)s billion" msgid_plural "%(value)s billion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:61 +#: templatetags/humanize.py:63 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:62 +#: templatetags/humanize.py:64 #, python-format msgid "%(value)s trillion" msgid_plural "%(value)s trillion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:65 +#: templatetags/humanize.py:67 #, python-format msgid "%(value).1f quadrillion" msgid_plural "%(value).1f quadrillion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:66 +#: templatetags/humanize.py:68 #, python-format msgid "%(value)s quadrillion" msgid_plural "%(value)s quadrillion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:69 +#: templatetags/humanize.py:71 #, python-format msgid "%(value).1f quintillion" msgid_plural "%(value).1f quintillion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:70 +#: templatetags/humanize.py:72 #, python-format msgid "%(value)s quintillion" msgid_plural "%(value)s quintillion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:73 +#: templatetags/humanize.py:75 #, python-format msgid "%(value).1f sextillion" msgid_plural "%(value).1f sextillion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:74 +#: templatetags/humanize.py:76 #, python-format msgid "%(value)s sextillion" msgid_plural "%(value)s sextillion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:77 +#: templatetags/humanize.py:79 #, python-format msgid "%(value).1f septillion" msgid_plural "%(value).1f septillion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:78 +#: templatetags/humanize.py:80 #, python-format msgid "%(value)s septillion" msgid_plural "%(value)s septillion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:81 +#: templatetags/humanize.py:83 #, python-format msgid "%(value).1f octillion" msgid_plural "%(value).1f octillion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:82 +#: templatetags/humanize.py:84 #, python-format msgid "%(value)s octillion" msgid_plural "%(value)s octillion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:85 +#: templatetags/humanize.py:87 #, python-format msgid "%(value).1f nonillion" msgid_plural "%(value).1f nonillion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:86 +#: templatetags/humanize.py:88 #, python-format msgid "%(value)s nonillion" msgid_plural "%(value)s nonillion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:89 +#: templatetags/humanize.py:91 #, python-format msgid "%(value).1f decillion" msgid_plural "%(value).1f decillion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:90 +#: templatetags/humanize.py:92 #, python-format msgid "%(value)s decillion" msgid_plural "%(value)s decillion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:93 +#: templatetags/humanize.py:95 #, python-format msgid "%(value).1f googol" msgid_plural "%(value).1f googol" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:94 +#: templatetags/humanize.py:96 #, python-format msgid "%(value)s googol" msgid_plural "%(value)s googol" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:143 +#: templatetags/humanize.py:145 msgid "one" msgstr "" -#: templatetags/humanize.py:143 +#: templatetags/humanize.py:145 msgid "two" msgstr "" -#: templatetags/humanize.py:143 +#: templatetags/humanize.py:145 msgid "three" msgstr "" -#: templatetags/humanize.py:143 +#: templatetags/humanize.py:145 msgid "four" msgstr "" -#: templatetags/humanize.py:143 +#: templatetags/humanize.py:145 msgid "five" msgstr "" -#: templatetags/humanize.py:143 +#: templatetags/humanize.py:145 msgid "six" msgstr "" -#: templatetags/humanize.py:143 +#: templatetags/humanize.py:145 msgid "seven" msgstr "" -#: templatetags/humanize.py:143 +#: templatetags/humanize.py:145 msgid "eight" msgstr "" -#: templatetags/humanize.py:143 +#: templatetags/humanize.py:145 msgid "nine" msgstr "" -#: templatetags/humanize.py:185 +#: templatetags/humanize.py:191 #, python-format msgctxt "naturaltime" msgid "%(delta)s ago" msgstr "" -#: templatetags/humanize.py:188 templatetags/humanize.py:210 +#: templatetags/humanize.py:194 templatetags/humanize.py:219 msgid "now" 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] "" - +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. #: templatetags/humanize.py:201 #, python-format -msgid "an hour ago" -msgid_plural "%(count)s hours ago" +msgid "a second ago" +msgid_plural "%(count)s seconds ago" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:207 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 +#, python-format +msgid "a minute ago" +msgid_plural "%(count)s minutes ago" +msgstr[0] "" +msgstr[1] "" + +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 +#, python-format +msgid "an hour ago" +msgid_plural "%(count)s hours ago" +msgstr[0] "" +msgstr[1] "" + +#: templatetags/humanize.py:216 #, python-format msgctxt "naturaltime" msgid "%(delta)s from now" msgstr "" -#: templatetags/humanize.py:213 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:229 #, python-format msgid "a second from now" -msgid_plural "%(count)s seconds from now" +msgid_plural "%(count)s seconds from now" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:218 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 #, python-format msgid "a minute from now" -msgid_plural "%(count)s minutes from now" +msgid_plural "%(count)s minutes from now" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:223 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 #, python-format msgid "an hour from now" -msgid_plural "%(count)s hours 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 54616c6b49..35e3e920bb 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 e15eeca98f..b7cbe7d52a 100644 --- a/django/contrib/humanize/locale/ga/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/ga/LC_MESSAGES/django.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-18 23:10+0200\n" -"PO-Revision-Date: 2013-05-19 08:23+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-11-16 09:36+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Irish (http://www.transifex.com/projects/p/django/language/" "ga/)\n" "MIME-Version: 1.0\n" @@ -313,33 +313,36 @@ msgstr "%(delta)s ó shin" msgid "now" msgstr "anois" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:198 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:201 #, python-format msgid "a second ago" -msgid_plural "%(count)s\\u00a0seconds ago" +msgid_plural "%(count)s seconds ago" msgstr[0] "soicind ó shin" msgstr[1] "%(count)s soicind ó shin" msgstr[2] "%(count)s soicind ó shin" msgstr[3] "%(count)s soicind ó shin" msgstr[4] "%(count)s soicind ó shin" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:204 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 #, python-format msgid "a minute ago" -msgid_plural "%(count)s\\u00a0minutes ago" +msgid_plural "%(count)s minutes ago" msgstr[0] "nóiméad ó shin" msgstr[1] "%(count)s nóiméad ó shin" msgstr[2] "%(count)s nóiméad ó shin" msgstr[3] "%(count)s nóiméad ó shin" msgstr[4] "%(count)s nóiméad ó shin" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:210 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 #, python-format msgid "an hour ago" -msgid_plural "%(count)s\\u00a0hours ago" +msgid_plural "%(count)s hours ago" msgstr[0] "uair a chloig ó shin" msgstr[1] "%(count)s uair a chloig ó shin" msgstr[2] "%(count)s uair a chloig ó shin" @@ -352,33 +355,36 @@ msgctxt "naturaltime" msgid "%(delta)s from now" msgstr " %(delta)s as seo amach" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:223 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:229 #, python-format msgid "a second from now" -msgid_plural "%(count)s\\u00a0seconds from now" +msgid_plural "%(count)s seconds from now" msgstr[0] "soicind as seo amach" msgstr[1] "%(count)s soicind as seo amach" msgstr[2] "%(count)s soicind as seo amach" msgstr[3] "%(count)s soicind as seo amach" msgstr[4] "%(count)s soicind as seo amach" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:229 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 #, python-format msgid "a minute from now" -msgid_plural "%(count)s\\u00a0minutes from now" +msgid_plural "%(count)s minutes from now" msgstr[0] "nóiméad as seo amach" msgstr[1] "%(count)s nóiméad as seo amach" msgstr[2] "%(count)s nóiméad as seo amach" msgstr[3] "%(count)s nóiméad as seo amach" msgstr[4] "%(count)s nóiméad as seo amach" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:235 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 #, python-format msgid "an hour from now" -msgid_plural "%(count)s\\u00a0hours from now" +msgid_plural "%(count)s hours from now" msgstr[0] "uair a chloig as seo amach" msgstr[1] "%(count)s uair a chloig as seo amach" msgstr[2] "%(count)s uair a chloig as seo amach" diff --git a/django/contrib/humanize/locale/gl/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/gl/LC_MESSAGES/django.mo index 923679bc0c..095179130d 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 3a7fb3e485..68dc2f6469 100644 --- a/django/contrib/humanize/locale/gl/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/gl/LC_MESSAGES/django.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-18 23:10+0200\n" -"PO-Revision-Date: 2013-09-07 11:29+0000\n" -"Last-Translator: Leandro Regueiro \n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-11-16 09:36+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Galician (http://www.transifex.com/projects/p/django/language/" "gl/)\n" "MIME-Version: 1.0\n" @@ -248,27 +248,30 @@ msgstr "hai %(delta)s" msgid "now" msgstr "agora" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:198 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:201 #, python-format msgid "a second ago" -msgid_plural "%(count)s\\u00a0seconds ago" +msgid_plural "%(count)s seconds ago" msgstr[0] "hai un segundo" msgstr[1] "hai %(count)s segundos" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:204 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 #, python-format msgid "a minute ago" -msgid_plural "%(count)s\\u00a0minutes ago" +msgid_plural "%(count)s minutes ago" msgstr[0] "hai un minuto" msgstr[1] "hai %(count)s minutos" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:210 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 #, python-format msgid "an hour ago" -msgid_plural "%(count)s\\u00a0hours ago" +msgid_plural "%(count)s hours ago" msgstr[0] "hai unha hora" msgstr[1] "hai %(count)s horas" @@ -278,26 +281,29 @@ msgctxt "naturaltime" msgid "%(delta)s from now" msgstr "dentro de %(delta)s" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:223 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:229 #, python-format msgid "a second from now" -msgid_plural "%(count)s\\u00a0seconds from now" +msgid_plural "%(count)s seconds from now" msgstr[0] "dentro dun segundo" msgstr[1] "dentro de %(count)s segundos" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:229 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 #, python-format msgid "a minute from now" -msgid_plural "%(count)s\\u00a0minutes from now" +msgid_plural "%(count)s minutes from now" msgstr[0] "dentro dun minuto" msgstr[1] "dentro de %(count)s minutos" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:235 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 #, python-format msgid "an hour from now" -msgid_plural "%(count)s\\u00a0hours from now" +msgid_plural "%(count)s hours from now" msgstr[0] "dentro dunha hora" msgstr[1] "dentro de %(count)s horas" diff --git a/django/contrib/humanize/locale/he/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/he/LC_MESSAGES/django.mo index 9e3ef16c6c..ee604c58bf 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 cbcfe8e682..3033873e52 100644 --- a/django/contrib/humanize/locale/he/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/he/LC_MESSAGES/django.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-18 23:10+0200\n" -"PO-Revision-Date: 2013-05-19 08:23+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-11-16 09:36+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Hebrew (http://www.transifex.com/projects/p/django/language/" "he/)\n" "MIME-Version: 1.0\n" @@ -247,27 +247,30 @@ msgstr "לפני %(delta)s" msgid "now" msgstr "עכשיו" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:198 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:201 #, python-format msgid "a second ago" -msgid_plural "%(count)s\\u00a0seconds ago" +msgid_plural "%(count)s seconds ago" msgstr[0] "לפני שנייה" msgstr[1] "לפני %(count)s שניות" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:204 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 #, python-format msgid "a minute ago" -msgid_plural "%(count)s\\u00a0minutes ago" +msgid_plural "%(count)s minutes ago" msgstr[0] "לפני דקה" msgstr[1] "לפני %(count)s דקות" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:210 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 #, python-format msgid "an hour ago" -msgid_plural "%(count)s\\u00a0hours ago" +msgid_plural "%(count)s hours ago" msgstr[0] "לפני שעה" msgstr[1] "לפני %(count)s שעות" @@ -277,26 +280,29 @@ msgctxt "naturaltime" msgid "%(delta)s from now" msgstr "בעוד %(delta)s" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:223 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:229 #, python-format msgid "a second from now" -msgid_plural "%(count)s\\u00a0seconds from now" +msgid_plural "%(count)s seconds from now" msgstr[0] "בעוד שנייה" msgstr[1] "בעוד %(count)s שניות" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:229 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 #, python-format msgid "a minute from now" -msgid_plural "%(count)s\\u00a0minutes from now" +msgid_plural "%(count)s minutes from now" msgstr[0] "בעוד דקה" msgstr[1] "בעוד %(count)s דקות" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:235 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 #, python-format msgid "an hour from now" -msgid_plural "%(count)s\\u00a0hours 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 48ca1e26f1..0d338b2dd0 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 b9b7fec07e..30384b0708 100644 --- a/django/contrib/humanize/locale/hi/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/hi/LC_MESSAGES/django.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-18 23:10+0200\n" -"PO-Revision-Date: 2013-05-19 08:23+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-11-16 09:36+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Hindi (http://www.transifex.com/projects/p/django/language/" "hi/)\n" "MIME-Version: 1.0\n" @@ -247,27 +247,30 @@ msgstr "%(delta)s पहले" msgid "now" msgstr "अभी" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:198 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:201 #, python-format msgid "a second ago" -msgid_plural "%(count)s\\u00a0seconds ago" +msgid_plural "%(count)s seconds ago" msgstr[0] "एक सेकेंड पहले" msgstr[1] "%(count)s सेकेंड पहले" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:204 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 #, python-format msgid "a minute ago" -msgid_plural "%(count)s\\u00a0minutes ago" +msgid_plural "%(count)s minutes ago" msgstr[0] " एक मिनट पहले" msgstr[1] "%(count)s मिनट पहले" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:210 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 #, python-format msgid "an hour ago" -msgid_plural "%(count)s\\u00a0hours ago" +msgid_plural "%(count)s hours ago" msgstr[0] "एक घंटा पहले" msgstr[1] "%(count)s घंटे पहले" @@ -277,26 +280,29 @@ msgctxt "naturaltime" msgid "%(delta)s from now" msgstr "%(delta)s अब से" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:223 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:229 #, python-format msgid "a second from now" -msgid_plural "%(count)s\\u00a0seconds from now" +msgid_plural "%(count)s seconds from now" msgstr[0] "अब से एक सेकेंड" msgstr[1] "अब से %(count)s सेकेंड" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:229 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 #, python-format msgid "a minute from now" -msgid_plural "%(count)s\\u00a0minutes from now" +msgid_plural "%(count)s minutes from now" msgstr[0] "अब से एक मिनट" msgstr[1] "अब से %(count)s मिनट" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:235 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 #, python-format msgid "an hour from now" -msgid_plural "%(count)s\\u00a0hours 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 25d9a90219..8d764c1674 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 2b961d7fbd..5ce5887fd5 100644 --- a/django/contrib/humanize/locale/hr/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/hr/LC_MESSAGES/django.po @@ -1,16 +1,13 @@ # This file is distributed under the same license as the Django package. # # Translators: -# , 2012. -# Jannis Leidel , 2011. -# , 2012. msgid "" msgstr "" -"Project-Id-Version: Django\n" +"Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-10-15 10:57+0200\n" -"PO-Revision-Date: 2012-04-16 10:48+0000\n" -"Last-Translator: aljosa \n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-04-24 18:40+0000\n" +"Last-Translator: Django team\n" "Language-Team: Croatian (http://www.transifex.com/projects/p/django/language/" "hr/)\n" "MIME-Version: 1.0\n" @@ -20,306 +17,318 @@ msgstr "" "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" -#: tests.py:125 templatetags/humanize.py:167 +#: tests.py:135 templatetags/humanize.py:168 msgid "today" -msgstr "danas" +msgstr "" -#: tests.py:125 templatetags/humanize.py:171 +#: tests.py:135 templatetags/humanize.py:172 msgid "yesterday" -msgstr "jučer" +msgstr "" -#: tests.py:125 templatetags/humanize.py:169 +#: tests.py:135 templatetags/humanize.py:170 msgid "tomorrow" -msgstr "sutra" +msgstr "" -#: templatetags/humanize.py:25 +#: templatetags/humanize.py:26 msgid "th" -msgstr "th" +msgstr "" -#: templatetags/humanize.py:25 +#: templatetags/humanize.py:26 msgid "st" -msgstr "st" +msgstr "" -#: templatetags/humanize.py:25 +#: templatetags/humanize.py:26 msgid "nd" -msgstr "nd" +msgstr "" -#: templatetags/humanize.py:25 +#: templatetags/humanize.py:26 msgid "rd" -msgstr "rd" - -#: templatetags/humanize.py:54 -#, python-format -msgid "%(value).1f million" -msgid_plural "%(value).1f million" -msgstr[0] "%(value).1f milijun" -msgstr[1] "%(value).1f milijuna" -msgstr[2] "%(value).1f milijuna" +msgstr "" #: templatetags/humanize.py:55 #, python-format +msgid "%(value).1f million" +msgid_plural "%(value).1f million" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:56 +#, python-format msgid "%(value)s million" msgid_plural "%(value)s million" -msgstr[0] "%(value)s milijun" -msgstr[1] "%(value)s milijuna" -msgstr[2] "%(value)s milijun" - -#: templatetags/humanize.py:58 -#, python-format -msgid "%(value).1f billion" -msgid_plural "%(value).1f billion" -msgstr[0] "%(value).1f milijarda" -msgstr[1] "%(value).1f milijarde" -msgstr[2] "%(value).1f milijarde" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" #: templatetags/humanize.py:59 #, python-format +msgid "%(value).1f billion" +msgid_plural "%(value).1f billion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:60 +#, python-format msgid "%(value)s billion" msgid_plural "%(value)s billion" -msgstr[0] "%(value)s milijarda" -msgstr[1] "%(value)s milijarde" -msgstr[2] "%(value)s milijardi" - -#: templatetags/humanize.py:62 -#, python-format -msgid "%(value).1f trillion" -msgid_plural "%(value).1f trillion" -msgstr[0] "%(value).1f bilion" -msgstr[1] "%(value).1f biliona" -msgstr[2] "%(value).1f bilion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" #: templatetags/humanize.py:63 #, python-format +msgid "%(value).1f trillion" +msgid_plural "%(value).1f trillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:64 +#, python-format msgid "%(value)s trillion" msgid_plural "%(value)s trillion" -msgstr[0] "%(value)s bilijun" -msgstr[1] "%(value)s bilijuna" -msgstr[2] "%(value)s bilijuna" - -#: templatetags/humanize.py:66 -#, python-format -msgid "%(value).1f quadrillion" -msgid_plural "%(value).1f quadrillion" -msgstr[0] "%(value).1f kvadrilijun" -msgstr[1] "%(value).1f kvadrilijuna" -msgstr[2] "%(value).1f kvadrilijuna" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" #: templatetags/humanize.py:67 #, python-format +msgid "%(value).1f quadrillion" +msgid_plural "%(value).1f quadrillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:68 +#, python-format msgid "%(value)s quadrillion" msgid_plural "%(value)s quadrillion" -msgstr[0] "%(value)s kvadrilijun" -msgstr[1] "%(value)s kvadrilijuna" -msgstr[2] "%(value)s kvadrilijuna" - -#: templatetags/humanize.py:70 -#, python-format -msgid "%(value).1f quintillion" -msgid_plural "%(value).1f quintillion" -msgstr[0] "%(value).1f kvintilijun" -msgstr[1] "%(value).1f kvintilijuna" -msgstr[2] "%(value).1f kvintilijuna" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" #: templatetags/humanize.py:71 #, python-format +msgid "%(value).1f quintillion" +msgid_plural "%(value).1f quintillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:72 +#, python-format msgid "%(value)s quintillion" msgid_plural "%(value)s quintillion" -msgstr[0] "%(value)s kvintilijun" -msgstr[1] "%(value)s kvintilijuna" -msgstr[2] "%(value)s kvintilijuna" - -#: templatetags/humanize.py:74 -#, python-format -msgid "%(value).1f sextillion" -msgid_plural "%(value).1f sextillion" -msgstr[0] "%(value).1f sekstilijun" -msgstr[1] "%(value).1f sekstilijuna" -msgstr[2] "%(value).1f sekstilijuna" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" #: templatetags/humanize.py:75 #, python-format +msgid "%(value).1f sextillion" +msgid_plural "%(value).1f sextillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:76 +#, python-format msgid "%(value)s sextillion" msgid_plural "%(value)s sextillion" -msgstr[0] "%(value)s sekstilijun" -msgstr[1] "%(value)s sekstilijuna" -msgstr[2] "%(value)s sekstilijuna" - -#: templatetags/humanize.py:78 -#, python-format -msgid "%(value).1f septillion" -msgid_plural "%(value).1f septillion" -msgstr[0] "%(value).1f septilijun" -msgstr[1] "%(value).1f septilijuna" -msgstr[2] "%(value).1f septilijuna" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" #: templatetags/humanize.py:79 #, python-format +msgid "%(value).1f septillion" +msgid_plural "%(value).1f septillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:80 +#, python-format msgid "%(value)s septillion" msgid_plural "%(value)s septillion" -msgstr[0] "%(value)s septilijun" -msgstr[1] "%(value)s septilijuna" -msgstr[2] "%(value)s septilijuna" - -#: templatetags/humanize.py:82 -#, python-format -msgid "%(value).1f octillion" -msgid_plural "%(value).1f octillion" -msgstr[0] "%(value).1f oktilijun" -msgstr[1] "%(value).1f oktilijuna" -msgstr[2] "%(value).1f oktilijuna" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" #: templatetags/humanize.py:83 #, python-format +msgid "%(value).1f octillion" +msgid_plural "%(value).1f octillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:84 +#, python-format msgid "%(value)s octillion" msgid_plural "%(value)s octillion" -msgstr[0] "%(value)s oktilijun" -msgstr[1] "%(value)s oktilijuna" -msgstr[2] "%(value)s oktilijuna" - -#: templatetags/humanize.py:86 -#, python-format -msgid "%(value).1f nonillion" -msgid_plural "%(value).1f nonillion" -msgstr[0] "%(value).1f nonillion" -msgstr[1] "%(value).1f nonillion" -msgstr[2] "%(value).1f nonillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" #: templatetags/humanize.py:87 #, python-format +msgid "%(value).1f nonillion" +msgid_plural "%(value).1f nonillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:88 +#, python-format msgid "%(value)s nonillion" msgid_plural "%(value)s nonillion" -msgstr[0] "%(value)s nonillion" -msgstr[1] "%(value)s nonillion" -msgstr[2] "%(value)s nonillion" - -#: templatetags/humanize.py:90 -#, python-format -msgid "%(value).1f decillion" -msgid_plural "%(value).1f decillion" -msgstr[0] "%(value).1f decillion" -msgstr[1] "%(value).1f decillion" -msgstr[2] "%(value).1f decillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" #: templatetags/humanize.py:91 #, python-format +msgid "%(value).1f decillion" +msgid_plural "%(value).1f decillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:92 +#, python-format msgid "%(value)s decillion" msgid_plural "%(value)s decillion" -msgstr[0] "%(value)s decillion" -msgstr[1] "%(value)s decillion" -msgstr[2] "%(value)s decillion" - -#: templatetags/humanize.py:94 -#, 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" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" #: templatetags/humanize.py:95 #, python-format +msgid "%(value).1f googol" +msgid_plural "%(value).1f googol" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:96 +#, 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" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" -#: templatetags/humanize.py:144 +#: templatetags/humanize.py:145 msgid "one" -msgstr "jedan" +msgstr "" -#: templatetags/humanize.py:144 +#: templatetags/humanize.py:145 msgid "two" -msgstr "dva" +msgstr "" -#: templatetags/humanize.py:144 +#: templatetags/humanize.py:145 msgid "three" -msgstr "tri" +msgstr "" -#: templatetags/humanize.py:144 +#: templatetags/humanize.py:145 msgid "four" -msgstr "četiri" +msgstr "" -#: templatetags/humanize.py:144 +#: templatetags/humanize.py:145 msgid "five" -msgstr "pet" +msgstr "" -#: templatetags/humanize.py:144 +#: templatetags/humanize.py:145 msgid "six" -msgstr "šest" +msgstr "" -#: templatetags/humanize.py:144 +#: templatetags/humanize.py:145 msgid "seven" -msgstr "sedam" +msgstr "" -#: templatetags/humanize.py:144 +#: templatetags/humanize.py:145 msgid "eight" -msgstr "osam" +msgstr "" -#: templatetags/humanize.py:144 +#: templatetags/humanize.py:145 msgid "nine" -msgstr "devet" +msgstr "" -#: templatetags/humanize.py:190 +#: templatetags/humanize.py:191 #, python-format msgctxt "naturaltime" msgid "%(delta)s ago" -msgstr "prije %(delta)s" +msgstr "" -#: templatetags/humanize.py:193 templatetags/humanize.py:215 +#: templatetags/humanize.py:194 templatetags/humanize.py:219 msgid "now" -msgstr "sada" - -#: templatetags/humanize.py:196 -#, python-format -msgid "a second ago" -msgid_plural "%(count)s seconds ago" -msgstr[0] "prije sekundu" -msgstr[1] "prije %(count)s sekunde" -msgstr[2] "prije %(count)s sekundi" +msgstr "" +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. #: templatetags/humanize.py:201 #, python-format -msgid "a minute ago" -msgid_plural "%(count)s minutes ago" -msgstr[0] "prije minutu" -msgstr[1] "prije %(count)s minute" -msgstr[2] "prije %(count)s minuta" +msgid "a second ago" +msgid_plural "%(count)s seconds ago" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" -#: templatetags/humanize.py:206 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 +#, python-format +msgid "a minute ago" +msgid_plural "%(count)s minutes ago" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 #, python-format msgid "an hour ago" -msgid_plural "%(count)s hours ago" -msgstr[0] "prije sat vremena" -msgstr[1] "prije %(count)s sata" -msgstr[2] "prije %(count)s sati" +msgid_plural "%(count)s hours ago" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" -#: templatetags/humanize.py:212 +#: templatetags/humanize.py:216 #, python-format msgctxt "naturaltime" msgid "%(delta)s from now" -msgstr "%(delta)s od sad" +msgstr "" -#: templatetags/humanize.py:218 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:229 #, python-format msgid "a second from now" -msgid_plural "%(count)s seconds from now" -msgstr[0] "sekunda od sad" -msgstr[1] "%(count)s sekunde od sad" -msgstr[2] "%(count)s sekundi od sad" +msgid_plural "%(count)s seconds from now" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" -#: templatetags/humanize.py:223 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 #, python-format msgid "a minute from now" -msgid_plural "%(count)s minutes from now" -msgstr[0] "za minutu" -msgstr[1] "za %(count)s minuta" -msgstr[2] "za %(count)s minuta" +msgid_plural "%(count)s minutes from now" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" -#: templatetags/humanize.py:228 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 #, python-format msgid "an hour from now" -msgid_plural "%(count)s hours from now" -msgstr[0] "za sat vremena" -msgstr[1] "za %(count)s sata/sati" -msgstr[2] "za %(count)s sata/sati" +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 0a24a24f42..6ac250f449 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 0dc7b8dcfe..0d46e09b78 100644 --- a/django/contrib/humanize/locale/hu/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/hu/LC_MESSAGES/django.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-18 23:10+0200\n" -"PO-Revision-Date: 2013-05-19 08:23+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-11-16 09:37+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Hungarian (http://www.transifex.com/projects/p/django/" "language/hu/)\n" "MIME-Version: 1.0\n" @@ -247,27 +247,30 @@ msgstr " %(delta)s ezelőtt" msgid "now" msgstr "most" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:198 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:201 #, python-format msgid "a second ago" -msgid_plural "%(count)s\\u00a0seconds ago" +msgid_plural "%(count)s seconds ago" msgstr[0] "egy másodperccel ezelőtt" msgstr[1] "%(count)s másodperccel ezelőtt" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:204 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 #, python-format msgid "a minute ago" -msgid_plural "%(count)s\\u00a0minutes ago" +msgid_plural "%(count)s minutes ago" msgstr[0] "egy perccel ezelőtt" msgstr[1] "%(count)s perccel ezelőtt" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:210 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 #, python-format msgid "an hour ago" -msgid_plural "%(count)s\\u00a0hours ago" +msgid_plural "%(count)s hours ago" msgstr[0] "egy órával ezelőtt" msgstr[1] "%(count)s órával ezelőtt" @@ -277,26 +280,29 @@ msgctxt "naturaltime" msgid "%(delta)s from now" msgstr "%(delta)s mostantól" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:223 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:229 #, python-format msgid "a second from now" -msgid_plural "%(count)s\\u00a0seconds from now" +msgid_plural "%(count)s seconds from now" msgstr[0] "egy másodperccel ezután" msgstr[1] "%(count)s másodperccel ezután" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:229 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 #, python-format msgid "a minute from now" -msgid_plural "%(count)s\\u00a0minutes from now" +msgid_plural "%(count)s minutes from now" msgstr[0] "egy perccel ezután" msgstr[1] "%(count)s perccel ezután" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:235 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 #, python-format msgid "an hour from now" -msgid_plural "%(count)s\\u00a0hours 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/ia/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/ia/LC_MESSAGES/django.mo index 9bcf7d54e8..17385b2957 100644 Binary files a/django/contrib/humanize/locale/ia/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/ia/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/ia/LC_MESSAGES/django.po b/django/contrib/humanize/locale/ia/LC_MESSAGES/django.po index 2f84e44ee2..eb8caebddd 100644 --- a/django/contrib/humanize/locale/ia/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/ia/LC_MESSAGES/django.po @@ -6,9 +6,9 @@ msgid "" msgstr "" "Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-18 23:10+0200\n" -"PO-Revision-Date: 2013-05-19 08:23+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-11-16 09:36+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Interlingua (http://www.transifex.com/projects/p/django/" "language/ia/)\n" "MIME-Version: 1.0\n" @@ -245,27 +245,30 @@ msgstr "%(delta)s retro" msgid "now" msgstr "ora" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:198 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:201 #, python-format msgid "a second ago" -msgid_plural "%(count)s\\u00a0seconds ago" +msgid_plural "%(count)s seconds ago" msgstr[0] "un secunda retro" msgstr[1] "%(count)s secundas retro" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:204 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 #, python-format msgid "a minute ago" -msgid_plural "%(count)s\\u00a0minutes ago" +msgid_plural "%(count)s minutes ago" msgstr[0] "un minuta retro" msgstr[1] "%(count)s minutas retro" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:210 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 #, python-format msgid "an hour ago" -msgid_plural "%(count)s\\u00a0hours ago" +msgid_plural "%(count)s hours ago" msgstr[0] "un hora retro" msgstr[1] "%(count)s horas retro" @@ -275,26 +278,29 @@ msgctxt "naturaltime" msgid "%(delta)s from now" msgstr "in %(delta)s" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:223 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:229 #, python-format msgid "a second from now" -msgid_plural "%(count)s\\u00a0seconds from now" +msgid_plural "%(count)s seconds from now" msgstr[0] "in un secunda" msgstr[1] "in %(count)s secundas" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:229 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 #, python-format msgid "a minute from now" -msgid_plural "%(count)s\\u00a0minutes from now" +msgid_plural "%(count)s minutes from now" msgstr[0] "in un minuta" msgstr[1] "in %(count)s minutas" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:235 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 #, python-format msgid "an hour from now" -msgid_plural "%(count)s\\u00a0hours from now" +msgid_plural "%(count)s hours from now" msgstr[0] "in un hora" msgstr[1] "in %(count)s horas" diff --git a/django/contrib/humanize/locale/id/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/id/LC_MESSAGES/django.mo index ec2f197b8e..8e9cb9415d 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 11836f0d74..5b97243550 100644 --- a/django/contrib/humanize/locale/id/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/id/LC_MESSAGES/django.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-18 23:10+0200\n" -"PO-Revision-Date: 2013-05-19 08:23+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-11-16 09:36+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/django/" "language/id/)\n" "MIME-Version: 1.0\n" @@ -224,25 +224,28 @@ msgstr "%(delta)s yang lalu" msgid "now" msgstr "sekarang" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:198 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:201 #, python-format msgid "a second ago" -msgid_plural "%(count)s\\u00a0seconds ago" +msgid_plural "%(count)s seconds ago" msgstr[0] "%(count)s detik yang lalu" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:204 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 #, python-format msgid "a minute ago" -msgid_plural "%(count)s\\u00a0minutes ago" +msgid_plural "%(count)s minutes ago" msgstr[0] "%(count)s menit yang lalu" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:210 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 #, python-format msgid "an hour ago" -msgid_plural "%(count)s\\u00a0hours ago" +msgid_plural "%(count)s hours ago" msgstr[0] "%(count)s jam yang lalu" #: templatetags/humanize.py:216 @@ -251,23 +254,26 @@ msgctxt "naturaltime" msgid "%(delta)s from now" msgstr "%(delta)s dari sekarang" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:223 -#, python-format -msgid "a second from now" -msgid_plural "%(count)s\\u00a0seconds from now" -msgstr[0] "%(count)s detik dari sekarang" - -#. Translators: \\u00a0 is non-breaking space +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. #: templatetags/humanize.py:229 #, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "%(count)s detik dari sekarang" + +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 +#, python-format msgid "a minute from now" -msgid_plural "%(count)s\\u00a0minutes from now" +msgid_plural "%(count)s minutes from now" msgstr[0] "%(count)s menit dari sekarang" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:235 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 #, python-format msgid "an hour from now" -msgid_plural "%(count)s\\u00a0hours 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 fdea4dbdbe..a8936d94ea 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 7a6c23818a..8b4db7d2ac 100644 --- a/django/contrib/humanize/locale/is/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/is/LC_MESSAGES/django.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-18 23:10+0200\n" -"PO-Revision-Date: 2013-05-19 08:23+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-11-16 09:36+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Icelandic (http://www.transifex.com/projects/p/django/" "language/is/)\n" "MIME-Version: 1.0\n" @@ -247,27 +247,30 @@ msgstr "%(delta)s síðan" msgid "now" msgstr "núna" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:198 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:201 #, python-format msgid "a second ago" -msgid_plural "%(count)s\\u00a0seconds ago" +msgid_plural "%(count)s seconds ago" msgstr[0] "fyrir sekúndu síðan" msgstr[1] "%(count)s sekúndum síðan" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:204 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 #, python-format msgid "a minute ago" -msgid_plural "%(count)s\\u00a0minutes ago" +msgid_plural "%(count)s minutes ago" msgstr[0] "fyrir mínútu síðan" msgstr[1] "%(count)s mínútum síðan" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:210 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 #, python-format msgid "an hour ago" -msgid_plural "%(count)s\\u00a0hours ago" +msgid_plural "%(count)s hours ago" msgstr[0] "fyrir klukkustund" msgstr[1] "fyrir %(count)s klukkustundum" @@ -277,26 +280,29 @@ msgctxt "naturaltime" msgid "%(delta)s from now" msgstr "eftir %(delta)s" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:223 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:229 #, python-format msgid "a second from now" -msgid_plural "%(count)s\\u00a0seconds from now" +msgid_plural "%(count)s seconds from now" msgstr[0] "eftir sekúndu" msgstr[1] "eftir %(count)s sekúndur" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:229 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 #, python-format msgid "a minute from now" -msgid_plural "%(count)s\\u00a0minutes from now" +msgid_plural "%(count)s minutes from now" msgstr[0] "eftir mínútu" msgstr[1] "eftir %(count)s mínútur" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:235 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 #, python-format msgid "an hour from now" -msgid_plural "%(count)s\\u00a0hours 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 bad5315faa..4039bf5a54 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 233486a54d..215c685030 100644 --- a/django/contrib/humanize/locale/it/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/it/LC_MESSAGES/django.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-18 23:10+0200\n" -"PO-Revision-Date: 2013-05-19 08:23+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-11-16 09:36+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Italian (http://www.transifex.com/projects/p/django/language/" "it/)\n" "MIME-Version: 1.0\n" @@ -248,27 +248,30 @@ msgstr "%(delta)s fa" msgid "now" msgstr "adesso" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:198 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:201 #, python-format msgid "a second ago" -msgid_plural "%(count)s\\u00a0seconds ago" +msgid_plural "%(count)s seconds ago" msgstr[0] "un secondo fa" msgstr[1] "%(count)s secondi fa" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:204 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 #, python-format msgid "a minute ago" -msgid_plural "%(count)s\\u00a0minutes ago" +msgid_plural "%(count)s minutes ago" msgstr[0] "un minuto fa" msgstr[1] "%(count)s minuti fa" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:210 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 #, python-format msgid "an hour ago" -msgid_plural "%(count)s\\u00a0hours ago" +msgid_plural "%(count)s hours ago" msgstr[0] "un'ora fa" msgstr[1] "%(count)s ore fa" @@ -278,26 +281,29 @@ msgctxt "naturaltime" msgid "%(delta)s from now" msgstr "%(delta)s da adesso" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:223 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:229 #, python-format msgid "a second from now" -msgid_plural "%(count)s\\u00a0seconds from now" +msgid_plural "%(count)s seconds from now" msgstr[0] "un secondo da adesso" msgstr[1] "%(count)s secondi da adesso" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:229 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 #, python-format msgid "a minute from now" -msgid_plural "%(count)s\\u00a0minutes from now" +msgid_plural "%(count)s minutes from now" msgstr[0] "un minuto da adesso" msgstr[1] "%(count)s minuti da adesso" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:235 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 #, python-format msgid "an hour from now" -msgid_plural "%(count)s\\u00a0hours 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 769856dd1b..2183388a32 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 c43d702fa5..30da07c3f5 100644 --- a/django/contrib/humanize/locale/ja/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/ja/LC_MESSAGES/django.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-18 23:10+0200\n" -"PO-Revision-Date: 2013-05-30 15:34+0000\n" -"Last-Translator: Shinya Okano \n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-11-16 09:37+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Japanese (http://www.transifex.com/projects/p/django/language/" "ja/)\n" "MIME-Version: 1.0\n" @@ -225,25 +225,28 @@ msgstr "%(delta)s前" msgid "now" msgstr "今" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:198 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:201 #, python-format msgid "a second ago" -msgid_plural "%(count)s\\u00a0seconds ago" +msgid_plural "%(count)s seconds ago" msgstr[0] "%(count)s秒前" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:204 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 #, python-format msgid "a minute ago" -msgid_plural "%(count)s\\u00a0minutes ago" +msgid_plural "%(count)s minutes ago" msgstr[0] "%(count)s分前" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:210 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 #, python-format msgid "an hour ago" -msgid_plural "%(count)s\\u00a0hours ago" +msgid_plural "%(count)s hours ago" msgstr[0] "%(count)s時間前" #: templatetags/humanize.py:216 @@ -252,23 +255,26 @@ msgctxt "naturaltime" msgid "%(delta)s from now" msgstr "今から%(delta)s" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:223 -#, python-format -msgid "a second from now" -msgid_plural "%(count)s\\u00a0seconds from now" -msgstr[0] "今から%(count)s秒" - -#. Translators: \\u00a0 is non-breaking space +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. #: templatetags/humanize.py:229 #, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "今から%(count)s秒" + +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 +#, python-format msgid "a minute from now" -msgid_plural "%(count)s\\u00a0minutes from now" +msgid_plural "%(count)s minutes from now" msgstr[0] "今から%(count)s分" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:235 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 #, python-format msgid "an hour from now" -msgid_plural "%(count)s\\u00a0hours 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 5104f5bacd..a26668efd3 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 d385b0a19b..4eef2f9418 100644 --- a/django/contrib/humanize/locale/ka/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/ka/LC_MESSAGES/django.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-18 23:10+0200\n" -"PO-Revision-Date: 2013-05-19 08:23+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-11-16 09:37+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Georgian (http://www.transifex.com/projects/p/django/language/" "ka/)\n" "MIME-Version: 1.0\n" @@ -224,25 +224,28 @@ msgstr "%(delta)s-ის წინ" msgid "now" msgstr "ახლა" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:198 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:201 #, python-format msgid "a second ago" -msgid_plural "%(count)s\\u00a0seconds ago" +msgid_plural "%(count)s seconds ago" msgstr[0] "%(count)s წამის წინ" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:204 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 #, python-format msgid "a minute ago" -msgid_plural "%(count)s\\u00a0minutes ago" +msgid_plural "%(count)s minutes ago" msgstr[0] "%(count)s წუთის წინ" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:210 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 #, python-format msgid "an hour ago" -msgid_plural "%(count)s\\u00a0hours ago" +msgid_plural "%(count)s hours ago" msgstr[0] "%(count)s საათის წინ" #: templatetags/humanize.py:216 @@ -251,23 +254,26 @@ msgctxt "naturaltime" msgid "%(delta)s from now" msgstr "%(delta)s-ის შემდეგ" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:223 -#, python-format -msgid "a second from now" -msgid_plural "%(count)s\\u00a0seconds from now" -msgstr[0] "%(count)s წამის შემდეგ" - -#. Translators: \\u00a0 is non-breaking space +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. #: templatetags/humanize.py:229 #, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "%(count)s წამის შემდეგ" + +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 +#, python-format msgid "a minute from now" -msgid_plural "%(count)s\\u00a0minutes from now" +msgid_plural "%(count)s minutes from now" msgstr[0] "%(count)s წუთის შემდეგ" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:235 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 #, python-format msgid "an hour from now" -msgid_plural "%(count)s\\u00a0hours from now" +msgid_plural "%(count)s hours from now" msgstr[0] "%(count)s საათის შემდეგ" diff --git a/django/contrib/humanize/locale/kk/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/kk/LC_MESSAGES/django.mo index d9fe22c879..87539ef2d9 100644 Binary files a/django/contrib/humanize/locale/kk/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/kk/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/kk/LC_MESSAGES/django.po b/django/contrib/humanize/locale/kk/LC_MESSAGES/django.po index 6c4e9b22f1..f3b320a5db 100644 --- a/django/contrib/humanize/locale/kk/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/kk/LC_MESSAGES/django.po @@ -6,9 +6,9 @@ msgid "" msgstr "" "Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-18 23:10+0200\n" -"PO-Revision-Date: 2013-05-19 08:23+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-11-16 09:37+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Kazakh (http://www.transifex.com/projects/p/django/language/" "kk/)\n" "MIME-Version: 1.0\n" @@ -223,29 +223,32 @@ msgstr "%(delta)s бұрын" msgid "now" msgstr "кәзір" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:198 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:201 #, python-format msgid "a second ago" -msgid_plural "%(count)s\\u00a0seconds ago" +msgid_plural "%(count)s seconds ago" msgstr[0] "" "one: бір секунд бұрын\n" "other: %(count)s секунд бұрын" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:204 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 #, python-format msgid "a minute ago" -msgid_plural "%(count)s\\u00a0minutes ago" +msgid_plural "%(count)s minutes ago" msgstr[0] "" "one: бір минут бұрын\n" "other: %(count)s минут бұрын" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:210 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 #, python-format msgid "an hour ago" -msgid_plural "%(count)s\\u00a0hours ago" +msgid_plural "%(count)s hours ago" msgstr[0] "" "one: бір сағат бұрын\n" "other: %(count)s сағат бұрын" @@ -256,29 +259,32 @@ msgctxt "naturaltime" msgid "%(delta)s from now" msgstr "кәзірден %(delta)s" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:223 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:229 #, python-format msgid "a second from now" -msgid_plural "%(count)s\\u00a0seconds from now" +msgid_plural "%(count)s seconds from now" msgstr[0] "" "one: кәзірден бір секунд\n" "other: кәзірден %(count)s секунд" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:229 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 #, python-format msgid "a minute from now" -msgid_plural "%(count)s\\u00a0minutes from now" +msgid_plural "%(count)s minutes from now" msgstr[0] "" "one: кәзірден бір минут\n" "other: кәзірден %(count)s минут" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:235 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 #, python-format msgid "an hour from now" -msgid_plural "%(count)s\\u00a0hours from now" +msgid_plural "%(count)s hours from now" msgstr[0] "" "one: кәзірден бір сағат\n" "other: кәзірден %(count)s сағат" diff --git a/django/contrib/humanize/locale/km/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/km/LC_MESSAGES/django.mo index c0df45c15e..e97b1e1044 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 0a04d7441f..3fbd1c95c8 100644 --- a/django/contrib/humanize/locale/km/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/km/LC_MESSAGES/django.po @@ -1,263 +1,277 @@ # This file is distributed under the same license as the Django package. # +# Translators: msgid "" msgstr "" -"Project-Id-Version: Django\n" +"Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-03-23 02:41+0100\n" -"PO-Revision-Date: 2011-03-15 15:28+0000\n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-04-24 18:40+0000\n" "Last-Translator: Django team\n" -"Language-Team: English \n" -"Language: km\n" +"Language-Team: Khmer (http://www.transifex.com/projects/p/django/language/" +"km/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0\n" +"Language: km\n" +"Plural-Forms: nplurals=1; plural=0;\n" -#: tests.py:108 templatetags/humanize.py:164 +#: tests.py:135 templatetags/humanize.py:168 msgid "today" msgstr "" -#: tests.py:108 templatetags/humanize.py:168 +#: tests.py:135 templatetags/humanize.py:172 msgid "yesterday" msgstr "" -#: tests.py:108 templatetags/humanize.py:166 +#: tests.py:135 templatetags/humanize.py:170 msgid "tomorrow" msgstr "" -#: templatetags/humanize.py:24 +#: templatetags/humanize.py:26 msgid "th" msgstr "" -#: templatetags/humanize.py:24 +#: templatetags/humanize.py:26 msgid "st" msgstr "" -#: templatetags/humanize.py:24 +#: templatetags/humanize.py:26 msgid "nd" msgstr "" -#: templatetags/humanize.py:24 +#: templatetags/humanize.py:26 msgid "rd" msgstr "" -#: templatetags/humanize.py:53 +#: templatetags/humanize.py:55 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" msgstr[0] "" -#: templatetags/humanize.py:54 +#: templatetags/humanize.py:56 #, python-format msgid "%(value)s million" msgid_plural "%(value)s million" msgstr[0] "" -#: templatetags/humanize.py:57 +#: templatetags/humanize.py:59 #, python-format msgid "%(value).1f billion" msgid_plural "%(value).1f billion" msgstr[0] "" -#: templatetags/humanize.py:58 +#: templatetags/humanize.py:60 #, python-format msgid "%(value)s billion" msgid_plural "%(value)s billion" msgstr[0] "" -#: templatetags/humanize.py:61 +#: templatetags/humanize.py:63 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" msgstr[0] "" -#: templatetags/humanize.py:62 +#: templatetags/humanize.py:64 #, python-format msgid "%(value)s trillion" msgid_plural "%(value)s trillion" msgstr[0] "" -#: templatetags/humanize.py:65 +#: templatetags/humanize.py:67 #, python-format msgid "%(value).1f quadrillion" msgid_plural "%(value).1f quadrillion" msgstr[0] "" -#: templatetags/humanize.py:66 +#: templatetags/humanize.py:68 #, python-format msgid "%(value)s quadrillion" msgid_plural "%(value)s quadrillion" msgstr[0] "" -#: templatetags/humanize.py:69 +#: templatetags/humanize.py:71 #, python-format msgid "%(value).1f quintillion" msgid_plural "%(value).1f quintillion" msgstr[0] "" -#: templatetags/humanize.py:70 +#: templatetags/humanize.py:72 #, python-format msgid "%(value)s quintillion" msgid_plural "%(value)s quintillion" msgstr[0] "" -#: templatetags/humanize.py:73 +#: templatetags/humanize.py:75 #, python-format msgid "%(value).1f sextillion" msgid_plural "%(value).1f sextillion" msgstr[0] "" -#: templatetags/humanize.py:74 +#: templatetags/humanize.py:76 #, python-format msgid "%(value)s sextillion" msgid_plural "%(value)s sextillion" msgstr[0] "" -#: templatetags/humanize.py:77 +#: templatetags/humanize.py:79 #, python-format msgid "%(value).1f septillion" msgid_plural "%(value).1f septillion" msgstr[0] "" -#: templatetags/humanize.py:78 +#: templatetags/humanize.py:80 #, python-format msgid "%(value)s septillion" msgid_plural "%(value)s septillion" msgstr[0] "" -#: templatetags/humanize.py:81 +#: templatetags/humanize.py:83 #, python-format msgid "%(value).1f octillion" msgid_plural "%(value).1f octillion" msgstr[0] "" -#: templatetags/humanize.py:82 +#: templatetags/humanize.py:84 #, python-format msgid "%(value)s octillion" msgid_plural "%(value)s octillion" msgstr[0] "" -#: templatetags/humanize.py:85 +#: templatetags/humanize.py:87 #, python-format msgid "%(value).1f nonillion" msgid_plural "%(value).1f nonillion" msgstr[0] "" -#: templatetags/humanize.py:86 +#: templatetags/humanize.py:88 #, python-format msgid "%(value)s nonillion" msgid_plural "%(value)s nonillion" msgstr[0] "" -#: templatetags/humanize.py:89 +#: templatetags/humanize.py:91 #, python-format msgid "%(value).1f decillion" msgid_plural "%(value).1f decillion" msgstr[0] "" -#: templatetags/humanize.py:90 +#: templatetags/humanize.py:92 #, python-format msgid "%(value)s decillion" msgid_plural "%(value)s decillion" msgstr[0] "" -#: templatetags/humanize.py:93 +#: templatetags/humanize.py:95 #, python-format msgid "%(value).1f googol" msgid_plural "%(value).1f googol" msgstr[0] "" -#: templatetags/humanize.py:94 +#: templatetags/humanize.py:96 #, python-format msgid "%(value)s googol" msgid_plural "%(value)s googol" msgstr[0] "" -#: templatetags/humanize.py:143 +#: templatetags/humanize.py:145 msgid "one" msgstr "" -#: templatetags/humanize.py:143 +#: templatetags/humanize.py:145 msgid "two" msgstr "" -#: templatetags/humanize.py:143 +#: templatetags/humanize.py:145 msgid "three" msgstr "" -#: templatetags/humanize.py:143 +#: templatetags/humanize.py:145 msgid "four" msgstr "" -#: templatetags/humanize.py:143 +#: templatetags/humanize.py:145 msgid "five" msgstr "" -#: templatetags/humanize.py:143 +#: templatetags/humanize.py:145 msgid "six" msgstr "" -#: templatetags/humanize.py:143 +#: templatetags/humanize.py:145 msgid "seven" msgstr "" -#: templatetags/humanize.py:143 +#: templatetags/humanize.py:145 msgid "eight" msgstr "" -#: templatetags/humanize.py:143 +#: templatetags/humanize.py:145 msgid "nine" msgstr "" -#: templatetags/humanize.py:185 +#: templatetags/humanize.py:191 #, python-format msgctxt "naturaltime" msgid "%(delta)s ago" msgstr "" -#: templatetags/humanize.py:188 templatetags/humanize.py:210 +#: templatetags/humanize.py:194 templatetags/humanize.py:219 msgid "now" 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] "" - +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. #: templatetags/humanize.py:201 #, python-format -msgid "an hour ago" -msgid_plural "%(count)s hours ago" +msgid "a second ago" +msgid_plural "%(count)s seconds ago" msgstr[0] "" -#: templatetags/humanize.py:207 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 +#, python-format +msgid "a minute ago" +msgid_plural "%(count)s minutes ago" +msgstr[0] "" + +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 +#, python-format +msgid "an hour ago" +msgid_plural "%(count)s hours ago" +msgstr[0] "" + +#: templatetags/humanize.py:216 #, python-format msgctxt "naturaltime" msgid "%(delta)s from now" msgstr "" -#: templatetags/humanize.py:213 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:229 #, python-format msgid "a second from now" -msgid_plural "%(count)s seconds from now" +msgid_plural "%(count)s seconds from now" msgstr[0] "" -#: templatetags/humanize.py:218 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 #, python-format msgid "a minute from now" -msgid_plural "%(count)s minutes from now" +msgid_plural "%(count)s minutes from now" msgstr[0] "" -#: templatetags/humanize.py:223 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 #, python-format msgid "an hour from now" -msgid_plural "%(count)s hours 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 f23551063f..7019b4fbf4 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 3663361ae3..27076c3cf9 100644 --- a/django/contrib/humanize/locale/kn/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/kn/LC_MESSAGES/django.po @@ -3,10 +3,10 @@ # Translators: msgid "" msgstr "" -"Project-Id-Version: Django\n" +"Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-10-15 10:57+0200\n" -"PO-Revision-Date: 2011-01-19 15:13+0000\n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-04-24 18:40+0000\n" "Last-Translator: Django team\n" "Language-Team: Kannada (http://www.transifex.com/projects/p/django/language/" "kn/)\n" @@ -16,250 +16,262 @@ msgstr "" "Language: kn\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: tests.py:125 templatetags/humanize.py:167 +#: tests.py:135 templatetags/humanize.py:168 msgid "today" msgstr "" -#: tests.py:125 templatetags/humanize.py:171 +#: tests.py:135 templatetags/humanize.py:172 msgid "yesterday" msgstr "" -#: tests.py:125 templatetags/humanize.py:169 +#: tests.py:135 templatetags/humanize.py:170 msgid "tomorrow" msgstr "" -#: templatetags/humanize.py:25 +#: templatetags/humanize.py:26 msgid "th" msgstr "" -#: templatetags/humanize.py:25 +#: templatetags/humanize.py:26 msgid "st" msgstr "" -#: templatetags/humanize.py:25 +#: templatetags/humanize.py:26 msgid "nd" msgstr "" -#: templatetags/humanize.py:25 +#: templatetags/humanize.py:26 msgid "rd" msgstr "" -#: templatetags/humanize.py:54 +#: templatetags/humanize.py:55 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" msgstr[0] "" -#: templatetags/humanize.py:55 +#: templatetags/humanize.py:56 #, python-format msgid "%(value)s million" msgid_plural "%(value)s million" msgstr[0] "" -#: templatetags/humanize.py:58 +#: templatetags/humanize.py:59 #, python-format msgid "%(value).1f billion" msgid_plural "%(value).1f billion" msgstr[0] "" -#: templatetags/humanize.py:59 +#: templatetags/humanize.py:60 #, python-format msgid "%(value)s billion" msgid_plural "%(value)s billion" msgstr[0] "" -#: templatetags/humanize.py:62 +#: templatetags/humanize.py:63 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" msgstr[0] "" -#: templatetags/humanize.py:63 +#: templatetags/humanize.py:64 #, python-format msgid "%(value)s trillion" msgid_plural "%(value)s trillion" msgstr[0] "" -#: templatetags/humanize.py:66 +#: templatetags/humanize.py:67 #, python-format msgid "%(value).1f quadrillion" msgid_plural "%(value).1f quadrillion" msgstr[0] "" -#: templatetags/humanize.py:67 +#: templatetags/humanize.py:68 #, python-format msgid "%(value)s quadrillion" msgid_plural "%(value)s quadrillion" msgstr[0] "" -#: templatetags/humanize.py:70 +#: templatetags/humanize.py:71 #, python-format msgid "%(value).1f quintillion" msgid_plural "%(value).1f quintillion" msgstr[0] "" -#: templatetags/humanize.py:71 +#: templatetags/humanize.py:72 #, python-format msgid "%(value)s quintillion" msgid_plural "%(value)s quintillion" msgstr[0] "" -#: templatetags/humanize.py:74 +#: templatetags/humanize.py:75 #, python-format msgid "%(value).1f sextillion" msgid_plural "%(value).1f sextillion" msgstr[0] "" -#: templatetags/humanize.py:75 +#: templatetags/humanize.py:76 #, python-format msgid "%(value)s sextillion" msgid_plural "%(value)s sextillion" msgstr[0] "" -#: templatetags/humanize.py:78 +#: templatetags/humanize.py:79 #, python-format msgid "%(value).1f septillion" msgid_plural "%(value).1f septillion" msgstr[0] "" -#: templatetags/humanize.py:79 +#: templatetags/humanize.py:80 #, python-format msgid "%(value)s septillion" msgid_plural "%(value)s septillion" msgstr[0] "" -#: templatetags/humanize.py:82 +#: templatetags/humanize.py:83 #, python-format msgid "%(value).1f octillion" msgid_plural "%(value).1f octillion" msgstr[0] "" -#: templatetags/humanize.py:83 +#: templatetags/humanize.py:84 #, python-format msgid "%(value)s octillion" msgid_plural "%(value)s octillion" msgstr[0] "" -#: templatetags/humanize.py:86 +#: templatetags/humanize.py:87 #, python-format msgid "%(value).1f nonillion" msgid_plural "%(value).1f nonillion" msgstr[0] "" -#: templatetags/humanize.py:87 +#: templatetags/humanize.py:88 #, python-format msgid "%(value)s nonillion" msgid_plural "%(value)s nonillion" msgstr[0] "" -#: templatetags/humanize.py:90 +#: templatetags/humanize.py:91 #, python-format msgid "%(value).1f decillion" msgid_plural "%(value).1f decillion" msgstr[0] "" -#: templatetags/humanize.py:91 +#: templatetags/humanize.py:92 #, python-format msgid "%(value)s decillion" msgid_plural "%(value)s decillion" msgstr[0] "" -#: templatetags/humanize.py:94 +#: templatetags/humanize.py:95 #, python-format msgid "%(value).1f googol" msgid_plural "%(value).1f googol" msgstr[0] "" -#: templatetags/humanize.py:95 +#: templatetags/humanize.py:96 #, python-format msgid "%(value)s googol" msgid_plural "%(value)s googol" msgstr[0] "" -#: templatetags/humanize.py:144 +#: templatetags/humanize.py:145 msgid "one" msgstr "" -#: templatetags/humanize.py:144 +#: templatetags/humanize.py:145 msgid "two" msgstr "" -#: templatetags/humanize.py:144 +#: templatetags/humanize.py:145 msgid "three" msgstr "" -#: templatetags/humanize.py:144 +#: templatetags/humanize.py:145 msgid "four" msgstr "" -#: templatetags/humanize.py:144 +#: templatetags/humanize.py:145 msgid "five" msgstr "" -#: templatetags/humanize.py:144 +#: templatetags/humanize.py:145 msgid "six" msgstr "" -#: templatetags/humanize.py:144 +#: templatetags/humanize.py:145 msgid "seven" msgstr "" -#: templatetags/humanize.py:144 +#: templatetags/humanize.py:145 msgid "eight" msgstr "" -#: templatetags/humanize.py:144 +#: templatetags/humanize.py:145 msgid "nine" msgstr "" -#: templatetags/humanize.py:190 +#: templatetags/humanize.py:191 #, python-format msgctxt "naturaltime" msgid "%(delta)s ago" msgstr "" -#: templatetags/humanize.py:193 templatetags/humanize.py:215 +#: templatetags/humanize.py:194 templatetags/humanize.py:219 msgid "now" msgstr "" -#: templatetags/humanize.py:196 -#, python-format -msgid "a second ago" -msgid_plural "%(count)s seconds ago" -msgstr[0] "" - +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. #: templatetags/humanize.py:201 #, python-format -msgid "a minute ago" -msgid_plural "%(count)s minutes ago" +msgid "a second ago" +msgid_plural "%(count)s seconds ago" msgstr[0] "" -#: templatetags/humanize.py:206 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 +#, python-format +msgid "a minute ago" +msgid_plural "%(count)s minutes ago" +msgstr[0] "" + +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 #, python-format msgid "an hour ago" -msgid_plural "%(count)s hours ago" +msgid_plural "%(count)s hours ago" msgstr[0] "" -#: templatetags/humanize.py:212 +#: templatetags/humanize.py:216 #, python-format msgctxt "naturaltime" msgid "%(delta)s from now" msgstr "" -#: templatetags/humanize.py:218 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:229 #, python-format msgid "a second from now" -msgid_plural "%(count)s seconds from now" +msgid_plural "%(count)s seconds from now" msgstr[0] "" -#: templatetags/humanize.py:223 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 #, python-format msgid "a minute from now" -msgid_plural "%(count)s minutes from now" +msgid_plural "%(count)s minutes from now" msgstr[0] "" -#: templatetags/humanize.py:228 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 #, python-format msgid "an hour from now" -msgid_plural "%(count)s hours 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 47baf7e9cd..4af0331abb 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 52c2e22381..e4fad1afb8 100644 --- a/django/contrib/humanize/locale/ko/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/ko/LC_MESSAGES/django.po @@ -6,9 +6,9 @@ msgid "" msgstr "" "Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-18 23:10+0200\n" -"PO-Revision-Date: 2013-05-19 08:23+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-11-16 09:37+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Korean (http://www.transifex.com/projects/p/django/language/" "ko/)\n" "MIME-Version: 1.0\n" @@ -223,25 +223,28 @@ msgstr "" msgid "now" msgstr "" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:198 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:201 #, python-format msgid "a second ago" -msgid_plural "%(count)s\\u00a0seconds ago" +msgid_plural "%(count)s seconds ago" msgstr[0] "" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:204 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 #, python-format msgid "a minute ago" -msgid_plural "%(count)s\\u00a0minutes ago" +msgid_plural "%(count)s minutes ago" msgstr[0] "" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:210 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 #, python-format msgid "an hour ago" -msgid_plural "%(count)s\\u00a0hours ago" +msgid_plural "%(count)s hours ago" msgstr[0] "" #: templatetags/humanize.py:216 @@ -250,23 +253,26 @@ msgctxt "naturaltime" msgid "%(delta)s from now" msgstr "" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:223 -#, python-format -msgid "a second from now" -msgid_plural "%(count)s\\u00a0seconds from now" -msgstr[0] "" - -#. Translators: \\u00a0 is non-breaking space +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. #: templatetags/humanize.py:229 #, python-format -msgid "a minute from now" -msgid_plural "%(count)s\\u00a0minutes from now" +msgid "a second from now" +msgid_plural "%(count)s seconds from now" msgstr[0] "" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:235 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 +#, python-format +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "" + +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 #, python-format msgid "an hour from now" -msgid_plural "%(count)s\\u00a0hours 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 effd22ddbc..2b64c12c1c 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 37eed77164..1c35a756e2 100644 --- a/django/contrib/humanize/locale/lt/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/lt/LC_MESSAGES/django.po @@ -6,9 +6,9 @@ msgid "" msgstr "" "Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-18 23:10+0200\n" -"PO-Revision-Date: 2013-10-23 16:20+0000\n" -"Last-Translator: Simonas Kazlauskas \n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-11-17 20:50+0000\n" +"Last-Translator: Claude Paroz \n" "Language-Team: Lithuanian (http://www.transifex.com/projects/p/django/" "language/lt/)\n" "MIME-Version: 1.0\n" @@ -268,32 +268,35 @@ msgstr "prieš %(delta)s" msgid "now" msgstr "dabar" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:198 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:201 #, python-format msgid "a second ago" -msgid_plural "%(count)s\\u00a0seconds ago" -msgstr[0] "prieš\\u00a0%(count)s\\u00a0sekundę" -msgstr[1] "prieš\\u00a0%(count)s\\u00a0sekundes" -msgstr[2] "prieš\\u00a0%(count)s\\u00a0sekundžių" +msgid_plural "%(count)s seconds ago" +msgstr[0] "prieš %(count)s sekundę" +msgstr[1] "prieš %(count)s sekundes" +msgstr[2] "prieš %(count)s sekundžių" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:204 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 #, python-format msgid "a minute ago" -msgid_plural "%(count)s\\u00a0minutes ago" -msgstr[0] "prieš\\u00a0%(count)s\\u00a0minutę" -msgstr[1] "prieš\\u00a0%(count)s\\u00a0minutes" -msgstr[2] "prieš\\u00a0%(count)s\\u00a0minučių" +msgid_plural "%(count)s minutes ago" +msgstr[0] "prieš %(count)s minutę" +msgstr[1] "prieš %(count)s minutes" +msgstr[2] "prieš %(count)s minučių" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:210 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 #, python-format msgid "an hour ago" -msgid_plural "%(count)s\\u00a0hours ago" -msgstr[0] "prieš\\u00a0%(count)s\\u00a0valandą" -msgstr[1] "prieš\\u00a0%(count)s\\u00a0valandas" -msgstr[2] "prieš\\u00a0%(count)s\\u00a0valandų" +msgid_plural "%(count)s hours ago" +msgstr[0] "prieš %(count)s valandą" +msgstr[1] "prieš %(count)s valandas" +msgstr[2] "prieš %(count)s valandų" #: templatetags/humanize.py:216 #, python-format @@ -301,29 +304,32 @@ msgctxt "naturaltime" msgid "%(delta)s from now" msgstr "%(delta)s nuo dabar" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:223 -#, python-format -msgid "a second from now" -msgid_plural "%(count)s\\u00a0seconds from now" -msgstr[0] "%(count)s\\u00a0sekundė nuo dabar" -msgstr[1] "%(count)s\\u00a0sekundės nuo dabar" -msgstr[2] "%(count)s\\u00a0sekundžių nuo dabar" - -#. Translators: \\u00a0 is non-breaking space +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. #: templatetags/humanize.py:229 #, python-format -msgid "a minute from now" -msgid_plural "%(count)s\\u00a0minutes from now" -msgstr[0] "%(count)s\\u00a0minutė nuo dabar" -msgstr[1] "%(count)s\\u00a0minutės nuo dabar" -msgstr[2] "%(count)s\\u00a0minučių nuo dabar" +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "%(count)s sekundė nuo dabar" +msgstr[1] "%(count)s sekundės nuo dabar" +msgstr[2] "%(count)s sekundžių nuo dabar" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:235 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 +#, python-format +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "%(count)s minutė nuo dabar" +msgstr[1] "%(count)s minutės nuo dabar" +msgstr[2] "%(count)s minučių nuo dabar" + +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 #, python-format msgid "an hour from now" -msgid_plural "%(count)s\\u00a0hours from now" -msgstr[0] "%(count)s\\u00a0valanda nuo dabar" -msgstr[1] "%(count)s\\u00a0valandos nuo dabar" -msgstr[2] "%(count)s\\u00a0valandų nuo dabar" +msgid_plural "%(count)s hours from now" +msgstr[0] "%(count)s 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 6b62e10351..929154a51d 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 a223a4babe..c2a93a762f 100644 --- a/django/contrib/humanize/locale/lv/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/lv/LC_MESSAGES/django.po @@ -6,9 +6,9 @@ msgid "" msgstr "" "Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-18 23:10+0200\n" -"PO-Revision-Date: 2013-05-19 08:23+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-11-16 09:36+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Latvian (http://www.transifex.com/projects/p/django/language/" "lv/)\n" "MIME-Version: 1.0\n" @@ -268,29 +268,32 @@ msgstr "" msgid "now" msgstr "" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:198 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:201 #, python-format msgid "a second ago" -msgid_plural "%(count)s\\u00a0seconds ago" +msgid_plural "%(count)s seconds ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:204 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 #, python-format msgid "a minute ago" -msgid_plural "%(count)s\\u00a0minutes ago" +msgid_plural "%(count)s minutes ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:210 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 #, python-format msgid "an hour ago" -msgid_plural "%(count)s\\u00a0hours ago" +msgid_plural "%(count)s hours ago" msgstr[0] "" msgstr[1] "" msgstr[2] "" @@ -301,29 +304,32 @@ msgctxt "naturaltime" msgid "%(delta)s from now" msgstr "" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:223 -#, python-format -msgid "a second from now" -msgid_plural "%(count)s\\u00a0seconds from now" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" - -#. Translators: \\u00a0 is non-breaking space +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. #: templatetags/humanize.py:229 #, python-format -msgid "a minute from now" -msgid_plural "%(count)s\\u00a0minutes from now" +msgid "a second from now" +msgid_plural "%(count)s seconds from now" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:235 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 #, python-format -msgid "an hour from now" -msgid_plural "%(count)s\\u00a0hours from now" +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 +#, 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 2980829602..16932612ad 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 63d8cf2374..249fdba43e 100644 --- a/django/contrib/humanize/locale/mk/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/mk/LC_MESSAGES/django.po @@ -6,9 +6,9 @@ msgid "" msgstr "" "Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-18 23:10+0200\n" -"PO-Revision-Date: 2013-09-23 10:57+0000\n" -"Last-Translator: vvangelovski \n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-11-16 09:37+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Macedonian (http://www.transifex.com/projects/p/django/" "language/mk/)\n" "MIME-Version: 1.0\n" @@ -245,29 +245,32 @@ msgstr "пред %(delta)s" msgid "now" msgstr "сега" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:198 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:201 #, python-format msgid "a second ago" -msgid_plural "%(count)s\\u00a0seconds ago" -msgstr[0] "пред секунда" -msgstr[1] "пред %(count)s\\u00a0секунди" +msgid_plural "%(count)s seconds ago" +msgstr[0] "" +msgstr[1] "пред %(count)s секунди" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:204 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 #, python-format msgid "a minute ago" -msgid_plural "%(count)s\\u00a0minutes ago" -msgstr[0] "пред минута" -msgstr[1] "пред %(count)s\\u00a0минути" +msgid_plural "%(count)s minutes ago" +msgstr[0] "" +msgstr[1] "пред %(count)s минути" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:210 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 #, python-format msgid "an hour ago" -msgid_plural "%(count)s\\u00a0hours ago" -msgstr[0] "пред час" -msgstr[1] "пред %(count)s\\u00a0часа" +msgid_plural "%(count)s hours ago" +msgstr[0] "" +msgstr[1] "пред %(count)s часа" #: templatetags/humanize.py:216 #, python-format @@ -275,26 +278,29 @@ msgctxt "naturaltime" msgid "%(delta)s from now" msgstr "%(delta)s од сега" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:223 -#, python-format -msgid "a second from now" -msgid_plural "%(count)s\\u00a0seconds from now" -msgstr[0] "за една секунда" -msgstr[1] "%(count)s\\u00a0секунди од сега" - -#. Translators: \\u00a0 is non-breaking space +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. #: templatetags/humanize.py:229 #, python-format -msgid "a minute from now" -msgid_plural "%(count)s\\u00a0minutes from now" -msgstr[0] "за една минута" -msgstr[1] "%(count)s\\u00a0минути од сега" +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "" +msgstr[1] "%(count)s секунди од сега" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:235 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 +#, python-format +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "" +msgstr[1] "%(count)s минути од сега" + +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 #, python-format msgid "an hour from now" -msgid_plural "%(count)s\\u00a0hours from now" -msgstr[0] "за еден час" -msgstr[1] "%(count)s\\u00a0часа од сега" +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 a9a6ea86d3..190e6d81c4 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 518e8afae1..057b90d53c 100644 --- a/django/contrib/humanize/locale/ml/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/ml/LC_MESSAGES/django.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-18 23:10+0200\n" -"PO-Revision-Date: 2013-05-19 08:23+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-11-16 09:36+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Malayalam (http://www.transifex.com/projects/p/django/" "language/ml/)\n" "MIME-Version: 1.0\n" @@ -246,27 +246,30 @@ msgstr "%(delta)s മുമ്പ്" msgid "now" msgstr "ഇപ്പോള്‍" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:198 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:201 #, python-format msgid "a second ago" -msgid_plural "%(count)s\\u00a0seconds ago" +msgid_plural "%(count)s seconds ago" msgstr[0] "ഒരു സെക്കന്‍ഡ് മുമ്പ്" msgstr[1] "%(count)s സെക്കന്‍ഡുകള്‍ മുമ്പ്" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:204 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 #, python-format msgid "a minute ago" -msgid_plural "%(count)s\\u00a0minutes ago" +msgid_plural "%(count)s minutes ago" msgstr[0] "ഒരു മിനുറ്റ് മുമ്പ്" msgstr[1] "%(count)s മിനുറ്റുകള്‍ മുമ്പ്" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:210 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 #, python-format msgid "an hour ago" -msgid_plural "%(count)s\\u00a0hours ago" +msgid_plural "%(count)s hours ago" msgstr[0] "ഒരു മണിക്കൂര്‍ മുമ്പ്" msgstr[1] "%(count)s മണിക്കൂര്‍ മുമ്പ്" @@ -276,26 +279,29 @@ msgctxt "naturaltime" msgid "%(delta)s from now" msgstr "ഇപ്പോള്‍ മുതല്‍ %(delta)s" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:223 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:229 #, python-format msgid "a second from now" -msgid_plural "%(count)s\\u00a0seconds from now" +msgid_plural "%(count)s seconds from now" msgstr[0] "ഇപ്പോള്‍ മുതല്‍ ഒരു സെക്കന്‍ഡ്" msgstr[1] "ഇപ്പോള്‍ മുതല്‍ %(count)s സെക്കന്‍ഡുകള്‍" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:229 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 #, python-format msgid "a minute from now" -msgid_plural "%(count)s\\u00a0minutes from now" +msgid_plural "%(count)s minutes from now" msgstr[0] "ഇപ്പോള്‍ മുതല്‍ ഒരു മിനുട്ട്" msgstr[1] "ഇപ്പോള്‍ മുതല്‍ %(count)s മിനുട്ടുകള്‍" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:235 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 #, python-format msgid "an hour from now" -msgid_plural "%(count)s\\u00a0hours 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 8ac9097bb9..4441e667fc 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 9e13e6debb..79b2c97309 100644 --- a/django/contrib/humanize/locale/mn/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/mn/LC_MESSAGES/django.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-18 23:10+0200\n" -"PO-Revision-Date: 2013-10-09 09:00+0000\n" -"Last-Translator: Анхбаяр Анхаа \n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-11-16 09:37+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Mongolian (http://www.transifex.com/projects/p/django/" "language/mn/)\n" "MIME-Version: 1.0\n" @@ -246,27 +246,30 @@ msgstr "%(delta)s өмнө" msgid "now" msgstr "одоо" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:198 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:201 #, python-format msgid "a second ago" -msgid_plural "%(count)s\\u00a0seconds ago" +msgid_plural "%(count)s seconds ago" msgstr[0] "" msgstr[1] "" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:204 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 #, python-format msgid "a minute ago" -msgid_plural "%(count)s\\u00a0minutes ago" +msgid_plural "%(count)s minutes ago" msgstr[0] "" msgstr[1] "" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:210 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 #, python-format msgid "an hour ago" -msgid_plural "%(count)s\\u00a0hours ago" +msgid_plural "%(count)s hours ago" msgstr[0] "" msgstr[1] "" @@ -276,26 +279,29 @@ msgctxt "naturaltime" msgid "%(delta)s from now" msgstr "одооноос %(delta)s " -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:223 -#, python-format -msgid "a second from now" -msgid_plural "%(count)s\\u00a0seconds from now" -msgstr[0] "" -msgstr[1] "" - -#. Translators: \\u00a0 is non-breaking space +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. #: templatetags/humanize.py:229 #, python-format -msgid "a minute from now" -msgid_plural "%(count)s\\u00a0minutes from now" +msgid "a second from now" +msgid_plural "%(count)s seconds from now" msgstr[0] "" msgstr[1] "" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:235 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 #, python-format -msgid "an hour from now" -msgid_plural "%(count)s\\u00a0hours from now" +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "" +msgstr[1] "" + +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 +#, 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/my/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/my/LC_MESSAGES/django.mo index 0032bad552..0a555f0bd4 100644 Binary files a/django/contrib/humanize/locale/my/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/my/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/my/LC_MESSAGES/django.po b/django/contrib/humanize/locale/my/LC_MESSAGES/django.po index fa993a01e8..0871a65f0d 100644 --- a/django/contrib/humanize/locale/my/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/my/LC_MESSAGES/django.po @@ -6,9 +6,9 @@ msgid "" msgstr "" "Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-18 23:10+0200\n" -"PO-Revision-Date: 2013-05-19 08:23+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-11-16 09:36+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Burmese (http://www.transifex.com/projects/p/django/language/" "my/)\n" "MIME-Version: 1.0\n" @@ -223,25 +223,28 @@ msgstr "%(delta)s အခါက" msgid "now" msgstr "ယခု" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:198 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:201 #, python-format msgid "a second ago" -msgid_plural "%(count)s\\u00a0seconds ago" +msgid_plural "%(count)s seconds ago" msgstr[0] "%(count)s စက္ကန့်များအခါက" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:204 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 #, python-format msgid "a minute ago" -msgid_plural "%(count)s\\u00a0minutes ago" +msgid_plural "%(count)s minutes ago" msgstr[0] "%(count)s မိနစ်များအခါက" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:210 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 #, python-format msgid "an hour ago" -msgid_plural "%(count)s\\u00a0hours ago" +msgid_plural "%(count)s hours ago" msgstr[0] "%(count)s နာရီများအခါက" #: templatetags/humanize.py:216 @@ -250,23 +253,26 @@ msgctxt "naturaltime" msgid "%(delta)s from now" msgstr "%(delta)s ယခုမှ" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:223 -#, python-format -msgid "a second from now" -msgid_plural "%(count)s\\u00a0seconds from now" -msgstr[0] "ယခုမှ %(count)s စက္ကန့်များ" - -#. Translators: \\u00a0 is non-breaking space +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. #: templatetags/humanize.py:229 #, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "ယခုမှ %(count)s စက္ကန့်များ" + +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 +#, python-format msgid "a minute from now" -msgid_plural "%(count)s\\u00a0minutes from now" +msgid_plural "%(count)s minutes from now" msgstr[0] "ယခုမှ %(count)s မိနစ်များ" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:235 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 #, python-format msgid "an hour from now" -msgid_plural "%(count)s\\u00a0hours from now" +msgid_plural "%(count)s hours from now" msgstr[0] "ယခုမှ %(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 c3f113b2bc..09b944d5e9 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 cbbcf33c81..5f79181e81 100644 --- a/django/contrib/humanize/locale/nb/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/nb/LC_MESSAGES/django.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-18 23:10+0200\n" -"PO-Revision-Date: 2013-05-19 08:23+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-11-16 09:37+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/django/" "language/nb/)\n" "MIME-Version: 1.0\n" @@ -246,27 +246,30 @@ msgstr "%(delta)s siden" msgid "now" msgstr "nå" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:198 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:201 #, python-format msgid "a second ago" -msgid_plural "%(count)s\\u00a0seconds ago" +msgid_plural "%(count)s seconds ago" msgstr[0] "ett sekund siden" msgstr[1] "%(count)s sekunder siden" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:204 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 #, python-format msgid "a minute ago" -msgid_plural "%(count)s\\u00a0minutes ago" +msgid_plural "%(count)s minutes ago" msgstr[0] "ett minutt siden" msgstr[1] "%(count)s minutter siden" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:210 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 #, python-format msgid "an hour ago" -msgid_plural "%(count)s\\u00a0hours ago" +msgid_plural "%(count)s hours ago" msgstr[0] "en time siden" msgstr[1] "%(count)s timer siden" @@ -276,26 +279,29 @@ msgctxt "naturaltime" msgid "%(delta)s from now" msgstr "%(delta)s fra nå" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:223 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:229 #, python-format msgid "a second from now" -msgid_plural "%(count)s\\u00a0seconds from now" +msgid_plural "%(count)s seconds from now" msgstr[0] "ett sekund fra nå" msgstr[1] "%(count)s sekunder fra nå" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:229 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 #, python-format msgid "a minute from now" -msgid_plural "%(count)s\\u00a0minutes from now" +msgid_plural "%(count)s minutes from now" msgstr[0] "ett minutt fra nå" msgstr[1] "%(count)s minutter fra nå" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:235 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 #, python-format msgid "an hour from now" -msgid_plural "%(count)s\\u00a0hours 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/ne/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/ne/LC_MESSAGES/django.mo index 0b30b05ed7..789c602fe5 100644 Binary files a/django/contrib/humanize/locale/ne/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/ne/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/ne/LC_MESSAGES/django.po b/django/contrib/humanize/locale/ne/LC_MESSAGES/django.po index 71e2d37635..92353188aa 100644 --- a/django/contrib/humanize/locale/ne/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/ne/LC_MESSAGES/django.po @@ -6,9 +6,9 @@ msgid "" msgstr "" "Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-18 23:10+0200\n" -"PO-Revision-Date: 2013-05-19 08:23+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-11-16 09:37+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Nepali (http://www.transifex.com/projects/p/django/language/" "ne/)\n" "MIME-Version: 1.0\n" @@ -245,27 +245,30 @@ msgstr "%(delta)s अगाडी" msgid "now" msgstr "अहिले" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:198 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:201 #, python-format msgid "a second ago" -msgid_plural "%(count)s\\u00a0seconds ago" +msgid_plural "%(count)s seconds ago" msgstr[0] "एक सेकेन्ड अगाडी " msgstr[1] "%(count)s सेकेन्ड अगाडी " -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:204 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 #, python-format msgid "a minute ago" -msgid_plural "%(count)s\\u00a0minutes ago" +msgid_plural "%(count)s minutes ago" msgstr[0] "एक मिनेट अगाडी " msgstr[1] "%(count)s मिनेट अगाडी " -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:210 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 #, python-format msgid "an hour ago" -msgid_plural "%(count)s\\u00a0hours ago" +msgid_plural "%(count)s hours ago" msgstr[0] "एक घन्टा अगाडी " msgstr[1] "%(count)s घन्टा अगाडी " @@ -275,26 +278,29 @@ msgctxt "naturaltime" msgid "%(delta)s from now" msgstr "" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:223 -#, python-format -msgid "a second from now" -msgid_plural "%(count)s\\u00a0seconds from now" -msgstr[0] "" -msgstr[1] "" - -#. Translators: \\u00a0 is non-breaking space +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. #: templatetags/humanize.py:229 #, python-format -msgid "a minute from now" -msgid_plural "%(count)s\\u00a0minutes from now" +msgid "a second from now" +msgid_plural "%(count)s seconds from now" msgstr[0] "" msgstr[1] "" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:235 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 #, python-format -msgid "an hour from now" -msgid_plural "%(count)s\\u00a0hours from now" +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "" +msgstr[1] "" + +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 +#, 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/nl/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/nl/LC_MESSAGES/django.mo index 9194898781..b67da73a85 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 3603c76b2d..0563d4cca5 100644 --- a/django/contrib/humanize/locale/nl/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/nl/LC_MESSAGES/django.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-18 23:10+0200\n" -"PO-Revision-Date: 2013-05-19 08:23+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-11-16 09:36+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Dutch (http://www.transifex.com/projects/p/django/language/" "nl/)\n" "MIME-Version: 1.0\n" @@ -247,27 +247,30 @@ msgstr "%(delta)s geleden" msgid "now" msgstr "nu" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:198 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:201 #, python-format msgid "a second ago" -msgid_plural "%(count)s\\u00a0seconds ago" +msgid_plural "%(count)s seconds ago" msgstr[0] "een seconde geleden" msgstr[1] "%(count)s seconden geleden" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:204 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 #, python-format msgid "a minute ago" -msgid_plural "%(count)s\\u00a0minutes ago" +msgid_plural "%(count)s minutes ago" msgstr[0] "een minuut geleden" msgstr[1] "%(count)s minuten geleden" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:210 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 #, python-format msgid "an hour ago" -msgid_plural "%(count)s\\u00a0hours ago" +msgid_plural "%(count)s hours ago" msgstr[0] "een uur geleden" msgstr[1] "%(count)s uur geleden" @@ -277,26 +280,29 @@ msgctxt "naturaltime" msgid "%(delta)s from now" msgstr "%(delta)s van nu" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:223 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:229 #, python-format msgid "a second from now" -msgid_plural "%(count)s\\u00a0seconds from now" +msgid_plural "%(count)s seconds from now" msgstr[0] "een seconde van nu" msgstr[1] "%(count)s seconden van nu" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:229 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 #, python-format msgid "a minute from now" -msgid_plural "%(count)s\\u00a0minutes from now" +msgid_plural "%(count)s minutes from now" msgstr[0] "een minuut van nu" msgstr[1] "%(count)s minuten van nu" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:235 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 #, python-format msgid "an hour from now" -msgid_plural "%(count)s\\u00a0hours 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 7685d11260..a322f273eb 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 bceaec328c..60e4e4fb49 100644 --- a/django/contrib/humanize/locale/nn/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/nn/LC_MESSAGES/django.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-18 23:10+0200\n" -"PO-Revision-Date: 2013-05-19 08:23+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-11-16 09:36+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Norwegian Nynorsk (http://www.transifex.com/projects/p/django/" "language/nn/)\n" "MIME-Version: 1.0\n" @@ -246,27 +246,30 @@ msgstr "%(delta)s sidan" msgid "now" msgstr "no" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:198 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:201 #, python-format msgid "a second ago" -msgid_plural "%(count)s\\u00a0seconds ago" +msgid_plural "%(count)s seconds ago" msgstr[0] "eitt sekund sidan" msgstr[1] "%(count)s sekund sidan" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:204 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 #, python-format msgid "a minute ago" -msgid_plural "%(count)s\\u00a0minutes ago" +msgid_plural "%(count)s minutes ago" msgstr[0] "eitt minutt sidan" msgstr[1] "%(count)s minutt sidan" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:210 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 #, python-format msgid "an hour ago" -msgid_plural "%(count)s\\u00a0hours ago" +msgid_plural "%(count)s hours ago" msgstr[0] "éin time sidan" msgstr[1] "%(count)s timar sidan" @@ -276,26 +279,29 @@ msgctxt "naturaltime" msgid "%(delta)s from now" msgstr "%(delta)s frå no" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:223 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:229 #, python-format msgid "a second from now" -msgid_plural "%(count)s\\u00a0seconds from now" +msgid_plural "%(count)s seconds from now" msgstr[0] "eitt sekund frå no" msgstr[1] "%(count)s sekund frå no" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:229 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 #, python-format msgid "a minute from now" -msgid_plural "%(count)s\\u00a0minutes from now" +msgid_plural "%(count)s minutes from now" msgstr[0] "eitt minutt frå no" msgstr[1] "%(count)s minutt frå no" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:235 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 #, python-format msgid "an hour from now" -msgid_plural "%(count)s\\u00a0hours from now" +msgid_plural "%(count)s hours from now" msgstr[0] "éin time frå no" msgstr[1] "%(count)s timar frå no" diff --git a/django/contrib/humanize/locale/os/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/os/LC_MESSAGES/django.mo index 6353aac06b..3ac36cc662 100644 Binary files a/django/contrib/humanize/locale/os/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/os/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/os/LC_MESSAGES/django.po b/django/contrib/humanize/locale/os/LC_MESSAGES/django.po index 052a709e94..91a220b037 100644 --- a/django/contrib/humanize/locale/os/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/os/LC_MESSAGES/django.po @@ -6,9 +6,9 @@ msgid "" msgstr "" "Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-18 23:10+0200\n" -"PO-Revision-Date: 2013-05-19 08:23+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-11-16 09:37+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Ossetic (http://www.transifex.com/projects/p/django/language/" "os/)\n" "MIME-Version: 1.0\n" @@ -245,27 +245,30 @@ msgstr "%(delta)s раздӕр" msgid "now" msgstr "ныр" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:198 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:201 #, python-format msgid "a second ago" -msgid_plural "%(count)s\\u00a0seconds ago" +msgid_plural "%(count)s seconds ago" msgstr[0] "секунд размӕ" msgstr[1] "%(count)s секунды размӕ" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:204 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 #, python-format msgid "a minute ago" -msgid_plural "%(count)s\\u00a0minutes ago" +msgid_plural "%(count)s minutes ago" msgstr[0] "минут размӕ" msgstr[1] "%(count)s минут размӕ" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:210 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 #, python-format msgid "an hour ago" -msgid_plural "%(count)s\\u00a0hours ago" +msgid_plural "%(count)s hours ago" msgstr[0] "сахат размӕ" msgstr[1] "%(count)s сахат размӕ" @@ -275,26 +278,29 @@ msgctxt "naturaltime" msgid "%(delta)s from now" msgstr "%(delta)s енырӕй" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:223 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:229 #, python-format msgid "a second from now" -msgid_plural "%(count)s\\u00a0seconds from now" +msgid_plural "%(count)s seconds from now" msgstr[0] "иу секунд енырӕй" msgstr[1] "енырӕй %(count)s секунд" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:229 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 #, python-format msgid "a minute from now" -msgid_plural "%(count)s\\u00a0minutes from now" +msgid_plural "%(count)s minutes from now" msgstr[0] "енырӕй 1 минут" msgstr[1] "енырӕй %(count)s минут" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:235 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 #, python-format msgid "an hour from now" -msgid_plural "%(count)s\\u00a0hours from now" +msgid_plural "%(count)s hours from now" msgstr[0] "енырӕй 1 сахат" msgstr[1] "енырӕй %(count)s сахат" diff --git a/django/contrib/humanize/locale/pa/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/pa/LC_MESSAGES/django.mo index 6b0525455f..03b965e44c 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 0f57b454c4..c57f6e7e2a 100644 --- a/django/contrib/humanize/locale/pa/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/pa/LC_MESSAGES/django.po @@ -1,14 +1,15 @@ # This file is distributed under the same license as the Django package. # # Translators: +# A S Alam , 2013 # Jannis Leidel , 2011 msgid "" msgstr "" "Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-18 23:10+0200\n" -"PO-Revision-Date: 2013-05-19 08:23+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-11-16 09:36+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/django/" "language/pa/)\n" "MIME-Version: 1.0\n" @@ -56,8 +57,8 @@ msgstr[1] "%(value).1f ਮਿਲੀਅਨ" #, python-format msgid "%(value)s million" msgid_plural "%(value)s million" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%(value)s ਮਿਲੀਅਨ" +msgstr[1] "%(value)s ਮਿਲੀਅਨ" #: templatetags/humanize.py:59 #, python-format @@ -243,29 +244,32 @@ msgstr "" #: templatetags/humanize.py:194 templatetags/humanize.py:219 msgid "now" -msgstr "" +msgstr "ਹੁਣ" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:198 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:201 #, python-format msgid "a second ago" -msgid_plural "%(count)s\\u00a0seconds ago" +msgid_plural "%(count)s seconds ago" msgstr[0] "" msgstr[1] "" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:204 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 #, python-format msgid "a minute ago" -msgid_plural "%(count)s\\u00a0minutes ago" +msgid_plural "%(count)s minutes ago" msgstr[0] "" msgstr[1] "" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:210 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 #, python-format msgid "an hour ago" -msgid_plural "%(count)s\\u00a0hours ago" +msgid_plural "%(count)s hours ago" msgstr[0] "" msgstr[1] "" @@ -275,26 +279,29 @@ msgctxt "naturaltime" msgid "%(delta)s from now" msgstr "" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:223 -#, python-format -msgid "a second from now" -msgid_plural "%(count)s\\u00a0seconds from now" -msgstr[0] "" -msgstr[1] "" - -#. Translators: \\u00a0 is non-breaking space +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. #: templatetags/humanize.py:229 #, python-format -msgid "a minute from now" -msgid_plural "%(count)s\\u00a0minutes from now" +msgid "a second from now" +msgid_plural "%(count)s seconds from now" msgstr[0] "" msgstr[1] "" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:235 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 #, python-format -msgid "an hour from now" -msgid_plural "%(count)s\\u00a0hours from now" +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "" +msgstr[1] "" + +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 +#, 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 62d19db3a3..3f7e02fbb2 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 dbd0eda2d4..19f1e85890 100644 --- a/django/contrib/humanize/locale/pl/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/pl/LC_MESSAGES/django.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-18 23:10+0200\n" -"PO-Revision-Date: 2013-05-19 08:23+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-11-16 09:36+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Polish (http://www.transifex.com/projects/p/django/language/" "pl/)\n" "MIME-Version: 1.0\n" @@ -270,29 +270,32 @@ msgstr "%(delta)s temu" msgid "now" msgstr "teraz" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:198 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:201 #, python-format msgid "a second ago" -msgid_plural "%(count)s\\u00a0seconds ago" +msgid_plural "%(count)s seconds ago" msgstr[0] "sekundę temu" msgstr[1] "%(count)s sekundy temu" msgstr[2] "%(count)s sekund temu" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:204 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 #, python-format msgid "a minute ago" -msgid_plural "%(count)s\\u00a0minutes ago" +msgid_plural "%(count)s minutes ago" msgstr[0] "minutę temu" msgstr[1] "%(count)s minuty temu" msgstr[2] "%(count)s minut temu" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:210 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 #, python-format msgid "an hour ago" -msgid_plural "%(count)s\\u00a0hours ago" +msgid_plural "%(count)s hours ago" msgstr[0] "godzinę temu" msgstr[1] "%(count)s godzin temu" msgstr[2] "%(count)s godziny temu" @@ -303,29 +306,32 @@ msgctxt "naturaltime" msgid "%(delta)s from now" msgstr "za %(delta)s " -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:223 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:229 #, python-format msgid "a second from now" -msgid_plural "%(count)s\\u00a0seconds 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" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:229 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 #, python-format msgid "a minute from now" -msgid_plural "%(count)s\\u00a0minutes 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" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:235 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 #, python-format msgid "an hour from now" -msgid_plural "%(count)s\\u00a0hours 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 f5a02a761b..fdebaa9d50 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 e1fb853fdb..7707000357 100644 --- a/django/contrib/humanize/locale/pt/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/pt/LC_MESSAGES/django.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-18 23:10+0200\n" -"PO-Revision-Date: 2013-10-31 16:26+0000\n" -"Last-Translator: Nuno Mariz \n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-11-16 09:36+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Portuguese (http://www.transifex.com/projects/p/django/" "language/pt/)\n" "MIME-Version: 1.0\n" @@ -246,27 +246,30 @@ msgstr "%(delta)s atrás" msgid "now" msgstr "agora" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:198 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:201 #, python-format msgid "a second ago" -msgid_plural "%(count)s\\u00a0seconds ago" +msgid_plural "%(count)s seconds ago" msgstr[0] "há 1 segundo" msgstr[1] "há %(count)s segundos" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:204 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 #, python-format msgid "a minute ago" -msgid_plural "%(count)s\\u00a0minutes ago" +msgid_plural "%(count)s minutes ago" msgstr[0] "há 1 minuto" msgstr[1] "há %(count)s minutos" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:210 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 #, python-format msgid "an hour ago" -msgid_plural "%(count)s\\u00a0hours ago" +msgid_plural "%(count)s hours ago" msgstr[0] "há 1 hora" msgstr[1] "há %(count)s horas" @@ -276,26 +279,29 @@ msgctxt "naturaltime" msgid "%(delta)s from now" msgstr "%(delta)s a partir de agora" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:223 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:229 #, python-format msgid "a second from now" -msgid_plural "%(count)s\\u00a0seconds 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" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:229 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 #, python-format msgid "a minute from now" -msgid_plural "%(count)s\\u00a0minutes 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" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:235 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 #, python-format msgid "an hour from now" -msgid_plural "%(count)s\\u00a0hours 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/pt_BR/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/pt_BR/LC_MESSAGES/django.mo index 2a7c21e2b6..c698018b1f 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 08b90c7c84..6bd81c86d6 100644 --- a/django/contrib/humanize/locale/pt_BR/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/pt_BR/LC_MESSAGES/django.po @@ -2,16 +2,16 @@ # # Translators: # Eduardo Carvalho , 2012 -# Guilherme Gondim , 2012 +# Guilherme Gondim , 2012-2013 # Jannis Leidel , 2011 # Sandro , 2011 msgid "" msgstr "" "Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-18 23:10+0200\n" -"PO-Revision-Date: 2013-05-19 08:23+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-11-16 09:36+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/" "django/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -248,27 +248,30 @@ msgstr "%(delta)s atrás" msgid "now" msgstr "agora" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:198 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:201 #, python-format msgid "a second ago" -msgid_plural "%(count)s\\u00a0seconds ago" +msgid_plural "%(count)s seconds ago" msgstr[0] "há 1 segundo" msgstr[1] "há %(count)s segundos" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:204 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 #, python-format msgid "a minute ago" -msgid_plural "%(count)s\\u00a0minutes ago" +msgid_plural "%(count)s minutes ago" msgstr[0] "há 1 minuto" msgstr[1] "há %(count)s minutos" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:210 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 #, python-format msgid "an hour ago" -msgid_plural "%(count)s\\u00a0hours ago" +msgid_plural "%(count)s hours ago" msgstr[0] "há 1 hora" msgstr[1] "há %(count)s horas" @@ -278,26 +281,29 @@ msgctxt "naturaltime" msgid "%(delta)s from now" msgstr "%(delta)s a partir de agora" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:223 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:229 #, python-format msgid "a second from now" -msgid_plural "%(count)s\\u00a0seconds 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" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:229 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 #, python-format msgid "a minute from now" -msgid_plural "%(count)s\\u00a0minutes 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" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:235 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 #, python-format msgid "an hour from now" -msgid_plural "%(count)s\\u00a0hours 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 3fdb60b895..66019d261e 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 4736565700..7d147ee44f 100644 --- a/django/contrib/humanize/locale/ro/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/ro/LC_MESSAGES/django.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-18 23:10+0200\n" -"PO-Revision-Date: 2013-07-03 14:31+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-11-16 09:37+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Romanian (http://www.transifex.com/projects/p/django/language/" "ro/)\n" "MIME-Version: 1.0\n" @@ -270,29 +270,32 @@ msgstr "acum %(delta)s" msgid "now" msgstr "acum" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:198 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:201 #, python-format msgid "a second ago" -msgid_plural "%(count)s\\u00a0seconds ago" +msgid_plural "%(count)s seconds ago" msgstr[0] "acum o secundă" msgstr[1] "acum %(count)s secunde" msgstr[2] "acum %(count)s de secunde" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:204 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 #, python-format msgid "a minute ago" -msgid_plural "%(count)s\\u00a0minutes 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 " -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:210 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 #, python-format msgid "an hour ago" -msgid_plural "%(count)s\\u00a0hours 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" @@ -303,29 +306,32 @@ msgctxt "naturaltime" msgid "%(delta)s from now" msgstr "%(delta)s de acum" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:223 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:229 #, python-format msgid "a second from now" -msgid_plural "%(count)s\\u00a0seconds 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" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:229 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 #, python-format msgid "a minute from now" -msgid_plural "%(count)s\\u00a0minutes 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" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:235 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 #, python-format msgid "an hour from now" -msgid_plural "%(count)s\\u00a0hours 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 18badd1ea8..aaf6b1c3f0 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 867cee90c9..7c30eea627 100644 --- a/django/contrib/humanize/locale/ru/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/ru/LC_MESSAGES/django.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-18 23:10+0200\n" -"PO-Revision-Date: 2013-05-19 08:23+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-11-16 09:36+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Russian (http://www.transifex.com/projects/p/django/language/" "ru/)\n" "MIME-Version: 1.0\n" @@ -271,29 +271,32 @@ msgstr "%(delta)s назад" msgid "now" msgstr "сейчас" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:198 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:201 #, python-format msgid "a second ago" -msgid_plural "%(count)s\\u00a0seconds ago" +msgid_plural "%(count)s seconds ago" msgstr[0] "%(count)s секунду назад" msgstr[1] "%(count)s секунды назад" msgstr[2] "%(count)s секунд назад" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:204 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 #, python-format msgid "a minute ago" -msgid_plural "%(count)s\\u00a0minutes ago" +msgid_plural "%(count)s minutes ago" msgstr[0] "%(count)s минуту назад" msgstr[1] "%(count)s минуты назад" msgstr[2] "%(count)s минут назад" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:210 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 #, python-format msgid "an hour ago" -msgid_plural "%(count)s\\u00a0hours ago" +msgid_plural "%(count)s hours ago" msgstr[0] "%(count)s час назад" msgstr[1] "%(count)s часа назад" msgstr[2] "%(count)s часов назад" @@ -304,29 +307,32 @@ msgctxt "naturaltime" msgid "%(delta)s from now" msgstr "через %(delta)s" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:223 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:229 #, python-format msgid "a second from now" -msgid_plural "%(count)s\\u00a0seconds from now" +msgid_plural "%(count)s seconds from now" msgstr[0] "через %(count)s секунду" msgstr[1] "через %(count)s секунды" msgstr[2] "через %(count)s секунд" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:229 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 #, python-format msgid "a minute from now" -msgid_plural "%(count)s\\u00a0minutes from now" +msgid_plural "%(count)s minutes from now" msgstr[0] "через %(count)s минуту" msgstr[1] "через %(count)s минуты" msgstr[2] "через %(count)s минут" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:235 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 #, python-format msgid "an hour from now" -msgid_plural "%(count)s\\u00a0hours 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 60d1c1e192..62404fd430 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 d12eaf4d06..adb9820a7e 100644 --- a/django/contrib/humanize/locale/sk/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/sk/LC_MESSAGES/django.po @@ -1,15 +1,16 @@ # This file is distributed under the same license as the Django package. # # Translators: +# claudep , 2013 # Jannis Leidel , 2011 # Marian Andre , 2012-2013 msgid "" msgstr "" "Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-18 23:10+0200\n" -"PO-Revision-Date: 2013-06-16 12:42+0000\n" -"Last-Translator: Marian Andre \n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-11-17 20:08+0000\n" +"Last-Translator: claudep \n" "Language-Team: Slovak (http://www.transifex.com/projects/p/django/language/" "sk/)\n" "MIME-Version: 1.0\n" @@ -268,32 +269,35 @@ msgstr "pred %(delta)s" msgid "now" msgstr "teraz" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:198 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:201 #, python-format msgid "a second ago" -msgid_plural "%(count)s\\u00a0seconds ago" +msgid_plural "%(count)s seconds ago" msgstr[0] "pred sekundou" -msgstr[1] "pred %(count)s sekundami" -msgstr[2] "pred %(count)s sekundami" +msgstr[1] "pred %(count)s sekundami" +msgstr[2] "pred %(count)s sekundami" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:204 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 #, python-format msgid "a minute ago" -msgid_plural "%(count)s\\u00a0minutes 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" +msgstr[1] "pred %(count)s minútami" +msgstr[2] "pred %(count)s minútami" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:210 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 #, python-format msgid "an hour ago" -msgid_plural "%(count)s\\u00a0hours ago" +msgid_plural "%(count)s hours ago" msgstr[0] "pred hodinou" -msgstr[1] "pred %(count)s hodinami" -msgstr[2] "pred %(count)s hodinami" +msgstr[1] "pred %(count)s hodinami" +msgstr[2] "pred %(count)s hodinami" #: templatetags/humanize.py:216 #, python-format @@ -301,29 +305,32 @@ msgctxt "naturaltime" msgid "%(delta)s from now" msgstr "%(delta)s odteraz" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:223 -#, python-format -msgid "a second from now" -msgid_plural "%(count)s\\u00a0seconds from now" -msgstr[0] "sekundu odteraz" -msgstr[1] "%(count)s sekundy odteraz" -msgstr[2] "%(count)s sekúnd odteraz" - -#. Translators: \\u00a0 is non-breaking space +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. #: templatetags/humanize.py:229 #, python-format -msgid "a minute from now" -msgid_plural "%(count)s\\u00a0minutes from now" -msgstr[0] "minútu odteraz" -msgstr[1] "%(count)s minúty odteraz" -msgstr[2] "%(count)s minút odteraz" +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" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:235 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 +#, 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" + +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 #, python-format msgid "an hour from now" -msgid_plural "%(count)s\\u00a0hours 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" +msgstr[1] "%(count)s\\u00a0hodiny 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 17d49ce605..ca1279db14 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 c5302ede42..a919c055b8 100644 --- a/django/contrib/humanize/locale/sl/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/sl/LC_MESSAGES/django.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-18 23:10+0200\n" -"PO-Revision-Date: 2013-08-18 23:28+0000\n" -"Last-Translator: Primož Verdnik \n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-11-17 21:10+0000\n" +"Last-Translator: Claude Paroz \n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/django/" "language/sl/)\n" "MIME-Version: 1.0\n" @@ -293,35 +293,38 @@ msgstr "Pred %(delta)s" msgid "now" msgstr "zdaj" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:198 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:201 #, python-format msgid "a second ago" -msgid_plural "%(count)s\\u00a0seconds ago" -msgstr[0] "pred %(count)s\\u00a0sekundo" -msgstr[1] "pred %(count)s\\u00a0sekundama" -msgstr[2] "pred %(count)s\\u00a0sekundami" -msgstr[3] "pred %(count)s\\u00a0sekundami" +msgid_plural "%(count)s seconds ago" +msgstr[0] "pred %(count)s sekundo" +msgstr[1] "pred %(count)s sekundama" +msgstr[2] "pred %(count)s sekundami" +msgstr[3] "pred %(count)s sekundami" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:204 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 #, python-format msgid "a minute ago" -msgid_plural "%(count)s\\u00a0minutes ago" -msgstr[0] "pred %(count)s\\u00a0minuto" -msgstr[1] "pred %(count)s\\u00a0minutama" -msgstr[2] "pred %(count)s\\u00a0minutami" -msgstr[3] "pred %(count)s\\u00a0minutami" +msgid_plural "%(count)s minutes ago" +msgstr[0] "pred %(count)s minuto" +msgstr[1] "pred %(count)s minutama" +msgstr[2] "pred %(count)s minutami" +msgstr[3] "pred %(count)s minutami" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:210 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 #, python-format msgid "an hour ago" -msgid_plural "%(count)s\\u00a0hours ago" -msgstr[0] "pred %(count)s\\u00a0uro" -msgstr[1] "pred %(count)s\\u00a0urama" -msgstr[2] "pred %(count)s\\u00a0urami" -msgstr[3] "pred %(count)s\\u00a0urami" +msgid_plural "%(count)s hours ago" +msgstr[0] "pred %(count)s uro" +msgstr[1] "pred %(count)s urama" +msgstr[2] "pred %(count)s urami" +msgstr[3] "pred %(count)s urami" #: templatetags/humanize.py:216 #, python-format @@ -329,32 +332,35 @@ msgctxt "naturaltime" msgid "%(delta)s from now" msgstr "čez %(delta)s" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:223 -#, python-format -msgid "a second from now" -msgid_plural "%(count)s\\u00a0seconds from now" -msgstr[0] "čez %(count)s\\u00a0sekundo" -msgstr[1] "čez %(count)s\\u00a0sekundi" -msgstr[2] "čez %(count)s\\u00a0sekunde" -msgstr[3] "čez %(count)s\\u00a0sekund" - -#. Translators: \\u00a0 is non-breaking space +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. #: templatetags/humanize.py:229 #, python-format -msgid "a minute from now" -msgid_plural "%(count)s\\u00a0minutes from now" -msgstr[0] "čez %(count)s\\u00a0minuto" -msgstr[1] "čez %(count)s\\u00a0minuti" -msgstr[2] "čez %(count)s\\u00a0minute" -msgstr[3] "čez %(count)s\\u00a0minut" +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "čez %(count)s sekundo" +msgstr[1] "čez %(count)s sekundi" +msgstr[2] "čez %(count)s sekunde" +msgstr[3] "čez %(count)s sekund" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:235 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 +#, python-format +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "čez %(count)s minuto" +msgstr[1] "čez %(count)s minuti" +msgstr[2] "čez %(count)s minute" +msgstr[3] "čez %(count)s minut" + +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 #, python-format msgid "an hour from now" -msgid_plural "%(count)s\\u00a0hours from now" -msgstr[0] "čez %(count)s\\u00a0uro" -msgstr[1] "čez %(count)s\\u00a0uri" -msgstr[2] "čez %(count)s\\u00a0ure" -msgstr[3] "čez %(count)s\\u00a0ur" +msgid_plural "%(count)s hours from now" +msgstr[0] "čez %(count)s uro" +msgstr[1] "čez %(count)s uri" +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 f5de1968fc..69c0188181 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 7c73a080d1..0cff5ffa65 100644 --- a/django/contrib/humanize/locale/sq/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/sq/LC_MESSAGES/django.po @@ -6,9 +6,9 @@ msgid "" msgstr "" "Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-18 23:10+0200\n" -"PO-Revision-Date: 2013-05-19 08:23+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-11-16 09:37+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Albanian (http://www.transifex.com/projects/p/django/language/" "sq/)\n" "MIME-Version: 1.0\n" @@ -245,27 +245,30 @@ msgstr "%(delta)s më parë" msgid "now" msgstr "tani" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:198 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:201 #, python-format msgid "a second ago" -msgid_plural "%(count)s\\u00a0seconds ago" +msgid_plural "%(count)s seconds ago" msgstr[0] "një sekondë më parë" msgstr[1] "%(count)s sekonda më parë" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:204 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 #, python-format msgid "a minute ago" -msgid_plural "%(count)s\\u00a0minutes ago" +msgid_plural "%(count)s minutes ago" msgstr[0] "një minutë më parë" msgstr[1] "%(count)s minuta më parë" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:210 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 #, python-format msgid "an hour ago" -msgid_plural "%(count)s\\u00a0hours ago" +msgid_plural "%(count)s hours ago" msgstr[0] "një orë më parë" msgstr[1] "%(count)s orë më parë" @@ -275,26 +278,29 @@ msgctxt "naturaltime" msgid "%(delta)s from now" msgstr "%(delta)s nga tani" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:223 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:229 #, python-format msgid "a second from now" -msgid_plural "%(count)s\\u00a0seconds from now" +msgid_plural "%(count)s seconds from now" msgstr[0] "një sekondë nga tani" msgstr[1] "%(count)s sekonda nga tani" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:229 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 #, python-format msgid "a minute from now" -msgid_plural "%(count)s\\u00a0minutes from now" +msgid_plural "%(count)s minutes from now" msgstr[0] "një minutë nga tani" msgstr[1] "%(count)s minuta nga tani" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:235 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 #, python-format msgid "an hour from now" -msgid_plural "%(count)s\\u00a0hours from now" +msgid_plural "%(count)s hours from now" msgstr[0] "një orë nga tani" msgstr[1] "%(count)s orë nga tani" diff --git a/django/contrib/humanize/locale/sr/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/sr/LC_MESSAGES/django.mo index 82ffab2c4d..90b76e3e4c 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 dafecf4c4c..12f418400b 100644 --- a/django/contrib/humanize/locale/sr/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/sr/LC_MESSAGES/django.po @@ -1,15 +1,13 @@ # 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" +"Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-10-15 10:57+0200\n" -"PO-Revision-Date: 2012-02-20 15:05+0000\n" -"Last-Translator: Janos Guljas \n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-04-24 18:40+0000\n" +"Last-Translator: Django team\n" "Language-Team: Serbian (http://www.transifex.com/projects/p/django/language/" "sr/)\n" "MIME-Version: 1.0\n" @@ -19,306 +17,318 @@ msgstr "" "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" -#: tests.py:125 templatetags/humanize.py:167 +#: tests.py:135 templatetags/humanize.py:168 msgid "today" -msgstr "десет" +msgstr "" -#: tests.py:125 templatetags/humanize.py:171 +#: tests.py:135 templatetags/humanize.py:172 msgid "yesterday" -msgstr "јуче" +msgstr "" -#: tests.py:125 templatetags/humanize.py:169 +#: tests.py:135 templatetags/humanize.py:170 msgid "tomorrow" -msgstr "сутра" +msgstr "" -#: templatetags/humanize.py:25 +#: templatetags/humanize.py:26 msgid "th" -msgstr "-и" +msgstr "" -#: templatetags/humanize.py:25 +#: templatetags/humanize.py:26 msgid "st" -msgstr "-ви" +msgstr "" -#: templatetags/humanize.py:25 +#: templatetags/humanize.py:26 msgid "nd" -msgstr "-и" +msgstr "" -#: templatetags/humanize.py:25 +#: templatetags/humanize.py:26 msgid "rd" -msgstr "-и" - -#: templatetags/humanize.py:54 -#, python-format -msgid "%(value).1f million" -msgid_plural "%(value).1f million" -msgstr[0] "%(value).1f милион" -msgstr[1] "%(value).1f милиона" -msgstr[2] "%(value).1f милиона" +msgstr "" #: templatetags/humanize.py:55 #, python-format +msgid "%(value).1f million" +msgid_plural "%(value).1f million" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:56 +#, 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:58 -#, python-format -msgid "%(value).1f billion" -msgid_plural "%(value).1f billion" -msgstr[0] "%(value).1f билион" -msgstr[1] "%(value).1f билиона" -msgstr[2] "%(value).1f билиона" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" #: templatetags/humanize.py:59 #, python-format +msgid "%(value).1f billion" +msgid_plural "%(value).1f billion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:60 +#, 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:62 -#, python-format -msgid "%(value).1f trillion" -msgid_plural "%(value).1f trillion" -msgstr[0] "%(value).1f трилион" -msgstr[1] "%(value).1f трилиона" -msgstr[2] "%(value).1f трилиона" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" #: templatetags/humanize.py:63 #, python-format +msgid "%(value).1f trillion" +msgid_plural "%(value).1f trillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:64 +#, 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:66 -#, python-format -msgid "%(value).1f quadrillion" -msgid_plural "%(value).1f quadrillion" -msgstr[0] "%(value).1f квадрилион" -msgstr[1] "%(value).1f квадрилиона" -msgstr[2] "%(value).1f квадрилиона" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" #: templatetags/humanize.py:67 #, python-format +msgid "%(value).1f quadrillion" +msgid_plural "%(value).1f quadrillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:68 +#, 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:70 -#, python-format -msgid "%(value).1f quintillion" -msgid_plural "%(value).1f quintillion" -msgstr[0] "%(value).1f квинтилион" -msgstr[1] "%(value).1f квинтилиона" -msgstr[2] "%(value).1f квинтилиона" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" #: templatetags/humanize.py:71 #, python-format +msgid "%(value).1f quintillion" +msgid_plural "%(value).1f quintillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:72 +#, 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:74 -#, python-format -msgid "%(value).1f sextillion" -msgid_plural "%(value).1f sextillion" -msgstr[0] "%(value).1f секстилион" -msgstr[1] "%(value).1f секстилиона" -msgstr[2] "%(value).1f секстилиона" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" #: templatetags/humanize.py:75 #, python-format +msgid "%(value).1f sextillion" +msgid_plural "%(value).1f sextillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:76 +#, 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:78 -#, python-format -msgid "%(value).1f septillion" -msgid_plural "%(value).1f septillion" -msgstr[0] "%(value).1f септилион" -msgstr[1] "%(value).1f септилиона" -msgstr[2] "%(value).1f септилиона" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" #: templatetags/humanize.py:79 #, python-format +msgid "%(value).1f septillion" +msgid_plural "%(value).1f septillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:80 +#, 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:82 -#, python-format -msgid "%(value).1f octillion" -msgid_plural "%(value).1f octillion" -msgstr[0] "%(value).1f окталион" -msgstr[1] "%(value).1f окталиона" -msgstr[2] "%(value).1f окталиона" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" #: templatetags/humanize.py:83 #, python-format +msgid "%(value).1f octillion" +msgid_plural "%(value).1f octillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:84 +#, 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:86 -#, python-format -msgid "%(value).1f nonillion" -msgid_plural "%(value).1f nonillion" -msgstr[0] "%(value).1f нонилион" -msgstr[1] "%(value).1f нонилиона" -msgstr[2] "%(value).1f нонилиона" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" #: templatetags/humanize.py:87 #, python-format +msgid "%(value).1f nonillion" +msgid_plural "%(value).1f nonillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:88 +#, 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:90 -#, python-format -msgid "%(value).1f decillion" -msgid_plural "%(value).1f decillion" -msgstr[0] "%(value).1f дектилион" -msgstr[1] "%(value).1f дектилиона" -msgstr[2] "%(value).1f дектилиона" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" #: templatetags/humanize.py:91 #, python-format +msgid "%(value).1f decillion" +msgid_plural "%(value).1f decillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:92 +#, 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:94 -#, python-format -msgid "%(value).1f googol" -msgid_plural "%(value).1f googol" -msgstr[0] "%(value).1f гугол" -msgstr[1] "%(value).1f гугола" -msgstr[2] "%(value).1f гугола" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" #: templatetags/humanize.py:95 #, python-format +msgid "%(value).1f googol" +msgid_plural "%(value).1f googol" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:96 +#, python-format msgid "%(value)s googol" msgid_plural "%(value)s googol" -msgstr[0] "%(value)s гугол" -msgstr[1] "%(value)s гугола" -msgstr[2] "%(value)s гугола" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" -#: templatetags/humanize.py:144 +#: templatetags/humanize.py:145 msgid "one" -msgstr "један" +msgstr "" -#: templatetags/humanize.py:144 +#: templatetags/humanize.py:145 msgid "two" -msgstr "два" +msgstr "" -#: templatetags/humanize.py:144 +#: templatetags/humanize.py:145 msgid "three" -msgstr "три" +msgstr "" -#: templatetags/humanize.py:144 +#: templatetags/humanize.py:145 msgid "four" -msgstr "четири" +msgstr "" -#: templatetags/humanize.py:144 +#: templatetags/humanize.py:145 msgid "five" -msgstr "пет" +msgstr "" -#: templatetags/humanize.py:144 +#: templatetags/humanize.py:145 msgid "six" -msgstr "шест" +msgstr "" -#: templatetags/humanize.py:144 +#: templatetags/humanize.py:145 msgid "seven" -msgstr "седам" +msgstr "" -#: templatetags/humanize.py:144 +#: templatetags/humanize.py:145 msgid "eight" -msgstr "осам" +msgstr "" -#: templatetags/humanize.py:144 +#: templatetags/humanize.py:145 msgid "nine" -msgstr "девет" +msgstr "" -#: templatetags/humanize.py:190 +#: templatetags/humanize.py:191 #, python-format msgctxt "naturaltime" msgid "%(delta)s ago" -msgstr "пре %(delta)s" +msgstr "" -#: templatetags/humanize.py:193 templatetags/humanize.py:215 +#: templatetags/humanize.py:194 templatetags/humanize.py:219 msgid "now" -msgstr "сада" - -#: templatetags/humanize.py:196 -#, python-format -msgid "a second ago" -msgid_plural "%(count)s seconds ago" -msgstr[0] "пре једне секунде" -msgstr[1] "пре %(count)s секунде" -msgstr[2] "пре %(count)s секунди" +msgstr "" +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. #: templatetags/humanize.py:201 #, python-format -msgid "a minute ago" -msgid_plural "%(count)s minutes ago" -msgstr[0] "пре једног минута" -msgstr[1] "пре %(count)s минута" -msgstr[2] "пре %(count)s минута" +msgid "a second ago" +msgid_plural "%(count)s seconds ago" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" -#: templatetags/humanize.py:206 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 +#, python-format +msgid "a minute ago" +msgid_plural "%(count)s minutes ago" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 #, python-format msgid "an hour ago" -msgid_plural "%(count)s hours ago" -msgstr[0] "пре једног сата" -msgstr[1] "пре %(count)s сата" -msgstr[2] "пре %(count)s сати" +msgid_plural "%(count)s hours ago" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" -#: templatetags/humanize.py:212 +#: templatetags/humanize.py:216 #, python-format msgctxt "naturaltime" msgid "%(delta)s from now" -msgstr "за %(delta)s" +msgstr "" -#: templatetags/humanize.py:218 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:229 #, python-format msgid "a second from now" -msgid_plural "%(count)s seconds from now" -msgstr[0] "за једну секунду" -msgstr[1] "за %(count)s секунде" -msgstr[2] "за %(count)s секунди" +msgid_plural "%(count)s seconds from now" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" -#: templatetags/humanize.py:223 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 #, python-format msgid "a minute from now" -msgid_plural "%(count)s minutes from now" -msgstr[0] "за један минут" -msgstr[1] "за %(count)s минута" -msgstr[2] "за %(count)s минута" +msgid_plural "%(count)s minutes from now" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" -#: templatetags/humanize.py:228 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 #, python-format msgid "an hour from now" -msgid_plural "%(count)s hours from now" -msgstr[0] "за један сат" -msgstr[1] "за %(count)s сата" -msgstr[2] "за %(count)s сати" +msgid_plural "%(count)s hours from now" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" 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 37857822eb..3e7ccff08e 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 226beb1957..efb717a4bd 100644 --- a/django/contrib/humanize/locale/sr_Latn/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/sr_Latn/LC_MESSAGES/django.po @@ -1,15 +1,13 @@ # 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" +"Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-10-15 10:57+0200\n" -"PO-Revision-Date: 2012-03-05 14:01+0000\n" -"Last-Translator: Janos Guljas \n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-04-24 18:40+0000\n" +"Last-Translator: Django team\n" "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/django/" "language/sr@latin/)\n" "MIME-Version: 1.0\n" @@ -19,306 +17,318 @@ msgstr "" "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" -#: tests.py:125 templatetags/humanize.py:167 +#: tests.py:135 templatetags/humanize.py:168 msgid "today" -msgstr "deset" +msgstr "" -#: tests.py:125 templatetags/humanize.py:171 +#: tests.py:135 templatetags/humanize.py:172 msgid "yesterday" -msgstr "juče" +msgstr "" -#: tests.py:125 templatetags/humanize.py:169 +#: tests.py:135 templatetags/humanize.py:170 msgid "tomorrow" -msgstr "sutra" +msgstr "" -#: templatetags/humanize.py:25 +#: templatetags/humanize.py:26 msgid "th" -msgstr "-i" +msgstr "" -#: templatetags/humanize.py:25 +#: templatetags/humanize.py:26 msgid "st" -msgstr "-vi" +msgstr "" -#: templatetags/humanize.py:25 +#: templatetags/humanize.py:26 msgid "nd" -msgstr "-i" +msgstr "" -#: templatetags/humanize.py:25 +#: templatetags/humanize.py:26 msgid "rd" -msgstr "-i" - -#: templatetags/humanize.py:54 -#, python-format -msgid "%(value).1f million" -msgid_plural "%(value).1f million" -msgstr[0] "%(value).1f milion" -msgstr[1] "%(value).1f miliona" -msgstr[2] "%(value).1f miliona" +msgstr "" #: templatetags/humanize.py:55 #, python-format +msgid "%(value).1f million" +msgid_plural "%(value).1f million" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:56 +#, python-format msgid "%(value)s million" msgid_plural "%(value)s million" -msgstr[0] "%(value)s milion" -msgstr[1] "%(value)s miliona" -msgstr[2] "%(value)s miliona" - -#: templatetags/humanize.py:58 -#, python-format -msgid "%(value).1f billion" -msgid_plural "%(value).1f billion" -msgstr[0] "%(value).1f bilion" -msgstr[1] "%(value).1f biliona" -msgstr[2] "%(value).1f biliona" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" #: templatetags/humanize.py:59 #, python-format +msgid "%(value).1f billion" +msgid_plural "%(value).1f billion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:60 +#, python-format msgid "%(value)s billion" msgid_plural "%(value)s billion" -msgstr[0] "%(value)s bilion" -msgstr[1] "%(value)s biliona" -msgstr[2] "%(value)s biliona" - -#: templatetags/humanize.py:62 -#, python-format -msgid "%(value).1f trillion" -msgid_plural "%(value).1f trillion" -msgstr[0] "%(value).1f trilion" -msgstr[1] "%(value).1f triliona" -msgstr[2] "%(value).1f triliona" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" #: templatetags/humanize.py:63 #, python-format +msgid "%(value).1f trillion" +msgid_plural "%(value).1f trillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:64 +#, python-format msgid "%(value)s trillion" msgid_plural "%(value)s trillion" -msgstr[0] "%(value)s trilion" -msgstr[1] "%(value)s triliona" -msgstr[2] "%(value)s triliona" - -#: templatetags/humanize.py:66 -#, python-format -msgid "%(value).1f quadrillion" -msgid_plural "%(value).1f quadrillion" -msgstr[0] "%(value).1f kvadrilion" -msgstr[1] "%(value).1f kvadriliona" -msgstr[2] "%(value).1f kvadriliona" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" #: templatetags/humanize.py:67 #, python-format +msgid "%(value).1f quadrillion" +msgid_plural "%(value).1f quadrillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:68 +#, python-format msgid "%(value)s quadrillion" msgid_plural "%(value)s quadrillion" -msgstr[0] "%(value)s kvadrilion" -msgstr[1] "%(value)s kvadriliona" -msgstr[2] "%(value)s kvadriliona" - -#: templatetags/humanize.py:70 -#, python-format -msgid "%(value).1f quintillion" -msgid_plural "%(value).1f quintillion" -msgstr[0] "%(value).1f kvintilion" -msgstr[1] "%(value).1f kvintiliona" -msgstr[2] "%(value).1f kvintiliona" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" #: templatetags/humanize.py:71 #, python-format +msgid "%(value).1f quintillion" +msgid_plural "%(value).1f quintillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:72 +#, python-format msgid "%(value)s quintillion" msgid_plural "%(value)s quintillion" -msgstr[0] "%(value)s kvintilion" -msgstr[1] "%(value)s kvintiliona" -msgstr[2] "%(value)s kvintiliona" - -#: templatetags/humanize.py:74 -#, python-format -msgid "%(value).1f sextillion" -msgid_plural "%(value).1f sextillion" -msgstr[0] "%(value).1f sekstilion" -msgstr[1] "%(value).1f sekstiliona" -msgstr[2] "%(value).1f sekstiliona" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" #: templatetags/humanize.py:75 #, python-format +msgid "%(value).1f sextillion" +msgid_plural "%(value).1f sextillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:76 +#, python-format msgid "%(value)s sextillion" msgid_plural "%(value)s sextillion" -msgstr[0] "%(value)s sekstilion" -msgstr[1] "%(value)s sekstiliona" -msgstr[2] "%(value)s sekstiliona" - -#: templatetags/humanize.py:78 -#, python-format -msgid "%(value).1f septillion" -msgid_plural "%(value).1f septillion" -msgstr[0] "%(value).1f septilion" -msgstr[1] "%(value).1f septiliona" -msgstr[2] "%(value).1f septiliona" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" #: templatetags/humanize.py:79 #, python-format +msgid "%(value).1f septillion" +msgid_plural "%(value).1f septillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:80 +#, python-format msgid "%(value)s septillion" msgid_plural "%(value)s septillion" -msgstr[0] "%(value)s septilion" -msgstr[1] "%(value)s septiliona" -msgstr[2] "%(value)s septiliona" - -#: templatetags/humanize.py:82 -#, python-format -msgid "%(value).1f octillion" -msgid_plural "%(value).1f octillion" -msgstr[0] "%(value).1f oktalion" -msgstr[1] "%(value).1f oktaliona" -msgstr[2] "%(value).1f oktaliona" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" #: templatetags/humanize.py:83 #, python-format +msgid "%(value).1f octillion" +msgid_plural "%(value).1f octillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:84 +#, python-format msgid "%(value)s octillion" msgid_plural "%(value)s octillion" -msgstr[0] "%(value)s oktalion" -msgstr[1] "%(value)s oktaliona" -msgstr[2] "%(value)s oktaliona" - -#: templatetags/humanize.py:86 -#, python-format -msgid "%(value).1f nonillion" -msgid_plural "%(value).1f nonillion" -msgstr[0] "%(value).1f nonilion" -msgstr[1] "%(value).1f noniliona" -msgstr[2] "%(value).1f noniliona" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" #: templatetags/humanize.py:87 #, python-format +msgid "%(value).1f nonillion" +msgid_plural "%(value).1f nonillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:88 +#, python-format msgid "%(value)s nonillion" msgid_plural "%(value)s nonillion" -msgstr[0] "%(value)s nonilion" -msgstr[1] "%(value)s noniliona" -msgstr[2] "%(value)s noniliona" - -#: templatetags/humanize.py:90 -#, python-format -msgid "%(value).1f decillion" -msgid_plural "%(value).1f decillion" -msgstr[0] "%(value).1f dektilion" -msgstr[1] "%(value).1f dektiliona" -msgstr[2] "%(value).1f dektiliona" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" #: templatetags/humanize.py:91 #, python-format +msgid "%(value).1f decillion" +msgid_plural "%(value).1f decillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:92 +#, python-format msgid "%(value)s decillion" msgid_plural "%(value)s decillion" -msgstr[0] "%(value)s dektilion" -msgstr[1] "%(value)s dektiliona" -msgstr[2] "%(value)s dektiliona" - -#: templatetags/humanize.py:94 -#, python-format -msgid "%(value).1f googol" -msgid_plural "%(value).1f googol" -msgstr[0] "%(value).1f gugol" -msgstr[1] "%(value).1f gugola" -msgstr[2] "%(value).1f gugola" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" #: templatetags/humanize.py:95 #, python-format +msgid "%(value).1f googol" +msgid_plural "%(value).1f googol" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:96 +#, python-format msgid "%(value)s googol" msgid_plural "%(value)s googol" -msgstr[0] "%(value)s gugol" -msgstr[1] "%(value)s gugola" -msgstr[2] "%(value)s gugola" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" -#: templatetags/humanize.py:144 +#: templatetags/humanize.py:145 msgid "one" -msgstr "jedan" +msgstr "" -#: templatetags/humanize.py:144 +#: templatetags/humanize.py:145 msgid "two" -msgstr "dva" +msgstr "" -#: templatetags/humanize.py:144 +#: templatetags/humanize.py:145 msgid "three" -msgstr "tri" +msgstr "" -#: templatetags/humanize.py:144 +#: templatetags/humanize.py:145 msgid "four" -msgstr "četiri" +msgstr "" -#: templatetags/humanize.py:144 +#: templatetags/humanize.py:145 msgid "five" -msgstr "pet" +msgstr "" -#: templatetags/humanize.py:144 +#: templatetags/humanize.py:145 msgid "six" -msgstr "šest" +msgstr "" -#: templatetags/humanize.py:144 +#: templatetags/humanize.py:145 msgid "seven" -msgstr "sedam" +msgstr "" -#: templatetags/humanize.py:144 +#: templatetags/humanize.py:145 msgid "eight" -msgstr "osam" +msgstr "" -#: templatetags/humanize.py:144 +#: templatetags/humanize.py:145 msgid "nine" -msgstr "devet" +msgstr "" -#: templatetags/humanize.py:190 +#: templatetags/humanize.py:191 #, python-format msgctxt "naturaltime" msgid "%(delta)s ago" -msgstr "pre %(delta)s" +msgstr "" -#: templatetags/humanize.py:193 templatetags/humanize.py:215 +#: templatetags/humanize.py:194 templatetags/humanize.py:219 msgid "now" -msgstr "sada" - -#: templatetags/humanize.py:196 -#, python-format -msgid "a second ago" -msgid_plural "%(count)s seconds ago" -msgstr[0] "pre jedne sekunde" -msgstr[1] "pre %(count)s sekunde" -msgstr[2] "pre %(count)s sekundi" +msgstr "" +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. #: templatetags/humanize.py:201 #, python-format -msgid "a minute ago" -msgid_plural "%(count)s minutes ago" -msgstr[0] "pre jednog minuta" -msgstr[1] "pre %(count)s minuta" -msgstr[2] "pre %(count)s minuta" +msgid "a second ago" +msgid_plural "%(count)s seconds ago" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" -#: templatetags/humanize.py:206 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 +#, python-format +msgid "a minute ago" +msgid_plural "%(count)s minutes ago" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 #, python-format msgid "an hour ago" -msgid_plural "%(count)s hours ago" -msgstr[0] "pre jednog sata" -msgstr[1] "pre %(count)s sata" -msgstr[2] "pre %(count)s sati" +msgid_plural "%(count)s hours ago" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" -#: templatetags/humanize.py:212 +#: templatetags/humanize.py:216 #, python-format msgctxt "naturaltime" msgid "%(delta)s from now" -msgstr "za %(delta)s" +msgstr "" -#: templatetags/humanize.py:218 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:229 #, python-format msgid "a second from now" -msgid_plural "%(count)s seconds from now" -msgstr[0] "za jadnu sekundu" -msgstr[1] "za %(count)s sekunde" -msgstr[2] "za %(count)s sekundi" +msgid_plural "%(count)s seconds from now" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" -#: templatetags/humanize.py:223 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 #, python-format msgid "a minute from now" -msgid_plural "%(count)s minutes from now" -msgstr[0] "za jedan minut" -msgstr[1] "za %(count)s minuta" -msgstr[2] "za %(count)s minuta" +msgid_plural "%(count)s minutes from now" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" -#: templatetags/humanize.py:228 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 #, python-format msgid "an hour from now" -msgid_plural "%(count)s hours from now" -msgstr[0] "za jedan sat" -msgstr[1] "za %(count)s sata" -msgstr[2] "za %(count)s sati" +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 7148d991f7..69c22e808e 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 587fdb6525..7011c8ac6d 100644 --- a/django/contrib/humanize/locale/sv/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/sv/LC_MESSAGES/django.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-18 23:10+0200\n" -"PO-Revision-Date: 2013-05-19 08:23+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-11-16 09:37+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Swedish (http://www.transifex.com/projects/p/django/language/" "sv/)\n" "MIME-Version: 1.0\n" @@ -246,27 +246,30 @@ msgstr "%(delta)s sedan" msgid "now" msgstr "nu" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:198 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:201 #, python-format msgid "a second ago" -msgid_plural "%(count)s\\u00a0seconds ago" +msgid_plural "%(count)s seconds ago" msgstr[0] "en sekund sedan" msgstr[1] "%(count)s sekunder sedan" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:204 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 #, python-format msgid "a minute ago" -msgid_plural "%(count)s\\u00a0minutes ago" +msgid_plural "%(count)s minutes ago" msgstr[0] "en minut sedan" msgstr[1] "%(count)s minuter sedan" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:210 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 #, python-format msgid "an hour ago" -msgid_plural "%(count)s\\u00a0hours ago" +msgid_plural "%(count)s hours ago" msgstr[0] "en timma sedan" msgstr[1] "%(count)s timmar sedan" @@ -276,26 +279,29 @@ msgctxt "naturaltime" msgid "%(delta)s from now" msgstr "%(delta)s från nu" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:223 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:229 #, python-format msgid "a second from now" -msgid_plural "%(count)s\\u00a0seconds from now" +msgid_plural "%(count)s seconds from now" msgstr[0] "en sekund från nu" msgstr[1] "%(count)s sekunder från nu" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:229 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 #, python-format msgid "a minute from now" -msgid_plural "%(count)s\\u00a0minutes from now" +msgid_plural "%(count)s minutes from now" msgstr[0] "en minut från nu" msgstr[1] "%(count)s minuter från nu" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:235 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 #, python-format msgid "an hour from now" -msgid_plural "%(count)s\\u00a0hours 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/sw/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/sw/LC_MESSAGES/django.mo index a1888bd9de..b90fad8d70 100644 Binary files a/django/contrib/humanize/locale/sw/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/sw/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/sw/LC_MESSAGES/django.po b/django/contrib/humanize/locale/sw/LC_MESSAGES/django.po index 8eef6ef260..4c7bd83962 100644 --- a/django/contrib/humanize/locale/sw/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/sw/LC_MESSAGES/django.po @@ -5,9 +5,9 @@ msgid "" msgstr "" "Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-18 23:10+0200\n" -"PO-Revision-Date: 2013-05-19 08:23+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-11-16 09:37+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Swahili (http://www.transifex.com/projects/p/django/language/" "sw/)\n" "MIME-Version: 1.0\n" @@ -244,27 +244,30 @@ msgstr "%(delta)s zilizopita" msgid "now" msgstr "sasa" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:198 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:201 #, python-format msgid "a second ago" -msgid_plural "%(count)s\\u00a0seconds ago" +msgid_plural "%(count)s seconds ago" msgstr[0] "sekunde iliyopita" msgstr[1] "sekunde %(count)s zilizopita" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:204 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 #, python-format msgid "a minute ago" -msgid_plural "%(count)s\\u00a0minutes ago" +msgid_plural "%(count)s minutes ago" msgstr[0] "dakika iliyopita" msgstr[1] "dakika %(count)s zilizopita" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:210 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 #, python-format msgid "an hour ago" -msgid_plural "%(count)s\\u00a0hours ago" +msgid_plural "%(count)s hours ago" msgstr[0] "saa iliyopita" msgstr[1] "saa %(count)s zilizopita" @@ -274,26 +277,29 @@ msgctxt "naturaltime" msgid "%(delta)s from now" msgstr "%(delta)s kutoka sasa" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:223 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:229 #, python-format msgid "a second from now" -msgid_plural "%(count)s\\u00a0seconds from now" +msgid_plural "%(count)s seconds from now" msgstr[0] "sekunde moja kutoka sasa" msgstr[1] "sekunde %(count)s kutoka sasa" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:229 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 #, python-format msgid "a minute from now" -msgid_plural "%(count)s\\u00a0minutes from now" +msgid_plural "%(count)s minutes from now" msgstr[0] "dakika moja kutoka sasa" msgstr[1] "dakika %(count)s kutoka sasa" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:235 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 #, python-format msgid "an hour from now" -msgid_plural "%(count)s\\u00a0hours from now" +msgid_plural "%(count)s hours from now" msgstr[0] "saa moja kutoka sasa" msgstr[1] "saa %(count)s kutoka sasa" diff --git a/django/contrib/humanize/locale/ta/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/ta/LC_MESSAGES/django.mo index 55acc54e53..26ef0eaaaf 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 e7bca62a78..d8ab8c268d 100644 --- a/django/contrib/humanize/locale/ta/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/ta/LC_MESSAGES/django.po @@ -3,10 +3,10 @@ # Translators: msgid "" msgstr "" -"Project-Id-Version: Django\n" +"Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-10-15 10:57+0200\n" -"PO-Revision-Date: 2011-01-19 15:13+0000\n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-04-24 18:40+0000\n" "Last-Translator: Django team\n" "Language-Team: Tamil (http://www.transifex.com/projects/p/django/language/" "ta/)\n" @@ -16,278 +16,290 @@ msgstr "" "Language: ta\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: tests.py:125 templatetags/humanize.py:167 +#: tests.py:135 templatetags/humanize.py:168 msgid "today" msgstr "" -#: tests.py:125 templatetags/humanize.py:171 +#: tests.py:135 templatetags/humanize.py:172 msgid "yesterday" msgstr "" -#: tests.py:125 templatetags/humanize.py:169 +#: tests.py:135 templatetags/humanize.py:170 msgid "tomorrow" msgstr "" -#: templatetags/humanize.py:25 +#: templatetags/humanize.py:26 msgid "th" msgstr "" -#: templatetags/humanize.py:25 +#: templatetags/humanize.py:26 msgid "st" msgstr "" -#: templatetags/humanize.py:25 +#: templatetags/humanize.py:26 msgid "nd" msgstr "" -#: templatetags/humanize.py:25 +#: templatetags/humanize.py:26 msgid "rd" msgstr "" -#: templatetags/humanize.py:54 +#: templatetags/humanize.py:55 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:55 +#: templatetags/humanize.py:56 #, python-format msgid "%(value)s million" msgid_plural "%(value)s million" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:58 +#: templatetags/humanize.py:59 #, python-format msgid "%(value).1f billion" msgid_plural "%(value).1f billion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:59 +#: templatetags/humanize.py:60 #, python-format msgid "%(value)s billion" msgid_plural "%(value)s billion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:62 +#: templatetags/humanize.py:63 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:63 +#: templatetags/humanize.py:64 #, python-format msgid "%(value)s trillion" msgid_plural "%(value)s trillion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:66 +#: templatetags/humanize.py:67 #, python-format msgid "%(value).1f quadrillion" msgid_plural "%(value).1f quadrillion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:67 +#: templatetags/humanize.py:68 #, python-format msgid "%(value)s quadrillion" msgid_plural "%(value)s quadrillion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:70 +#: templatetags/humanize.py:71 #, python-format msgid "%(value).1f quintillion" msgid_plural "%(value).1f quintillion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:71 +#: templatetags/humanize.py:72 #, python-format msgid "%(value)s quintillion" msgid_plural "%(value)s quintillion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:74 +#: templatetags/humanize.py:75 #, python-format msgid "%(value).1f sextillion" msgid_plural "%(value).1f sextillion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:75 +#: templatetags/humanize.py:76 #, python-format msgid "%(value)s sextillion" msgid_plural "%(value)s sextillion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:78 +#: templatetags/humanize.py:79 #, python-format msgid "%(value).1f septillion" msgid_plural "%(value).1f septillion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:79 +#: templatetags/humanize.py:80 #, python-format msgid "%(value)s septillion" msgid_plural "%(value)s septillion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:82 +#: templatetags/humanize.py:83 #, python-format msgid "%(value).1f octillion" msgid_plural "%(value).1f octillion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:83 +#: templatetags/humanize.py:84 #, python-format msgid "%(value)s octillion" msgid_plural "%(value)s octillion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:86 +#: templatetags/humanize.py:87 #, python-format msgid "%(value).1f nonillion" msgid_plural "%(value).1f nonillion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:87 +#: templatetags/humanize.py:88 #, python-format msgid "%(value)s nonillion" msgid_plural "%(value)s nonillion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:90 +#: templatetags/humanize.py:91 #, python-format msgid "%(value).1f decillion" msgid_plural "%(value).1f decillion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:91 +#: templatetags/humanize.py:92 #, python-format msgid "%(value)s decillion" msgid_plural "%(value)s decillion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:94 +#: templatetags/humanize.py:95 #, python-format msgid "%(value).1f googol" msgid_plural "%(value).1f googol" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:95 +#: templatetags/humanize.py:96 #, python-format msgid "%(value)s googol" msgid_plural "%(value)s googol" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:144 +#: templatetags/humanize.py:145 msgid "one" msgstr "" -#: templatetags/humanize.py:144 +#: templatetags/humanize.py:145 msgid "two" msgstr "" -#: templatetags/humanize.py:144 +#: templatetags/humanize.py:145 msgid "three" msgstr "" -#: templatetags/humanize.py:144 +#: templatetags/humanize.py:145 msgid "four" msgstr "" -#: templatetags/humanize.py:144 +#: templatetags/humanize.py:145 msgid "five" msgstr "" -#: templatetags/humanize.py:144 +#: templatetags/humanize.py:145 msgid "six" msgstr "" -#: templatetags/humanize.py:144 +#: templatetags/humanize.py:145 msgid "seven" msgstr "" -#: templatetags/humanize.py:144 +#: templatetags/humanize.py:145 msgid "eight" msgstr "" -#: templatetags/humanize.py:144 +#: templatetags/humanize.py:145 msgid "nine" msgstr "" -#: templatetags/humanize.py:190 +#: templatetags/humanize.py:191 #, python-format msgctxt "naturaltime" msgid "%(delta)s ago" msgstr "" -#: templatetags/humanize.py:193 templatetags/humanize.py:215 +#: templatetags/humanize.py:194 templatetags/humanize.py:219 msgid "now" msgstr "" -#: templatetags/humanize.py:196 -#, python-format -msgid "a second ago" -msgid_plural "%(count)s seconds ago" -msgstr[0] "" -msgstr[1] "" - +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. #: templatetags/humanize.py:201 #, python-format -msgid "a minute ago" -msgid_plural "%(count)s minutes ago" +msgid "a second ago" +msgid_plural "%(count)s seconds ago" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:206 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 +#, python-format +msgid "a minute ago" +msgid_plural "%(count)s minutes ago" +msgstr[0] "" +msgstr[1] "" + +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 #, python-format msgid "an hour ago" -msgid_plural "%(count)s hours ago" +msgid_plural "%(count)s hours ago" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:212 +#: templatetags/humanize.py:216 #, python-format msgctxt "naturaltime" msgid "%(delta)s from now" msgstr "" -#: templatetags/humanize.py:218 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:229 #, python-format msgid "a second from now" -msgid_plural "%(count)s seconds from now" +msgid_plural "%(count)s seconds from now" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:223 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 #, python-format msgid "a minute from now" -msgid_plural "%(count)s minutes from now" +msgid_plural "%(count)s minutes from now" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:228 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 #, python-format msgid "an hour from now" -msgid_plural "%(count)s hours 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 6230b0c765..4f871379ff 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 811f8610a0..7771d8d31e 100644 --- a/django/contrib/humanize/locale/te/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/te/LC_MESSAGES/django.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-18 23:10+0200\n" -"PO-Revision-Date: 2013-05-19 08:23+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-11-16 09:36+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Telugu (http://www.transifex.com/projects/p/django/language/" "te/)\n" "MIME-Version: 1.0\n" @@ -246,27 +246,30 @@ msgstr "%(delta)s క్రితము" msgid "now" msgstr "ఇప్పుడు " -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:198 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:201 #, python-format msgid "a second ago" -msgid_plural "%(count)s\\u00a0seconds ago" +msgid_plural "%(count)s seconds ago" msgstr[0] "ఒక క్షణం క్రితము " msgstr[1] "%(count)s క్షణాలు క్రితము " -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:204 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 #, python-format msgid "a minute ago" -msgid_plural "%(count)s\\u00a0minutes ago" +msgid_plural "%(count)s minutes ago" msgstr[0] "ఒక నిముషము క్రితము " msgstr[1] "%(count)s నిముషాల క్రితము " -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:210 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 #, python-format msgid "an hour ago" -msgid_plural "%(count)s\\u00a0hours ago" +msgid_plural "%(count)s hours ago" msgstr[0] "ఒక గంట క్రితము " msgstr[1] "%(count)s గంటల క్రితము " @@ -276,26 +279,29 @@ msgctxt "naturaltime" msgid "%(delta)s from now" msgstr "ఇప్పటినుండి %(delta)s కు" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:223 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:229 #, python-format msgid "a second from now" -msgid_plural "%(count)s\\u00a0seconds from now" +msgid_plural "%(count)s seconds from now" msgstr[0] "ఒక క్షణములో " msgstr[1] "%(count)s క్షణాలో " -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:229 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 #, python-format msgid "a minute from now" -msgid_plural "%(count)s\\u00a0minutes from now" +msgid_plural "%(count)s minutes from now" msgstr[0] "ఒక నిముషములో " msgstr[1] "%(count)s నిముషాలో " -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:235 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 #, python-format msgid "an hour from now" -msgid_plural "%(count)s\\u00a0hours 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 065cb15b8a..dce852754d 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 d77e52eb6e..b946d92e28 100644 --- a/django/contrib/humanize/locale/th/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/th/LC_MESSAGES/django.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-18 23:10+0200\n" -"PO-Revision-Date: 2013-05-19 08:23+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-11-16 09:36+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Thai (http://www.transifex.com/projects/p/django/language/" "th/)\n" "MIME-Version: 1.0\n" @@ -225,25 +225,28 @@ msgstr " %(delta)s ที่ผ่านมา" msgid "now" msgstr "ขณะนี้" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:198 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:201 #, python-format msgid "a second ago" -msgid_plural "%(count)s\\u00a0seconds ago" +msgid_plural "%(count)s seconds ago" msgstr[0] "%(count)s วินาทีที่ผ่านมา" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:204 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 #, python-format msgid "a minute ago" -msgid_plural "%(count)s\\u00a0minutes ago" +msgid_plural "%(count)s minutes ago" msgstr[0] "%(count)s นาทีที่แล้ว" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:210 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 #, python-format msgid "an hour ago" -msgid_plural "%(count)s\\u00a0hours ago" +msgid_plural "%(count)s hours ago" msgstr[0] "%(count)s ชั่วโมงที่แล้ว" #: templatetags/humanize.py:216 @@ -252,23 +255,26 @@ msgctxt "naturaltime" msgid "%(delta)s from now" msgstr "%(delta)s จากนี้" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:223 -#, python-format -msgid "a second from now" -msgid_plural "%(count)s\\u00a0seconds from now" -msgstr[0] "%(count)s วินาทีต่อจากนี้" - -#. Translators: \\u00a0 is non-breaking space +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. #: templatetags/humanize.py:229 #, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "%(count)s วินาทีต่อจากนี้" + +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 +#, python-format msgid "a minute from now" -msgid_plural "%(count)s\\u00a0minutes from now" +msgid_plural "%(count)s minutes from now" msgstr[0] " %(count)s นาทีต่อจากนี้" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:235 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 #, python-format msgid "an hour from now" -msgid_plural "%(count)s\\u00a0hours 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 a1f8fdd716..e822d3c4ab 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 95f7f14219..47d0e531fb 100644 --- a/django/contrib/humanize/locale/tr/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/tr/LC_MESSAGES/django.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-18 23:10+0200\n" -"PO-Revision-Date: 2013-05-19 08:23+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-11-16 09:36+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Turkish (http://www.transifex.com/projects/p/django/language/" "tr/)\n" "MIME-Version: 1.0\n" @@ -248,27 +248,30 @@ msgstr "%(delta)s önce" msgid "now" msgstr "şimdi" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:198 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:201 #, python-format msgid "a second ago" -msgid_plural "%(count)s\\u00a0seconds ago" +msgid_plural "%(count)s seconds ago" msgstr[0] "%(count)s saniye önce" msgstr[1] "%(count)s saniye önce" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:204 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 #, python-format msgid "a minute ago" -msgid_plural "%(count)s\\u00a0minutes ago" +msgid_plural "%(count)s minutes ago" msgstr[0] "bir dakika önce" msgstr[1] "%(count)s dakika önce" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:210 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 #, python-format msgid "an hour ago" -msgid_plural "%(count)s\\u00a0hours ago" +msgid_plural "%(count)s hours ago" msgstr[0] "bir saat önce" msgstr[1] "%(count)s saat önce" @@ -278,26 +281,29 @@ msgctxt "naturaltime" msgid "%(delta)s from now" msgstr "şu andan %(delta)s sonra" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:223 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:229 #, python-format msgid "a second from now" -msgid_plural "%(count)s\\u00a0seconds from now" +msgid_plural "%(count)s seconds from now" msgstr[0] "şu andan %(count)s saniye sonra" msgstr[1] "şu andan %(count)s saniye sonra" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:229 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 #, python-format msgid "a minute from now" -msgid_plural "%(count)s\\u00a0minutes from now" +msgid_plural "%(count)s minutes from now" msgstr[0] "şu andan %(count)s dakika sonra" msgstr[1] "şu andan %(count)s dakika sonra" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:235 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 #, python-format msgid "an hour from now" -msgid_plural "%(count)s\\u00a0hours from now" +msgid_plural "%(count)s hours from now" msgstr[0] "şu andan %(count)s saat sonra" msgstr[1] "şu andan %(count)s saat sonra" diff --git a/django/contrib/humanize/locale/tt/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/tt/LC_MESSAGES/django.mo index 750aba7ac1..db5e9714f1 100644 Binary files a/django/contrib/humanize/locale/tt/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/tt/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/tt/LC_MESSAGES/django.po b/django/contrib/humanize/locale/tt/LC_MESSAGES/django.po index 59b87dd502..3e1efd475d 100644 --- a/django/contrib/humanize/locale/tt/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/tt/LC_MESSAGES/django.po @@ -6,9 +6,9 @@ msgid "" msgstr "" "Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-18 23:10+0200\n" -"PO-Revision-Date: 2013-05-19 08:23+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-11-16 09:36+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Tatar (http://www.transifex.com/projects/p/django/language/" "tt/)\n" "MIME-Version: 1.0\n" @@ -223,25 +223,28 @@ msgstr "%(delta)s элек" msgid "now" msgstr "хәзер" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:198 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:201 #, python-format msgid "a second ago" -msgid_plural "%(count)s\\u00a0seconds ago" +msgid_plural "%(count)s seconds ago" msgstr[0] "%(count)s секунд элек" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:204 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 #, python-format msgid "a minute ago" -msgid_plural "%(count)s\\u00a0minutes ago" +msgid_plural "%(count)s minutes ago" msgstr[0] "%(count)s минут элек" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:210 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 #, python-format msgid "an hour ago" -msgid_plural "%(count)s\\u00a0hours ago" +msgid_plural "%(count)s hours ago" msgstr[0] "%(count)s сәгать элек" #: templatetags/humanize.py:216 @@ -250,23 +253,26 @@ msgctxt "naturaltime" msgid "%(delta)s from now" msgstr "хәзердән %(delta)s" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:223 -#, python-format -msgid "a second from now" -msgid_plural "%(count)s\\u00a0seconds from now" -msgstr[0] "%(count)s секундта" - -#. Translators: \\u00a0 is non-breaking space +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. #: templatetags/humanize.py:229 #, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "%(count)s секундта" + +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 +#, python-format msgid "a minute from now" -msgid_plural "%(count)s\\u00a0minutes from now" +msgid_plural "%(count)s minutes from now" msgstr[0] "%(count)s минутта" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:235 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 #, python-format msgid "an hour from now" -msgid_plural "%(count)s\\u00a0hours from now" +msgid_plural "%(count)s hours from now" msgstr[0] "%(count)s сәгаттә" diff --git a/django/contrib/humanize/locale/uk/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/uk/LC_MESSAGES/django.mo index d58aef7bac..57c61b75bc 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 dc4b85f9e9..d4ea632896 100644 --- a/django/contrib/humanize/locale/uk/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/uk/LC_MESSAGES/django.po @@ -1,16 +1,14 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Jannis Leidel , 2011. -# Sergey Lysach , 2012. -# Андрей Костенко , 2011. +# Alex Bolotov , 2013 msgid "" msgstr "" -"Project-Id-Version: Django\n" +"Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-10-15 10:57+0200\n" -"PO-Revision-Date: 2012-03-11 17:52+0000\n" -"Last-Translator: Sergey Lysach \n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-11-16 09:37+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/django/" "language/uk/)\n" "MIME-Version: 1.0\n" @@ -20,306 +18,318 @@ msgstr "" "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" -#: tests.py:125 templatetags/humanize.py:167 +#: tests.py:135 templatetags/humanize.py:168 msgid "today" msgstr "сьогодні" -#: tests.py:125 templatetags/humanize.py:171 +#: tests.py:135 templatetags/humanize.py:172 msgid "yesterday" msgstr "вчора" -#: tests.py:125 templatetags/humanize.py:169 +#: tests.py:135 templatetags/humanize.py:170 msgid "tomorrow" msgstr "завтра" -#: templatetags/humanize.py:25 +#: templatetags/humanize.py:26 msgid "th" -msgstr "ий" +msgstr "-ий" -#: templatetags/humanize.py:25 +#: templatetags/humanize.py:26 msgid "st" -msgstr "ий" +msgstr "-ий" -#: templatetags/humanize.py:25 +#: templatetags/humanize.py:26 msgid "nd" -msgstr "ій" +msgstr "-ий" -#: templatetags/humanize.py:25 +#: templatetags/humanize.py:26 msgid "rd" -msgstr "ий" - -#: templatetags/humanize.py:54 -#, python-format -msgid "%(value).1f million" -msgid_plural "%(value).1f million" -msgstr[0] "%(value).1f мільйон" -msgstr[1] "%(value).1f мільйони" -msgstr[2] "%(value).1f мільйонів" +msgstr "-ій" #: templatetags/humanize.py:55 #, python-format +msgid "%(value).1f million" +msgid_plural "%(value).1f million" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:56 +#, 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:58 -#, python-format -msgid "%(value).1f billion" -msgid_plural "%(value).1f billion" -msgstr[0] "%(value).1f мільярд" -msgstr[1] "%(value).1f мільярди" -msgstr[2] "%(value).1f мільярдів" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" #: templatetags/humanize.py:59 #, python-format +msgid "%(value).1f billion" +msgid_plural "%(value).1f billion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:60 +#, 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:62 -#, python-format -msgid "%(value).1f trillion" -msgid_plural "%(value).1f trillion" -msgstr[0] "%(value).1f трильйон" -msgstr[1] "%(value).1f трильйони" -msgstr[2] "%(value).1f трильйонів" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" #: templatetags/humanize.py:63 #, python-format +msgid "%(value).1f trillion" +msgid_plural "%(value).1f trillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:64 +#, 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:66 -#, python-format -msgid "%(value).1f quadrillion" -msgid_plural "%(value).1f quadrillion" -msgstr[0] "%(value).1f квадрильйон" -msgstr[1] "%(value).1f квадрильйони" -msgstr[2] "%(value).1f квадрильйонів" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" #: templatetags/humanize.py:67 #, python-format +msgid "%(value).1f quadrillion" +msgid_plural "%(value).1f quadrillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:68 +#, 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:70 -#, python-format -msgid "%(value).1f quintillion" -msgid_plural "%(value).1f quintillion" -msgstr[0] "%(value).1f квінтильйон" -msgstr[1] "%(value).1f квінтильйона" -msgstr[2] "%(value).1f квінтильйонів" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" #: templatetags/humanize.py:71 #, python-format +msgid "%(value).1f quintillion" +msgid_plural "%(value).1f quintillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:72 +#, 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:74 -#, python-format -msgid "%(value).1f sextillion" -msgid_plural "%(value).1f sextillion" -msgstr[0] "%(value).1f секстильйон" -msgstr[1] "%(value).1f секстильйона" -msgstr[2] "%(value).1f секстильйонів" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" #: templatetags/humanize.py:75 #, python-format +msgid "%(value).1f sextillion" +msgid_plural "%(value).1f sextillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:76 +#, 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:78 -#, python-format -msgid "%(value).1f septillion" -msgid_plural "%(value).1f septillion" -msgstr[0] "%(value).1f септильйон" -msgstr[1] "%(value).1f септильйона" -msgstr[2] "%(value).1f септильйонів" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" #: templatetags/humanize.py:79 #, python-format +msgid "%(value).1f septillion" +msgid_plural "%(value).1f septillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:80 +#, 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:82 -#, python-format -msgid "%(value).1f octillion" -msgid_plural "%(value).1f octillion" -msgstr[0] "%(value).1f октильйон" -msgstr[1] "%(value).1f октильйони" -msgstr[2] "%(value).1f октильйонів" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" #: templatetags/humanize.py:83 #, python-format +msgid "%(value).1f octillion" +msgid_plural "%(value).1f octillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:84 +#, 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:86 -#, python-format -msgid "%(value).1f nonillion" -msgid_plural "%(value).1f nonillion" -msgstr[0] "%(value).1f нонільйон" -msgstr[1] "%(value).1f нонільйони" -msgstr[2] "%(value).1f нонільйонів" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" #: templatetags/humanize.py:87 #, python-format +msgid "%(value).1f nonillion" +msgid_plural "%(value).1f nonillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:88 +#, 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:90 -#, python-format -msgid "%(value).1f decillion" -msgid_plural "%(value).1f decillion" -msgstr[0] "%(value).1f децильйон" -msgstr[1] "%(value).1f децильйони" -msgstr[2] "%(value).1f децильйонів" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" #: templatetags/humanize.py:91 #, python-format +msgid "%(value).1f decillion" +msgid_plural "%(value).1f decillion" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:92 +#, 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:94 -#, python-format -msgid "%(value).1f googol" -msgid_plural "%(value).1f googol" -msgstr[0] "%(value).1f гугол" -msgstr[1] "%(value).1f гуголі" -msgstr[2] "%(value).1f гуголів" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" #: templatetags/humanize.py:95 #, python-format +msgid "%(value).1f googol" +msgid_plural "%(value).1f googol" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templatetags/humanize.py:96 +#, python-format msgid "%(value)s googol" msgid_plural "%(value)s googol" -msgstr[0] "%(value)s гугол" -msgstr[1] "%(value)s гуголі" -msgstr[2] "%(value)s гуголів" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" -#: templatetags/humanize.py:144 +#: templatetags/humanize.py:145 msgid "one" msgstr "один" -#: templatetags/humanize.py:144 +#: templatetags/humanize.py:145 msgid "two" msgstr "два" -#: templatetags/humanize.py:144 +#: templatetags/humanize.py:145 msgid "three" msgstr "три" -#: templatetags/humanize.py:144 +#: templatetags/humanize.py:145 msgid "four" msgstr "чотири" -#: templatetags/humanize.py:144 +#: templatetags/humanize.py:145 msgid "five" -msgstr "п'ять" +msgstr "" -#: templatetags/humanize.py:144 +#: templatetags/humanize.py:145 msgid "six" msgstr "шість" -#: templatetags/humanize.py:144 +#: templatetags/humanize.py:145 msgid "seven" msgstr "сім" -#: templatetags/humanize.py:144 +#: templatetags/humanize.py:145 msgid "eight" msgstr "вісім" -#: templatetags/humanize.py:144 +#: templatetags/humanize.py:145 msgid "nine" -msgstr "дев'ять" +msgstr "" -#: templatetags/humanize.py:190 +#: templatetags/humanize.py:191 #, python-format msgctxt "naturaltime" msgid "%(delta)s ago" msgstr "%(delta)s тому" -#: templatetags/humanize.py:193 templatetags/humanize.py:215 +#: templatetags/humanize.py:194 templatetags/humanize.py:219 msgid "now" msgstr "зараз" -#: templatetags/humanize.py:196 -#, python-format -msgid "a second ago" -msgid_plural "%(count)s seconds ago" -msgstr[0] "секунду тому" -msgstr[1] "%(count)s секунди тому" -msgstr[2] "%(count)s секунд тому" - +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. #: templatetags/humanize.py:201 #, python-format -msgid "a minute ago" -msgid_plural "%(count)s minutes ago" -msgstr[0] "хвилину тому" -msgstr[1] "%(count)s хвилини тому" -msgstr[2] "%(count)s хвилин тому" +msgid "a second ago" +msgid_plural "%(count)s seconds ago" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" -#: templatetags/humanize.py:206 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 +#, python-format +msgid "a minute ago" +msgid_plural "%(count)s minutes ago" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 #, python-format msgid "an hour ago" -msgid_plural "%(count)s hours ago" -msgstr[0] "годину тому" -msgstr[1] "%(count)s години тому" -msgstr[2] "%(count)s годин тому" +msgid_plural "%(count)s hours ago" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" -#: templatetags/humanize.py:212 +#: templatetags/humanize.py:216 #, python-format msgctxt "naturaltime" msgid "%(delta)s from now" -msgstr "через %(delta)s" +msgstr "%(delta)s від тепер" -#: templatetags/humanize.py:218 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:229 #, python-format msgid "a second from now" -msgid_plural "%(count)s seconds from now" -msgstr[0] "через секунду" -msgstr[1] "через %(count)s секунди" -msgstr[2] "через %(count)s секунд" +msgid_plural "%(count)s seconds from now" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" -#: templatetags/humanize.py:223 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 #, python-format msgid "a minute from now" -msgid_plural "%(count)s minutes from now" -msgstr[0] "через хвилину" -msgstr[1] "через %(count)s хвилини" -msgstr[2] "через %(count)s хвилин" +msgid_plural "%(count)s minutes from now" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" -#: templatetags/humanize.py:228 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 #, python-format msgid "an hour from now" -msgid_plural "%(count)s hours from now" -msgstr[0] "через годину" -msgstr[1] "через %(count)s години" -msgstr[2] "через %(count)s годин" +msgid_plural "%(count)s hours from now" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" diff --git a/django/contrib/humanize/locale/ur/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/ur/LC_MESSAGES/django.mo index f202cf2d7d..3295bc7e28 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 cf39b7f9b3..78e5894cf3 100644 --- a/django/contrib/humanize/locale/ur/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/ur/LC_MESSAGES/django.po @@ -6,9 +6,9 @@ msgid "" msgstr "" "Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-18 23:10+0200\n" -"PO-Revision-Date: 2013-05-19 08:23+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-11-16 09:36+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Urdu (http://www.transifex.com/projects/p/django/language/" "ur/)\n" "MIME-Version: 1.0\n" @@ -245,27 +245,30 @@ msgstr "" msgid "now" msgstr "" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:198 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:201 #, python-format msgid "a second ago" -msgid_plural "%(count)s\\u00a0seconds ago" +msgid_plural "%(count)s seconds ago" msgstr[0] "" msgstr[1] "" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:204 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 #, python-format msgid "a minute ago" -msgid_plural "%(count)s\\u00a0minutes ago" +msgid_plural "%(count)s minutes ago" msgstr[0] "" msgstr[1] "" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:210 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 #, python-format msgid "an hour ago" -msgid_plural "%(count)s\\u00a0hours ago" +msgid_plural "%(count)s hours ago" msgstr[0] "" msgstr[1] "" @@ -275,26 +278,29 @@ msgctxt "naturaltime" msgid "%(delta)s from now" msgstr "" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:223 -#, python-format -msgid "a second from now" -msgid_plural "%(count)s\\u00a0seconds from now" -msgstr[0] "" -msgstr[1] "" - -#. Translators: \\u00a0 is non-breaking space +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. #: templatetags/humanize.py:229 #, python-format -msgid "a minute from now" -msgid_plural "%(count)s\\u00a0minutes from now" +msgid "a second from now" +msgid_plural "%(count)s seconds from now" msgstr[0] "" msgstr[1] "" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:235 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 #, python-format -msgid "an hour from now" -msgid_plural "%(count)s\\u00a0hours from now" +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "" +msgstr[1] "" + +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 +#, 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 8314a6bd52..65c5f6d468 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 f46f181e9b..84c807eb23 100644 --- a/django/contrib/humanize/locale/vi/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/vi/LC_MESSAGES/django.po @@ -6,9 +6,9 @@ msgid "" msgstr "" "Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-18 23:10+0200\n" -"PO-Revision-Date: 2013-05-19 08:23+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-11-16 09:36+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Vietnamese (http://www.transifex.com/projects/p/django/" "language/vi/)\n" "MIME-Version: 1.0\n" @@ -223,25 +223,28 @@ msgstr "" msgid "now" msgstr "" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:198 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:201 #, python-format msgid "a second ago" -msgid_plural "%(count)s\\u00a0seconds ago" +msgid_plural "%(count)s seconds ago" msgstr[0] "" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:204 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 #, python-format msgid "a minute ago" -msgid_plural "%(count)s\\u00a0minutes ago" +msgid_plural "%(count)s minutes ago" msgstr[0] "" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:210 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 #, python-format msgid "an hour ago" -msgid_plural "%(count)s\\u00a0hours ago" +msgid_plural "%(count)s hours ago" msgstr[0] "" #: templatetags/humanize.py:216 @@ -250,23 +253,26 @@ msgctxt "naturaltime" msgid "%(delta)s from now" msgstr "" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:223 -#, python-format -msgid "a second from now" -msgid_plural "%(count)s\\u00a0seconds from now" -msgstr[0] "" - -#. Translators: \\u00a0 is non-breaking space +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. #: templatetags/humanize.py:229 #, python-format -msgid "a minute from now" -msgid_plural "%(count)s\\u00a0minutes from now" +msgid "a second from now" +msgid_plural "%(count)s seconds from now" msgstr[0] "" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:235 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 +#, python-format +msgid "a minute from now" +msgid_plural "%(count)s minutes from now" +msgstr[0] "" + +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 #, python-format msgid "an hour from now" -msgid_plural "%(count)s\\u00a0hours 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 a944471041..bff7f1d4e4 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 78bc143900..0b36d48b82 100644 --- a/django/contrib/humanize/locale/zh_CN/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/zh_CN/LC_MESSAGES/django.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-18 23:10+0200\n" -"PO-Revision-Date: 2013-05-19 08:23+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-11-16 09:36+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/django/" "language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -225,25 +225,28 @@ msgstr "%(delta)s 之前" msgid "now" msgstr "现在" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:198 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:201 #, python-format msgid "a second ago" -msgid_plural "%(count)s\\u00a0seconds ago" +msgid_plural "%(count)s seconds ago" msgstr[0] "%(count)s 秒钟之前" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:204 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 #, python-format msgid "a minute ago" -msgid_plural "%(count)s\\u00a0minutes ago" +msgid_plural "%(count)s minutes ago" msgstr[0] "%(count)s 分钟之前" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:210 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 #, python-format msgid "an hour ago" -msgid_plural "%(count)s\\u00a0hours ago" +msgid_plural "%(count)s hours ago" msgstr[0] "%(count)s 小时之前" #: templatetags/humanize.py:216 @@ -252,23 +255,26 @@ msgctxt "naturaltime" msgid "%(delta)s from now" msgstr "%(delta)s 之后" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:223 -#, python-format -msgid "a second from now" -msgid_plural "%(count)s\\u00a0seconds from now" -msgstr[0] "%(count)s 秒钟之后" - -#. Translators: \\u00a0 is non-breaking space +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. #: templatetags/humanize.py:229 #, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "%(count)s 秒钟之后" + +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 +#, python-format msgid "a minute from now" -msgid_plural "%(count)s\\u00a0minutes from now" +msgid_plural "%(count)s minutes from now" msgstr[0] "%(count)s 分钟之后" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:235 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 #, python-format msgid "an hour from now" -msgid_plural "%(count)s\\u00a0hours 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 3387957bc9..936eacd953 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 27aaeff4b1..081f25ff27 100644 --- a/django/contrib/humanize/locale/zh_TW/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/zh_TW/LC_MESSAGES/django.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: django-core\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-18 23:10+0200\n" -"PO-Revision-Date: 2013-05-19 08:23+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2013-11-15 15:36+0100\n" +"PO-Revision-Date: 2013-11-16 09:36+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/django/" "language/zh_TW/)\n" "MIME-Version: 1.0\n" @@ -225,25 +225,28 @@ msgstr "%(delta)s 以前" msgid "now" msgstr "現在" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:198 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:201 #, python-format msgid "a second ago" -msgid_plural "%(count)s\\u00a0seconds ago" +msgid_plural "%(count)s seconds ago" msgstr[0] "%(count)s 秒前" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:204 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:208 #, python-format msgid "a minute ago" -msgid_plural "%(count)s\\u00a0minutes ago" +msgid_plural "%(count)s minutes ago" msgstr[0] "%(count)s 分鐘前" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:210 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:215 #, python-format msgid "an hour ago" -msgid_plural "%(count)s\\u00a0hours ago" +msgid_plural "%(count)s hours ago" msgstr[0] "%(count)s 小時前" #: templatetags/humanize.py:216 @@ -252,23 +255,26 @@ msgctxt "naturaltime" msgid "%(delta)s from now" msgstr "%(delta)s 後" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:223 -#, python-format -msgid "a second from now" -msgid_plural "%(count)s\\u00a0seconds from now" -msgstr[0] "%(count)s 秒後" - -#. Translators: \\u00a0 is non-breaking space +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. #: templatetags/humanize.py:229 #, python-format +msgid "a second from now" +msgid_plural "%(count)s seconds from now" +msgstr[0] "%(count)s 秒後" + +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:236 +#, python-format msgid "a minute from now" -msgid_plural "%(count)s\\u00a0minutes from now" +msgid_plural "%(count)s minutes from now" msgstr[0] "%(count)s 分鐘後" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:235 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: templatetags/humanize.py:243 #, python-format msgid "an hour from now" -msgid_plural "%(count)s\\u00a0hours from now" +msgid_plural "%(count)s hours from now" msgstr[0] "%(count)s 小時後" diff --git a/docs/releases/1.6.1.txt b/docs/releases/1.6.1.txt index 55115704bb..ad85908ca8 100644 --- a/docs/releases/1.6.1.txt +++ b/docs/releases/1.6.1.txt @@ -22,3 +22,5 @@ Bug fixes raised an error (#21439). * Fixed a regression that prevented editable ``GenericRelation`` subclasses from working in ``ModelForms``. +* Fixed ``django.contrib.humanize`` translations where the unicode sequence + for the non-breaking space was returned verbatim (#21415).