From 12328facdefd882ec28f1950b25b6b967e1699d6 Mon Sep 17 00:00:00 2001 From: JackDandy Date: Wed, 5 May 2021 16:52:57 +0100 Subject: [PATCH] =?UTF-8?q?Update=20humanize=203.2.0=20(a0f03c1)=20?= =?UTF-8?q?=E2=86=92=203.5.0=20(b6b0ea5).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGES.md | 3 +- lib/humanize/__init__.py | 13 +- lib/humanize/i18n.py | 22 ++- lib/humanize/locale/de_DE/LC_MESSAGES/humanize.po | 164 ++++++++++++-------- lib/humanize/locale/es_ES/LC_MESSAGES/humanize.po | 164 ++++++++++++-------- lib/humanize/locale/fa_IR/LC_MESSAGES/humanize.po | 168 +++++++++++--------- lib/humanize/locale/fi_FI/LC_MESSAGES/humanize.po | 164 ++++++++++++-------- lib/humanize/locale/fr_FR/LC_MESSAGES/humanize.po | 164 ++++++++++++-------- lib/humanize/locale/id_ID/LC_MESSAGES/humanize.po | 152 ++++++++++-------- lib/humanize/locale/it_IT/LC_MESSAGES/humanize.po | 164 ++++++++++++-------- lib/humanize/locale/ja_JP/LC_MESSAGES/humanize.po | 156 ++++++++++--------- lib/humanize/locale/ko_KR/LC_MESSAGES/humanize.po | 168 +++++++++++--------- lib/humanize/locale/nl_NL/LC_MESSAGES/humanize.po | 164 ++++++++++++-------- lib/humanize/locale/pl_PL/LC_MESSAGES/humanize.po | 176 +++++++++++++-------- lib/humanize/locale/pt_BR/LC_MESSAGES/humanize.po | 164 ++++++++++++-------- lib/humanize/locale/pt_PT/LC_MESSAGES/humanize.po | 164 ++++++++++++-------- lib/humanize/locale/ru_RU/LC_MESSAGES/humanize.po | 180 +++++++++++++--------- lib/humanize/locale/sk_SK/LC_MESSAGES/humanize.po | 176 +++++++++++++-------- lib/humanize/locale/tr_TR/LC_MESSAGES/humanize.po | 168 +++++++++++--------- lib/humanize/locale/uk_UA/LC_MESSAGES/humanize.po | 176 +++++++++++++-------- lib/humanize/locale/vi_VI/LC_MESSAGES/humanize.po | 168 +++++++++++--------- lib/humanize/locale/zh_CN/LC_MESSAGES/humanize.po | 168 +++++++++++--------- lib/humanize/number.py | 108 +++++++++++-- lib/humanize/time.py | 16 +- 24 files changed, 1995 insertions(+), 1335 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 721d310..e513b95 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -35,7 +35,7 @@ * Update attr 20.2.0 (4f74fba) to 20.3.0 (f3762ba) * Update diskcache_py3 5.0.1 (9670fbb) to 5.1.0 (40ce0de) * Update diskcache_py2 4.1.0 (b0451e0) from 5.1.0 (40ce0de) -* Update humanize 3.1.0 (aec9dc2) to 3.2.0 (a0f03c1) +* Update humanize 3.1.0 (aec9dc2) to 3.5.0 (b6b0ea5) * Update Rarfile 3.1 (a4202ca) to 4.0 (55fe778) * Update Requests library 2.24.0 (2f70990) to 2.25.1 (bdc00eb) * Update Six compatibility library 1.15.0 (c0be881) to 1.16.0 (b620447) @@ -45,6 +45,7 @@ [develop changelog] +* Update humanize 3.1.0 (aec9dc2) to 3.2.0 (a0f03c1) * Update Requests library 2.25.0 (03957eb) to 2.25.0 (589c454) * Update Requests library 2.25.0 (589c454) to 2.25.1 (bdc00eb) * Update urllib3 1.26.1 (7675532) to 1.26.2 (eae04d6) diff --git a/lib/humanize/__init__.py b/lib/humanize/__init__.py index f02bbf8..0ccf63e 100644 --- a/lib/humanize/__init__.py +++ b/lib/humanize/__init__.py @@ -2,7 +2,15 @@ from humanize.filesize import naturalsize from humanize.i18n import activate, deactivate, thousands_separator -from humanize.number import apnumber, fractional, intcomma, intword, ordinal, scientific +from humanize.number import ( + apnumber, + clamp, + fractional, + intcomma, + intword, + ordinal, + scientific, +) from humanize.time import ( naturaldate, naturalday, @@ -11,13 +19,14 @@ from humanize.time import ( precisedelta, ) -__version__ = VERSION = '3.1.0' +__version__ = VERSION = '3.5.0' __all__ = [ "__version__", "activate", "apnumber", + "clamp", "deactivate", "fractional", "intcomma", diff --git a/lib/humanize/i18n.py b/lib/humanize/i18n.py index 55e6d66..195a3f0 100644 --- a/lib/humanize/i18n.py +++ b/lib/humanize/i18n.py @@ -138,7 +138,27 @@ def gettext_noop(message): return message -def thousands_separator() -> str: +def ngettext_noop(singular, plural): + """Mark two strings as pluralized translations without translating them. + + Example usage: + ```python + CONSTANTS = [ngettext_noop('first', 'firsts'), ngettext_noop('second', 'seconds')] + def num_name(n): + return ngettext(*CONSTANTS[n]) + ``` + + Args: + singular (str): Singular text to translate in the future. + plural (str): Plural text to translate in the future. + + Returns: + tuple: Original text, unchanged. + """ + return (singular, plural) + + +def thousands_separator(): """Return the thousands separator for a locale, default to comma. Returns: diff --git a/lib/humanize/locale/de_DE/LC_MESSAGES/humanize.po b/lib/humanize/locale/de_DE/LC_MESSAGES/humanize.po index 8b35e93..51a2254 100644 --- a/lib/humanize/locale/de_DE/LC_MESSAGES/humanize.po +++ b/lib/humanize/locale/de_DE/LC_MESSAGES/humanize.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: humanize\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-09-29 21:07+0300\n" +"POT-Creation-Date: 2021-04-30 22:34+0200\n" "PO-Revision-Date: 2016-12-18 11:50+0100\n" "Last-Translator: Christian Klein \n" "Language-Team: German\n" @@ -19,269 +19,297 @@ msgstr "" "Generated-By: Christian Klein\n" "X-Generator: Sublime Text 3\n" -#: src/humanize/number.py:31 +#: src/humanize/number.py:56 msgctxt "0" msgid "th" msgstr "." -#: src/humanize/number.py:32 +#: src/humanize/number.py:57 msgctxt "1" msgid "st" msgstr "." -#: src/humanize/number.py:33 +#: src/humanize/number.py:58 msgctxt "2" msgid "nd" msgstr "." -#: src/humanize/number.py:34 +#: src/humanize/number.py:59 msgctxt "3" msgid "rd" msgstr "." -#: src/humanize/number.py:35 +#: src/humanize/number.py:60 msgctxt "4" msgid "th" msgstr "." -#: src/humanize/number.py:36 +#: src/humanize/number.py:61 msgctxt "5" msgid "th" msgstr "." -#: src/humanize/number.py:37 +#: src/humanize/number.py:62 msgctxt "6" msgid "th" msgstr "." -#: src/humanize/number.py:38 +#: src/humanize/number.py:63 msgctxt "7" msgid "th" msgstr "." -#: src/humanize/number.py:39 +#: src/humanize/number.py:64 msgctxt "8" msgid "th" msgstr "." -#: src/humanize/number.py:40 +#: src/humanize/number.py:65 msgctxt "9" msgid "th" msgstr "." -#: src/humanize/number.py:82 +#: src/humanize/number.py:126 +msgid "thousand" +msgid_plural "thousand" +msgstr[0] "" +msgstr[1] "" + +#: src/humanize/number.py:127 msgid "million" -msgstr "Million" +msgid_plural "million" +msgstr[0] "Million" +msgstr[1] "Million" -#: src/humanize/number.py:83 +#: src/humanize/number.py:128 msgid "billion" -msgstr "Milliarde" +msgid_plural "billion" +msgstr[0] "Milliarde" +msgstr[1] "Milliarde" -#: src/humanize/number.py:84 +#: src/humanize/number.py:129 msgid "trillion" -msgstr "Billion" +msgid_plural "trillion" +msgstr[0] "Billion" +msgstr[1] "Billion" -#: src/humanize/number.py:85 +#: src/humanize/number.py:130 msgid "quadrillion" -msgstr "Billiarde" +msgid_plural "quadrillion" +msgstr[0] "Billiarde" +msgstr[1] "Billiarde" -#: src/humanize/number.py:86 +#: src/humanize/number.py:131 msgid "quintillion" -msgstr "Trillion" +msgid_plural "quintillion" +msgstr[0] "Trillion" +msgstr[1] "Trillion" -#: src/humanize/number.py:87 +#: src/humanize/number.py:132 msgid "sextillion" -msgstr "Trilliarde" +msgid_plural "sextillion" +msgstr[0] "Trilliarde" +msgstr[1] "Trilliarde" -#: src/humanize/number.py:88 +#: src/humanize/number.py:133 msgid "septillion" -msgstr "Quadrillion" +msgid_plural "septillion" +msgstr[0] "Quadrillion" +msgstr[1] "Quadrillion" -#: src/humanize/number.py:89 +#: src/humanize/number.py:134 msgid "octillion" -msgstr "Quadrillarde" +msgid_plural "octillion" +msgstr[0] "Quadrillarde" +msgstr[1] "Quadrillarde" -#: src/humanize/number.py:90 +#: src/humanize/number.py:135 msgid "nonillion" -msgstr "Quintillion" +msgid_plural "nonillion" +msgstr[0] "Quintillion" +msgstr[1] "Quintillion" -#: src/humanize/number.py:91 +#: src/humanize/number.py:136 msgid "decillion" -msgstr "Quintilliarde" +msgid_plural "decillion" +msgstr[0] "Quintilliarde" +msgstr[1] "Quintilliarde" -#: src/humanize/number.py:92 +#: src/humanize/number.py:137 msgid "googol" -msgstr "Googol" +msgid_plural "googol" +msgstr[0] "Googol" +msgstr[1] "Googol" -#: src/humanize/number.py:147 +#: src/humanize/number.py:228 msgid "zero" msgstr "null" -#: src/humanize/number.py:148 +#: src/humanize/number.py:229 msgid "one" msgstr "eins" -#: src/humanize/number.py:149 +#: src/humanize/number.py:230 msgid "two" msgstr "zwei" -#: src/humanize/number.py:150 +#: src/humanize/number.py:231 msgid "three" msgstr "drei" -#: src/humanize/number.py:151 +#: src/humanize/number.py:232 msgid "four" msgstr "vier" -#: src/humanize/number.py:152 +#: src/humanize/number.py:233 msgid "five" msgstr "fünf" -#: src/humanize/number.py:153 +#: src/humanize/number.py:234 msgid "six" msgstr "sechs" -#: src/humanize/number.py:154 +#: src/humanize/number.py:235 msgid "seven" msgstr "sieben" -#: src/humanize/number.py:155 +#: src/humanize/number.py:236 msgid "eight" msgstr "acht" -#: src/humanize/number.py:156 +#: src/humanize/number.py:237 msgid "nine" msgstr "neun" -#: src/humanize/time.py:119 +#: src/humanize/time.py:133 #, fuzzy, python-format msgid "%d microsecond" msgid_plural "%d microseconds" msgstr[0] "%d Mikrosekunde" msgstr[1] "%d Mikrosekunden" -#: src/humanize/time.py:128 +#: src/humanize/time.py:142 #, fuzzy, python-format msgid "%d millisecond" msgid_plural "%d milliseconds" msgstr[0] "%d Millisekunde" msgstr[1] "%d Millisekunden" -#: src/humanize/time.py:131 src/humanize/time.py:204 +#: src/humanize/time.py:145 src/humanize/time.py:220 msgid "a moment" msgstr "ein Moment" -#: src/humanize/time.py:133 +#: src/humanize/time.py:147 msgid "a second" msgstr "eine Sekunde" -#: src/humanize/time.py:135 +#: src/humanize/time.py:149 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d Sekunde" msgstr[1] "%d Sekunden" -#: src/humanize/time.py:137 +#: src/humanize/time.py:151 msgid "a minute" msgstr "eine Minute" -#: src/humanize/time.py:140 +#: src/humanize/time.py:154 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d Minute" msgstr[1] "%d Minuten" -#: src/humanize/time.py:142 +#: src/humanize/time.py:156 msgid "an hour" msgstr "eine Stunde" -#: src/humanize/time.py:145 +#: src/humanize/time.py:159 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d Stunde" msgstr[1] "%d Stunden" -#: src/humanize/time.py:148 +#: src/humanize/time.py:162 msgid "a day" msgstr "ein Tag" -#: src/humanize/time.py:150 src/humanize/time.py:153 +#: src/humanize/time.py:164 src/humanize/time.py:167 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d Tag" msgstr[1] "%d Tage" -#: src/humanize/time.py:155 +#: src/humanize/time.py:169 msgid "a month" msgstr "ein Monat" -#: src/humanize/time.py:157 +#: src/humanize/time.py:171 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d Monat" msgstr[1] "%d Monate" -#: src/humanize/time.py:160 +#: src/humanize/time.py:174 msgid "a year" msgstr "ein Jahr" -#: src/humanize/time.py:162 src/humanize/time.py:171 +#: src/humanize/time.py:176 src/humanize/time.py:185 #, python-format msgid "1 year, %d day" msgid_plural "1 year, %d days" msgstr[0] "ein Jahr und %d Tag" msgstr[1] "ein Jahr und %d Tage" -#: src/humanize/time.py:165 +#: src/humanize/time.py:179 msgid "1 year, 1 month" msgstr "ein Monat" -#: src/humanize/time.py:168 +#: src/humanize/time.py:182 #, python-format msgid "1 year, %d month" msgid_plural "1 year, %d months" msgstr[0] "ein Jahr und %d Monat" msgstr[1] "ein Jahr und %d Monate" -#: src/humanize/time.py:173 +#: src/humanize/time.py:187 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d Jahr" msgstr[1] "%d Jahre" -#: src/humanize/time.py:201 +#: src/humanize/time.py:217 #, python-format msgid "%s from now" msgstr "%s ab jetzt" -#: src/humanize/time.py:201 +#: src/humanize/time.py:217 #, python-format msgid "%s ago" msgstr "vor %s" -#: src/humanize/time.py:205 +#: src/humanize/time.py:221 msgid "now" msgstr "jetzt" -#: src/humanize/time.py:227 +#: src/humanize/time.py:244 msgid "today" msgstr "heute" -#: src/humanize/time.py:229 +#: src/humanize/time.py:246 msgid "tomorrow" msgstr "morgen" -#: src/humanize/time.py:231 +#: src/humanize/time.py:248 msgid "yesterday" msgstr "gestern" -#: src/humanize/time.py:498 +#: src/humanize/time.py:534 #, python-format msgid "%s and %s" msgstr "%s und %s" diff --git a/lib/humanize/locale/es_ES/LC_MESSAGES/humanize.po b/lib/humanize/locale/es_ES/LC_MESSAGES/humanize.po index 68f5b14..219525f 100644 --- a/lib/humanize/locale/es_ES/LC_MESSAGES/humanize.po +++ b/lib/humanize/locale/es_ES/LC_MESSAGES/humanize.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-09-29 21:07+0300\n" +"POT-Creation-Date: 2021-04-30 22:34+0200\n" "PO-Revision-Date: 2020-03-31 21:08+0200\n" "Last-Translator: Álvaro Mondéjar \n" "Language-Team: \n" @@ -18,269 +18,297 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 2.3\n" -#: src/humanize/number.py:31 +#: src/humanize/number.py:56 msgctxt "0" msgid "th" msgstr "º" -#: src/humanize/number.py:32 +#: src/humanize/number.py:57 msgctxt "1" msgid "st" msgstr "º" -#: src/humanize/number.py:33 +#: src/humanize/number.py:58 msgctxt "2" msgid "nd" msgstr "º" -#: src/humanize/number.py:34 +#: src/humanize/number.py:59 msgctxt "3" msgid "rd" msgstr "º" -#: src/humanize/number.py:35 +#: src/humanize/number.py:60 msgctxt "4" msgid "th" msgstr "º" -#: src/humanize/number.py:36 +#: src/humanize/number.py:61 msgctxt "5" msgid "th" msgstr "º" -#: src/humanize/number.py:37 +#: src/humanize/number.py:62 msgctxt "6" msgid "th" msgstr "º" -#: src/humanize/number.py:38 +#: src/humanize/number.py:63 msgctxt "7" msgid "th" msgstr "º" -#: src/humanize/number.py:39 +#: src/humanize/number.py:64 msgctxt "8" msgid "th" msgstr "º" -#: src/humanize/number.py:40 +#: src/humanize/number.py:65 msgctxt "9" msgid "th" msgstr "º" -#: src/humanize/number.py:82 +#: src/humanize/number.py:126 +msgid "thousand" +msgid_plural "thousand" +msgstr[0] "mil" +msgstr[1] "mil" + +#: src/humanize/number.py:127 msgid "million" -msgstr "millón" +msgid_plural "million" +msgstr[0] "millón" +msgstr[1] "millones" -#: src/humanize/number.py:83 +#: src/humanize/number.py:128 msgid "billion" -msgstr "billón" +msgid_plural "billion" +msgstr[0] "billón" +msgstr[1] "billones" -#: src/humanize/number.py:84 +#: src/humanize/number.py:129 msgid "trillion" -msgstr "trillón" +msgid_plural "trillion" +msgstr[0] "trillón" +msgstr[1] "trillones" -#: src/humanize/number.py:85 +#: src/humanize/number.py:130 msgid "quadrillion" -msgstr "quatrillón" +msgid_plural "quadrillion" +msgstr[0] "quatrillón" +msgstr[1] "quatrillones" -#: src/humanize/number.py:86 +#: src/humanize/number.py:131 msgid "quintillion" -msgstr "quintillón" +msgid_plural "quintillion" +msgstr[0] "quintillón" +msgstr[1] "quintillones" -#: src/humanize/number.py:87 +#: src/humanize/number.py:132 msgid "sextillion" -msgstr "sextillón" +msgid_plural "sextillion" +msgstr[0] "sextillón" +msgstr[1] "sextillones" -#: src/humanize/number.py:88 +#: src/humanize/number.py:133 msgid "septillion" -msgstr "septillón" +msgid_plural "septillion" +msgstr[0] "septillón" +msgstr[1] "septillones" -#: src/humanize/number.py:89 +#: src/humanize/number.py:134 msgid "octillion" -msgstr "octillón" +msgid_plural "octillion" +msgstr[0] "octillón" +msgstr[1] "octillones" -#: src/humanize/number.py:90 +#: src/humanize/number.py:135 msgid "nonillion" -msgstr "nonillón" +msgid_plural "nonillion" +msgstr[0] "nonillón" +msgstr[1] "nonillones" -#: src/humanize/number.py:91 +#: src/humanize/number.py:136 msgid "decillion" -msgstr "decillón" +msgid_plural "decillion" +msgstr[0] "decillón" +msgstr[1] "decillones" -#: src/humanize/number.py:92 +#: src/humanize/number.py:137 msgid "googol" -msgstr "gúgol" +msgid_plural "googol" +msgstr[0] "gúgol" +msgstr[1] "gúgol" -#: src/humanize/number.py:147 +#: src/humanize/number.py:228 msgid "zero" msgstr "cero" -#: src/humanize/number.py:148 +#: src/humanize/number.py:229 msgid "one" msgstr "uno" -#: src/humanize/number.py:149 +#: src/humanize/number.py:230 msgid "two" msgstr "dos" -#: src/humanize/number.py:150 +#: src/humanize/number.py:231 msgid "three" msgstr "tres" -#: src/humanize/number.py:151 +#: src/humanize/number.py:232 msgid "four" msgstr "cuatro" -#: src/humanize/number.py:152 +#: src/humanize/number.py:233 msgid "five" msgstr "cinco" -#: src/humanize/number.py:153 +#: src/humanize/number.py:234 msgid "six" msgstr "seis" -#: src/humanize/number.py:154 +#: src/humanize/number.py:235 msgid "seven" msgstr "siete" -#: src/humanize/number.py:155 +#: src/humanize/number.py:236 msgid "eight" msgstr "ocho" -#: src/humanize/number.py:156 +#: src/humanize/number.py:237 msgid "nine" msgstr "nueve" -#: src/humanize/time.py:119 +#: src/humanize/time.py:133 #, python-format msgid "%d microsecond" msgid_plural "%d microseconds" msgstr[0] "%d microsegundo" msgstr[1] "%d microsegundos" -#: src/humanize/time.py:128 +#: src/humanize/time.py:142 #, python-format msgid "%d millisecond" msgid_plural "%d milliseconds" msgstr[0] "%d milisegundo" msgstr[1] "%d milisegundos" -#: src/humanize/time.py:131 src/humanize/time.py:204 +#: src/humanize/time.py:145 src/humanize/time.py:220 msgid "a moment" msgstr "un momento" -#: src/humanize/time.py:133 +#: src/humanize/time.py:147 msgid "a second" msgstr "un segundo" -#: src/humanize/time.py:135 +#: src/humanize/time.py:149 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d segundo" msgstr[1] "%d segundos" -#: src/humanize/time.py:137 +#: src/humanize/time.py:151 msgid "a minute" msgstr "un minuto" -#: src/humanize/time.py:140 +#: src/humanize/time.py:154 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minuto" msgstr[1] "%d minutos" -#: src/humanize/time.py:142 +#: src/humanize/time.py:156 msgid "an hour" msgstr "una hora" -#: src/humanize/time.py:145 +#: src/humanize/time.py:159 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d hora" msgstr[1] "%d horas" -#: src/humanize/time.py:148 +#: src/humanize/time.py:162 msgid "a day" msgstr "un día" -#: src/humanize/time.py:150 src/humanize/time.py:153 +#: src/humanize/time.py:164 src/humanize/time.py:167 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d día" msgstr[1] "%d días" -#: src/humanize/time.py:155 +#: src/humanize/time.py:169 msgid "a month" msgstr "un mes" -#: src/humanize/time.py:157 +#: src/humanize/time.py:171 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d mes" msgstr[1] "%d meses" -#: src/humanize/time.py:160 +#: src/humanize/time.py:174 msgid "a year" msgstr "un año" -#: src/humanize/time.py:162 src/humanize/time.py:171 +#: src/humanize/time.py:176 src/humanize/time.py:185 #, python-format msgid "1 year, %d day" msgid_plural "1 year, %d days" msgstr[0] "1 año y %d día" msgstr[1] "1 año y %d días" -#: src/humanize/time.py:165 +#: src/humanize/time.py:179 msgid "1 year, 1 month" msgstr "1 año y 1 mes" -#: src/humanize/time.py:168 +#: src/humanize/time.py:182 #, python-format msgid "1 year, %d month" msgid_plural "1 year, %d months" msgstr[0] "1 año y %d mes" msgstr[1] "1 año y %d meses" -#: src/humanize/time.py:173 +#: src/humanize/time.py:187 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d año" msgstr[1] "%d años" -#: src/humanize/time.py:201 +#: src/humanize/time.py:217 #, python-format msgid "%s from now" msgstr "en %s" -#: src/humanize/time.py:201 +#: src/humanize/time.py:217 #, python-format msgid "%s ago" msgstr "hace %s" -#: src/humanize/time.py:205 +#: src/humanize/time.py:221 msgid "now" msgstr "ahora" -#: src/humanize/time.py:227 +#: src/humanize/time.py:244 msgid "today" msgstr "hoy" -#: src/humanize/time.py:229 +#: src/humanize/time.py:246 msgid "tomorrow" msgstr "mañana" -#: src/humanize/time.py:231 +#: src/humanize/time.py:248 msgid "yesterday" msgstr "ayer" -#: src/humanize/time.py:498 +#: src/humanize/time.py:534 #, python-format msgid "%s and %s" msgstr "" diff --git a/lib/humanize/locale/fa_IR/LC_MESSAGES/humanize.po b/lib/humanize/locale/fa_IR/LC_MESSAGES/humanize.po index c2a70da..b3b9ad8 100644 --- a/lib/humanize/locale/fa_IR/LC_MESSAGES/humanize.po +++ b/lib/humanize/locale/fa_IR/LC_MESSAGES/humanize.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: humanize\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-09-29 21:07+0300\n" +"POT-Creation-Date: 2021-04-30 22:34+0200\n" "PO-Revision-Date: 2017-01-10 02:44+0330\n" "Last-Translator: Christian Klein \n" "Language-Team: German\n" @@ -19,269 +19,297 @@ msgstr "" "Generated-By: Christian Klein\n" "X-Generator: Poedit 1.5.4\n" -#: src/humanize/number.py:31 +#: src/humanize/number.py:56 msgctxt "0" msgid "th" msgstr "." -#: src/humanize/number.py:32 +#: src/humanize/number.py:57 msgctxt "1" msgid "st" msgstr "اولین" -#: src/humanize/number.py:33 +#: src/humanize/number.py:58 msgctxt "2" msgid "nd" msgstr "دومین" -#: src/humanize/number.py:34 +#: src/humanize/number.py:59 msgctxt "3" msgid "rd" msgstr "سومین" -#: src/humanize/number.py:35 +#: src/humanize/number.py:60 msgctxt "4" msgid "th" msgstr "چهارمین" -#: src/humanize/number.py:36 +#: src/humanize/number.py:61 msgctxt "5" msgid "th" msgstr "پنجمین" -#: src/humanize/number.py:37 +#: src/humanize/number.py:62 msgctxt "6" msgid "th" msgstr "ششمین" -#: src/humanize/number.py:38 +#: src/humanize/number.py:63 msgctxt "7" msgid "th" msgstr "هفتمین" -#: src/humanize/number.py:39 +#: src/humanize/number.py:64 msgctxt "8" msgid "th" msgstr "هشتمین" -#: src/humanize/number.py:40 +#: src/humanize/number.py:65 msgctxt "9" msgid "th" msgstr "نهمین" -#: src/humanize/number.py:82 +#: src/humanize/number.py:126 +msgid "thousand" +msgid_plural "thousand" +msgstr[0] "" +msgstr[1] "" + +#: src/humanize/number.py:127 msgid "million" -msgstr "میلیون" +msgid_plural "million" +msgstr[0] "میلیون" +msgstr[1] "میلیون" -#: src/humanize/number.py:83 +#: src/humanize/number.py:128 msgid "billion" -msgstr "میلیارد" +msgid_plural "billion" +msgstr[0] "میلیارد" +msgstr[1] "میلیارد" -#: src/humanize/number.py:84 +#: src/humanize/number.py:129 msgid "trillion" -msgstr "ترلیون" +msgid_plural "trillion" +msgstr[0] "ترلیون" +msgstr[1] "ترلیون" -#: src/humanize/number.py:85 +#: src/humanize/number.py:130 msgid "quadrillion" -msgstr "کوادریلیون" +msgid_plural "quadrillion" +msgstr[0] "کوادریلیون" +msgstr[1] "کوادریلیون" -#: src/humanize/number.py:86 +#: src/humanize/number.py:131 msgid "quintillion" -msgstr "کوانتیلیون" +msgid_plural "quintillion" +msgstr[0] "کوانتیلیون" +msgstr[1] "کوانتیلیون" -#: src/humanize/number.py:87 +#: src/humanize/number.py:132 msgid "sextillion" -msgstr "سکستیلیون" +msgid_plural "sextillion" +msgstr[0] "سکستیلیون" +msgstr[1] "سکستیلیون" -#: src/humanize/number.py:88 +#: src/humanize/number.py:133 msgid "septillion" -msgstr "سپتیلیون" +msgid_plural "septillion" +msgstr[0] "سپتیلیون" +msgstr[1] "سپتیلیون" -#: src/humanize/number.py:89 +#: src/humanize/number.py:134 msgid "octillion" -msgstr "اوکتیلیون" +msgid_plural "octillion" +msgstr[0] "اوکتیلیون" +msgstr[1] "اوکتیلیون" -#: src/humanize/number.py:90 +#: src/humanize/number.py:135 msgid "nonillion" -msgstr "نونیلیون" +msgid_plural "nonillion" +msgstr[0] "نونیلیون" +msgstr[1] "نونیلیون" -#: src/humanize/number.py:91 +#: src/humanize/number.py:136 msgid "decillion" -msgstr "دسیلیون" +msgid_plural "decillion" +msgstr[0] "دسیلیون" +msgstr[1] "دسیلیون" -#: src/humanize/number.py:92 +#: src/humanize/number.py:137 msgid "googol" -msgstr "گوگول" +msgid_plural "googol" +msgstr[0] "گوگول" +msgstr[1] "گوگول" -#: src/humanize/number.py:147 +#: src/humanize/number.py:228 msgid "zero" msgstr "" -#: src/humanize/number.py:148 +#: src/humanize/number.py:229 msgid "one" msgstr "یک" -#: src/humanize/number.py:149 +#: src/humanize/number.py:230 msgid "two" msgstr "دو" -#: src/humanize/number.py:150 +#: src/humanize/number.py:231 msgid "three" msgstr "سه" -#: src/humanize/number.py:151 +#: src/humanize/number.py:232 msgid "four" msgstr "چهار" -#: src/humanize/number.py:152 +#: src/humanize/number.py:233 msgid "five" msgstr "پنج" -#: src/humanize/number.py:153 +#: src/humanize/number.py:234 msgid "six" msgstr "شش" -#: src/humanize/number.py:154 +#: src/humanize/number.py:235 msgid "seven" msgstr "هفت" -#: src/humanize/number.py:155 +#: src/humanize/number.py:236 msgid "eight" msgstr "هشت" -#: src/humanize/number.py:156 +#: src/humanize/number.py:237 msgid "nine" msgstr "نه" -#: src/humanize/time.py:119 -#, fuzzy, python-format +#: src/humanize/time.py:133 +#, python-format msgid "%d microsecond" msgid_plural "%d microseconds" msgstr[0] "" msgstr[1] "" -#: src/humanize/time.py:128 -#, fuzzy, python-format +#: src/humanize/time.py:142 +#, python-format msgid "%d millisecond" msgid_plural "%d milliseconds" msgstr[0] "" msgstr[1] "" -#: src/humanize/time.py:131 src/humanize/time.py:204 +#: src/humanize/time.py:145 src/humanize/time.py:220 msgid "a moment" msgstr "یک لحظه" -#: src/humanize/time.py:133 +#: src/humanize/time.py:147 msgid "a second" msgstr "یک ثانیه" -#: src/humanize/time.py:135 +#: src/humanize/time.py:149 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d ثانیه" msgstr[1] "%d ثانیه" -#: src/humanize/time.py:137 +#: src/humanize/time.py:151 msgid "a minute" msgstr "یک دقیقه" -#: src/humanize/time.py:140 +#: src/humanize/time.py:154 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d دقیقه" msgstr[1] "%d دقیقه" -#: src/humanize/time.py:142 +#: src/humanize/time.py:156 msgid "an hour" msgstr "یک ساعت" -#: src/humanize/time.py:145 +#: src/humanize/time.py:159 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d ساعت" msgstr[1] "%d ساعت" -#: src/humanize/time.py:148 +#: src/humanize/time.py:162 msgid "a day" msgstr "یک روز" -#: src/humanize/time.py:150 src/humanize/time.py:153 +#: src/humanize/time.py:164 src/humanize/time.py:167 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d روز" msgstr[1] "%d روز" -#: src/humanize/time.py:155 +#: src/humanize/time.py:169 msgid "a month" msgstr "یک ماه" -#: src/humanize/time.py:157 +#: src/humanize/time.py:171 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d ماه" msgstr[1] "%d ماه" -#: src/humanize/time.py:160 +#: src/humanize/time.py:174 msgid "a year" msgstr "یک سال" -#: src/humanize/time.py:162 src/humanize/time.py:171 +#: src/humanize/time.py:176 src/humanize/time.py:185 #, python-format msgid "1 year, %d day" msgid_plural "1 year, %d days" msgstr[0] "۱ سال و %d روز" msgstr[1] "۱ سال و %d روز" -#: src/humanize/time.py:165 +#: src/humanize/time.py:179 msgid "1 year, 1 month" msgstr "۱ سال و ۱ ماه" -#: src/humanize/time.py:168 +#: src/humanize/time.py:182 #, python-format msgid "1 year, %d month" msgid_plural "1 year, %d months" msgstr[0] "۱ سال و %d ماه" msgstr[1] "۱ سال و %d ماه" -#: src/humanize/time.py:173 +#: src/humanize/time.py:187 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d سال" msgstr[1] "%d سال" -#: src/humanize/time.py:201 +#: src/humanize/time.py:217 #, python-format msgid "%s from now" msgstr "%s تا به اکنون" -#: src/humanize/time.py:201 +#: src/humanize/time.py:217 #, python-format msgid "%s ago" msgstr "%s پیش" -#: src/humanize/time.py:205 +#: src/humanize/time.py:221 msgid "now" msgstr "اکنون" -#: src/humanize/time.py:227 +#: src/humanize/time.py:244 msgid "today" msgstr "امروز" -#: src/humanize/time.py:229 +#: src/humanize/time.py:246 msgid "tomorrow" msgstr "فردا" -#: src/humanize/time.py:231 +#: src/humanize/time.py:248 msgid "yesterday" msgstr "دیروز" -#: src/humanize/time.py:498 +#: src/humanize/time.py:534 #, python-format msgid "%s and %s" msgstr "" diff --git a/lib/humanize/locale/fi_FI/LC_MESSAGES/humanize.po b/lib/humanize/locale/fi_FI/LC_MESSAGES/humanize.po index 1226296..e07c558 100644 --- a/lib/humanize/locale/fi_FI/LC_MESSAGES/humanize.po +++ b/lib/humanize/locale/fi_FI/LC_MESSAGES/humanize.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: humanize\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-09-29 21:07+0300\n" +"POT-Creation-Date: 2021-04-30 22:34+0200\n" "PO-Revision-Date: 2017-03-02 11:26+0200\n" "Last-Translator: Ville Skyttä \n" "Language-Team: Finnish\n" @@ -18,269 +18,297 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 1.8.12\n" -#: src/humanize/number.py:31 +#: src/humanize/number.py:56 msgctxt "0" msgid "th" msgstr "." -#: src/humanize/number.py:32 +#: src/humanize/number.py:57 msgctxt "1" msgid "st" msgstr "." -#: src/humanize/number.py:33 +#: src/humanize/number.py:58 msgctxt "2" msgid "nd" msgstr "." -#: src/humanize/number.py:34 +#: src/humanize/number.py:59 msgctxt "3" msgid "rd" msgstr "." -#: src/humanize/number.py:35 +#: src/humanize/number.py:60 msgctxt "4" msgid "th" msgstr "." -#: src/humanize/number.py:36 +#: src/humanize/number.py:61 msgctxt "5" msgid "th" msgstr "." -#: src/humanize/number.py:37 +#: src/humanize/number.py:62 msgctxt "6" msgid "th" msgstr "." -#: src/humanize/number.py:38 +#: src/humanize/number.py:63 msgctxt "7" msgid "th" msgstr "." -#: src/humanize/number.py:39 +#: src/humanize/number.py:64 msgctxt "8" msgid "th" msgstr "." -#: src/humanize/number.py:40 +#: src/humanize/number.py:65 msgctxt "9" msgid "th" msgstr "." -#: src/humanize/number.py:82 +#: src/humanize/number.py:126 +msgid "thousand" +msgid_plural "thousand" +msgstr[0] "tuhatta" +msgstr[1] "tuhatta" + +#: src/humanize/number.py:127 msgid "million" -msgstr "miljoonaa" +msgid_plural "million" +msgstr[0] "miljoonaa" +msgstr[1] "miljoonaa" -#: src/humanize/number.py:83 +#: src/humanize/number.py:128 msgid "billion" -msgstr "miljardia" +msgid_plural "billion" +msgstr[0] "miljardia" +msgstr[1] "miljardia" -#: src/humanize/number.py:84 +#: src/humanize/number.py:129 msgid "trillion" -msgstr "biljoonaa" +msgid_plural "trillion" +msgstr[0] "biljoonaa" +msgstr[1] "biljoonaa" -#: src/humanize/number.py:85 +#: src/humanize/number.py:130 msgid "quadrillion" -msgstr "kvadriljoonaa" +msgid_plural "quadrillion" +msgstr[0] "kvadriljoonaa" +msgstr[1] "kvadriljoonaa" -#: src/humanize/number.py:86 +#: src/humanize/number.py:131 msgid "quintillion" -msgstr "kvintiljoonaa" +msgid_plural "quintillion" +msgstr[0] "kvintiljoonaa" +msgstr[1] "kvintiljoonaa" -#: src/humanize/number.py:87 +#: src/humanize/number.py:132 msgid "sextillion" -msgstr "sekstiljoonaa" +msgid_plural "sextillion" +msgstr[0] "sekstiljoonaa" +msgstr[1] "sekstiljoonaa" -#: src/humanize/number.py:88 +#: src/humanize/number.py:133 msgid "septillion" -msgstr "septiljoonaa" +msgid_plural "septillion" +msgstr[0] "septiljoonaa" +msgstr[1] "septiljoonaa" -#: src/humanize/number.py:89 +#: src/humanize/number.py:134 msgid "octillion" -msgstr "oktiljoonaa" +msgid_plural "octillion" +msgstr[0] "oktiljoonaa" +msgstr[1] "oktiljoonaa" -#: src/humanize/number.py:90 +#: src/humanize/number.py:135 msgid "nonillion" -msgstr "noniljoonaa" +msgid_plural "nonillion" +msgstr[0] "noniljoonaa" +msgstr[1] "noniljoonaa" -#: src/humanize/number.py:91 +#: src/humanize/number.py:136 msgid "decillion" -msgstr "dekiljoonaa" +msgid_plural "decillion" +msgstr[0] "dekiljoonaa" +msgstr[1] "dekiljoonaa" -#: src/humanize/number.py:92 +#: src/humanize/number.py:137 msgid "googol" -msgstr "googol" +msgid_plural "googol" +msgstr[0] "googol" +msgstr[1] "googol" -#: src/humanize/number.py:147 +#: src/humanize/number.py:228 msgid "zero" msgstr "nolla" -#: src/humanize/number.py:148 +#: src/humanize/number.py:229 msgid "one" msgstr "yksi" -#: src/humanize/number.py:149 +#: src/humanize/number.py:230 msgid "two" msgstr "kaksi" -#: src/humanize/number.py:150 +#: src/humanize/number.py:231 msgid "three" msgstr "kolme" -#: src/humanize/number.py:151 +#: src/humanize/number.py:232 msgid "four" msgstr "neljä" -#: src/humanize/number.py:152 +#: src/humanize/number.py:233 msgid "five" msgstr "viisi" -#: src/humanize/number.py:153 +#: src/humanize/number.py:234 msgid "six" msgstr "kuusi" -#: src/humanize/number.py:154 +#: src/humanize/number.py:235 msgid "seven" msgstr "seitsemän" -#: src/humanize/number.py:155 +#: src/humanize/number.py:236 msgid "eight" msgstr "kahdeksan" -#: src/humanize/number.py:156 +#: src/humanize/number.py:237 msgid "nine" msgstr "yhdeksän" -#: src/humanize/time.py:119 +#: src/humanize/time.py:133 #, fuzzy, python-format msgid "%d microsecond" msgid_plural "%d microseconds" msgstr[0] "%d mikrosekunti" msgstr[1] "%d mikrosekuntia" -#: src/humanize/time.py:128 +#: src/humanize/time.py:142 #, fuzzy, python-format msgid "%d millisecond" msgid_plural "%d milliseconds" msgstr[0] "%d millisekunti" msgstr[1] "%d millisekuntia" -#: src/humanize/time.py:131 src/humanize/time.py:204 +#: src/humanize/time.py:145 src/humanize/time.py:220 msgid "a moment" msgstr "hetki" -#: src/humanize/time.py:133 +#: src/humanize/time.py:147 msgid "a second" msgstr "sekunti" -#: src/humanize/time.py:135 +#: src/humanize/time.py:149 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d sekunti" msgstr[1] "%d sekuntia" -#: src/humanize/time.py:137 +#: src/humanize/time.py:151 msgid "a minute" msgstr "minuutti" -#: src/humanize/time.py:140 +#: src/humanize/time.py:154 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minuutti" msgstr[1] "%d minuuttia" -#: src/humanize/time.py:142 +#: src/humanize/time.py:156 msgid "an hour" msgstr "tunti" -#: src/humanize/time.py:145 +#: src/humanize/time.py:159 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d tunti" msgstr[1] "%d tuntia" -#: src/humanize/time.py:148 +#: src/humanize/time.py:162 msgid "a day" msgstr "päivä" -#: src/humanize/time.py:150 src/humanize/time.py:153 +#: src/humanize/time.py:164 src/humanize/time.py:167 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d päivä" msgstr[1] "%d päivää" -#: src/humanize/time.py:155 +#: src/humanize/time.py:169 msgid "a month" msgstr "kuukausi" -#: src/humanize/time.py:157 +#: src/humanize/time.py:171 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d kuukausi" msgstr[1] "%d kuukautta" -#: src/humanize/time.py:160 +#: src/humanize/time.py:174 msgid "a year" msgstr "vuosi" -#: src/humanize/time.py:162 src/humanize/time.py:171 +#: src/humanize/time.py:176 src/humanize/time.py:185 #, python-format msgid "1 year, %d day" msgid_plural "1 year, %d days" msgstr[0] "1 vuosi, %d päivä" msgstr[1] "1 vuosi, %d päivää" -#: src/humanize/time.py:165 +#: src/humanize/time.py:179 msgid "1 year, 1 month" msgstr "1 vuosi, 1 kuukausi" -#: src/humanize/time.py:168 +#: src/humanize/time.py:182 #, python-format msgid "1 year, %d month" msgid_plural "1 year, %d months" msgstr[0] "1 vuosi, %d kuukausi" msgstr[1] "1 vuosi, %d kuukautta" -#: src/humanize/time.py:173 +#: src/humanize/time.py:187 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d vuosi" msgstr[1] "%d vuotta" -#: src/humanize/time.py:201 +#: src/humanize/time.py:217 #, python-format msgid "%s from now" msgstr "%s tästä" -#: src/humanize/time.py:201 +#: src/humanize/time.py:217 #, python-format msgid "%s ago" msgstr "%s sitten" -#: src/humanize/time.py:205 +#: src/humanize/time.py:221 msgid "now" msgstr "nyt" -#: src/humanize/time.py:227 +#: src/humanize/time.py:244 msgid "today" msgstr "tänään" -#: src/humanize/time.py:229 +#: src/humanize/time.py:246 msgid "tomorrow" msgstr "huomenna" -#: src/humanize/time.py:231 +#: src/humanize/time.py:248 msgid "yesterday" msgstr "eilen" -#: src/humanize/time.py:498 +#: src/humanize/time.py:534 #, python-format msgid "%s and %s" msgstr "%s ja %s" diff --git a/lib/humanize/locale/fr_FR/LC_MESSAGES/humanize.po b/lib/humanize/locale/fr_FR/LC_MESSAGES/humanize.po index df85d62..01bb94a 100644 --- a/lib/humanize/locale/fr_FR/LC_MESSAGES/humanize.po +++ b/lib/humanize/locale/fr_FR/LC_MESSAGES/humanize.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-09-29 21:07+0300\n" +"POT-Creation-Date: 2021-04-30 22:34+0200\n" "PO-Revision-Date: 2013-06-22 08:52+0100\n" "Last-Translator: Olivier Cortès \n" "Language-Team: fr_FR \n" @@ -19,289 +19,317 @@ msgstr "" "Generated-By: Babel 0.9.6\n" "X-Generator: Poedit 1.5.5\n" -#: src/humanize/number.py:31 +#: src/humanize/number.py:56 #, fuzzy msgctxt "0" msgid "th" msgstr "e" -#: src/humanize/number.py:32 +#: src/humanize/number.py:57 #, fuzzy msgctxt "1" msgid "st" msgstr "er" -#: src/humanize/number.py:33 +#: src/humanize/number.py:58 #, fuzzy msgctxt "2" msgid "nd" msgstr "e" -#: src/humanize/number.py:34 +#: src/humanize/number.py:59 #, fuzzy msgctxt "3" msgid "rd" msgstr "e" -#: src/humanize/number.py:35 +#: src/humanize/number.py:60 #, fuzzy msgctxt "4" msgid "th" msgstr "e" -#: src/humanize/number.py:36 +#: src/humanize/number.py:61 #, fuzzy msgctxt "5" msgid "th" msgstr "e" -#: src/humanize/number.py:37 +#: src/humanize/number.py:62 #, fuzzy msgctxt "6" msgid "th" msgstr "e" -#: src/humanize/number.py:38 +#: src/humanize/number.py:63 #, fuzzy msgctxt "7" msgid "th" msgstr "e" -#: src/humanize/number.py:39 +#: src/humanize/number.py:64 #, fuzzy msgctxt "8" msgid "th" msgstr "e" -#: src/humanize/number.py:40 +#: src/humanize/number.py:65 #, fuzzy msgctxt "9" msgid "th" msgstr "e" -#: src/humanize/number.py:82 +#: src/humanize/number.py:126 +msgid "thousand" +msgid_plural "thousand" +msgstr[0] "" +msgstr[1] "" + +#: src/humanize/number.py:127 #, fuzzy msgid "million" -msgstr "%(value)s million" +msgid_plural "million" +msgstr[0] "%(value)s million" +msgstr[1] "%(value)s million" -#: src/humanize/number.py:83 +#: src/humanize/number.py:128 msgid "billion" -msgstr "milliard" +msgid_plural "billion" +msgstr[0] "milliard" +msgstr[1] "milliard" -#: src/humanize/number.py:84 +#: src/humanize/number.py:129 #, fuzzy msgid "trillion" -msgstr "%(value)s billion" +msgid_plural "trillion" +msgstr[0] "%(value)s billion" +msgstr[1] "%(value)s billion" -#: src/humanize/number.py:85 +#: src/humanize/number.py:130 #, fuzzy msgid "quadrillion" -msgstr "%(value)s billiard" +msgid_plural "quadrillion" +msgstr[0] "%(value)s billiard" +msgstr[1] "%(value)s billiard" -#: src/humanize/number.py:86 +#: src/humanize/number.py:131 #, fuzzy msgid "quintillion" -msgstr "%(value)s trillion" +msgid_plural "quintillion" +msgstr[0] "%(value)s trillion" +msgstr[1] "%(value)s trillion" -#: src/humanize/number.py:87 +#: src/humanize/number.py:132 #, fuzzy msgid "sextillion" -msgstr "%(value)s trilliard" +msgid_plural "sextillion" +msgstr[0] "%(value)s trilliard" +msgstr[1] "%(value)s trilliard" -#: src/humanize/number.py:88 +#: src/humanize/number.py:133 #, fuzzy msgid "septillion" -msgstr "%(value)s quatrillion" +msgid_plural "septillion" +msgstr[0] "%(value)s quatrillion" +msgstr[1] "%(value)s quatrillion" -#: src/humanize/number.py:89 +#: src/humanize/number.py:134 #, fuzzy msgid "octillion" -msgstr "%(value)s quadrilliard" +msgid_plural "octillion" +msgstr[0] "%(value)s quadrilliard" +msgstr[1] "%(value)s quadrilliard" -#: src/humanize/number.py:90 +#: src/humanize/number.py:135 #, fuzzy msgid "nonillion" -msgstr "%(value)s quintillion" +msgid_plural "nonillion" +msgstr[0] "%(value)s quintillion" +msgstr[1] "%(value)s quintillion" -#: src/humanize/number.py:91 +#: src/humanize/number.py:136 #, fuzzy msgid "decillion" -msgstr "%(value)s quintilliard" +msgid_plural "decillion" +msgstr[0] "%(value)s quintilliard" +msgstr[1] "%(value)s quintilliard" -#: src/humanize/number.py:92 +#: src/humanize/number.py:137 #, fuzzy msgid "googol" -msgstr "%(value)s gogol" +msgid_plural "googol" +msgstr[0] "%(value)s gogol" +msgstr[1] "%(value)s gogol" -#: src/humanize/number.py:147 +#: src/humanize/number.py:228 msgid "zero" msgstr "zéro" -#: src/humanize/number.py:148 +#: src/humanize/number.py:229 msgid "one" msgstr "un" -#: src/humanize/number.py:149 +#: src/humanize/number.py:230 msgid "two" msgstr "deux" -#: src/humanize/number.py:150 +#: src/humanize/number.py:231 msgid "three" msgstr "trois" -#: src/humanize/number.py:151 +#: src/humanize/number.py:232 msgid "four" msgstr "quatre" -#: src/humanize/number.py:152 +#: src/humanize/number.py:233 msgid "five" msgstr "cinq" -#: src/humanize/number.py:153 +#: src/humanize/number.py:234 msgid "six" msgstr "six" -#: src/humanize/number.py:154 +#: src/humanize/number.py:235 msgid "seven" msgstr "sept" -#: src/humanize/number.py:155 +#: src/humanize/number.py:236 msgid "eight" msgstr "huit" -#: src/humanize/number.py:156 +#: src/humanize/number.py:237 msgid "nine" msgstr "neuf" -#: src/humanize/time.py:119 +#: src/humanize/time.py:133 #, fuzzy, python-format msgid "%d microsecond" msgid_plural "%d microseconds" msgstr[0] "%d microseconde" msgstr[1] "%d microsecondes" -#: src/humanize/time.py:128 +#: src/humanize/time.py:142 #, fuzzy, python-format msgid "%d millisecond" msgid_plural "%d milliseconds" msgstr[0] "%d milliseconde" msgstr[1] "%d millisecondes" -#: src/humanize/time.py:131 src/humanize/time.py:204 +#: src/humanize/time.py:145 src/humanize/time.py:220 msgid "a moment" msgstr "un moment" -#: src/humanize/time.py:133 +#: src/humanize/time.py:147 msgid "a second" msgstr "une seconde" -#: src/humanize/time.py:135 +#: src/humanize/time.py:149 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d seconde" msgstr[1] "%d secondes" -#: src/humanize/time.py:137 +#: src/humanize/time.py:151 msgid "a minute" msgstr "une minute" -#: src/humanize/time.py:140 +#: src/humanize/time.py:154 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minute" msgstr[1] "%d minutes" -#: src/humanize/time.py:142 +#: src/humanize/time.py:156 msgid "an hour" msgstr "une heure" -#: src/humanize/time.py:145 +#: src/humanize/time.py:159 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d heure" msgstr[1] "%d heures" -#: src/humanize/time.py:148 +#: src/humanize/time.py:162 msgid "a day" msgstr "un jour" -#: src/humanize/time.py:150 src/humanize/time.py:153 +#: src/humanize/time.py:164 src/humanize/time.py:167 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d jour" msgstr[1] "%d jours" -#: src/humanize/time.py:155 +#: src/humanize/time.py:169 msgid "a month" msgstr "un mois" -#: src/humanize/time.py:157 +#: src/humanize/time.py:171 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d mois" msgstr[1] "%d mois" -#: src/humanize/time.py:160 +#: src/humanize/time.py:174 msgid "a year" msgstr "un an" -#: src/humanize/time.py:162 src/humanize/time.py:171 +#: src/humanize/time.py:176 src/humanize/time.py:185 #, python-format msgid "1 year, %d day" msgid_plural "1 year, %d days" msgstr[0] "un an et %d jour" msgstr[1] "un an et %d jours" -#: src/humanize/time.py:165 +#: src/humanize/time.py:179 msgid "1 year, 1 month" msgstr "un an et un mois" -#: src/humanize/time.py:168 +#: src/humanize/time.py:182 #, python-format msgid "1 year, %d month" msgid_plural "1 year, %d months" msgstr[0] "un an et %d mois" msgstr[1] "un an et %d mois" -#: src/humanize/time.py:173 +#: src/humanize/time.py:187 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d an" msgstr[1] "%d ans" -#: src/humanize/time.py:201 +#: src/humanize/time.py:217 #, python-format msgid "%s from now" msgstr "dans %s" -#: src/humanize/time.py:201 +#: src/humanize/time.py:217 #, python-format msgid "%s ago" msgstr "il y a %s" -#: src/humanize/time.py:205 +#: src/humanize/time.py:221 msgid "now" msgstr "maintenant" -#: src/humanize/time.py:227 +#: src/humanize/time.py:244 msgid "today" msgstr "aujourd'hui" -#: src/humanize/time.py:229 +#: src/humanize/time.py:246 msgid "tomorrow" msgstr "demain" -#: src/humanize/time.py:231 +#: src/humanize/time.py:248 msgid "yesterday" msgstr "hier" -#: src/humanize/time.py:498 +#: src/humanize/time.py:534 #, python-format msgid "%s and %s" msgstr "%s et %s" diff --git a/lib/humanize/locale/id_ID/LC_MESSAGES/humanize.po b/lib/humanize/locale/id_ID/LC_MESSAGES/humanize.po index 8ec63ef..a2725b9 100644 --- a/lib/humanize/locale/id_ID/LC_MESSAGES/humanize.po +++ b/lib/humanize/locale/id_ID/LC_MESSAGES/humanize.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-09-29 21:07+0300\n" +"POT-Creation-Date: 2021-04-30 22:34+0200\n" "PO-Revision-Date: 2017-03-18 15:41+0700\n" "Last-Translator: adie.rebel@gmail.com\n" "Language-Team: Indonesian\n" @@ -18,259 +18,275 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Poedit 1.8.11\n" -#: src/humanize/number.py:31 +#: src/humanize/number.py:56 msgctxt "0" msgid "th" msgstr "." -#: src/humanize/number.py:32 +#: src/humanize/number.py:57 msgctxt "1" msgid "st" msgstr "." -#: src/humanize/number.py:33 +#: src/humanize/number.py:58 msgctxt "2" msgid "nd" msgstr "." -#: src/humanize/number.py:34 +#: src/humanize/number.py:59 msgctxt "3" msgid "rd" msgstr "." -#: src/humanize/number.py:35 +#: src/humanize/number.py:60 msgctxt "4" msgid "th" msgstr "." -#: src/humanize/number.py:36 +#: src/humanize/number.py:61 msgctxt "5" msgid "th" msgstr "." -#: src/humanize/number.py:37 +#: src/humanize/number.py:62 msgctxt "6" msgid "th" msgstr "." -#: src/humanize/number.py:38 +#: src/humanize/number.py:63 msgctxt "7" msgid "th" msgstr "." -#: src/humanize/number.py:39 +#: src/humanize/number.py:64 msgctxt "8" msgid "th" msgstr "." -#: src/humanize/number.py:40 +#: src/humanize/number.py:65 msgctxt "9" msgid "th" msgstr "." -#: src/humanize/number.py:82 +#: src/humanize/number.py:126 +msgid "thousand" +msgid_plural "thousand" +msgstr[0] "" + +#: src/humanize/number.py:127 msgid "million" -msgstr "juta" +msgid_plural "million" +msgstr[0] "juta" -#: src/humanize/number.py:83 +#: src/humanize/number.py:128 msgid "billion" -msgstr "miliar" +msgid_plural "billion" +msgstr[0] "miliar" -#: src/humanize/number.py:84 +#: src/humanize/number.py:129 msgid "trillion" -msgstr "triliun" +msgid_plural "trillion" +msgstr[0] "triliun" -#: src/humanize/number.py:85 +#: src/humanize/number.py:130 msgid "quadrillion" -msgstr "kuadriliun" +msgid_plural "quadrillion" +msgstr[0] "kuadriliun" -#: src/humanize/number.py:86 +#: src/humanize/number.py:131 msgid "quintillion" -msgstr "quintillion" +msgid_plural "quintillion" +msgstr[0] "quintillion" -#: src/humanize/number.py:87 +#: src/humanize/number.py:132 msgid "sextillion" -msgstr "sextillion" +msgid_plural "sextillion" +msgstr[0] "sextillion" -#: src/humanize/number.py:88 +#: src/humanize/number.py:133 msgid "septillion" -msgstr "septillion" +msgid_plural "septillion" +msgstr[0] "septillion" -#: src/humanize/number.py:89 +#: src/humanize/number.py:134 msgid "octillion" -msgstr "octillion" +msgid_plural "octillion" +msgstr[0] "octillion" -#: src/humanize/number.py:90 +#: src/humanize/number.py:135 msgid "nonillion" -msgstr "nonillion" +msgid_plural "nonillion" +msgstr[0] "nonillion" -#: src/humanize/number.py:91 +#: src/humanize/number.py:136 msgid "decillion" -msgstr "decillion" +msgid_plural "decillion" +msgstr[0] "decillion" -#: src/humanize/number.py:92 +#: src/humanize/number.py:137 msgid "googol" -msgstr "googol" +msgid_plural "googol" +msgstr[0] "googol" -#: src/humanize/number.py:147 +#: src/humanize/number.py:228 msgid "zero" msgstr "nol" -#: src/humanize/number.py:148 +#: src/humanize/number.py:229 msgid "one" msgstr "satu" -#: src/humanize/number.py:149 +#: src/humanize/number.py:230 msgid "two" msgstr "dua" -#: src/humanize/number.py:150 +#: src/humanize/number.py:231 msgid "three" msgstr "tiga" -#: src/humanize/number.py:151 +#: src/humanize/number.py:232 msgid "four" msgstr "empat" -#: src/humanize/number.py:152 +#: src/humanize/number.py:233 msgid "five" msgstr "lima" -#: src/humanize/number.py:153 +#: src/humanize/number.py:234 msgid "six" msgstr "enam" -#: src/humanize/number.py:154 +#: src/humanize/number.py:235 msgid "seven" msgstr "tujuh" -#: src/humanize/number.py:155 +#: src/humanize/number.py:236 msgid "eight" msgstr "delapan" -#: src/humanize/number.py:156 +#: src/humanize/number.py:237 msgid "nine" msgstr "sembilan" -#: src/humanize/time.py:119 +#: src/humanize/time.py:133 #, fuzzy, python-format msgid "%d microsecond" msgid_plural "%d microseconds" msgstr[0] "%d mikro detik" -#: src/humanize/time.py:128 +#: src/humanize/time.py:142 #, fuzzy, python-format msgid "%d millisecond" msgid_plural "%d milliseconds" msgstr[0] "%d mili detik" -#: src/humanize/time.py:131 src/humanize/time.py:204 +#: src/humanize/time.py:145 src/humanize/time.py:220 msgid "a moment" msgstr "beberapa saat" -#: src/humanize/time.py:133 +#: src/humanize/time.py:147 msgid "a second" msgstr "sedetik" -#: src/humanize/time.py:135 +#: src/humanize/time.py:149 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d detik" -#: src/humanize/time.py:137 +#: src/humanize/time.py:151 msgid "a minute" msgstr "semenit" -#: src/humanize/time.py:140 +#: src/humanize/time.py:154 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d menit" -#: src/humanize/time.py:142 +#: src/humanize/time.py:156 msgid "an hour" msgstr "sejam" -#: src/humanize/time.py:145 +#: src/humanize/time.py:159 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d jam" -#: src/humanize/time.py:148 +#: src/humanize/time.py:162 msgid "a day" msgstr "sehari" -#: src/humanize/time.py:150 src/humanize/time.py:153 +#: src/humanize/time.py:164 src/humanize/time.py:167 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d hari" -#: src/humanize/time.py:155 +#: src/humanize/time.py:169 msgid "a month" msgstr "sebulan" -#: src/humanize/time.py:157 +#: src/humanize/time.py:171 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d bulan" -#: src/humanize/time.py:160 +#: src/humanize/time.py:174 msgid "a year" msgstr "setahun" -#: src/humanize/time.py:162 src/humanize/time.py:171 +#: src/humanize/time.py:176 src/humanize/time.py:185 #, python-format msgid "1 year, %d day" msgid_plural "1 year, %d days" msgstr[0] "1 tahun, %d hari" -#: src/humanize/time.py:165 +#: src/humanize/time.py:179 msgid "1 year, 1 month" msgstr "1 tahun, 1 bulan" -#: src/humanize/time.py:168 +#: src/humanize/time.py:182 #, python-format msgid "1 year, %d month" msgid_plural "1 year, %d months" msgstr[0] "1 tahun, %d bulan" -#: src/humanize/time.py:173 +#: src/humanize/time.py:187 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d tahun" -#: src/humanize/time.py:201 +#: src/humanize/time.py:217 #, python-format msgid "%s from now" msgstr "%s dari sekarang" -#: src/humanize/time.py:201 +#: src/humanize/time.py:217 #, python-format msgid "%s ago" msgstr "%s yang lalu" -#: src/humanize/time.py:205 +#: src/humanize/time.py:221 msgid "now" msgstr "sekarang" -#: src/humanize/time.py:227 +#: src/humanize/time.py:244 msgid "today" msgstr "hari ini" -#: src/humanize/time.py:229 +#: src/humanize/time.py:246 msgid "tomorrow" msgstr "besok" -#: src/humanize/time.py:231 +#: src/humanize/time.py:248 msgid "yesterday" msgstr "kemarin" -#: src/humanize/time.py:498 +#: src/humanize/time.py:534 #, python-format msgid "%s and %s" msgstr "%s dan %s" diff --git a/lib/humanize/locale/it_IT/LC_MESSAGES/humanize.po b/lib/humanize/locale/it_IT/LC_MESSAGES/humanize.po index a0992bc..d9a12b4 100644 --- a/lib/humanize/locale/it_IT/LC_MESSAGES/humanize.po +++ b/lib/humanize/locale/it_IT/LC_MESSAGES/humanize.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-09-29 21:07+0300\n" +"POT-Creation-Date: 2021-04-30 22:34+0200\n" "PO-Revision-Date: 2018-10-27 22:52+0200\n" "Last-Translator: derfel \n" "Language-Team: Italian\n" @@ -18,269 +18,297 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 2.2\n" -#: src/humanize/number.py:31 +#: src/humanize/number.py:56 msgctxt "0" msgid "th" msgstr "º" -#: src/humanize/number.py:32 +#: src/humanize/number.py:57 msgctxt "1" msgid "st" msgstr "º" -#: src/humanize/number.py:33 +#: src/humanize/number.py:58 msgctxt "2" msgid "nd" msgstr "º" -#: src/humanize/number.py:34 +#: src/humanize/number.py:59 msgctxt "3" msgid "rd" msgstr "º" -#: src/humanize/number.py:35 +#: src/humanize/number.py:60 msgctxt "4" msgid "th" msgstr "º" -#: src/humanize/number.py:36 +#: src/humanize/number.py:61 msgctxt "5" msgid "th" msgstr "º" -#: src/humanize/number.py:37 +#: src/humanize/number.py:62 msgctxt "6" msgid "th" msgstr "º" -#: src/humanize/number.py:38 +#: src/humanize/number.py:63 msgctxt "7" msgid "th" msgstr "º" -#: src/humanize/number.py:39 +#: src/humanize/number.py:64 msgctxt "8" msgid "th" msgstr "º" -#: src/humanize/number.py:40 +#: src/humanize/number.py:65 msgctxt "9" msgid "th" msgstr "º" -#: src/humanize/number.py:82 +#: src/humanize/number.py:126 +msgid "thousand" +msgid_plural "thousand" +msgstr[0] "" +msgstr[1] "" + +#: src/humanize/number.py:127 msgid "million" -msgstr "milioni" +msgid_plural "million" +msgstr[0] "milioni" +msgstr[1] "milioni" -#: src/humanize/number.py:83 +#: src/humanize/number.py:128 msgid "billion" -msgstr "miliardi" +msgid_plural "billion" +msgstr[0] "miliardi" +msgstr[1] "miliardi" -#: src/humanize/number.py:84 +#: src/humanize/number.py:129 msgid "trillion" -msgstr "bilioni" +msgid_plural "trillion" +msgstr[0] "bilioni" +msgstr[1] "bilioni" -#: src/humanize/number.py:85 +#: src/humanize/number.py:130 msgid "quadrillion" -msgstr "biliardi" +msgid_plural "quadrillion" +msgstr[0] "biliardi" +msgstr[1] "biliardi" -#: src/humanize/number.py:86 +#: src/humanize/number.py:131 msgid "quintillion" -msgstr "trilioni" +msgid_plural "quintillion" +msgstr[0] "trilioni" +msgstr[1] "trilioni" -#: src/humanize/number.py:87 +#: src/humanize/number.py:132 msgid "sextillion" -msgstr "triliardi" +msgid_plural "sextillion" +msgstr[0] "triliardi" +msgstr[1] "triliardi" -#: src/humanize/number.py:88 +#: src/humanize/number.py:133 msgid "septillion" -msgstr "quadrilioni" +msgid_plural "septillion" +msgstr[0] "quadrilioni" +msgstr[1] "quadrilioni" -#: src/humanize/number.py:89 +#: src/humanize/number.py:134 msgid "octillion" -msgstr "quadriliardi" +msgid_plural "octillion" +msgstr[0] "quadriliardi" +msgstr[1] "quadriliardi" -#: src/humanize/number.py:90 +#: src/humanize/number.py:135 msgid "nonillion" -msgstr "quintilioni" +msgid_plural "nonillion" +msgstr[0] "quintilioni" +msgstr[1] "quintilioni" -#: src/humanize/number.py:91 +#: src/humanize/number.py:136 msgid "decillion" -msgstr "quintiliardi" +msgid_plural "decillion" +msgstr[0] "quintiliardi" +msgstr[1] "quintiliardi" -#: src/humanize/number.py:92 +#: src/humanize/number.py:137 msgid "googol" -msgstr "googol" +msgid_plural "googol" +msgstr[0] "googol" +msgstr[1] "googol" -#: src/humanize/number.py:147 +#: src/humanize/number.py:228 msgid "zero" msgstr "zero" -#: src/humanize/number.py:148 +#: src/humanize/number.py:229 msgid "one" msgstr "uno" -#: src/humanize/number.py:149 +#: src/humanize/number.py:230 msgid "two" msgstr "due" -#: src/humanize/number.py:150 +#: src/humanize/number.py:231 msgid "three" msgstr "tre" -#: src/humanize/number.py:151 +#: src/humanize/number.py:232 msgid "four" msgstr "quattro" -#: src/humanize/number.py:152 +#: src/humanize/number.py:233 msgid "five" msgstr "cinque" -#: src/humanize/number.py:153 +#: src/humanize/number.py:234 msgid "six" msgstr "sei" -#: src/humanize/number.py:154 +#: src/humanize/number.py:235 msgid "seven" msgstr "sette" -#: src/humanize/number.py:155 +#: src/humanize/number.py:236 msgid "eight" msgstr "otto" -#: src/humanize/number.py:156 +#: src/humanize/number.py:237 msgid "nine" msgstr "nove" -#: src/humanize/time.py:119 +#: src/humanize/time.py:133 #, fuzzy, python-format msgid "%d microsecond" msgid_plural "%d microseconds" msgstr[0] "%d microsecondo" msgstr[1] "%d microsecondi" -#: src/humanize/time.py:128 +#: src/humanize/time.py:142 #, fuzzy, python-format msgid "%d millisecond" msgid_plural "%d milliseconds" msgstr[0] "%d millisecondo" msgstr[1] "%d millisecondi" -#: src/humanize/time.py:131 src/humanize/time.py:204 +#: src/humanize/time.py:145 src/humanize/time.py:220 msgid "a moment" msgstr "un momento" -#: src/humanize/time.py:133 +#: src/humanize/time.py:147 msgid "a second" msgstr "un secondo" -#: src/humanize/time.py:135 +#: src/humanize/time.py:149 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d secondo" msgstr[1] "%d secondi" -#: src/humanize/time.py:137 +#: src/humanize/time.py:151 msgid "a minute" msgstr "un minuto" -#: src/humanize/time.py:140 +#: src/humanize/time.py:154 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minuto" msgstr[1] "%d minuti" -#: src/humanize/time.py:142 +#: src/humanize/time.py:156 msgid "an hour" msgstr "un'ora" -#: src/humanize/time.py:145 +#: src/humanize/time.py:159 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d ora" msgstr[1] "%d ore" -#: src/humanize/time.py:148 +#: src/humanize/time.py:162 msgid "a day" msgstr "un giorno" -#: src/humanize/time.py:150 src/humanize/time.py:153 +#: src/humanize/time.py:164 src/humanize/time.py:167 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d giorno" msgstr[1] "%d giorni" -#: src/humanize/time.py:155 +#: src/humanize/time.py:169 msgid "a month" msgstr "un mese" -#: src/humanize/time.py:157 +#: src/humanize/time.py:171 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d mese" msgstr[1] "%d mesi" -#: src/humanize/time.py:160 +#: src/humanize/time.py:174 msgid "a year" msgstr "un anno" -#: src/humanize/time.py:162 src/humanize/time.py:171 +#: src/humanize/time.py:176 src/humanize/time.py:185 #, python-format msgid "1 year, %d day" msgid_plural "1 year, %d days" msgstr[0] "un anno e %d giorno" msgstr[1] "un anno e %d giorni" -#: src/humanize/time.py:165 +#: src/humanize/time.py:179 msgid "1 year, 1 month" msgstr "un anno ed un mese" -#: src/humanize/time.py:168 +#: src/humanize/time.py:182 #, python-format msgid "1 year, %d month" msgid_plural "1 year, %d months" msgstr[0] "un anno e %d mese" msgstr[1] "un anno e %d mesi" -#: src/humanize/time.py:173 +#: src/humanize/time.py:187 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d anno" msgstr[1] "%d anni" -#: src/humanize/time.py:201 +#: src/humanize/time.py:217 #, python-format msgid "%s from now" msgstr "fra %s" -#: src/humanize/time.py:201 +#: src/humanize/time.py:217 #, python-format msgid "%s ago" msgstr "%s fa" -#: src/humanize/time.py:205 +#: src/humanize/time.py:221 msgid "now" msgstr "adesso" -#: src/humanize/time.py:227 +#: src/humanize/time.py:244 msgid "today" msgstr "oggi" -#: src/humanize/time.py:229 +#: src/humanize/time.py:246 msgid "tomorrow" msgstr "domani" -#: src/humanize/time.py:231 +#: src/humanize/time.py:248 msgid "yesterday" msgstr "ieri" -#: src/humanize/time.py:498 +#: src/humanize/time.py:534 #, python-format msgid "%s and %s" msgstr "" diff --git a/lib/humanize/locale/ja_JP/LC_MESSAGES/humanize.po b/lib/humanize/locale/ja_JP/LC_MESSAGES/humanize.po index c055cae..21a21f8 100644 --- a/lib/humanize/locale/ja_JP/LC_MESSAGES/humanize.po +++ b/lib/humanize/locale/ja_JP/LC_MESSAGES/humanize.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: humanize\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-09-29 21:07+0300\n" +"POT-Creation-Date: 2021-04-30 22:34+0200\n" "PO-Revision-Date: 2018-01-22 10:48+0900\n" "Last-Translator: Kan Torii \n" "Language-Team: Japanese\n" @@ -19,270 +19,286 @@ msgstr "" "Generated-By: Babel 0.9.6\n" "X-Generator: Poedit 2.0.6\n" -#: src/humanize/number.py:31 +#: src/humanize/number.py:56 msgctxt "0" msgid "th" msgstr "番目" -#: src/humanize/number.py:32 +#: src/humanize/number.py:57 msgctxt "1" msgid "st" msgstr "番目" -#: src/humanize/number.py:33 +#: src/humanize/number.py:58 msgctxt "2" msgid "nd" msgstr "番目" -#: src/humanize/number.py:34 +#: src/humanize/number.py:59 msgctxt "3" msgid "rd" msgstr "番目" -#: src/humanize/number.py:35 +#: src/humanize/number.py:60 msgctxt "4" msgid "th" msgstr "番目" -#: src/humanize/number.py:36 +#: src/humanize/number.py:61 msgctxt "5" msgid "th" msgstr "番目" -#: src/humanize/number.py:37 +#: src/humanize/number.py:62 msgctxt "6" msgid "th" msgstr "番目" -#: src/humanize/number.py:38 +#: src/humanize/number.py:63 msgctxt "7" msgid "th" msgstr "番目" -#: src/humanize/number.py:39 +#: src/humanize/number.py:64 msgctxt "8" msgid "th" msgstr "番目" -#: src/humanize/number.py:40 +#: src/humanize/number.py:65 msgctxt "9" msgid "th" msgstr "番目" -#: src/humanize/number.py:82 +#: src/humanize/number.py:126 +msgid "thousand" +msgid_plural "thousand" +msgstr[0] "" + +#: src/humanize/number.py:127 msgid "million" -msgstr "百万" +msgid_plural "million" +msgstr[0] "百万" -#: src/humanize/number.py:83 +#: src/humanize/number.py:128 #, fuzzy msgid "billion" -msgstr "十億" +msgid_plural "billion" +msgstr[0] "十億" -#: src/humanize/number.py:84 +#: src/humanize/number.py:129 msgid "trillion" -msgstr "兆" +msgid_plural "trillion" +msgstr[0] "兆" -#: src/humanize/number.py:85 +#: src/humanize/number.py:130 #, fuzzy msgid "quadrillion" -msgstr "千兆" +msgid_plural "quadrillion" +msgstr[0] "千兆" -#: src/humanize/number.py:86 +#: src/humanize/number.py:131 #, fuzzy msgid "quintillion" -msgstr "百京" +msgid_plural "quintillion" +msgstr[0] "百京" -#: src/humanize/number.py:87 +#: src/humanize/number.py:132 #, fuzzy msgid "sextillion" -msgstr "十垓" +msgid_plural "sextillion" +msgstr[0] "十垓" -#: src/humanize/number.py:88 +#: src/humanize/number.py:133 #, fuzzy msgid "septillion" -msgstr "じょ" +msgid_plural "septillion" +msgstr[0] "じょ" -#: src/humanize/number.py:89 +#: src/humanize/number.py:134 #, fuzzy msgid "octillion" -msgstr "千じょ" +msgid_plural "octillion" +msgstr[0] "千じょ" -#: src/humanize/number.py:90 +#: src/humanize/number.py:135 #, fuzzy msgid "nonillion" -msgstr "百穣" +msgid_plural "nonillion" +msgstr[0] "百穣" -#: src/humanize/number.py:91 +#: src/humanize/number.py:136 #, fuzzy msgid "decillion" -msgstr "十溝" +msgid_plural "decillion" +msgstr[0] "十溝" -#: src/humanize/number.py:92 +#: src/humanize/number.py:137 #, fuzzy msgid "googol" -msgstr "溝無量大数" +msgid_plural "googol" +msgstr[0] "溝無量大数" -#: src/humanize/number.py:147 +#: src/humanize/number.py:228 msgid "zero" msgstr "" -#: src/humanize/number.py:148 +#: src/humanize/number.py:229 msgid "one" msgstr "一" -#: src/humanize/number.py:149 +#: src/humanize/number.py:230 msgid "two" msgstr "二" -#: src/humanize/number.py:150 +#: src/humanize/number.py:231 msgid "three" msgstr "三" -#: src/humanize/number.py:151 +#: src/humanize/number.py:232 msgid "four" msgstr "四" -#: src/humanize/number.py:152 +#: src/humanize/number.py:233 msgid "five" msgstr "五" -#: src/humanize/number.py:153 +#: src/humanize/number.py:234 msgid "six" msgstr "六" -#: src/humanize/number.py:154 +#: src/humanize/number.py:235 msgid "seven" msgstr "七" -#: src/humanize/number.py:155 +#: src/humanize/number.py:236 msgid "eight" msgstr "八" -#: src/humanize/number.py:156 +#: src/humanize/number.py:237 msgid "nine" msgstr "九" -#: src/humanize/time.py:119 -#, fuzzy, python-format +#: src/humanize/time.py:133 +#, python-format msgid "%d microsecond" msgid_plural "%d microseconds" msgstr[0] "" -#: src/humanize/time.py:128 -#, fuzzy, python-format +#: src/humanize/time.py:142 +#, python-format msgid "%d millisecond" msgid_plural "%d milliseconds" msgstr[0] "" -#: src/humanize/time.py:131 src/humanize/time.py:204 +#: src/humanize/time.py:145 src/humanize/time.py:220 #, fuzzy msgid "a moment" msgstr "短時間" -#: src/humanize/time.py:133 +#: src/humanize/time.py:147 msgid "a second" msgstr "1秒" -#: src/humanize/time.py:135 +#: src/humanize/time.py:149 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d秒" -#: src/humanize/time.py:137 +#: src/humanize/time.py:151 msgid "a minute" msgstr "1分" -#: src/humanize/time.py:140 +#: src/humanize/time.py:154 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d分" -#: src/humanize/time.py:142 +#: src/humanize/time.py:156 msgid "an hour" msgstr "1時間" -#: src/humanize/time.py:145 +#: src/humanize/time.py:159 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d時間" -#: src/humanize/time.py:148 +#: src/humanize/time.py:162 msgid "a day" msgstr "1日" -#: src/humanize/time.py:150 src/humanize/time.py:153 +#: src/humanize/time.py:164 src/humanize/time.py:167 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d日" -#: src/humanize/time.py:155 +#: src/humanize/time.py:169 msgid "a month" msgstr "1ヶ月" -#: src/humanize/time.py:157 +#: src/humanize/time.py:171 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%dヶ月" -#: src/humanize/time.py:160 +#: src/humanize/time.py:174 msgid "a year" msgstr "1年" -#: src/humanize/time.py:162 src/humanize/time.py:171 +#: src/humanize/time.py:176 src/humanize/time.py:185 #, python-format msgid "1 year, %d day" msgid_plural "1 year, %d days" msgstr[0] "1年 %d日" -#: src/humanize/time.py:165 +#: src/humanize/time.py:179 msgid "1 year, 1 month" msgstr "1年 1ヶ月" -#: src/humanize/time.py:168 +#: src/humanize/time.py:182 #, python-format msgid "1 year, %d month" msgid_plural "1 year, %d months" msgstr[0] "1年 %dヶ月" -#: src/humanize/time.py:173 +#: src/humanize/time.py:187 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d年" -#: src/humanize/time.py:201 +#: src/humanize/time.py:217 #, python-format msgid "%s from now" msgstr "%s後" -#: src/humanize/time.py:201 +#: src/humanize/time.py:217 #, python-format msgid "%s ago" msgstr "%s前" -#: src/humanize/time.py:205 +#: src/humanize/time.py:221 #, fuzzy msgid "now" msgstr "今" -#: src/humanize/time.py:227 +#: src/humanize/time.py:244 msgid "today" msgstr "本日" -#: src/humanize/time.py:229 +#: src/humanize/time.py:246 msgid "tomorrow" msgstr "明日" -#: src/humanize/time.py:231 +#: src/humanize/time.py:248 msgid "yesterday" msgstr "昨日" -#: src/humanize/time.py:498 +#: src/humanize/time.py:534 #, python-format msgid "%s and %s" msgstr "" diff --git a/lib/humanize/locale/ko_KR/LC_MESSAGES/humanize.po b/lib/humanize/locale/ko_KR/LC_MESSAGES/humanize.po index 27c274e..e316ebe 100644 --- a/lib/humanize/locale/ko_KR/LC_MESSAGES/humanize.po +++ b/lib/humanize/locale/ko_KR/LC_MESSAGES/humanize.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-09-29 21:07+0300\n" +"POT-Creation-Date: 2021-04-30 22:34+0200\n" "PO-Revision-Date: 2013-07-10 11:38+0900\n" "Last-Translator: @youngrok\n" "Language-Team: ko_KR \n" @@ -19,288 +19,316 @@ msgstr "" "Generated-By: Babel 0.9.6\n" "X-Generator: Poedit 1.5.7\n" -#: src/humanize/number.py:31 +#: src/humanize/number.py:56 #, fuzzy msgctxt "0" msgid "th" msgstr "번째" -#: src/humanize/number.py:32 +#: src/humanize/number.py:57 #, fuzzy msgctxt "1" msgid "st" msgstr "번째" -#: src/humanize/number.py:33 +#: src/humanize/number.py:58 #, fuzzy msgctxt "2" msgid "nd" msgstr "번째" -#: src/humanize/number.py:34 +#: src/humanize/number.py:59 #, fuzzy msgctxt "3" msgid "rd" msgstr "번째" -#: src/humanize/number.py:35 +#: src/humanize/number.py:60 #, fuzzy msgctxt "4" msgid "th" msgstr "번째" -#: src/humanize/number.py:36 +#: src/humanize/number.py:61 #, fuzzy msgctxt "5" msgid "th" msgstr "번째" -#: src/humanize/number.py:37 +#: src/humanize/number.py:62 #, fuzzy msgctxt "6" msgid "th" msgstr "번째" -#: src/humanize/number.py:38 +#: src/humanize/number.py:63 #, fuzzy msgctxt "7" msgid "th" msgstr "번째" -#: src/humanize/number.py:39 +#: src/humanize/number.py:64 #, fuzzy msgctxt "8" msgid "th" msgstr "번째" -#: src/humanize/number.py:40 +#: src/humanize/number.py:65 #, fuzzy msgctxt "9" msgid "th" msgstr "번째" -#: src/humanize/number.py:82 +#: src/humanize/number.py:126 +msgid "thousand" +msgid_plural "thousand" +msgstr[0] "" +msgstr[1] "" + +#: src/humanize/number.py:127 msgid "million" -msgstr "%(value)s million" +msgid_plural "million" +msgstr[0] "%(value)s million" +msgstr[1] "%(value)s million" -#: src/humanize/number.py:83 +#: src/humanize/number.py:128 msgid "billion" -msgstr "milliard" +msgid_plural "billion" +msgstr[0] "milliard" +msgstr[1] "milliard" -#: src/humanize/number.py:84 +#: src/humanize/number.py:129 #, fuzzy msgid "trillion" -msgstr "%(value)s billion" +msgid_plural "trillion" +msgstr[0] "%(value)s billion" +msgstr[1] "%(value)s billion" -#: src/humanize/number.py:85 +#: src/humanize/number.py:130 #, fuzzy msgid "quadrillion" -msgstr "%(value)s quadrillion" +msgid_plural "quadrillion" +msgstr[0] "%(value)s quadrillion" +msgstr[1] "%(value)s quadrillion" -#: src/humanize/number.py:86 +#: src/humanize/number.py:131 #, fuzzy msgid "quintillion" -msgstr "%(value)s quintillion" +msgid_plural "quintillion" +msgstr[0] "%(value)s quintillion" +msgstr[1] "%(value)s quintillion" -#: src/humanize/number.py:87 +#: src/humanize/number.py:132 #, fuzzy msgid "sextillion" -msgstr "%(value)s sextillion" +msgid_plural "sextillion" +msgstr[0] "%(value)s sextillion" +msgstr[1] "%(value)s sextillion" -#: src/humanize/number.py:88 +#: src/humanize/number.py:133 #, fuzzy msgid "septillion" -msgstr "%(value)s septillion" +msgid_plural "septillion" +msgstr[0] "%(value)s septillion" +msgstr[1] "%(value)s septillion" -#: src/humanize/number.py:89 +#: src/humanize/number.py:134 #, fuzzy msgid "octillion" -msgstr "%(value)s octillion" +msgid_plural "octillion" +msgstr[0] "%(value)s octillion" +msgstr[1] "%(value)s octillion" -#: src/humanize/number.py:90 +#: src/humanize/number.py:135 #, fuzzy msgid "nonillion" -msgstr "%(value)s nonillion" +msgid_plural "nonillion" +msgstr[0] "%(value)s nonillion" +msgstr[1] "%(value)s nonillion" -#: src/humanize/number.py:91 +#: src/humanize/number.py:136 #, fuzzy msgid "decillion" -msgstr "%(value)s décillion" +msgid_plural "decillion" +msgstr[0] "%(value)s décillion" +msgstr[1] "%(value)s décillion" -#: src/humanize/number.py:92 +#: src/humanize/number.py:137 #, fuzzy msgid "googol" -msgstr "%(value)s gogol" +msgid_plural "googol" +msgstr[0] "%(value)s gogol" +msgstr[1] "%(value)s gogol" -#: src/humanize/number.py:147 +#: src/humanize/number.py:228 msgid "zero" msgstr "" -#: src/humanize/number.py:148 +#: src/humanize/number.py:229 msgid "one" msgstr "하나" -#: src/humanize/number.py:149 +#: src/humanize/number.py:230 msgid "two" msgstr "둘" -#: src/humanize/number.py:150 +#: src/humanize/number.py:231 msgid "three" msgstr "셋" -#: src/humanize/number.py:151 +#: src/humanize/number.py:232 msgid "four" msgstr "넷" -#: src/humanize/number.py:152 +#: src/humanize/number.py:233 msgid "five" msgstr "다섯" -#: src/humanize/number.py:153 +#: src/humanize/number.py:234 msgid "six" msgstr "여섯" -#: src/humanize/number.py:154 +#: src/humanize/number.py:235 msgid "seven" msgstr "일곱" -#: src/humanize/number.py:155 +#: src/humanize/number.py:236 msgid "eight" msgstr "여덟" -#: src/humanize/number.py:156 +#: src/humanize/number.py:237 msgid "nine" msgstr "아홉" -#: src/humanize/time.py:119 -#, fuzzy, python-format +#: src/humanize/time.py:133 +#, python-format msgid "%d microsecond" msgid_plural "%d microseconds" msgstr[0] "" msgstr[1] "" -#: src/humanize/time.py:128 -#, fuzzy, python-format +#: src/humanize/time.py:142 +#, python-format msgid "%d millisecond" msgid_plural "%d milliseconds" msgstr[0] "" msgstr[1] "" -#: src/humanize/time.py:131 src/humanize/time.py:204 +#: src/humanize/time.py:145 src/humanize/time.py:220 msgid "a moment" msgstr "잠깐" -#: src/humanize/time.py:133 +#: src/humanize/time.py:147 msgid "a second" msgstr "1초" -#: src/humanize/time.py:135 +#: src/humanize/time.py:149 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d초" msgstr[1] "%d초" -#: src/humanize/time.py:137 +#: src/humanize/time.py:151 msgid "a minute" msgstr "1분" -#: src/humanize/time.py:140 +#: src/humanize/time.py:154 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d분" msgstr[1] "%d분" -#: src/humanize/time.py:142 +#: src/humanize/time.py:156 msgid "an hour" msgstr "1시간" -#: src/humanize/time.py:145 +#: src/humanize/time.py:159 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d heure" msgstr[1] "%d시간" -#: src/humanize/time.py:148 +#: src/humanize/time.py:162 msgid "a day" msgstr "하루" -#: src/humanize/time.py:150 src/humanize/time.py:153 +#: src/humanize/time.py:164 src/humanize/time.py:167 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d jour" msgstr[1] "%d일" -#: src/humanize/time.py:155 +#: src/humanize/time.py:169 msgid "a month" msgstr "한달" -#: src/humanize/time.py:157 +#: src/humanize/time.py:171 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d mois" msgstr[1] "%d개월" -#: src/humanize/time.py:160 +#: src/humanize/time.py:174 msgid "a year" msgstr "1년" -#: src/humanize/time.py:162 src/humanize/time.py:171 +#: src/humanize/time.py:176 src/humanize/time.py:185 #, python-format msgid "1 year, %d day" msgid_plural "1 year, %d days" msgstr[0] "1년 %d일" msgstr[1] "1년 %d일" -#: src/humanize/time.py:165 +#: src/humanize/time.py:179 msgid "1 year, 1 month" msgstr "1년, 1개월" -#: src/humanize/time.py:168 +#: src/humanize/time.py:182 #, python-format msgid "1 year, %d month" msgid_plural "1 year, %d months" msgstr[0] "1년, %d개월" msgstr[1] "1년, %d개월" -#: src/humanize/time.py:173 +#: src/humanize/time.py:187 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d 년" msgstr[1] "%d ans" -#: src/humanize/time.py:201 +#: src/humanize/time.py:217 #, python-format msgid "%s from now" msgstr "%s 후" -#: src/humanize/time.py:201 +#: src/humanize/time.py:217 #, python-format msgid "%s ago" msgstr "%s 전" -#: src/humanize/time.py:205 +#: src/humanize/time.py:221 msgid "now" msgstr "방금" -#: src/humanize/time.py:227 +#: src/humanize/time.py:244 msgid "today" msgstr "오늘" -#: src/humanize/time.py:229 +#: src/humanize/time.py:246 msgid "tomorrow" msgstr "내일" -#: src/humanize/time.py:231 +#: src/humanize/time.py:248 msgid "yesterday" msgstr "어제" -#: src/humanize/time.py:498 +#: src/humanize/time.py:534 #, python-format msgid "%s and %s" msgstr "" diff --git a/lib/humanize/locale/nl_NL/LC_MESSAGES/humanize.po b/lib/humanize/locale/nl_NL/LC_MESSAGES/humanize.po index 4d51053..3fc7594 100644 --- a/lib/humanize/locale/nl_NL/LC_MESSAGES/humanize.po +++ b/lib/humanize/locale/nl_NL/LC_MESSAGES/humanize.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-09-29 21:07+0300\n" +"POT-Creation-Date: 2021-04-30 22:34+0200\n" "PO-Revision-Date: 2015-03-25 21:08+0100\n" "Last-Translator: Martin van Wingerden\n" "Language-Team: nl_NL\n" @@ -19,269 +19,297 @@ msgstr "" "Generated-By: Babel 0.9.6\n" "X-Generator: Poedit 1.7.5\n" -#: src/humanize/number.py:31 +#: src/humanize/number.py:56 msgctxt "0" msgid "th" msgstr "de" -#: src/humanize/number.py:32 +#: src/humanize/number.py:57 msgctxt "1" msgid "st" msgstr "ste" -#: src/humanize/number.py:33 +#: src/humanize/number.py:58 msgctxt "2" msgid "nd" msgstr "de" -#: src/humanize/number.py:34 +#: src/humanize/number.py:59 msgctxt "3" msgid "rd" msgstr "de" -#: src/humanize/number.py:35 +#: src/humanize/number.py:60 msgctxt "4" msgid "th" msgstr "de" -#: src/humanize/number.py:36 +#: src/humanize/number.py:61 msgctxt "5" msgid "th" msgstr "de" -#: src/humanize/number.py:37 +#: src/humanize/number.py:62 msgctxt "6" msgid "th" msgstr "de" -#: src/humanize/number.py:38 +#: src/humanize/number.py:63 msgctxt "7" msgid "th" msgstr "de" -#: src/humanize/number.py:39 +#: src/humanize/number.py:64 msgctxt "8" msgid "th" msgstr "de" -#: src/humanize/number.py:40 +#: src/humanize/number.py:65 msgctxt "9" msgid "th" msgstr "de" -#: src/humanize/number.py:82 +#: src/humanize/number.py:126 +msgid "thousand" +msgid_plural "thousand" +msgstr[0] "" +msgstr[1] "" + +#: src/humanize/number.py:127 msgid "million" -msgstr "miljoen" +msgid_plural "million" +msgstr[0] "miljoen" +msgstr[1] "miljoen" -#: src/humanize/number.py:83 +#: src/humanize/number.py:128 msgid "billion" -msgstr "miljard" +msgid_plural "billion" +msgstr[0] "miljard" +msgstr[1] "miljard" -#: src/humanize/number.py:84 +#: src/humanize/number.py:129 msgid "trillion" -msgstr "biljoen" +msgid_plural "trillion" +msgstr[0] "biljoen" +msgstr[1] "biljoen" -#: src/humanize/number.py:85 +#: src/humanize/number.py:130 msgid "quadrillion" -msgstr "biljard" +msgid_plural "quadrillion" +msgstr[0] "biljard" +msgstr[1] "biljard" -#: src/humanize/number.py:86 +#: src/humanize/number.py:131 msgid "quintillion" -msgstr "triljoen" +msgid_plural "quintillion" +msgstr[0] "triljoen" +msgstr[1] "triljoen" -#: src/humanize/number.py:87 +#: src/humanize/number.py:132 msgid "sextillion" -msgstr "triljard" +msgid_plural "sextillion" +msgstr[0] "triljard" +msgstr[1] "triljard" -#: src/humanize/number.py:88 +#: src/humanize/number.py:133 msgid "septillion" -msgstr "quadriljoen" +msgid_plural "septillion" +msgstr[0] "quadriljoen" +msgstr[1] "quadriljoen" -#: src/humanize/number.py:89 +#: src/humanize/number.py:134 msgid "octillion" -msgstr "quadriljard" +msgid_plural "octillion" +msgstr[0] "quadriljard" +msgstr[1] "quadriljard" -#: src/humanize/number.py:90 +#: src/humanize/number.py:135 msgid "nonillion" -msgstr "quintiljoen" +msgid_plural "nonillion" +msgstr[0] "quintiljoen" +msgstr[1] "quintiljoen" -#: src/humanize/number.py:91 +#: src/humanize/number.py:136 msgid "decillion" -msgstr "quintiljard" +msgid_plural "decillion" +msgstr[0] "quintiljard" +msgstr[1] "quintiljard" -#: src/humanize/number.py:92 +#: src/humanize/number.py:137 msgid "googol" -msgstr "googol" +msgid_plural "googol" +msgstr[0] "googol" +msgstr[1] "googol" -#: src/humanize/number.py:147 +#: src/humanize/number.py:228 msgid "zero" msgstr "nul" -#: src/humanize/number.py:148 +#: src/humanize/number.py:229 msgid "one" msgstr "één" -#: src/humanize/number.py:149 +#: src/humanize/number.py:230 msgid "two" msgstr "twee" -#: src/humanize/number.py:150 +#: src/humanize/number.py:231 msgid "three" msgstr "drie" -#: src/humanize/number.py:151 +#: src/humanize/number.py:232 msgid "four" msgstr "vier" -#: src/humanize/number.py:152 +#: src/humanize/number.py:233 msgid "five" msgstr "vijf" -#: src/humanize/number.py:153 +#: src/humanize/number.py:234 msgid "six" msgstr "zes" -#: src/humanize/number.py:154 +#: src/humanize/number.py:235 msgid "seven" msgstr "zeven" -#: src/humanize/number.py:155 +#: src/humanize/number.py:236 msgid "eight" msgstr "acht" -#: src/humanize/number.py:156 +#: src/humanize/number.py:237 msgid "nine" msgstr "negen" -#: src/humanize/time.py:119 +#: src/humanize/time.py:133 #, fuzzy, python-format msgid "%d microsecond" msgid_plural "%d microseconds" msgstr[0] "%d microseconde" msgstr[1] "%d microseconden" -#: src/humanize/time.py:128 +#: src/humanize/time.py:142 #, fuzzy, python-format msgid "%d millisecond" msgid_plural "%d milliseconds" msgstr[0] "%d milliseconde" msgstr[1] "%d milliseconden" -#: src/humanize/time.py:131 src/humanize/time.py:204 +#: src/humanize/time.py:145 src/humanize/time.py:220 msgid "a moment" msgstr "een moment" -#: src/humanize/time.py:133 +#: src/humanize/time.py:147 msgid "a second" msgstr "een seconde" -#: src/humanize/time.py:135 +#: src/humanize/time.py:149 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d seconde" msgstr[1] "%d seconden" -#: src/humanize/time.py:137 +#: src/humanize/time.py:151 msgid "a minute" msgstr "een minuut" -#: src/humanize/time.py:140 +#: src/humanize/time.py:154 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minuut" msgstr[1] "%d minuten" -#: src/humanize/time.py:142 +#: src/humanize/time.py:156 msgid "an hour" msgstr "een uur" -#: src/humanize/time.py:145 +#: src/humanize/time.py:159 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d uur" msgstr[1] "%d uur" -#: src/humanize/time.py:148 +#: src/humanize/time.py:162 msgid "a day" msgstr "een dag" -#: src/humanize/time.py:150 src/humanize/time.py:153 +#: src/humanize/time.py:164 src/humanize/time.py:167 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d dag" msgstr[1] "%d dagen" -#: src/humanize/time.py:155 +#: src/humanize/time.py:169 msgid "a month" msgstr "een maand" -#: src/humanize/time.py:157 +#: src/humanize/time.py:171 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d maand" msgstr[1] "%d maanden" -#: src/humanize/time.py:160 +#: src/humanize/time.py:174 msgid "a year" msgstr "een jaar" -#: src/humanize/time.py:162 src/humanize/time.py:171 +#: src/humanize/time.py:176 src/humanize/time.py:185 #, python-format msgid "1 year, %d day" msgid_plural "1 year, %d days" msgstr[0] "1 jaar, %d dag" msgstr[1] "1 jaar, %d dagen" -#: src/humanize/time.py:165 +#: src/humanize/time.py:179 msgid "1 year, 1 month" msgstr "1 jaar, 1 maand" -#: src/humanize/time.py:168 +#: src/humanize/time.py:182 #, python-format msgid "1 year, %d month" msgid_plural "1 year, %d months" msgstr[0] "1 jaar, %d maand" msgstr[1] "1 jaar, %d maanden" -#: src/humanize/time.py:173 +#: src/humanize/time.py:187 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d jaar" msgstr[1] "%d jaar" -#: src/humanize/time.py:201 +#: src/humanize/time.py:217 #, python-format msgid "%s from now" msgstr "over %s" -#: src/humanize/time.py:201 +#: src/humanize/time.py:217 #, python-format msgid "%s ago" msgstr "%s geleden" -#: src/humanize/time.py:205 +#: src/humanize/time.py:221 msgid "now" msgstr "nu" -#: src/humanize/time.py:227 +#: src/humanize/time.py:244 msgid "today" msgstr "vandaag" -#: src/humanize/time.py:229 +#: src/humanize/time.py:246 msgid "tomorrow" msgstr "morgen" -#: src/humanize/time.py:231 +#: src/humanize/time.py:248 msgid "yesterday" msgstr "gisteren" -#: src/humanize/time.py:498 +#: src/humanize/time.py:534 #, python-format msgid "%s and %s" msgstr "%s en %s" diff --git a/lib/humanize/locale/pl_PL/LC_MESSAGES/humanize.po b/lib/humanize/locale/pl_PL/LC_MESSAGES/humanize.po index 34dd72d..0b41c09 100644 --- a/lib/humanize/locale/pl_PL/LC_MESSAGES/humanize.po +++ b/lib/humanize/locale/pl_PL/LC_MESSAGES/humanize.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-09-29 21:07+0300\n" +"POT-Creation-Date: 2021-04-30 22:34+0200\n" "PO-Revision-Date: 2020-04-22 10:02+0200\n" "Last-Translator: Bartosz Bubak \n" "Language-Team: Polish\n" @@ -18,141 +18,181 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -#: src/humanize/number.py:31 +#: src/humanize/number.py:56 msgctxt "0" msgid "th" msgstr "." -#: src/humanize/number.py:32 +#: src/humanize/number.py:57 msgctxt "1" msgid "st" msgstr "." -#: src/humanize/number.py:33 +#: src/humanize/number.py:58 msgctxt "2" msgid "nd" msgstr "." -#: src/humanize/number.py:34 +#: src/humanize/number.py:59 msgctxt "3" msgid "rd" msgstr "." -#: src/humanize/number.py:35 +#: src/humanize/number.py:60 msgctxt "4" msgid "th" msgstr "." -#: src/humanize/number.py:36 +#: src/humanize/number.py:61 msgctxt "5" msgid "th" msgstr "." -#: src/humanize/number.py:37 +#: src/humanize/number.py:62 msgctxt "6" msgid "th" msgstr "." -#: src/humanize/number.py:38 +#: src/humanize/number.py:63 msgctxt "7" msgid "th" msgstr "." -#: src/humanize/number.py:39 +#: src/humanize/number.py:64 msgctxt "8" msgid "th" msgstr "." -#: src/humanize/number.py:40 +#: src/humanize/number.py:65 msgctxt "9" msgid "th" msgstr "." -#: src/humanize/number.py:82 +#: src/humanize/number.py:126 +msgid "thousand" +msgid_plural "thousand" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: src/humanize/number.py:127 msgid "million" -msgstr "milion" +msgid_plural "million" +msgstr[0] "milion" +msgstr[1] "milion" +msgstr[2] "milion" -#: src/humanize/number.py:83 +#: src/humanize/number.py:128 msgid "billion" -msgstr "bilion" +msgid_plural "billion" +msgstr[0] "bilion" +msgstr[1] "bilion" +msgstr[2] "bilion" -#: src/humanize/number.py:84 +#: src/humanize/number.py:129 msgid "trillion" -msgstr "trylion" +msgid_plural "trillion" +msgstr[0] "trylion" +msgstr[1] "trylion" +msgstr[2] "trylion" -#: src/humanize/number.py:85 +#: src/humanize/number.py:130 msgid "quadrillion" -msgstr "kwadrylion" +msgid_plural "quadrillion" +msgstr[0] "kwadrylion" +msgstr[1] "kwadrylion" +msgstr[2] "kwadrylion" -#: src/humanize/number.py:86 +#: src/humanize/number.py:131 msgid "quintillion" -msgstr "kwintylion" +msgid_plural "quintillion" +msgstr[0] "kwintylion" +msgstr[1] "kwintylion" +msgstr[2] "kwintylion" -#: src/humanize/number.py:87 +#: src/humanize/number.py:132 msgid "sextillion" -msgstr "sekstylion" +msgid_plural "sextillion" +msgstr[0] "sekstylion" +msgstr[1] "sekstylion" +msgstr[2] "sekstylion" -#: src/humanize/number.py:88 +#: src/humanize/number.py:133 msgid "septillion" -msgstr "septylion" +msgid_plural "septillion" +msgstr[0] "septylion" +msgstr[1] "septylion" +msgstr[2] "septylion" -#: src/humanize/number.py:89 +#: src/humanize/number.py:134 msgid "octillion" -msgstr "oktylion" +msgid_plural "octillion" +msgstr[0] "oktylion" +msgstr[1] "oktylion" +msgstr[2] "oktylion" -#: src/humanize/number.py:90 +#: src/humanize/number.py:135 msgid "nonillion" -msgstr "nonilion" +msgid_plural "nonillion" +msgstr[0] "nonilion" +msgstr[1] "nonilion" +msgstr[2] "nonilion" -#: src/humanize/number.py:91 +#: src/humanize/number.py:136 msgid "decillion" -msgstr "decylion" +msgid_plural "decillion" +msgstr[0] "decylion" +msgstr[1] "decylion" +msgstr[2] "decylion" -#: src/humanize/number.py:92 +#: src/humanize/number.py:137 msgid "googol" -msgstr "googol" +msgid_plural "googol" +msgstr[0] "googol" +msgstr[1] "googol" +msgstr[2] "googol" -#: src/humanize/number.py:147 +#: src/humanize/number.py:228 msgid "zero" msgstr "zero" -#: src/humanize/number.py:148 +#: src/humanize/number.py:229 msgid "one" msgstr "jeden" -#: src/humanize/number.py:149 +#: src/humanize/number.py:230 msgid "two" msgstr "dwa" -#: src/humanize/number.py:150 +#: src/humanize/number.py:231 msgid "three" msgstr "trzy" -#: src/humanize/number.py:151 +#: src/humanize/number.py:232 msgid "four" msgstr "cztery" -#: src/humanize/number.py:152 +#: src/humanize/number.py:233 msgid "five" msgstr "pięć" -#: src/humanize/number.py:153 +#: src/humanize/number.py:234 msgid "six" msgstr "sześć" -#: src/humanize/number.py:154 +#: src/humanize/number.py:235 msgid "seven" msgstr "siedem" -#: src/humanize/number.py:155 +#: src/humanize/number.py:236 msgid "eight" msgstr "osiem" -#: src/humanize/number.py:156 +#: src/humanize/number.py:237 msgid "nine" msgstr "dziewięć" -#: src/humanize/time.py:119 +#: src/humanize/time.py:133 #, python-format msgid "%d microsecond" msgid_plural "%d microseconds" @@ -160,7 +200,7 @@ msgstr[0] "%d mikrosekunda" msgstr[1] "%d mikrosekundy" msgstr[2] "%d mikrosekund" -#: src/humanize/time.py:128 +#: src/humanize/time.py:142 #, python-format msgid "%d millisecond" msgid_plural "%d milliseconds" @@ -168,15 +208,15 @@ msgstr[0] "%d milisekunda" msgstr[1] "%d milisekundy" msgstr[2] "%d milisekund" -#: src/humanize/time.py:131 src/humanize/time.py:204 +#: src/humanize/time.py:145 src/humanize/time.py:220 msgid "a moment" msgstr "chwila" -#: src/humanize/time.py:133 +#: src/humanize/time.py:147 msgid "a second" msgstr "sekunda" -#: src/humanize/time.py:135 +#: src/humanize/time.py:149 #, python-format msgid "%d second" msgid_plural "%d seconds" @@ -184,11 +224,11 @@ msgstr[0] "%d sekunda" msgstr[1] "%d sekundy" msgstr[2] "%d sekund" -#: src/humanize/time.py:137 +#: src/humanize/time.py:151 msgid "a minute" msgstr "minuta" -#: src/humanize/time.py:140 +#: src/humanize/time.py:154 #, python-format msgid "%d minute" msgid_plural "%d minutes" @@ -196,11 +236,11 @@ msgstr[0] "%d minuta" msgstr[1] "%d minuty" msgstr[2] "%d minut" -#: src/humanize/time.py:142 +#: src/humanize/time.py:156 msgid "an hour" msgstr "godzina" -#: src/humanize/time.py:145 +#: src/humanize/time.py:159 #, python-format msgid "%d hour" msgid_plural "%d hours" @@ -208,11 +248,11 @@ msgstr[0] "%d godzina" msgstr[1] "%d godziny" msgstr[2] "%d godzin" -#: src/humanize/time.py:148 +#: src/humanize/time.py:162 msgid "a day" msgstr "dzień" -#: src/humanize/time.py:150 src/humanize/time.py:153 +#: src/humanize/time.py:164 src/humanize/time.py:167 #, python-format msgid "%d day" msgid_plural "%d days" @@ -220,11 +260,11 @@ msgstr[0] "%d dzień" msgstr[1] "%d dni" msgstr[2] "%d dni" -#: src/humanize/time.py:155 +#: src/humanize/time.py:169 msgid "a month" msgstr "miesiąc" -#: src/humanize/time.py:157 +#: src/humanize/time.py:171 #, python-format msgid "%d month" msgid_plural "%d months" @@ -232,11 +272,11 @@ msgstr[0] "%d miesiąc" msgstr[1] "%d miesiące" msgstr[2] "%d miesięcy" -#: src/humanize/time.py:160 +#: src/humanize/time.py:174 msgid "a year" msgstr "rok" -#: src/humanize/time.py:162 src/humanize/time.py:171 +#: src/humanize/time.py:176 src/humanize/time.py:185 #, python-format msgid "1 year, %d day" msgid_plural "1 year, %d days" @@ -244,11 +284,11 @@ msgstr[0] "1 rok, %d dzień" msgstr[1] "1 rok, %d dni" msgstr[2] "1 rok, %d dni" -#: src/humanize/time.py:165 +#: src/humanize/time.py:179 msgid "1 year, 1 month" msgstr "" -#: src/humanize/time.py:168 +#: src/humanize/time.py:182 #, python-format msgid "1 year, %d month" msgid_plural "1 year, %d months" @@ -256,7 +296,7 @@ msgstr[0] "1 rok, %d miesiąc" msgstr[1] "1 rok, %d miesiące" msgstr[2] "1 rok, %d miesięcy" -#: src/humanize/time.py:173 +#: src/humanize/time.py:187 #, python-format msgid "%d year" msgid_plural "%d years" @@ -264,33 +304,33 @@ msgstr[0] "%d rok" msgstr[1] "%d lat" msgstr[2] "%d lata" -#: src/humanize/time.py:201 +#: src/humanize/time.py:217 #, python-format msgid "%s from now" msgstr "%s od teraz" -#: src/humanize/time.py:201 +#: src/humanize/time.py:217 #, python-format msgid "%s ago" msgstr "%s temu" -#: src/humanize/time.py:205 +#: src/humanize/time.py:221 msgid "now" msgstr "teraz" -#: src/humanize/time.py:227 +#: src/humanize/time.py:244 msgid "today" msgstr "dziś" -#: src/humanize/time.py:229 +#: src/humanize/time.py:246 msgid "tomorrow" msgstr "jutro" -#: src/humanize/time.py:231 +#: src/humanize/time.py:248 msgid "yesterday" msgstr "wczoraj" -#: src/humanize/time.py:498 +#: src/humanize/time.py:534 #, python-format msgid "%s and %s" msgstr "" diff --git a/lib/humanize/locale/pt_BR/LC_MESSAGES/humanize.po b/lib/humanize/locale/pt_BR/LC_MESSAGES/humanize.po index 27688c7..13f604a 100644 --- a/lib/humanize/locale/pt_BR/LC_MESSAGES/humanize.po +++ b/lib/humanize/locale/pt_BR/LC_MESSAGES/humanize.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-09-29 21:07+0300\n" +"POT-Creation-Date: 2021-04-30 22:34+0200\n" "PO-Revision-Date: 2016-06-15 15:58-0300\n" "Last-Translator: \n" "Language-Team: \n" @@ -18,269 +18,297 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Poedit 1.8.5\n" -#: src/humanize/number.py:31 +#: src/humanize/number.py:56 msgctxt "0" msgid "th" msgstr "º" -#: src/humanize/number.py:32 +#: src/humanize/number.py:57 msgctxt "1" msgid "st" msgstr "º" -#: src/humanize/number.py:33 +#: src/humanize/number.py:58 msgctxt "2" msgid "nd" msgstr "º" -#: src/humanize/number.py:34 +#: src/humanize/number.py:59 msgctxt "3" msgid "rd" msgstr "º" -#: src/humanize/number.py:35 +#: src/humanize/number.py:60 msgctxt "4" msgid "th" msgstr "º" -#: src/humanize/number.py:36 +#: src/humanize/number.py:61 msgctxt "5" msgid "th" msgstr "º" -#: src/humanize/number.py:37 +#: src/humanize/number.py:62 msgctxt "6" msgid "th" msgstr "º" -#: src/humanize/number.py:38 +#: src/humanize/number.py:63 msgctxt "7" msgid "th" msgstr "º" -#: src/humanize/number.py:39 +#: src/humanize/number.py:64 msgctxt "8" msgid "th" msgstr "º" -#: src/humanize/number.py:40 +#: src/humanize/number.py:65 msgctxt "9" msgid "th" msgstr "º" -#: src/humanize/number.py:82 +#: src/humanize/number.py:126 +msgid "thousand" +msgid_plural "thousand" +msgstr[0] "" +msgstr[1] "" + +#: src/humanize/number.py:127 msgid "million" -msgstr "milhão" +msgid_plural "million" +msgstr[0] "milhão" +msgstr[1] "milhão" -#: src/humanize/number.py:83 +#: src/humanize/number.py:128 msgid "billion" -msgstr "bilhão" +msgid_plural "billion" +msgstr[0] "bilhão" +msgstr[1] "bilhão" -#: src/humanize/number.py:84 +#: src/humanize/number.py:129 msgid "trillion" -msgstr "trilhão" +msgid_plural "trillion" +msgstr[0] "trilhão" +msgstr[1] "trilhão" -#: src/humanize/number.py:85 +#: src/humanize/number.py:130 msgid "quadrillion" -msgstr "quatrilhão" +msgid_plural "quadrillion" +msgstr[0] "quatrilhão" +msgstr[1] "quatrilhão" -#: src/humanize/number.py:86 +#: src/humanize/number.py:131 msgid "quintillion" -msgstr "quintilhão" +msgid_plural "quintillion" +msgstr[0] "quintilhão" +msgstr[1] "quintilhão" -#: src/humanize/number.py:87 +#: src/humanize/number.py:132 msgid "sextillion" -msgstr "sextilhão" +msgid_plural "sextillion" +msgstr[0] "sextilhão" +msgstr[1] "sextilhão" -#: src/humanize/number.py:88 +#: src/humanize/number.py:133 msgid "septillion" -msgstr "septilhão" +msgid_plural "septillion" +msgstr[0] "septilhão" +msgstr[1] "septilhão" -#: src/humanize/number.py:89 +#: src/humanize/number.py:134 msgid "octillion" -msgstr "octilhão" +msgid_plural "octillion" +msgstr[0] "octilhão" +msgstr[1] "octilhão" -#: src/humanize/number.py:90 +#: src/humanize/number.py:135 msgid "nonillion" -msgstr "nonilhão" +msgid_plural "nonillion" +msgstr[0] "nonilhão" +msgstr[1] "nonilhão" -#: src/humanize/number.py:91 +#: src/humanize/number.py:136 msgid "decillion" -msgstr "decilhão" +msgid_plural "decillion" +msgstr[0] "decilhão" +msgstr[1] "decilhão" -#: src/humanize/number.py:92 +#: src/humanize/number.py:137 msgid "googol" -msgstr "undecilhão" +msgid_plural "googol" +msgstr[0] "undecilhão" +msgstr[1] "undecilhão" -#: src/humanize/number.py:147 +#: src/humanize/number.py:228 msgid "zero" msgstr "zero" -#: src/humanize/number.py:148 +#: src/humanize/number.py:229 msgid "one" msgstr "um" -#: src/humanize/number.py:149 +#: src/humanize/number.py:230 msgid "two" msgstr "dois" -#: src/humanize/number.py:150 +#: src/humanize/number.py:231 msgid "three" msgstr "três" -#: src/humanize/number.py:151 +#: src/humanize/number.py:232 msgid "four" msgstr "quatro" -#: src/humanize/number.py:152 +#: src/humanize/number.py:233 msgid "five" msgstr "cinco" -#: src/humanize/number.py:153 +#: src/humanize/number.py:234 msgid "six" msgstr "seis" -#: src/humanize/number.py:154 +#: src/humanize/number.py:235 msgid "seven" msgstr "sete" -#: src/humanize/number.py:155 +#: src/humanize/number.py:236 msgid "eight" msgstr "oito" -#: src/humanize/number.py:156 +#: src/humanize/number.py:237 msgid "nine" msgstr "nove" -#: src/humanize/time.py:119 +#: src/humanize/time.py:133 #, fuzzy, python-format msgid "%d microsecond" msgid_plural "%d microseconds" msgstr[0] "%d microssegundo" msgstr[1] "%d microssegundos" -#: src/humanize/time.py:128 +#: src/humanize/time.py:142 #, fuzzy, python-format msgid "%d millisecond" msgid_plural "%d milliseconds" msgstr[0] "%d milissegundo" msgstr[1] "%d milissegundos" -#: src/humanize/time.py:131 src/humanize/time.py:204 +#: src/humanize/time.py:145 src/humanize/time.py:220 msgid "a moment" msgstr "um momento" -#: src/humanize/time.py:133 +#: src/humanize/time.py:147 msgid "a second" msgstr "um segundo" -#: src/humanize/time.py:135 +#: src/humanize/time.py:149 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d segundo" msgstr[1] "%d segundos" -#: src/humanize/time.py:137 +#: src/humanize/time.py:151 msgid "a minute" msgstr "um minuto" -#: src/humanize/time.py:140 +#: src/humanize/time.py:154 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minuto" msgstr[1] "%d minutos" -#: src/humanize/time.py:142 +#: src/humanize/time.py:156 msgid "an hour" msgstr "uma hora" -#: src/humanize/time.py:145 +#: src/humanize/time.py:159 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d hora" msgstr[1] "%d horas" -#: src/humanize/time.py:148 +#: src/humanize/time.py:162 msgid "a day" msgstr "um dia" -#: src/humanize/time.py:150 src/humanize/time.py:153 +#: src/humanize/time.py:164 src/humanize/time.py:167 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d dia" msgstr[1] "%d dias" -#: src/humanize/time.py:155 +#: src/humanize/time.py:169 msgid "a month" msgstr "um mês" -#: src/humanize/time.py:157 +#: src/humanize/time.py:171 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d mês" msgstr[1] "%d meses" -#: src/humanize/time.py:160 +#: src/humanize/time.py:174 msgid "a year" msgstr "um ano" -#: src/humanize/time.py:162 src/humanize/time.py:171 +#: src/humanize/time.py:176 src/humanize/time.py:185 #, python-format msgid "1 year, %d day" msgid_plural "1 year, %d days" msgstr[0] "1 ano e %d dia" msgstr[1] "1 ano e %d dias" -#: src/humanize/time.py:165 +#: src/humanize/time.py:179 msgid "1 year, 1 month" msgstr "1 ano e 1 mês" -#: src/humanize/time.py:168 +#: src/humanize/time.py:182 #, python-format msgid "1 year, %d month" msgid_plural "1 year, %d months" msgstr[0] "1 ano e %d mês" msgstr[1] "1 ano e %d meses" -#: src/humanize/time.py:173 +#: src/humanize/time.py:187 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d ano" msgstr[1] "%d anos" -#: src/humanize/time.py:201 +#: src/humanize/time.py:217 #, python-format msgid "%s from now" msgstr "em %s" -#: src/humanize/time.py:201 +#: src/humanize/time.py:217 #, python-format msgid "%s ago" msgstr "há %s" -#: src/humanize/time.py:205 +#: src/humanize/time.py:221 msgid "now" msgstr "agora" -#: src/humanize/time.py:227 +#: src/humanize/time.py:244 msgid "today" msgstr "hoje" -#: src/humanize/time.py:229 +#: src/humanize/time.py:246 msgid "tomorrow" msgstr "amanhã" -#: src/humanize/time.py:231 +#: src/humanize/time.py:248 msgid "yesterday" msgstr "ontem" -#: src/humanize/time.py:498 +#: src/humanize/time.py:534 #, python-format msgid "%s and %s" msgstr "%s e %s" diff --git a/lib/humanize/locale/pt_PT/LC_MESSAGES/humanize.po b/lib/humanize/locale/pt_PT/LC_MESSAGES/humanize.po index eecd597..82e9b28 100644 --- a/lib/humanize/locale/pt_PT/LC_MESSAGES/humanize.po +++ b/lib/humanize/locale/pt_PT/LC_MESSAGES/humanize.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-09-29 21:07+0300\n" +"POT-Creation-Date: 2021-04-30 22:34+0200\n" "PO-Revision-Date: 2020-07-05 18:17+0100\n" "Last-Translator: \n" "Language-Team: \n" @@ -18,269 +18,297 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Poedit 2.3.1\n" -#: src/humanize/number.py:31 +#: src/humanize/number.py:56 msgctxt "0" msgid "th" msgstr "º" -#: src/humanize/number.py:32 +#: src/humanize/number.py:57 msgctxt "1" msgid "st" msgstr "º" -#: src/humanize/number.py:33 +#: src/humanize/number.py:58 msgctxt "2" msgid "nd" msgstr "º" -#: src/humanize/number.py:34 +#: src/humanize/number.py:59 msgctxt "3" msgid "rd" msgstr "º" -#: src/humanize/number.py:35 +#: src/humanize/number.py:60 msgctxt "4" msgid "th" msgstr "º" -#: src/humanize/number.py:36 +#: src/humanize/number.py:61 msgctxt "5" msgid "th" msgstr "º" -#: src/humanize/number.py:37 +#: src/humanize/number.py:62 msgctxt "6" msgid "th" msgstr "º" -#: src/humanize/number.py:38 +#: src/humanize/number.py:63 msgctxt "7" msgid "th" msgstr "º" -#: src/humanize/number.py:39 +#: src/humanize/number.py:64 msgctxt "8" msgid "th" msgstr "º" -#: src/humanize/number.py:40 +#: src/humanize/number.py:65 msgctxt "9" msgid "th" msgstr "º" -#: src/humanize/number.py:82 +#: src/humanize/number.py:126 +msgid "thousand" +msgid_plural "thousand" +msgstr[0] "" +msgstr[1] "" + +#: src/humanize/number.py:127 msgid "million" -msgstr "milhão" +msgid_plural "million" +msgstr[0] "milhão" +msgstr[1] "milhão" -#: src/humanize/number.py:83 +#: src/humanize/number.py:128 msgid "billion" -msgstr "milhar de milhão" +msgid_plural "billion" +msgstr[0] "milhar de milhão" +msgstr[1] "milhar de milhão" -#: src/humanize/number.py:84 +#: src/humanize/number.py:129 msgid "trillion" -msgstr "bilião" +msgid_plural "trillion" +msgstr[0] "bilião" +msgstr[1] "bilião" -#: src/humanize/number.py:85 +#: src/humanize/number.py:130 msgid "quadrillion" -msgstr "mil biliões" +msgid_plural "quadrillion" +msgstr[0] "mil biliões" +msgstr[1] "mil biliões" -#: src/humanize/number.py:86 +#: src/humanize/number.py:131 msgid "quintillion" -msgstr "trilião" +msgid_plural "quintillion" +msgstr[0] "trilião" +msgstr[1] "trilião" -#: src/humanize/number.py:87 +#: src/humanize/number.py:132 msgid "sextillion" -msgstr "mil triliões" +msgid_plural "sextillion" +msgstr[0] "mil triliões" +msgstr[1] "mil triliões" -#: src/humanize/number.py:88 +#: src/humanize/number.py:133 msgid "septillion" -msgstr "quatrilião" +msgid_plural "septillion" +msgstr[0] "quatrilião" +msgstr[1] "quatrilião" -#: src/humanize/number.py:89 +#: src/humanize/number.py:134 msgid "octillion" -msgstr "mil quatriliões" +msgid_plural "octillion" +msgstr[0] "mil quatriliões" +msgstr[1] "mil quatriliões" -#: src/humanize/number.py:90 +#: src/humanize/number.py:135 msgid "nonillion" -msgstr "quintilhão" +msgid_plural "nonillion" +msgstr[0] "quintilhão" +msgstr[1] "quintilhão" -#: src/humanize/number.py:91 +#: src/humanize/number.py:136 msgid "decillion" -msgstr "mil quintilhões" +msgid_plural "decillion" +msgstr[0] "mil quintilhões" +msgstr[1] "mil quintilhões" -#: src/humanize/number.py:92 +#: src/humanize/number.py:137 msgid "googol" -msgstr "sextilhão" +msgid_plural "googol" +msgstr[0] "sextilhão" +msgstr[1] "sextilhão" -#: src/humanize/number.py:147 +#: src/humanize/number.py:228 msgid "zero" msgstr "zero" -#: src/humanize/number.py:148 +#: src/humanize/number.py:229 msgid "one" msgstr "um" -#: src/humanize/number.py:149 +#: src/humanize/number.py:230 msgid "two" msgstr "dois" -#: src/humanize/number.py:150 +#: src/humanize/number.py:231 msgid "three" msgstr "três" -#: src/humanize/number.py:151 +#: src/humanize/number.py:232 msgid "four" msgstr "quatro" -#: src/humanize/number.py:152 +#: src/humanize/number.py:233 msgid "five" msgstr "cinco" -#: src/humanize/number.py:153 +#: src/humanize/number.py:234 msgid "six" msgstr "seis" -#: src/humanize/number.py:154 +#: src/humanize/number.py:235 msgid "seven" msgstr "sete" -#: src/humanize/number.py:155 +#: src/humanize/number.py:236 msgid "eight" msgstr "oito" -#: src/humanize/number.py:156 +#: src/humanize/number.py:237 msgid "nine" msgstr "nove" -#: src/humanize/time.py:119 +#: src/humanize/time.py:133 #, python-format msgid "%d microsecond" msgid_plural "%d microseconds" msgstr[0] "%d microssegundo" msgstr[1] "%d microssegundos" -#: src/humanize/time.py:128 +#: src/humanize/time.py:142 #, python-format msgid "%d millisecond" msgid_plural "%d milliseconds" msgstr[0] "%d milissegundo" msgstr[1] "%d milissegundos" -#: src/humanize/time.py:131 src/humanize/time.py:204 +#: src/humanize/time.py:145 src/humanize/time.py:220 msgid "a moment" msgstr "um momento" -#: src/humanize/time.py:133 +#: src/humanize/time.py:147 msgid "a second" msgstr "um segundo" -#: src/humanize/time.py:135 +#: src/humanize/time.py:149 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d segundo" msgstr[1] "%d segundos" -#: src/humanize/time.py:137 +#: src/humanize/time.py:151 msgid "a minute" msgstr "um minuto" -#: src/humanize/time.py:140 +#: src/humanize/time.py:154 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minuto" msgstr[1] "%d minutos" -#: src/humanize/time.py:142 +#: src/humanize/time.py:156 msgid "an hour" msgstr "uma hora" -#: src/humanize/time.py:145 +#: src/humanize/time.py:159 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d hora" msgstr[1] "%d horas" -#: src/humanize/time.py:148 +#: src/humanize/time.py:162 msgid "a day" msgstr "um dia" -#: src/humanize/time.py:150 src/humanize/time.py:153 +#: src/humanize/time.py:164 src/humanize/time.py:167 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d dia" msgstr[1] "%d dias" -#: src/humanize/time.py:155 +#: src/humanize/time.py:169 msgid "a month" msgstr "um mês" -#: src/humanize/time.py:157 +#: src/humanize/time.py:171 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d mês" msgstr[1] "%d meses" -#: src/humanize/time.py:160 +#: src/humanize/time.py:174 msgid "a year" msgstr "um ano" -#: src/humanize/time.py:162 src/humanize/time.py:171 +#: src/humanize/time.py:176 src/humanize/time.py:185 #, python-format msgid "1 year, %d day" msgid_plural "1 year, %d days" msgstr[0] "1 ano e %d dia" msgstr[1] "1 ano e %d dias" -#: src/humanize/time.py:165 +#: src/humanize/time.py:179 msgid "1 year, 1 month" msgstr "1 ano e 1 mês" -#: src/humanize/time.py:168 +#: src/humanize/time.py:182 #, python-format msgid "1 year, %d month" msgid_plural "1 year, %d months" msgstr[0] "1 ano e %d mês" msgstr[1] "1 ano e %d meses" -#: src/humanize/time.py:173 +#: src/humanize/time.py:187 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d ano" msgstr[1] "%d anos" -#: src/humanize/time.py:201 +#: src/humanize/time.py:217 #, python-format msgid "%s from now" msgstr "daqui a %s" -#: src/humanize/time.py:201 +#: src/humanize/time.py:217 #, python-format msgid "%s ago" msgstr "há %s" -#: src/humanize/time.py:205 +#: src/humanize/time.py:221 msgid "now" msgstr "agora" -#: src/humanize/time.py:227 +#: src/humanize/time.py:244 msgid "today" msgstr "hoje" -#: src/humanize/time.py:229 +#: src/humanize/time.py:246 msgid "tomorrow" msgstr "amanhã" -#: src/humanize/time.py:231 +#: src/humanize/time.py:248 msgid "yesterday" msgstr "ontem" -#: src/humanize/time.py:498 +#: src/humanize/time.py:534 #, python-format msgid "%s and %s" msgstr "%s e %s" diff --git a/lib/humanize/locale/ru_RU/LC_MESSAGES/humanize.po b/lib/humanize/locale/ru_RU/LC_MESSAGES/humanize.po index cfa8ad4..1362683 100644 --- a/lib/humanize/locale/ru_RU/LC_MESSAGES/humanize.po +++ b/lib/humanize/locale/ru_RU/LC_MESSAGES/humanize.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-09-29 20:53+0300\n" +"POT-Creation-Date: 2021-04-30 22:34+0200\n" "PO-Revision-Date: 2014-03-24 20:32+0300\n" "Last-Translator: Sergey Prokhorov \n" "Language-Team: ru_RU \n" @@ -21,171 +21,211 @@ msgstr "" "X-Generator: Poedit 1.5.4\n" # в Django тут "ий" но на самом деле оба варианта работают плохо -#: src/humanize/number.py:31 +#: src/humanize/number.py:56 msgctxt "0" msgid "th" msgstr "ой" -#: src/humanize/number.py:32 +#: src/humanize/number.py:57 msgctxt "1" msgid "st" msgstr "ый" -#: src/humanize/number.py:33 +#: src/humanize/number.py:58 msgctxt "2" msgid "nd" msgstr "ой" -#: src/humanize/number.py:34 +#: src/humanize/number.py:59 msgctxt "3" msgid "rd" msgstr "ий" # в Django тут "ий" но на самом деле оба варианта работают плохо -#: src/humanize/number.py:35 +#: src/humanize/number.py:60 msgctxt "4" msgid "th" msgstr "ый" # в Django тут "ий" но на самом деле оба варианта работают плохо -#: src/humanize/number.py:36 +#: src/humanize/number.py:61 msgctxt "5" msgid "th" msgstr "ый" # в Django тут "ий" но на самом деле оба варианта работают плохо -#: src/humanize/number.py:37 +#: src/humanize/number.py:62 msgctxt "6" msgid "th" msgstr "ой" # в Django тут "ий" но на самом деле оба варианта работают плохо -#: src/humanize/number.py:38 +#: src/humanize/number.py:63 msgctxt "7" msgid "th" msgstr "ой" # в Django тут "ий" но на самом деле оба варианта работают плохо -#: src/humanize/number.py:39 +#: src/humanize/number.py:64 msgctxt "8" msgid "th" msgstr "ой" # в Django тут "ий" но на самом деле оба варианта работают плохо -#: src/humanize/number.py:40 +#: src/humanize/number.py:65 msgctxt "9" msgid "th" msgstr "ый" -#: src/humanize/number.py:82 +#: src/humanize/number.py:126 +msgid "thousand" +msgid_plural "thousand" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: src/humanize/number.py:127 msgid "million" -msgstr "миллиона" +msgid_plural "million" +msgstr[0] "миллиона" +msgstr[1] "миллиона" +msgstr[2] "миллиона" -#: src/humanize/number.py:83 +#: src/humanize/number.py:128 msgid "billion" -msgstr "миллиарда" +msgid_plural "billion" +msgstr[0] "миллиарда" +msgstr[1] "миллиарда" +msgstr[2] "миллиарда" -#: src/humanize/number.py:84 +#: src/humanize/number.py:129 msgid "trillion" -msgstr "триллиона" +msgid_plural "trillion" +msgstr[0] "триллиона" +msgstr[1] "триллиона" +msgstr[2] "триллиона" -#: src/humanize/number.py:85 +#: src/humanize/number.py:130 msgid "quadrillion" -msgstr "квадриллиона" +msgid_plural "quadrillion" +msgstr[0] "квадриллиона" +msgstr[1] "квадриллиона" +msgstr[2] "квадриллиона" -#: src/humanize/number.py:86 +#: src/humanize/number.py:131 msgid "quintillion" -msgstr "квинтиллиона" +msgid_plural "quintillion" +msgstr[0] "квинтиллиона" +msgstr[1] "квинтиллиона" +msgstr[2] "квинтиллиона" -#: src/humanize/number.py:87 +#: src/humanize/number.py:132 msgid "sextillion" -msgstr "сикстиллиона" +msgid_plural "sextillion" +msgstr[0] "сикстиллиона" +msgstr[1] "сикстиллиона" +msgstr[2] "сикстиллиона" -#: src/humanize/number.py:88 +#: src/humanize/number.py:133 msgid "septillion" -msgstr "септиллиона" +msgid_plural "septillion" +msgstr[0] "септиллиона" +msgstr[1] "септиллиона" +msgstr[2] "септиллиона" -#: src/humanize/number.py:89 +#: src/humanize/number.py:134 msgid "octillion" -msgstr "октиллиона" +msgid_plural "octillion" +msgstr[0] "октиллиона" +msgstr[1] "октиллиона" +msgstr[2] "октиллиона" -#: src/humanize/number.py:90 +#: src/humanize/number.py:135 msgid "nonillion" -msgstr "нониллиона" +msgid_plural "nonillion" +msgstr[0] "нониллиона" +msgstr[1] "нониллиона" +msgstr[2] "нониллиона" -#: src/humanize/number.py:91 +#: src/humanize/number.py:136 msgid "decillion" -msgstr "децилиона" +msgid_plural "decillion" +msgstr[0] "децилиона" +msgstr[1] "децилиона" +msgstr[2] "децилиона" -#: src/humanize/number.py:92 +#: src/humanize/number.py:137 msgid "googol" -msgstr "гогола" +msgid_plural "googol" +msgstr[0] "гогола" +msgstr[1] "гогола" +msgstr[2] "гогола" -#: src/humanize/number.py:147 +#: src/humanize/number.py:228 msgid "zero" msgstr "" -#: src/humanize/number.py:148 +#: src/humanize/number.py:229 msgid "one" msgstr "один" -#: src/humanize/number.py:149 +#: src/humanize/number.py:230 msgid "two" msgstr "два" -#: src/humanize/number.py:150 +#: src/humanize/number.py:231 msgid "three" msgstr "три" -#: src/humanize/number.py:151 +#: src/humanize/number.py:232 msgid "four" msgstr "четыре" -#: src/humanize/number.py:152 +#: src/humanize/number.py:233 msgid "five" msgstr "пять" -#: src/humanize/number.py:153 +#: src/humanize/number.py:234 msgid "six" msgstr "шесть" -#: src/humanize/number.py:154 +#: src/humanize/number.py:235 msgid "seven" msgstr "семь" -#: src/humanize/number.py:155 +#: src/humanize/number.py:236 msgid "eight" msgstr "восемь" -#: src/humanize/number.py:156 +#: src/humanize/number.py:237 msgid "nine" msgstr "девять" -#: src/humanize/time.py:119 -#, fuzzy, python-format +#: src/humanize/time.py:133 +#, python-format msgid "%d microsecond" msgid_plural "%d microseconds" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/humanize/time.py:128 -#, fuzzy, python-format +#: src/humanize/time.py:142 +#, python-format msgid "%d millisecond" msgid_plural "%d milliseconds" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/humanize/time.py:131 src/humanize/time.py:204 +#: src/humanize/time.py:145 src/humanize/time.py:220 msgid "a moment" msgstr "только что" -#: src/humanize/time.py:133 +#: src/humanize/time.py:147 msgid "a second" msgstr "секунду" -#: src/humanize/time.py:135 +#: src/humanize/time.py:149 #, python-format msgid "%d second" msgid_plural "%d seconds" @@ -193,11 +233,11 @@ msgstr[0] "%d секунда" msgstr[1] "%d секунды" msgstr[2] "%d секунд" -#: src/humanize/time.py:137 +#: src/humanize/time.py:151 msgid "a minute" msgstr "минуту" -#: src/humanize/time.py:140 +#: src/humanize/time.py:154 #, python-format msgid "%d minute" msgid_plural "%d minutes" @@ -205,11 +245,11 @@ msgstr[0] "%d минута" msgstr[1] "%d минуты" msgstr[2] "%d минут" -#: src/humanize/time.py:142 +#: src/humanize/time.py:156 msgid "an hour" msgstr "час" -#: src/humanize/time.py:145 +#: src/humanize/time.py:159 #, python-format msgid "%d hour" msgid_plural "%d hours" @@ -217,11 +257,11 @@ msgstr[0] "%d час" msgstr[1] "%d часа" msgstr[2] "%d часов" -#: src/humanize/time.py:148 +#: src/humanize/time.py:162 msgid "a day" msgstr "день" -#: src/humanize/time.py:150 src/humanize/time.py:153 +#: src/humanize/time.py:164 src/humanize/time.py:167 #, python-format msgid "%d day" msgid_plural "%d days" @@ -229,11 +269,11 @@ msgstr[0] "%d день" msgstr[1] "%d дня" msgstr[2] "%d дней" -#: src/humanize/time.py:155 +#: src/humanize/time.py:169 msgid "a month" msgstr "месяц" -#: src/humanize/time.py:157 +#: src/humanize/time.py:171 #, python-format msgid "%d month" msgid_plural "%d months" @@ -241,11 +281,11 @@ msgstr[0] "%d месяц" msgstr[1] "%d месяца" msgstr[2] "%d месяцев" -#: src/humanize/time.py:160 +#: src/humanize/time.py:174 msgid "a year" msgstr "год" -#: src/humanize/time.py:162 src/humanize/time.py:171 +#: src/humanize/time.py:176 src/humanize/time.py:185 #, python-format msgid "1 year, %d day" msgid_plural "1 year, %d days" @@ -253,11 +293,11 @@ msgstr[0] "1 год, %d день" msgstr[1] "1 год, %d дня" msgstr[2] "1 год, %d дней" -#: src/humanize/time.py:165 +#: src/humanize/time.py:179 msgid "1 year, 1 month" msgstr "1 год, 1 месяц" -#: src/humanize/time.py:168 +#: src/humanize/time.py:182 #, python-format msgid "1 year, %d month" msgid_plural "1 year, %d months" @@ -265,7 +305,7 @@ msgstr[0] "1 год, %d месяц" msgstr[1] "1 год, %d месяца" msgstr[2] "1 год, %d месяцев" -#: src/humanize/time.py:173 +#: src/humanize/time.py:187 #, python-format msgid "%d year" msgid_plural "%d years" @@ -273,33 +313,33 @@ msgstr[0] "%d год" msgstr[1] "%d года" msgstr[2] "%d лет" -#: src/humanize/time.py:201 +#: src/humanize/time.py:217 #, python-format msgid "%s from now" msgstr "через %s" -#: src/humanize/time.py:201 +#: src/humanize/time.py:217 #, python-format msgid "%s ago" msgstr "%s назад" -#: src/humanize/time.py:205 +#: src/humanize/time.py:221 msgid "now" msgstr "сейчас" -#: src/humanize/time.py:227 +#: src/humanize/time.py:244 msgid "today" msgstr "сегодня" -#: src/humanize/time.py:229 +#: src/humanize/time.py:246 msgid "tomorrow" msgstr "завтра" -#: src/humanize/time.py:231 +#: src/humanize/time.py:248 msgid "yesterday" msgstr "вчера" -#: src/humanize/time.py:498 +#: src/humanize/time.py:534 #, python-format msgid "%s and %s" msgstr "%s и %s" diff --git a/lib/humanize/locale/sk_SK/LC_MESSAGES/humanize.po b/lib/humanize/locale/sk_SK/LC_MESSAGES/humanize.po index 04c206a..c72c81d 100644 --- a/lib/humanize/locale/sk_SK/LC_MESSAGES/humanize.po +++ b/lib/humanize/locale/sk_SK/LC_MESSAGES/humanize.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: humanize\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-09-29 21:07+0300\n" +"POT-Creation-Date: 2021-04-30 22:34+0200\n" "PO-Revision-Date: 2020-09-29 22:43+0300\n" "Last-Translator: Jose Riha \n" "Language-Team: sk \n" @@ -18,141 +18,181 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: src/humanize/number.py:31 +#: src/humanize/number.py:56 msgctxt "0" msgid "th" msgstr "." -#: src/humanize/number.py:32 +#: src/humanize/number.py:57 msgctxt "1" msgid "st" msgstr "." -#: src/humanize/number.py:33 +#: src/humanize/number.py:58 msgctxt "2" msgid "nd" msgstr "." -#: src/humanize/number.py:34 +#: src/humanize/number.py:59 msgctxt "3" msgid "rd" msgstr "." -#: src/humanize/number.py:35 +#: src/humanize/number.py:60 msgctxt "4" msgid "th" msgstr "." -#: src/humanize/number.py:36 +#: src/humanize/number.py:61 msgctxt "5" msgid "th" msgstr "." -#: src/humanize/number.py:37 +#: src/humanize/number.py:62 msgctxt "6" msgid "th" msgstr "." -#: src/humanize/number.py:38 +#: src/humanize/number.py:63 msgctxt "7" msgid "th" msgstr "." -#: src/humanize/number.py:39 +#: src/humanize/number.py:64 msgctxt "8" msgid "th" msgstr "." -#: src/humanize/number.py:40 +#: src/humanize/number.py:65 msgctxt "9" msgid "th" msgstr "." -#: src/humanize/number.py:82 +#: src/humanize/number.py:126 +msgid "thousand" +msgid_plural "thousand" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: src/humanize/number.py:127 msgid "million" -msgstr "milióna/ov" +msgid_plural "million" +msgstr[0] "milióna/ov" +msgstr[1] "milióna/ov" +msgstr[2] "milióna/ov" -#: src/humanize/number.py:83 +#: src/humanize/number.py:128 msgid "billion" -msgstr "miliardy/árd" +msgid_plural "billion" +msgstr[0] "miliardy/árd" +msgstr[1] "miliardy/árd" +msgstr[2] "miliardy/árd" -#: src/humanize/number.py:84 +#: src/humanize/number.py:129 msgid "trillion" -msgstr "bilióna/ov" +msgid_plural "trillion" +msgstr[0] "bilióna/ov" +msgstr[1] "bilióna/ov" +msgstr[2] "bilióna/ov" -#: src/humanize/number.py:85 +#: src/humanize/number.py:130 msgid "quadrillion" -msgstr "biliardy/árd" +msgid_plural "quadrillion" +msgstr[0] "biliardy/árd" +msgstr[1] "biliardy/árd" +msgstr[2] "biliardy/árd" -#: src/humanize/number.py:86 +#: src/humanize/number.py:131 msgid "quintillion" -msgstr "trilióna/árd" +msgid_plural "quintillion" +msgstr[0] "trilióna/árd" +msgstr[1] "trilióna/árd" +msgstr[2] "trilióna/árd" -#: src/humanize/number.py:87 +#: src/humanize/number.py:132 msgid "sextillion" -msgstr "triliardy/árd" +msgid_plural "sextillion" +msgstr[0] "triliardy/árd" +msgstr[1] "triliardy/árd" +msgstr[2] "triliardy/árd" -#: src/humanize/number.py:88 +#: src/humanize/number.py:133 msgid "septillion" -msgstr "kvadrilióna/ov" +msgid_plural "septillion" +msgstr[0] "kvadrilióna/ov" +msgstr[1] "kvadrilióna/ov" +msgstr[2] "kvadrilióna/ov" -#: src/humanize/number.py:89 +#: src/humanize/number.py:134 msgid "octillion" -msgstr "kvadriliardy/árd" +msgid_plural "octillion" +msgstr[0] "kvadriliardy/árd" +msgstr[1] "kvadriliardy/árd" +msgstr[2] "kvadriliardy/árd" -#: src/humanize/number.py:90 +#: src/humanize/number.py:135 msgid "nonillion" -msgstr "kvintilióna/ov" +msgid_plural "nonillion" +msgstr[0] "kvintilióna/ov" +msgstr[1] "kvintilióna/ov" +msgstr[2] "kvintilióna/ov" -#: src/humanize/number.py:91 +#: src/humanize/number.py:136 msgid "decillion" -msgstr "kvintiliardy/árd" +msgid_plural "decillion" +msgstr[0] "kvintiliardy/árd" +msgstr[1] "kvintiliardy/árd" +msgstr[2] "kvintiliardy/árd" -#: src/humanize/number.py:92 +#: src/humanize/number.py:137 msgid "googol" -msgstr "googola/ov" +msgid_plural "googol" +msgstr[0] "googola/ov" +msgstr[1] "googola/ov" +msgstr[2] "googola/ov" -#: src/humanize/number.py:147 +#: src/humanize/number.py:228 msgid "zero" msgstr "nula" -#: src/humanize/number.py:148 +#: src/humanize/number.py:229 msgid "one" msgstr "jedna" -#: src/humanize/number.py:149 +#: src/humanize/number.py:230 msgid "two" msgstr "dve" -#: src/humanize/number.py:150 +#: src/humanize/number.py:231 msgid "three" msgstr "tri" -#: src/humanize/number.py:151 +#: src/humanize/number.py:232 msgid "four" msgstr "štyri" -#: src/humanize/number.py:152 +#: src/humanize/number.py:233 msgid "five" msgstr "päť" -#: src/humanize/number.py:153 +#: src/humanize/number.py:234 msgid "six" msgstr "šesť" -#: src/humanize/number.py:154 +#: src/humanize/number.py:235 msgid "seven" msgstr "sedem" -#: src/humanize/number.py:155 +#: src/humanize/number.py:236 msgid "eight" msgstr "osem" -#: src/humanize/number.py:156 +#: src/humanize/number.py:237 msgid "nine" msgstr "deväť" -#: src/humanize/time.py:119 +#: src/humanize/time.py:133 #, fuzzy, python-format msgid "%d microsecond" msgid_plural "%d microseconds" @@ -160,7 +200,7 @@ msgstr[0] "%d mikrosekundu" msgstr[1] "%d mikrosekundy" msgstr[2] "%d mikrosekúnd" -#: src/humanize/time.py:128 +#: src/humanize/time.py:142 #, fuzzy, python-format msgid "%d millisecond" msgid_plural "%d milliseconds" @@ -168,15 +208,15 @@ msgstr[0] "%d milisekundu" msgstr[1] "%d milisekundy" msgstr[2] "%d milisekúnd" -#: src/humanize/time.py:131 src/humanize/time.py:204 +#: src/humanize/time.py:145 src/humanize/time.py:220 msgid "a moment" msgstr "chvíľku" -#: src/humanize/time.py:133 +#: src/humanize/time.py:147 msgid "a second" msgstr "sekundu" -#: src/humanize/time.py:135 +#: src/humanize/time.py:149 #, python-format msgid "%d second" msgid_plural "%d seconds" @@ -184,11 +224,11 @@ msgstr[0] "%d sekundu" msgstr[1] "%d sekundy" msgstr[2] "%d sekúnd" -#: src/humanize/time.py:137 +#: src/humanize/time.py:151 msgid "a minute" msgstr "minútu" -#: src/humanize/time.py:140 +#: src/humanize/time.py:154 #, python-format msgid "%d minute" msgid_plural "%d minutes" @@ -196,11 +236,11 @@ msgstr[0] "%d minútu" msgstr[1] "%d minúty" msgstr[2] "%d minút" -#: src/humanize/time.py:142 +#: src/humanize/time.py:156 msgid "an hour" msgstr "hodinu" -#: src/humanize/time.py:145 +#: src/humanize/time.py:159 #, python-format msgid "%d hour" msgid_plural "%d hours" @@ -208,11 +248,11 @@ msgstr[0] "%d hodina" msgstr[1] "%d hodiny" msgstr[2] "%d hodín" -#: src/humanize/time.py:148 +#: src/humanize/time.py:162 msgid "a day" msgstr "deň" -#: src/humanize/time.py:150 src/humanize/time.py:153 +#: src/humanize/time.py:164 src/humanize/time.py:167 #, python-format msgid "%d day" msgid_plural "%d days" @@ -220,11 +260,11 @@ msgstr[0] "%d deň" msgstr[1] "%d dni" msgstr[2] "%d dní" -#: src/humanize/time.py:155 +#: src/humanize/time.py:169 msgid "a month" msgstr "mesiac" -#: src/humanize/time.py:157 +#: src/humanize/time.py:171 #, python-format msgid "%d month" msgid_plural "%d months" @@ -232,11 +272,11 @@ msgstr[0] "%d mesiac" msgstr[1] "%d mesiace" msgstr[2] "%d mesiacov" -#: src/humanize/time.py:160 +#: src/humanize/time.py:174 msgid "a year" msgstr "rok" -#: src/humanize/time.py:162 src/humanize/time.py:171 +#: src/humanize/time.py:176 src/humanize/time.py:185 #, python-format msgid "1 year, %d day" msgid_plural "1 year, %d days" @@ -244,11 +284,11 @@ msgstr[0] "1 rok, %d deň" msgstr[1] "1 rok, %d dni" msgstr[2] "1 rok, %d dní" -#: src/humanize/time.py:165 +#: src/humanize/time.py:179 msgid "1 year, 1 month" msgstr "1 rok, 1 mesiac" -#: src/humanize/time.py:168 +#: src/humanize/time.py:182 #, python-format msgid "1 year, %d month" msgid_plural "1 year, %d months" @@ -256,7 +296,7 @@ msgstr[0] "1 rok, %d mesiac" msgstr[1] "1 rok, %d mesiace" msgstr[2] "1 rok, %d mesiacov" -#: src/humanize/time.py:173 +#: src/humanize/time.py:187 #, python-format msgid "%d year" msgid_plural "%d years" @@ -264,33 +304,33 @@ msgstr[0] "%d rok" msgstr[1] "%d roky" msgstr[2] "%d rokov" -#: src/humanize/time.py:201 +#: src/humanize/time.py:217 #, python-format msgid "%s from now" msgstr "o %s" -#: src/humanize/time.py:201 +#: src/humanize/time.py:217 #, python-format msgid "%s ago" msgstr "%s naspäť" -#: src/humanize/time.py:205 +#: src/humanize/time.py:221 msgid "now" msgstr "teraz" -#: src/humanize/time.py:227 +#: src/humanize/time.py:244 msgid "today" msgstr "dnes" -#: src/humanize/time.py:229 +#: src/humanize/time.py:246 msgid "tomorrow" msgstr "zajtra" -#: src/humanize/time.py:231 +#: src/humanize/time.py:248 msgid "yesterday" msgstr "včera" -#: src/humanize/time.py:498 +#: src/humanize/time.py:534 #, python-format msgid "%s and %s" msgstr "" diff --git a/lib/humanize/locale/tr_TR/LC_MESSAGES/humanize.po b/lib/humanize/locale/tr_TR/LC_MESSAGES/humanize.po index a3da4da..3533eb1 100644 --- a/lib/humanize/locale/tr_TR/LC_MESSAGES/humanize.po +++ b/lib/humanize/locale/tr_TR/LC_MESSAGES/humanize.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: humanize\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-09-29 21:07+0300\n" +"POT-Creation-Date: 2021-04-30 22:34+0200\n" "PO-Revision-Date: 2017-02-23 20:00+0300\n" "Last-Translator: Emre Çintay \n" "Language-Team: Turkish\n" @@ -19,269 +19,297 @@ msgstr "" "X-Generator: Poedit 1.8.7.1\n" "Generated-By: Emre Çintay\n" -#: src/humanize/number.py:31 +#: src/humanize/number.py:56 msgctxt "0" msgid "th" msgstr "." -#: src/humanize/number.py:32 +#: src/humanize/number.py:57 msgctxt "1" msgid "st" msgstr "." -#: src/humanize/number.py:33 +#: src/humanize/number.py:58 msgctxt "2" msgid "nd" msgstr "." -#: src/humanize/number.py:34 +#: src/humanize/number.py:59 msgctxt "3" msgid "rd" msgstr "." -#: src/humanize/number.py:35 +#: src/humanize/number.py:60 msgctxt "4" msgid "th" msgstr "." -#: src/humanize/number.py:36 +#: src/humanize/number.py:61 msgctxt "5" msgid "th" msgstr "." -#: src/humanize/number.py:37 +#: src/humanize/number.py:62 msgctxt "6" msgid "th" msgstr "." -#: src/humanize/number.py:38 +#: src/humanize/number.py:63 msgctxt "7" msgid "th" msgstr "." -#: src/humanize/number.py:39 +#: src/humanize/number.py:64 msgctxt "8" msgid "th" msgstr "." -#: src/humanize/number.py:40 +#: src/humanize/number.py:65 msgctxt "9" msgid "th" msgstr "." -#: src/humanize/number.py:82 +#: src/humanize/number.py:126 +msgid "thousand" +msgid_plural "thousand" +msgstr[0] "" +msgstr[1] "" + +#: src/humanize/number.py:127 msgid "million" -msgstr "milyon" +msgid_plural "million" +msgstr[0] "milyon" +msgstr[1] "milyon" -#: src/humanize/number.py:83 +#: src/humanize/number.py:128 msgid "billion" -msgstr "milyar" +msgid_plural "billion" +msgstr[0] "milyar" +msgstr[1] "milyar" -#: src/humanize/number.py:84 +#: src/humanize/number.py:129 msgid "trillion" -msgstr "trilyon" +msgid_plural "trillion" +msgstr[0] "trilyon" +msgstr[1] "trilyon" -#: src/humanize/number.py:85 +#: src/humanize/number.py:130 msgid "quadrillion" -msgstr "katrilyon" +msgid_plural "quadrillion" +msgstr[0] "katrilyon" +msgstr[1] "katrilyon" -#: src/humanize/number.py:86 +#: src/humanize/number.py:131 msgid "quintillion" -msgstr "kentilyon" +msgid_plural "quintillion" +msgstr[0] "kentilyon" +msgstr[1] "kentilyon" -#: src/humanize/number.py:87 +#: src/humanize/number.py:132 msgid "sextillion" -msgstr "sekstilyon" +msgid_plural "sextillion" +msgstr[0] "sekstilyon" +msgstr[1] "sekstilyon" -#: src/humanize/number.py:88 +#: src/humanize/number.py:133 msgid "septillion" -msgstr "septilyon" +msgid_plural "septillion" +msgstr[0] "septilyon" +msgstr[1] "septilyon" -#: src/humanize/number.py:89 +#: src/humanize/number.py:134 msgid "octillion" -msgstr "oktilyon" +msgid_plural "octillion" +msgstr[0] "oktilyon" +msgstr[1] "oktilyon" -#: src/humanize/number.py:90 +#: src/humanize/number.py:135 msgid "nonillion" -msgstr "nonilyon" +msgid_plural "nonillion" +msgstr[0] "nonilyon" +msgstr[1] "nonilyon" -#: src/humanize/number.py:91 +#: src/humanize/number.py:136 msgid "decillion" -msgstr "desilyon" +msgid_plural "decillion" +msgstr[0] "desilyon" +msgstr[1] "desilyon" -#: src/humanize/number.py:92 +#: src/humanize/number.py:137 msgid "googol" -msgstr "googol" +msgid_plural "googol" +msgstr[0] "googol" +msgstr[1] "googol" -#: src/humanize/number.py:147 +#: src/humanize/number.py:228 msgid "zero" msgstr "" -#: src/humanize/number.py:148 +#: src/humanize/number.py:229 msgid "one" msgstr "bir" -#: src/humanize/number.py:149 +#: src/humanize/number.py:230 msgid "two" msgstr "iki" -#: src/humanize/number.py:150 +#: src/humanize/number.py:231 msgid "three" msgstr "üç" -#: src/humanize/number.py:151 +#: src/humanize/number.py:232 msgid "four" msgstr "dört" -#: src/humanize/number.py:152 +#: src/humanize/number.py:233 msgid "five" msgstr "beş" -#: src/humanize/number.py:153 +#: src/humanize/number.py:234 msgid "six" msgstr "altı" -#: src/humanize/number.py:154 +#: src/humanize/number.py:235 msgid "seven" msgstr "yedi" -#: src/humanize/number.py:155 +#: src/humanize/number.py:236 msgid "eight" msgstr "sekiz" -#: src/humanize/number.py:156 +#: src/humanize/number.py:237 msgid "nine" msgstr "dokuz" -#: src/humanize/time.py:119 -#, fuzzy, python-format +#: src/humanize/time.py:133 +#, python-format msgid "%d microsecond" msgid_plural "%d microseconds" msgstr[0] "" msgstr[1] "" -#: src/humanize/time.py:128 -#, fuzzy, python-format +#: src/humanize/time.py:142 +#, python-format msgid "%d millisecond" msgid_plural "%d milliseconds" msgstr[0] "" msgstr[1] "" -#: src/humanize/time.py:131 src/humanize/time.py:204 +#: src/humanize/time.py:145 src/humanize/time.py:220 msgid "a moment" msgstr "biraz" -#: src/humanize/time.py:133 +#: src/humanize/time.py:147 msgid "a second" msgstr "bir saniye" -#: src/humanize/time.py:135 +#: src/humanize/time.py:149 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d saniye" msgstr[1] "%d saniye" -#: src/humanize/time.py:137 +#: src/humanize/time.py:151 msgid "a minute" msgstr "bir dakika" -#: src/humanize/time.py:140 +#: src/humanize/time.py:154 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d dakika" msgstr[1] "%d dakika" -#: src/humanize/time.py:142 +#: src/humanize/time.py:156 msgid "an hour" msgstr "bir saat" -#: src/humanize/time.py:145 +#: src/humanize/time.py:159 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d saat" msgstr[1] "%d saat" -#: src/humanize/time.py:148 +#: src/humanize/time.py:162 msgid "a day" msgstr "bir gün" -#: src/humanize/time.py:150 src/humanize/time.py:153 +#: src/humanize/time.py:164 src/humanize/time.py:167 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d gün" msgstr[1] "%d gün" -#: src/humanize/time.py:155 +#: src/humanize/time.py:169 msgid "a month" msgstr "bir ay" -#: src/humanize/time.py:157 +#: src/humanize/time.py:171 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d ay" msgstr[1] "%d ay" -#: src/humanize/time.py:160 +#: src/humanize/time.py:174 msgid "a year" msgstr "bir yıl" -#: src/humanize/time.py:162 src/humanize/time.py:171 +#: src/humanize/time.py:176 src/humanize/time.py:185 #, python-format msgid "1 year, %d day" msgid_plural "1 year, %d days" msgstr[0] "1 yıl, %d gün" msgstr[1] "1 yıl, %d gün" -#: src/humanize/time.py:165 +#: src/humanize/time.py:179 msgid "1 year, 1 month" msgstr "1 yıl, 1 ay" -#: src/humanize/time.py:168 +#: src/humanize/time.py:182 #, python-format msgid "1 year, %d month" msgid_plural "1 year, %d months" msgstr[0] "1 yıl, %d ay" msgstr[1] "1 yıl, %d ay" -#: src/humanize/time.py:173 +#: src/humanize/time.py:187 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d yıl" msgstr[1] "%d yıl" -#: src/humanize/time.py:201 +#: src/humanize/time.py:217 #, python-format msgid "%s from now" msgstr "şu andan itibaren %s" -#: src/humanize/time.py:201 +#: src/humanize/time.py:217 #, python-format msgid "%s ago" msgstr "%s önce" -#: src/humanize/time.py:205 +#: src/humanize/time.py:221 msgid "now" msgstr "şimdi" -#: src/humanize/time.py:227 +#: src/humanize/time.py:244 msgid "today" msgstr "bugün" -#: src/humanize/time.py:229 +#: src/humanize/time.py:246 msgid "tomorrow" msgstr "yarın" -#: src/humanize/time.py:231 +#: src/humanize/time.py:248 msgid "yesterday" msgstr "dün" -#: src/humanize/time.py:498 +#: src/humanize/time.py:534 #, python-format msgid "%s and %s" msgstr "" diff --git a/lib/humanize/locale/uk_UA/LC_MESSAGES/humanize.po b/lib/humanize/locale/uk_UA/LC_MESSAGES/humanize.po index c4d1d98..527f113 100644 --- a/lib/humanize/locale/uk_UA/LC_MESSAGES/humanize.po +++ b/lib/humanize/locale/uk_UA/LC_MESSAGES/humanize.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-09-29 21:07+0300\n" +"POT-Creation-Date: 2021-04-30 22:34+0200\n" "PO-Revision-Date: \n" "Last-Translator: TL\n" "Language-Team: uk_UA\n" @@ -15,141 +15,181 @@ msgstr "" "Generated-By:\n" "X-Generator: \n" -#: src/humanize/number.py:31 +#: src/humanize/number.py:56 msgctxt "0" msgid "th" msgstr "ий" -#: src/humanize/number.py:32 +#: src/humanize/number.py:57 msgctxt "1" msgid "st" msgstr "ий" -#: src/humanize/number.py:33 +#: src/humanize/number.py:58 msgctxt "2" msgid "nd" msgstr "ий" -#: src/humanize/number.py:34 +#: src/humanize/number.py:59 msgctxt "3" msgid "rd" msgstr "ій" -#: src/humanize/number.py:35 +#: src/humanize/number.py:60 msgctxt "4" msgid "th" msgstr "ий" -#: src/humanize/number.py:36 +#: src/humanize/number.py:61 msgctxt "5" msgid "th" msgstr "ий" -#: src/humanize/number.py:37 +#: src/humanize/number.py:62 msgctxt "6" msgid "th" msgstr "ий" -#: src/humanize/number.py:38 +#: src/humanize/number.py:63 msgctxt "7" msgid "th" msgstr "ий" -#: src/humanize/number.py:39 +#: src/humanize/number.py:64 msgctxt "8" msgid "th" msgstr "ий" -#: src/humanize/number.py:40 +#: src/humanize/number.py:65 msgctxt "9" msgid "th" msgstr "ий" -#: src/humanize/number.py:82 +#: src/humanize/number.py:126 +msgid "thousand" +msgid_plural "thousand" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: src/humanize/number.py:127 msgid "million" -msgstr "мільйонів" +msgid_plural "million" +msgstr[0] "мільйонів" +msgstr[1] "мільйонів" +msgstr[2] "мільйонів" -#: src/humanize/number.py:83 +#: src/humanize/number.py:128 msgid "billion" -msgstr "мільярдів" +msgid_plural "billion" +msgstr[0] "мільярдів" +msgstr[1] "мільярдів" +msgstr[2] "мільярдів" -#: src/humanize/number.py:84 +#: src/humanize/number.py:129 msgid "trillion" -msgstr "трильйонів" +msgid_plural "trillion" +msgstr[0] "трильйонів" +msgstr[1] "трильйонів" +msgstr[2] "трильйонів" -#: src/humanize/number.py:85 +#: src/humanize/number.py:130 msgid "quadrillion" -msgstr "квадрильйонів" +msgid_plural "quadrillion" +msgstr[0] "квадрильйонів" +msgstr[1] "квадрильйонів" +msgstr[2] "квадрильйонів" -#: src/humanize/number.py:86 +#: src/humanize/number.py:131 msgid "quintillion" -msgstr "квинтиліонів" +msgid_plural "quintillion" +msgstr[0] "квинтиліонів" +msgstr[1] "квинтиліонів" +msgstr[2] "квинтиліонів" -#: src/humanize/number.py:87 +#: src/humanize/number.py:132 msgid "sextillion" -msgstr "сикстильйонів" +msgid_plural "sextillion" +msgstr[0] "сикстильйонів" +msgstr[1] "сикстильйонів" +msgstr[2] "сикстильйонів" -#: src/humanize/number.py:88 +#: src/humanize/number.py:133 msgid "septillion" -msgstr "септильйонів" +msgid_plural "septillion" +msgstr[0] "септильйонів" +msgstr[1] "септильйонів" +msgstr[2] "септильйонів" -#: src/humanize/number.py:89 +#: src/humanize/number.py:134 msgid "octillion" -msgstr "октильйонів" +msgid_plural "octillion" +msgstr[0] "октильйонів" +msgstr[1] "октильйонів" +msgstr[2] "октильйонів" -#: src/humanize/number.py:90 +#: src/humanize/number.py:135 msgid "nonillion" -msgstr "нонильйонів" +msgid_plural "nonillion" +msgstr[0] "нонильйонів" +msgstr[1] "нонильйонів" +msgstr[2] "нонильйонів" -#: src/humanize/number.py:91 +#: src/humanize/number.py:136 msgid "decillion" -msgstr "децильйонів" +msgid_plural "decillion" +msgstr[0] "децильйонів" +msgstr[1] "децильйонів" +msgstr[2] "децильйонів" -#: src/humanize/number.py:92 +#: src/humanize/number.py:137 msgid "googol" -msgstr "гугола" +msgid_plural "googol" +msgstr[0] "гугола" +msgstr[1] "гугола" +msgstr[2] "гугола" -#: src/humanize/number.py:147 +#: src/humanize/number.py:228 msgid "zero" msgstr "нуль" -#: src/humanize/number.py:148 +#: src/humanize/number.py:229 msgid "one" msgstr "один" -#: src/humanize/number.py:149 +#: src/humanize/number.py:230 msgid "two" msgstr "два" -#: src/humanize/number.py:150 +#: src/humanize/number.py:231 msgid "three" msgstr "три" -#: src/humanize/number.py:151 +#: src/humanize/number.py:232 msgid "four" msgstr "чотири" -#: src/humanize/number.py:152 +#: src/humanize/number.py:233 msgid "five" msgstr "п'ять" -#: src/humanize/number.py:153 +#: src/humanize/number.py:234 msgid "six" msgstr "шість" -#: src/humanize/number.py:154 +#: src/humanize/number.py:235 msgid "seven" msgstr "сім" -#: src/humanize/number.py:155 +#: src/humanize/number.py:236 msgid "eight" msgstr "вісім" -#: src/humanize/number.py:156 +#: src/humanize/number.py:237 msgid "nine" msgstr "дев'ять" -#: src/humanize/time.py:119 +#: src/humanize/time.py:133 #, fuzzy, python-format msgid "%d microsecond" msgid_plural "%d microseconds" @@ -157,7 +197,7 @@ msgstr[0] "%d мікросекунда" msgstr[1] "%d мікросекунд" msgstr[2] "%d мікросекунди" -#: src/humanize/time.py:128 +#: src/humanize/time.py:142 #, fuzzy, python-format msgid "%d millisecond" msgid_plural "%d milliseconds" @@ -165,15 +205,15 @@ msgstr[0] "%d мілісекунда" msgstr[1] "%d мілісекунди" msgstr[2] "%d мілісекунди" -#: src/humanize/time.py:131 src/humanize/time.py:204 +#: src/humanize/time.py:145 src/humanize/time.py:220 msgid "a moment" msgstr "у цей момент" -#: src/humanize/time.py:133 +#: src/humanize/time.py:147 msgid "a second" msgstr "секунду" -#: src/humanize/time.py:135 +#: src/humanize/time.py:149 #, python-format msgid "%d second" msgid_plural "%d seconds" @@ -181,11 +221,11 @@ msgstr[0] "%d секунда" msgstr[1] "%d секунд" msgstr[2] "%d секунд" -#: src/humanize/time.py:137 +#: src/humanize/time.py:151 msgid "a minute" msgstr "хвилина" -#: src/humanize/time.py:140 +#: src/humanize/time.py:154 #, python-format msgid "%d minute" msgid_plural "%d minutes" @@ -193,11 +233,11 @@ msgstr[0] "%d хвилина" msgstr[1] "%d хвилини" msgstr[2] "%d хвилин" -#: src/humanize/time.py:142 +#: src/humanize/time.py:156 msgid "an hour" msgstr "година" -#: src/humanize/time.py:145 +#: src/humanize/time.py:159 #, python-format msgid "%d hour" msgid_plural "%d hours" @@ -205,11 +245,11 @@ msgstr[0] "%d година" msgstr[1] "%d годин" msgstr[2] "%d годин" -#: src/humanize/time.py:148 +#: src/humanize/time.py:162 msgid "a day" msgstr "день" -#: src/humanize/time.py:150 src/humanize/time.py:153 +#: src/humanize/time.py:164 src/humanize/time.py:167 #, python-format msgid "%d day" msgid_plural "%d days" @@ -217,11 +257,11 @@ msgstr[0] "%d день" msgstr[1] "%d дня" msgstr[2] "%d дні" -#: src/humanize/time.py:155 +#: src/humanize/time.py:169 msgid "a month" msgstr "місяць" -#: src/humanize/time.py:157 +#: src/humanize/time.py:171 #, python-format msgid "%d month" msgid_plural "%d months" @@ -229,11 +269,11 @@ msgstr[0] "%d місяць" msgstr[1] "%d місяця" msgstr[2] "%d місяців" -#: src/humanize/time.py:160 +#: src/humanize/time.py:174 msgid "a year" msgstr "рік" -#: src/humanize/time.py:162 src/humanize/time.py:171 +#: src/humanize/time.py:176 src/humanize/time.py:185 #, python-format msgid "1 year, %d day" msgid_plural "1 year, %d days" @@ -241,11 +281,11 @@ msgstr[0] "1 рік, %d день" msgstr[1] "1 рік, %d дня" msgstr[2] "1 рік, %d днів" -#: src/humanize/time.py:165 +#: src/humanize/time.py:179 msgid "1 year, 1 month" msgstr "1 рік, 1 місяць" -#: src/humanize/time.py:168 +#: src/humanize/time.py:182 #, python-format msgid "1 year, %d month" msgid_plural "1 year, %d months" @@ -253,7 +293,7 @@ msgstr[0] "1 рік, %d місяць" msgstr[1] "1 рік, %d місяця" msgstr[2] "1 рік, %d місяців" -#: src/humanize/time.py:173 +#: src/humanize/time.py:187 #, python-format msgid "%d year" msgid_plural "%d years" @@ -261,33 +301,33 @@ msgstr[0] "%d рік" msgstr[1] "%d роки" msgstr[2] "%d років" -#: src/humanize/time.py:201 +#: src/humanize/time.py:217 #, python-format msgid "%s from now" msgstr "через %s" -#: src/humanize/time.py:201 +#: src/humanize/time.py:217 #, python-format msgid "%s ago" msgstr "%s назад" -#: src/humanize/time.py:205 +#: src/humanize/time.py:221 msgid "now" msgstr "зараз" -#: src/humanize/time.py:227 +#: src/humanize/time.py:244 msgid "today" msgstr "сьогодні" -#: src/humanize/time.py:229 +#: src/humanize/time.py:246 msgid "tomorrow" msgstr "завтра" -#: src/humanize/time.py:231 +#: src/humanize/time.py:248 msgid "yesterday" msgstr "вчора" -#: src/humanize/time.py:498 +#: src/humanize/time.py:534 #, python-format msgid "%s and %s" msgstr "" diff --git a/lib/humanize/locale/vi_VI/LC_MESSAGES/humanize.po b/lib/humanize/locale/vi_VI/LC_MESSAGES/humanize.po index cb403bd..839e0bf 100644 --- a/lib/humanize/locale/vi_VI/LC_MESSAGES/humanize.po +++ b/lib/humanize/locale/vi_VI/LC_MESSAGES/humanize.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-09-29 21:07+0300\n" +"POT-Creation-Date: 2021-04-30 22:34+0200\n" "PO-Revision-Date: 2017-05-30 11:51+0700\n" "Last-Translator: Olivier Cortès \n" "Language-Team: vi_VI \n" @@ -19,276 +19,304 @@ msgstr "" "Generated-By: Babel 0.9.6\n" "X-Generator: Poedit 1.8.7.1\n" -#: src/humanize/number.py:31 +#: src/humanize/number.py:56 msgctxt "0" msgid "th" msgstr "." -#: src/humanize/number.py:32 +#: src/humanize/number.py:57 msgctxt "1" msgid "st" msgstr "." -#: src/humanize/number.py:33 +#: src/humanize/number.py:58 msgctxt "2" msgid "nd" msgstr "." -#: src/humanize/number.py:34 +#: src/humanize/number.py:59 msgctxt "3" msgid "rd" msgstr "." -#: src/humanize/number.py:35 +#: src/humanize/number.py:60 msgctxt "4" msgid "th" msgstr "." -#: src/humanize/number.py:36 +#: src/humanize/number.py:61 msgctxt "5" msgid "th" msgstr "." -#: src/humanize/number.py:37 +#: src/humanize/number.py:62 msgctxt "6" msgid "th" msgstr "." -#: src/humanize/number.py:38 +#: src/humanize/number.py:63 msgctxt "7" msgid "th" msgstr "." -#: src/humanize/number.py:39 +#: src/humanize/number.py:64 msgctxt "8" msgid "th" msgstr "." -#: src/humanize/number.py:40 +#: src/humanize/number.py:65 msgctxt "9" msgid "th" msgstr "." -#: src/humanize/number.py:82 +#: src/humanize/number.py:126 +msgid "thousand" +msgid_plural "thousand" +msgstr[0] "" +msgstr[1] "" + +#: src/humanize/number.py:127 msgid "million" -msgstr "%(value)s triệu" +msgid_plural "million" +msgstr[0] "%(value)s triệu" +msgstr[1] "%(value)s triệu" -#: src/humanize/number.py:83 +#: src/humanize/number.py:128 msgid "billion" -msgstr "tỷ" +msgid_plural "billion" +msgstr[0] "tỷ" +msgstr[1] "tỷ" -#: src/humanize/number.py:84 +#: src/humanize/number.py:129 msgid "trillion" -msgstr "%(value)s nghìn tỷ" +msgid_plural "trillion" +msgstr[0] "%(value)s nghìn tỷ" +msgstr[1] "%(value)s nghìn tỷ" -#: src/humanize/number.py:85 +#: src/humanize/number.py:130 msgid "quadrillion" -msgstr "%(value)s triệu tỷ" +msgid_plural "quadrillion" +msgstr[0] "%(value)s triệu tỷ" +msgstr[1] "%(value)s triệu tỷ" -#: src/humanize/number.py:86 +#: src/humanize/number.py:131 #, fuzzy msgid "quintillion" -msgstr "%(value)s quintillion" +msgid_plural "quintillion" +msgstr[0] "%(value)s quintillion" +msgstr[1] "%(value)s quintillion" -#: src/humanize/number.py:87 +#: src/humanize/number.py:132 #, fuzzy msgid "sextillion" -msgstr "%(value)s sextillion" +msgid_plural "sextillion" +msgstr[0] "%(value)s sextillion" +msgstr[1] "%(value)s sextillion" -#: src/humanize/number.py:88 +#: src/humanize/number.py:133 #, fuzzy msgid "septillion" -msgstr "%(value)s septillion" +msgid_plural "septillion" +msgstr[0] "%(value)s septillion" +msgstr[1] "%(value)s septillion" -#: src/humanize/number.py:89 +#: src/humanize/number.py:134 #, fuzzy msgid "octillion" -msgstr "%(value)s octillion" +msgid_plural "octillion" +msgstr[0] "%(value)s octillion" +msgstr[1] "%(value)s octillion" -#: src/humanize/number.py:90 +#: src/humanize/number.py:135 #, fuzzy msgid "nonillion" -msgstr "%(value)s nonillion" +msgid_plural "nonillion" +msgstr[0] "%(value)s nonillion" +msgstr[1] "%(value)s nonillion" -#: src/humanize/number.py:91 +#: src/humanize/number.py:136 #, fuzzy msgid "decillion" -msgstr "%(value)s décillion" +msgid_plural "decillion" +msgstr[0] "%(value)s décillion" +msgstr[1] "%(value)s décillion" -#: src/humanize/number.py:92 +#: src/humanize/number.py:137 #, fuzzy msgid "googol" -msgstr "%(value)s gogol" +msgid_plural "googol" +msgstr[0] "%(value)s gogol" +msgstr[1] "%(value)s gogol" -#: src/humanize/number.py:147 +#: src/humanize/number.py:228 msgid "zero" msgstr "" -#: src/humanize/number.py:148 +#: src/humanize/number.py:229 msgid "one" msgstr "một" -#: src/humanize/number.py:149 +#: src/humanize/number.py:230 msgid "two" msgstr "hai" -#: src/humanize/number.py:150 +#: src/humanize/number.py:231 msgid "three" msgstr "ba" -#: src/humanize/number.py:151 +#: src/humanize/number.py:232 msgid "four" msgstr "bốn" -#: src/humanize/number.py:152 +#: src/humanize/number.py:233 msgid "five" msgstr "năm" -#: src/humanize/number.py:153 +#: src/humanize/number.py:234 msgid "six" msgstr "sáu" -#: src/humanize/number.py:154 +#: src/humanize/number.py:235 msgid "seven" msgstr "bảy" -#: src/humanize/number.py:155 +#: src/humanize/number.py:236 msgid "eight" msgstr "tám" -#: src/humanize/number.py:156 +#: src/humanize/number.py:237 msgid "nine" msgstr "chín" -#: src/humanize/time.py:119 -#, fuzzy, python-format +#: src/humanize/time.py:133 +#, python-format msgid "%d microsecond" msgid_plural "%d microseconds" msgstr[0] "" msgstr[1] "" -#: src/humanize/time.py:128 -#, fuzzy, python-format +#: src/humanize/time.py:142 +#, python-format msgid "%d millisecond" msgid_plural "%d milliseconds" msgstr[0] "" msgstr[1] "" -#: src/humanize/time.py:131 src/humanize/time.py:204 +#: src/humanize/time.py:145 src/humanize/time.py:220 msgid "a moment" msgstr "ngay lúc này" -#: src/humanize/time.py:133 +#: src/humanize/time.py:147 msgid "a second" msgstr "một giây" -#: src/humanize/time.py:135 +#: src/humanize/time.py:149 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d giây" msgstr[1] "%d giây" -#: src/humanize/time.py:137 +#: src/humanize/time.py:151 msgid "a minute" msgstr "một phút" -#: src/humanize/time.py:140 +#: src/humanize/time.py:154 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d phút" msgstr[1] "%d phút" -#: src/humanize/time.py:142 +#: src/humanize/time.py:156 msgid "an hour" msgstr "một giờ" -#: src/humanize/time.py:145 +#: src/humanize/time.py:159 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d giờ" msgstr[1] "%d giờ" -#: src/humanize/time.py:148 +#: src/humanize/time.py:162 msgid "a day" msgstr "một ngày" -#: src/humanize/time.py:150 src/humanize/time.py:153 +#: src/humanize/time.py:164 src/humanize/time.py:167 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d ngày" msgstr[1] "%d ngày" -#: src/humanize/time.py:155 +#: src/humanize/time.py:169 msgid "a month" msgstr "một tháng" -#: src/humanize/time.py:157 +#: src/humanize/time.py:171 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d tháng" msgstr[1] "%d tháng" -#: src/humanize/time.py:160 +#: src/humanize/time.py:174 msgid "a year" msgstr "một năm" -#: src/humanize/time.py:162 src/humanize/time.py:171 +#: src/humanize/time.py:176 src/humanize/time.py:185 #, python-format msgid "1 year, %d day" msgid_plural "1 year, %d days" msgstr[0] "1 năm %d ngày" msgstr[1] "1 năm %d ngày" -#: src/humanize/time.py:165 +#: src/humanize/time.py:179 msgid "1 year, 1 month" msgstr "1 năm 1 tháng" -#: src/humanize/time.py:168 +#: src/humanize/time.py:182 #, python-format msgid "1 year, %d month" msgid_plural "1 year, %d months" msgstr[0] "1 năm %d tháng" msgstr[1] "un an et %d mois" -#: src/humanize/time.py:173 +#: src/humanize/time.py:187 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d năm" msgstr[1] "%d năm" -#: src/humanize/time.py:201 +#: src/humanize/time.py:217 #, python-format msgid "%s from now" msgstr "%s ngày tới" -#: src/humanize/time.py:201 +#: src/humanize/time.py:217 #, python-format msgid "%s ago" msgstr "%s trước" -#: src/humanize/time.py:205 +#: src/humanize/time.py:221 msgid "now" msgstr "ngay bây giờ" -#: src/humanize/time.py:227 +#: src/humanize/time.py:244 msgid "today" msgstr "hôm nay" -#: src/humanize/time.py:229 +#: src/humanize/time.py:246 msgid "tomorrow" msgstr "ngày mai" -#: src/humanize/time.py:231 +#: src/humanize/time.py:248 msgid "yesterday" msgstr "ngày hôm qua" -#: src/humanize/time.py:498 +#: src/humanize/time.py:534 #, python-format msgid "%s and %s" msgstr "" diff --git a/lib/humanize/locale/zh_CN/LC_MESSAGES/humanize.po b/lib/humanize/locale/zh_CN/LC_MESSAGES/humanize.po index 5433598..404f8f7 100644 --- a/lib/humanize/locale/zh_CN/LC_MESSAGES/humanize.po +++ b/lib/humanize/locale/zh_CN/LC_MESSAGES/humanize.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-09-29 21:07+0300\n" +"POT-Creation-Date: 2021-04-30 22:34+0200\n" "PO-Revision-Date: 2016-11-14 23:02+0000\n" "Last-Translator: Liwen SUN \n" "Language-Team: Chinese (simplified)\n" @@ -18,269 +18,297 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: src/humanize/number.py:31 +#: src/humanize/number.py:56 msgctxt "0" msgid "th" msgstr "第" -#: src/humanize/number.py:32 +#: src/humanize/number.py:57 msgctxt "1" msgid "st" msgstr "第" -#: src/humanize/number.py:33 +#: src/humanize/number.py:58 msgctxt "2" msgid "nd" msgstr "第" -#: src/humanize/number.py:34 +#: src/humanize/number.py:59 msgctxt "3" msgid "rd" msgstr "第" -#: src/humanize/number.py:35 +#: src/humanize/number.py:60 msgctxt "4" msgid "th" msgstr "第" -#: src/humanize/number.py:36 +#: src/humanize/number.py:61 msgctxt "5" msgid "th" msgstr "第" -#: src/humanize/number.py:37 +#: src/humanize/number.py:62 msgctxt "6" msgid "th" msgstr "第" -#: src/humanize/number.py:38 +#: src/humanize/number.py:63 msgctxt "7" msgid "th" msgstr "第" -#: src/humanize/number.py:39 +#: src/humanize/number.py:64 msgctxt "8" msgid "th" msgstr "第" -#: src/humanize/number.py:40 +#: src/humanize/number.py:65 msgctxt "9" msgid "th" msgstr "第" -#: src/humanize/number.py:82 +#: src/humanize/number.py:126 +msgid "thousand" +msgid_plural "thousand" +msgstr[0] "" +msgstr[1] "" + +#: src/humanize/number.py:127 msgid "million" -msgstr "百万" +msgid_plural "million" +msgstr[0] "百万" +msgstr[1] "百万" -#: src/humanize/number.py:83 +#: src/humanize/number.py:128 msgid "billion" -msgstr "十亿" +msgid_plural "billion" +msgstr[0] "十亿" +msgstr[1] "十亿" -#: src/humanize/number.py:84 +#: src/humanize/number.py:129 msgid "trillion" -msgstr "兆" +msgid_plural "trillion" +msgstr[0] "兆" +msgstr[1] "兆" -#: src/humanize/number.py:85 +#: src/humanize/number.py:130 msgid "quadrillion" -msgstr "万亿" +msgid_plural "quadrillion" +msgstr[0] "万亿" +msgstr[1] "万亿" -#: src/humanize/number.py:86 +#: src/humanize/number.py:131 msgid "quintillion" -msgstr "百京" +msgid_plural "quintillion" +msgstr[0] "百京" +msgstr[1] "百京" -#: src/humanize/number.py:87 +#: src/humanize/number.py:132 msgid "sextillion" -msgstr "十垓" +msgid_plural "sextillion" +msgstr[0] "十垓" +msgstr[1] "十垓" -#: src/humanize/number.py:88 +#: src/humanize/number.py:133 msgid "septillion" -msgstr "秭" +msgid_plural "septillion" +msgstr[0] "秭" +msgstr[1] "秭" -#: src/humanize/number.py:89 +#: src/humanize/number.py:134 msgid "octillion" -msgstr "千秭" +msgid_plural "octillion" +msgstr[0] "千秭" +msgstr[1] "千秭" -#: src/humanize/number.py:90 +#: src/humanize/number.py:135 msgid "nonillion" -msgstr "百穰" +msgid_plural "nonillion" +msgstr[0] "百穰" +msgstr[1] "百穰" -#: src/humanize/number.py:91 +#: src/humanize/number.py:136 msgid "decillion" -msgstr "十沟" +msgid_plural "decillion" +msgstr[0] "十沟" +msgstr[1] "十沟" -#: src/humanize/number.py:92 +#: src/humanize/number.py:137 msgid "googol" -msgstr "古高尔" +msgid_plural "googol" +msgstr[0] "古高尔" +msgstr[1] "古高尔" -#: src/humanize/number.py:147 +#: src/humanize/number.py:228 msgid "zero" msgstr "" -#: src/humanize/number.py:148 +#: src/humanize/number.py:229 msgid "one" msgstr "一" -#: src/humanize/number.py:149 +#: src/humanize/number.py:230 msgid "two" msgstr "二" -#: src/humanize/number.py:150 +#: src/humanize/number.py:231 msgid "three" msgstr "三" -#: src/humanize/number.py:151 +#: src/humanize/number.py:232 msgid "four" msgstr "四" -#: src/humanize/number.py:152 +#: src/humanize/number.py:233 msgid "five" msgstr "五" -#: src/humanize/number.py:153 +#: src/humanize/number.py:234 msgid "six" msgstr "六" -#: src/humanize/number.py:154 +#: src/humanize/number.py:235 msgid "seven" msgstr "七" -#: src/humanize/number.py:155 +#: src/humanize/number.py:236 msgid "eight" msgstr "八" -#: src/humanize/number.py:156 +#: src/humanize/number.py:237 msgid "nine" msgstr "九" -#: src/humanize/time.py:119 -#, fuzzy, python-format +#: src/humanize/time.py:133 +#, python-format msgid "%d microsecond" msgid_plural "%d microseconds" msgstr[0] "" msgstr[1] "" -#: src/humanize/time.py:128 -#, fuzzy, python-format +#: src/humanize/time.py:142 +#, python-format msgid "%d millisecond" msgid_plural "%d milliseconds" msgstr[0] "" msgstr[1] "" -#: src/humanize/time.py:131 src/humanize/time.py:204 +#: src/humanize/time.py:145 src/humanize/time.py:220 msgid "a moment" msgstr "一会儿" -#: src/humanize/time.py:133 +#: src/humanize/time.py:147 msgid "a second" msgstr "1秒" -#: src/humanize/time.py:135 +#: src/humanize/time.py:149 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d秒" msgstr[1] "%d秒" -#: src/humanize/time.py:137 +#: src/humanize/time.py:151 msgid "a minute" msgstr "1分" -#: src/humanize/time.py:140 +#: src/humanize/time.py:154 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d分" msgstr[1] "%d分" -#: src/humanize/time.py:142 +#: src/humanize/time.py:156 msgid "an hour" msgstr "1小时" -#: src/humanize/time.py:145 +#: src/humanize/time.py:159 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d小时" msgstr[1] "%d小时" -#: src/humanize/time.py:148 +#: src/humanize/time.py:162 msgid "a day" msgstr "1天" -#: src/humanize/time.py:150 src/humanize/time.py:153 +#: src/humanize/time.py:164 src/humanize/time.py:167 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d天" msgstr[1] "%d天" -#: src/humanize/time.py:155 +#: src/humanize/time.py:169 msgid "a month" msgstr "1月" -#: src/humanize/time.py:157 +#: src/humanize/time.py:171 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d月" msgstr[1] "%d月" -#: src/humanize/time.py:160 +#: src/humanize/time.py:174 msgid "a year" msgstr "1年" -#: src/humanize/time.py:162 src/humanize/time.py:171 +#: src/humanize/time.py:176 src/humanize/time.py:185 #, python-format msgid "1 year, %d day" msgid_plural "1 year, %d days" msgstr[0] "%d年" msgstr[1] "%d年" -#: src/humanize/time.py:165 +#: src/humanize/time.py:179 msgid "1 year, 1 month" msgstr "1年又1月" -#: src/humanize/time.py:168 +#: src/humanize/time.py:182 #, python-format msgid "1 year, %d month" msgid_plural "1 year, %d months" msgstr[0] "1年又%d月" msgstr[1] "1年又%d月" -#: src/humanize/time.py:173 +#: src/humanize/time.py:187 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d年" msgstr[1] "%d年" -#: src/humanize/time.py:201 +#: src/humanize/time.py:217 #, python-format msgid "%s from now" msgstr "%s之后" -#: src/humanize/time.py:201 +#: src/humanize/time.py:217 #, python-format msgid "%s ago" msgstr "%s之前" -#: src/humanize/time.py:205 +#: src/humanize/time.py:221 msgid "now" msgstr "现在" -#: src/humanize/time.py:227 +#: src/humanize/time.py:244 msgid "today" msgstr "今天" -#: src/humanize/time.py:229 +#: src/humanize/time.py:246 msgid "tomorrow" msgstr "明天" -#: src/humanize/time.py:231 +#: src/humanize/time.py:248 msgid "yesterday" msgstr "昨天" -#: src/humanize/time.py:498 +#: src/humanize/time.py:534 #, python-format msgid "%s and %s" msgstr "" diff --git a/lib/humanize/number.py b/lib/humanize/number.py index 8b62e4d..9246474 100644 --- a/lib/humanize/number.py +++ b/lib/humanize/number.py @@ -3,12 +3,14 @@ """Humanizing functions for numbers.""" +import math import re from fractions import Fraction from . import compat from .i18n import gettext as _ -from .i18n import gettext_noop as N_ +from .i18n import ngettext +from .i18n import ngettext_noop as NS_ from .i18n import pgettext as P_ from .i18n import thousands_separator @@ -76,7 +78,7 @@ def intcomma(value, ndigits=None): compatibility with Django's `intcomma`, this function also accepts floats. Examples: - ``pycon + ```pycon >>> intcomma(100) '100' >>> intcomma("1000") @@ -121,19 +123,20 @@ def intcomma(value, ndigits=None): return intcomma(new) -powers = [10 ** x for x in (6, 9, 12, 15, 18, 21, 24, 27, 30, 33, 100)] +powers = [10 ** x for x in (3, 6, 9, 12, 15, 18, 21, 24, 27, 30, 33, 100)] human_powers = ( - N_("million"), - N_("billion"), - N_("trillion"), - N_("quadrillion"), - N_("quintillion"), - N_("sextillion"), - N_("septillion"), - N_("octillion"), - N_("nonillion"), - N_("decillion"), - N_("googol"), + NS_("thousand", "thousand"), + NS_("million", "million"), + NS_("billion", "billion"), + NS_("trillion", "trillion"), + NS_("quadrillion", "quadrillion"), + NS_("quintillion", "quintillion"), + NS_("sextillion", "sextillion"), + NS_("septillion", "septillion"), + NS_("octillion", "octillion"), + NS_("nonillion", "nonillion"), + NS_("decillion", "decillion"), + NS_("googol", "googol"), ) @@ -148,6 +151,8 @@ def intword(value, format="%.1f"): ```pycon >>> intword("100") '100' + >>> intword("12400") + '12.4 thousand' >>> intword("1000000") '1.0 million' >>> intword(1_200_000_000) @@ -181,9 +186,15 @@ def intword(value, format="%.1f"): chopped = value / float(powers[ordinal - 1]) if float(format % chopped) == float(10 ** 3): chopped = value / float(powers[ordinal]) - return (" ".join([format, _(human_powers[ordinal])])) % chopped + singular, plural = human_powers[ordinal] + return ( + " ".join([format, ngettext(singular, plural, math.ceil(chopped))]) + ) % chopped else: - return (" ".join([format, _(human_powers[ordinal - 1])])) % chopped + singular, plural = human_powers[ordinal - 1] + return ( + " ".join([format, ngettext(singular, plural, math.ceil(chopped))]) + ) % chopped return str(value) @@ -339,7 +350,7 @@ def scientific(value, precision=2): value = str(value).replace("-", "") negative = True - if isinstance(value, str): + if isinstance(value, compat.string_types): value = float(value) fmt = "{:.%se}" % str(int(precision)) @@ -365,3 +376,66 @@ def scientific(value, precision=2): final_str = part1 + " x 10" + "".join(new_part2) return final_str + + +def clamp(value, format="{:}", floor=None, ceil=None, floor_token="<", ceil_token=">"): + """Returns number with the specified format, clamped between floor and ceil. + + If the number is larger than ceil or smaller than floor, then the respective limit + will be returned, formatted and prepended with a token specifying as such. + + Examples: + ```pycon + >>> clamp(123.456) + '123.456' + >>> clamp(0.0001, floor=0.01) + '<0.01' + >>> clamp(0.99, format="{:.0%}", ceil=0.99) + '99%' + >>> clamp(0.999, format="{:.0%}", ceil=0.99) + '>99%' + >>> clamp(1, format=intword, floor=1e6, floor_token="under ") + 'under 1.0 million' + >>> clamp(None) is None + True + + ``` + + Args: + value (int, float): Input number. + format (str OR callable): Can either be a formatting string, or a callable + function than receives value and returns a string. + floor (int, float): Smallest value before clamping. + ceil (int, float): Largest value before clamping. + floor_token (str): If value is smaller than floor, token will be prepended + to output. + ceil_token (str): If value is larger than ceil, token will be prepended + to output. + + Returns: + str: Formatted number. The output is clamped between the indicated floor and + ceil. If the number if larger than ceil or smaller than floor, the output will + be prepended with a token indicating as such. + + """ + if value is None: + return None + + if floor is not None and value < floor: + value = floor + token = floor_token + elif ceil is not None and value > ceil: + value = ceil + token = ceil_token + else: + token = "" + + if isinstance(format, compat.string_types): + return token + format.format(value) + elif callable(format): + return token + format(value) + else: + raise ValueError( + "Invalid format. Must be either a valid formatting string, or a function " + "that accepts value and returns a string." + ) diff --git a/lib/humanize/time.py b/lib/humanize/time.py index 279604d..686265b 100644 --- a/lib/humanize/time.py +++ b/lib/humanize/time.py @@ -366,17 +366,17 @@ def _suitable_minimum_unit(min_unit, suppress): If not suppressed, return the same unit: >>> from humanize.time import _suitable_minimum_unit, Unit - >>> _suitable_minimum_unit(Unit.HOURS, []) - + >>> _suitable_minimum_unit(Unit.HOURS, []).name + 'HOURS' But if suppressed, find a unit greather than the original one that is not suppressed: - >>> _suitable_minimum_unit(Unit.HOURS, [Unit.HOURS]) - + >>> _suitable_minimum_unit(Unit.HOURS, [Unit.HOURS]).name + 'DAYS' - >>> _suitable_minimum_unit(Unit.HOURS, [Unit.HOURS, Unit.DAYS]) - + >>> _suitable_minimum_unit(Unit.HOURS, [Unit.HOURS, Unit.DAYS]).name + 'MONTHS' """ if min_unit in suppress: for unit in Unit: @@ -394,8 +394,8 @@ def _suppress_lower_units(min_unit, suppress): """Extend suppressed units (if any) with all units lower than the minimum unit. >>> from humanize.time import _suppress_lower_units, Unit - >>> list(sorted(_suppress_lower_units(Unit.SECONDS, [Unit.DAYS]))) - [, , ] + >>> [x.name for x in sorted(_suppress_lower_units(Unit.SECONDS, [Unit.DAYS]))] + ['MICROSECONDS', 'MILLISECONDS', 'DAYS'] """ suppress = set(suppress) for u in Unit: