diff --git a/src/humanize/i18n.py b/src/humanize/i18n.py index 0d71b7f..95e7be9 100644 --- a/src/humanize/i18n.py +++ b/src/humanize/i18n.py @@ -101,7 +101,7 @@ def ngettext(message, plural, num): """Plural version of gettext. Args: - message (str): Singlular text to translate. + message (str): Singular text to translate. plural (str): Plural text to translate. num (str): The number (e.g. item count) to determine translation for the respective grammatical number. diff --git a/src/humanize/locale/de_DE/LC_MESSAGES/humanize.mo b/src/humanize/locale/de_DE/LC_MESSAGES/humanize.mo index 9032870..6095626 100644 Binary files a/src/humanize/locale/de_DE/LC_MESSAGES/humanize.mo and b/src/humanize/locale/de_DE/LC_MESSAGES/humanize.mo differ diff --git a/src/humanize/locale/de_DE/LC_MESSAGES/humanize.po b/src/humanize/locale/de_DE/LC_MESSAGES/humanize.po index f2e151a..8b35e93 100644 --- a/src/humanize/locale/de_DE/LC_MESSAGES/humanize.po +++ b/src/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-03-22 16:30+0200\n" +"POT-Creation-Date: 2020-09-29 21:07+0300\n" "PO-Revision-Date: 2016-12-18 11:50+0100\n" "Last-Translator: Christian Klein \n" "Language-Team: German\n" @@ -19,264 +19,269 @@ msgstr "" "Generated-By: Christian Klein\n" "X-Generator: Sublime Text 3\n" -#: src/humanize/number.py:22 +#: src/humanize/number.py:31 msgctxt "0" msgid "th" msgstr "." -#: src/humanize/number.py:23 +#: src/humanize/number.py:32 msgctxt "1" msgid "st" msgstr "." -#: src/humanize/number.py:24 +#: src/humanize/number.py:33 msgctxt "2" msgid "nd" msgstr "." -#: src/humanize/number.py:25 +#: src/humanize/number.py:34 msgctxt "3" msgid "rd" msgstr "." -#: src/humanize/number.py:26 +#: src/humanize/number.py:35 msgctxt "4" msgid "th" msgstr "." -#: src/humanize/number.py:27 +#: src/humanize/number.py:36 msgctxt "5" msgid "th" msgstr "." -#: src/humanize/number.py:28 +#: src/humanize/number.py:37 msgctxt "6" msgid "th" msgstr "." -#: src/humanize/number.py:29 +#: src/humanize/number.py:38 msgctxt "7" msgid "th" msgstr "." -#: src/humanize/number.py:30 +#: src/humanize/number.py:39 msgctxt "8" msgid "th" msgstr "." -#: src/humanize/number.py:31 +#: src/humanize/number.py:40 msgctxt "9" msgid "th" msgstr "." -#: src/humanize/number.py:73 +#: src/humanize/number.py:82 msgid "million" msgstr "Million" -#: src/humanize/number.py:74 +#: src/humanize/number.py:83 msgid "billion" msgstr "Milliarde" -#: src/humanize/number.py:75 +#: src/humanize/number.py:84 msgid "trillion" msgstr "Billion" -#: src/humanize/number.py:76 +#: src/humanize/number.py:85 msgid "quadrillion" msgstr "Billiarde" -#: src/humanize/number.py:77 +#: src/humanize/number.py:86 msgid "quintillion" msgstr "Trillion" -#: src/humanize/number.py:78 +#: src/humanize/number.py:87 msgid "sextillion" msgstr "Trilliarde" -#: src/humanize/number.py:79 +#: src/humanize/number.py:88 msgid "septillion" msgstr "Quadrillion" -#: src/humanize/number.py:80 +#: src/humanize/number.py:89 msgid "octillion" msgstr "Quadrillarde" -#: src/humanize/number.py:81 +#: src/humanize/number.py:90 msgid "nonillion" msgstr "Quintillion" -#: src/humanize/number.py:82 +#: src/humanize/number.py:91 msgid "decillion" msgstr "Quintilliarde" -#: src/humanize/number.py:83 +#: src/humanize/number.py:92 msgid "googol" msgstr "Googol" -#: src/humanize/number.py:138 +#: src/humanize/number.py:147 msgid "zero" msgstr "null" -#: src/humanize/number.py:139 +#: src/humanize/number.py:148 msgid "one" msgstr "eins" -#: src/humanize/number.py:140 +#: src/humanize/number.py:149 msgid "two" msgstr "zwei" -#: src/humanize/number.py:141 +#: src/humanize/number.py:150 msgid "three" msgstr "drei" -#: src/humanize/number.py:142 +#: src/humanize/number.py:151 msgid "four" msgstr "vier" -#: src/humanize/number.py:143 +#: src/humanize/number.py:152 msgid "five" msgstr "fünf" -#: src/humanize/number.py:144 +#: src/humanize/number.py:153 msgid "six" msgstr "sechs" -#: src/humanize/number.py:145 +#: src/humanize/number.py:154 msgid "seven" msgstr "sieben" -#: src/humanize/number.py:146 +#: src/humanize/number.py:155 msgid "eight" msgstr "acht" -#: src/humanize/number.py:147 +#: src/humanize/number.py:156 msgid "nine" msgstr "neun" -#: src/humanize/time.py:87 +#: src/humanize/time.py:119 #, fuzzy, python-format msgid "%d microsecond" msgid_plural "%d microseconds" msgstr[0] "%d Mikrosekunde" msgstr[1] "%d Mikrosekunden" -#: src/humanize/time.py:93 +#: src/humanize/time.py:128 #, fuzzy, python-format msgid "%d millisecond" msgid_plural "%d milliseconds" msgstr[0] "%d Millisekunde" msgstr[1] "%d Millisekunden" -#: src/humanize/time.py:96 src/humanize/time.py:170 +#: src/humanize/time.py:131 src/humanize/time.py:204 msgid "a moment" msgstr "ein Moment" -#: src/humanize/time.py:98 +#: src/humanize/time.py:133 msgid "a second" msgstr "eine Sekunde" -#: src/humanize/time.py:100 +#: src/humanize/time.py:135 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d Sekunde" msgstr[1] "%d Sekunden" -#: src/humanize/time.py:102 +#: src/humanize/time.py:137 msgid "a minute" msgstr "eine Minute" -#: src/humanize/time.py:105 +#: src/humanize/time.py:140 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d Minute" msgstr[1] "%d Minuten" -#: src/humanize/time.py:107 +#: src/humanize/time.py:142 msgid "an hour" msgstr "eine Stunde" -#: src/humanize/time.py:110 +#: src/humanize/time.py:145 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d Stunde" msgstr[1] "%d Stunden" -#: src/humanize/time.py:113 +#: src/humanize/time.py:148 msgid "a day" msgstr "ein Tag" -#: src/humanize/time.py:115 src/humanize/time.py:118 +#: src/humanize/time.py:150 src/humanize/time.py:153 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d Tag" msgstr[1] "%d Tage" -#: src/humanize/time.py:120 +#: src/humanize/time.py:155 msgid "a month" msgstr "ein Monat" -#: src/humanize/time.py:122 +#: src/humanize/time.py:157 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d Monat" msgstr[1] "%d Monate" -#: src/humanize/time.py:125 +#: src/humanize/time.py:160 msgid "a year" msgstr "ein Jahr" -#: src/humanize/time.py:127 src/humanize/time.py:136 +#: src/humanize/time.py:162 src/humanize/time.py:171 #, 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:130 +#: src/humanize/time.py:165 msgid "1 year, 1 month" msgstr "ein Monat" -#: src/humanize/time.py:133 +#: src/humanize/time.py:168 #, 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:138 +#: src/humanize/time.py:173 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d Jahr" msgstr[1] "%d Jahre" -#: src/humanize/time.py:167 +#: src/humanize/time.py:201 #, python-format msgid "%s from now" msgstr "%s ab jetzt" -#: src/humanize/time.py:167 +#: src/humanize/time.py:201 #, python-format msgid "%s ago" msgstr "vor %s" -#: src/humanize/time.py:171 +#: src/humanize/time.py:205 msgid "now" msgstr "jetzt" -#: src/humanize/time.py:190 +#: src/humanize/time.py:227 msgid "today" msgstr "heute" -#: src/humanize/time.py:192 +#: src/humanize/time.py:229 msgid "tomorrow" msgstr "morgen" -#: src/humanize/time.py:194 +#: src/humanize/time.py:231 msgid "yesterday" msgstr "gestern" + +#: src/humanize/time.py:498 +#, python-format +msgid "%s and %s" +msgstr "%s und %s" diff --git a/src/humanize/locale/es_ES/LC_MESSAGES/humanize.po b/src/humanize/locale/es_ES/LC_MESSAGES/humanize.po index cf07b97..68f5b14 100644 --- a/src/humanize/locale/es_ES/LC_MESSAGES/humanize.po +++ b/src/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-03-22 16:30+0200\n" +"POT-Creation-Date: 2020-09-29 21:07+0300\n" "PO-Revision-Date: 2020-03-31 21:08+0200\n" "Last-Translator: Álvaro Mondéjar \n" "Language-Team: \n" @@ -18,264 +18,269 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 2.3\n" -#: src/humanize/number.py:22 +#: src/humanize/number.py:31 msgctxt "0" msgid "th" msgstr "º" -#: src/humanize/number.py:23 +#: src/humanize/number.py:32 msgctxt "1" msgid "st" msgstr "º" -#: src/humanize/number.py:24 +#: src/humanize/number.py:33 msgctxt "2" msgid "nd" msgstr "º" -#: src/humanize/number.py:25 +#: src/humanize/number.py:34 msgctxt "3" msgid "rd" msgstr "º" -#: src/humanize/number.py:26 +#: src/humanize/number.py:35 msgctxt "4" msgid "th" msgstr "º" -#: src/humanize/number.py:27 +#: src/humanize/number.py:36 msgctxt "5" msgid "th" msgstr "º" -#: src/humanize/number.py:28 +#: src/humanize/number.py:37 msgctxt "6" msgid "th" msgstr "º" -#: src/humanize/number.py:29 +#: src/humanize/number.py:38 msgctxt "7" msgid "th" msgstr "º" -#: src/humanize/number.py:30 +#: src/humanize/number.py:39 msgctxt "8" msgid "th" msgstr "º" -#: src/humanize/number.py:31 +#: src/humanize/number.py:40 msgctxt "9" msgid "th" msgstr "º" -#: src/humanize/number.py:73 +#: src/humanize/number.py:82 msgid "million" msgstr "millón" -#: src/humanize/number.py:74 +#: src/humanize/number.py:83 msgid "billion" msgstr "billón" -#: src/humanize/number.py:75 +#: src/humanize/number.py:84 msgid "trillion" msgstr "trillón" -#: src/humanize/number.py:76 +#: src/humanize/number.py:85 msgid "quadrillion" msgstr "quatrillón" -#: src/humanize/number.py:77 +#: src/humanize/number.py:86 msgid "quintillion" msgstr "quintillón" -#: src/humanize/number.py:78 +#: src/humanize/number.py:87 msgid "sextillion" msgstr "sextillón" -#: src/humanize/number.py:79 +#: src/humanize/number.py:88 msgid "septillion" msgstr "septillón" -#: src/humanize/number.py:80 +#: src/humanize/number.py:89 msgid "octillion" msgstr "octillón" -#: src/humanize/number.py:81 +#: src/humanize/number.py:90 msgid "nonillion" msgstr "nonillón" -#: src/humanize/number.py:82 +#: src/humanize/number.py:91 msgid "decillion" msgstr "decillón" -#: src/humanize/number.py:83 +#: src/humanize/number.py:92 msgid "googol" msgstr "gúgol" -#: src/humanize/number.py:138 +#: src/humanize/number.py:147 msgid "zero" msgstr "cero" -#: src/humanize/number.py:139 +#: src/humanize/number.py:148 msgid "one" msgstr "uno" -#: src/humanize/number.py:140 +#: src/humanize/number.py:149 msgid "two" msgstr "dos" -#: src/humanize/number.py:141 +#: src/humanize/number.py:150 msgid "three" msgstr "tres" -#: src/humanize/number.py:142 +#: src/humanize/number.py:151 msgid "four" msgstr "cuatro" -#: src/humanize/number.py:143 +#: src/humanize/number.py:152 msgid "five" msgstr "cinco" -#: src/humanize/number.py:144 +#: src/humanize/number.py:153 msgid "six" msgstr "seis" -#: src/humanize/number.py:145 +#: src/humanize/number.py:154 msgid "seven" msgstr "siete" -#: src/humanize/number.py:146 +#: src/humanize/number.py:155 msgid "eight" msgstr "ocho" -#: src/humanize/number.py:147 +#: src/humanize/number.py:156 msgid "nine" msgstr "nueve" -#: src/humanize/time.py:87 +#: src/humanize/time.py:119 #, python-format msgid "%d microsecond" msgid_plural "%d microseconds" msgstr[0] "%d microsegundo" msgstr[1] "%d microsegundos" -#: src/humanize/time.py:93 +#: src/humanize/time.py:128 #, python-format msgid "%d millisecond" msgid_plural "%d milliseconds" msgstr[0] "%d milisegundo" msgstr[1] "%d milisegundos" -#: src/humanize/time.py:96 src/humanize/time.py:170 +#: src/humanize/time.py:131 src/humanize/time.py:204 msgid "a moment" msgstr "un momento" -#: src/humanize/time.py:98 +#: src/humanize/time.py:133 msgid "a second" msgstr "un segundo" -#: src/humanize/time.py:100 +#: src/humanize/time.py:135 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d segundo" msgstr[1] "%d segundos" -#: src/humanize/time.py:102 +#: src/humanize/time.py:137 msgid "a minute" msgstr "un minuto" -#: src/humanize/time.py:105 +#: src/humanize/time.py:140 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minuto" msgstr[1] "%d minutos" -#: src/humanize/time.py:107 +#: src/humanize/time.py:142 msgid "an hour" msgstr "una hora" -#: src/humanize/time.py:110 +#: src/humanize/time.py:145 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d hora" msgstr[1] "%d horas" -#: src/humanize/time.py:113 +#: src/humanize/time.py:148 msgid "a day" msgstr "un día" -#: src/humanize/time.py:115 src/humanize/time.py:118 +#: src/humanize/time.py:150 src/humanize/time.py:153 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d día" msgstr[1] "%d días" -#: src/humanize/time.py:120 +#: src/humanize/time.py:155 msgid "a month" msgstr "un mes" -#: src/humanize/time.py:122 +#: src/humanize/time.py:157 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d mes" msgstr[1] "%d meses" -#: src/humanize/time.py:125 +#: src/humanize/time.py:160 msgid "a year" msgstr "un año" -#: src/humanize/time.py:127 src/humanize/time.py:136 +#: src/humanize/time.py:162 src/humanize/time.py:171 #, 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:130 +#: src/humanize/time.py:165 msgid "1 year, 1 month" msgstr "1 año y 1 mes" -#: src/humanize/time.py:133 +#: src/humanize/time.py:168 #, 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:138 +#: src/humanize/time.py:173 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d año" msgstr[1] "%d años" -#: src/humanize/time.py:167 +#: src/humanize/time.py:201 #, python-format msgid "%s from now" msgstr "en %s" -#: src/humanize/time.py:167 +#: src/humanize/time.py:201 #, python-format msgid "%s ago" msgstr "hace %s" -#: src/humanize/time.py:171 +#: src/humanize/time.py:205 msgid "now" msgstr "ahora" -#: src/humanize/time.py:190 +#: src/humanize/time.py:227 msgid "today" msgstr "hoy" -#: src/humanize/time.py:192 +#: src/humanize/time.py:229 msgid "tomorrow" msgstr "mañana" -#: src/humanize/time.py:194 +#: src/humanize/time.py:231 msgid "yesterday" msgstr "ayer" + +#: src/humanize/time.py:498 +#, python-format +msgid "%s and %s" +msgstr "" diff --git a/src/humanize/locale/fa_IR/LC_MESSAGES/humanize.po b/src/humanize/locale/fa_IR/LC_MESSAGES/humanize.po index 413247e..c2a70da 100644 --- a/src/humanize/locale/fa_IR/LC_MESSAGES/humanize.po +++ b/src/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-02-08 20:21+0200\n" +"POT-Creation-Date: 2020-09-29 21:07+0300\n" "PO-Revision-Date: 2017-01-10 02:44+0330\n" "Last-Translator: Christian Klein \n" "Language-Team: German\n" @@ -19,246 +19,269 @@ msgstr "" "Generated-By: Christian Klein\n" "X-Generator: Poedit 1.5.4\n" -#: src/humanize/number.py:24 +#: src/humanize/number.py:31 msgctxt "0" msgid "th" msgstr "." -#: src/humanize/number.py:25 +#: src/humanize/number.py:32 msgctxt "1" msgid "st" msgstr "اولین" -#: src/humanize/number.py:26 +#: src/humanize/number.py:33 msgctxt "2" msgid "nd" msgstr "دومین" -#: src/humanize/number.py:27 +#: src/humanize/number.py:34 msgctxt "3" msgid "rd" msgstr "سومین" -#: src/humanize/number.py:28 +#: src/humanize/number.py:35 msgctxt "4" msgid "th" msgstr "چهارمین" -#: src/humanize/number.py:29 +#: src/humanize/number.py:36 msgctxt "5" msgid "th" msgstr "پنجمین" -#: src/humanize/number.py:30 +#: src/humanize/number.py:37 msgctxt "6" msgid "th" msgstr "ششمین" -#: src/humanize/number.py:31 +#: src/humanize/number.py:38 msgctxt "7" msgid "th" msgstr "هفتمین" -#: src/humanize/number.py:32 +#: src/humanize/number.py:39 msgctxt "8" msgid "th" msgstr "هشتمین" -#: src/humanize/number.py:33 +#: src/humanize/number.py:40 msgctxt "9" msgid "th" msgstr "نهمین" -#: src/humanize/number.py:62 +#: src/humanize/number.py:82 msgid "million" msgstr "میلیون" -#: src/humanize/number.py:63 +#: src/humanize/number.py:83 msgid "billion" msgstr "میلیارد" -#: src/humanize/number.py:64 +#: src/humanize/number.py:84 msgid "trillion" msgstr "ترلیون" -#: src/humanize/number.py:65 +#: src/humanize/number.py:85 msgid "quadrillion" msgstr "کوادریلیون" -#: src/humanize/number.py:66 +#: src/humanize/number.py:86 msgid "quintillion" msgstr "کوانتیلیون" -#: src/humanize/number.py:67 +#: src/humanize/number.py:87 msgid "sextillion" msgstr "سکستیلیون" -#: src/humanize/number.py:68 +#: src/humanize/number.py:88 msgid "septillion" msgstr "سپتیلیون" -#: src/humanize/number.py:69 +#: src/humanize/number.py:89 msgid "octillion" msgstr "اوکتیلیون" -#: src/humanize/number.py:70 +#: src/humanize/number.py:90 msgid "nonillion" msgstr "نونیلیون" -#: src/humanize/number.py:71 +#: src/humanize/number.py:91 msgid "decillion" msgstr "دسیلیون" -#: src/humanize/number.py:72 +#: src/humanize/number.py:92 msgid "googol" msgstr "گوگول" -#: src/humanize/number.py:108 +#: src/humanize/number.py:147 +msgid "zero" +msgstr "" + +#: src/humanize/number.py:148 msgid "one" msgstr "یک" -#: src/humanize/number.py:109 +#: src/humanize/number.py:149 msgid "two" msgstr "دو" -#: src/humanize/number.py:110 +#: src/humanize/number.py:150 msgid "three" msgstr "سه" -#: src/humanize/number.py:111 +#: src/humanize/number.py:151 msgid "four" msgstr "چهار" -#: src/humanize/number.py:112 +#: src/humanize/number.py:152 msgid "five" msgstr "پنج" -#: src/humanize/number.py:113 +#: src/humanize/number.py:153 msgid "six" msgstr "شش" -#: src/humanize/number.py:114 +#: src/humanize/number.py:154 msgid "seven" msgstr "هفت" -#: src/humanize/number.py:115 +#: src/humanize/number.py:155 msgid "eight" msgstr "هشت" -#: src/humanize/number.py:116 +#: src/humanize/number.py:156 msgid "nine" msgstr "نه" -#: src/humanize/time.py:68 src/humanize/time.py:131 +#: src/humanize/time.py:119 +#, fuzzy, python-format +msgid "%d microsecond" +msgid_plural "%d microseconds" +msgstr[0] "" +msgstr[1] "" + +#: src/humanize/time.py:128 +#, fuzzy, python-format +msgid "%d millisecond" +msgid_plural "%d milliseconds" +msgstr[0] "" +msgstr[1] "" + +#: src/humanize/time.py:131 src/humanize/time.py:204 msgid "a moment" msgstr "یک لحظه" -#: src/humanize/time.py:70 +#: src/humanize/time.py:133 msgid "a second" msgstr "یک ثانیه" -#: src/humanize/time.py:72 +#: src/humanize/time.py:135 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d ثانیه" msgstr[1] "%d ثانیه" -#: src/humanize/time.py:74 +#: src/humanize/time.py:137 msgid "a minute" msgstr "یک دقیقه" -#: src/humanize/time.py:77 +#: src/humanize/time.py:140 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d دقیقه" msgstr[1] "%d دقیقه" -#: src/humanize/time.py:79 +#: src/humanize/time.py:142 msgid "an hour" msgstr "یک ساعت" -#: src/humanize/time.py:82 +#: src/humanize/time.py:145 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d ساعت" msgstr[1] "%d ساعت" -#: src/humanize/time.py:85 +#: src/humanize/time.py:148 msgid "a day" msgstr "یک روز" -#: src/humanize/time.py:87 src/humanize/time.py:90 +#: src/humanize/time.py:150 src/humanize/time.py:153 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d روز" msgstr[1] "%d روز" -#: src/humanize/time.py:92 +#: src/humanize/time.py:155 msgid "a month" msgstr "یک ماه" -#: src/humanize/time.py:94 +#: src/humanize/time.py:157 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d ماه" msgstr[1] "%d ماه" -#: src/humanize/time.py:97 +#: src/humanize/time.py:160 msgid "a year" msgstr "یک سال" -#: src/humanize/time.py:99 src/humanize/time.py:108 +#: src/humanize/time.py:162 src/humanize/time.py:171 #, python-format msgid "1 year, %d day" msgid_plural "1 year, %d days" msgstr[0] "۱ سال و %d روز" msgstr[1] "۱ سال و %d روز" -#: src/humanize/time.py:102 +#: src/humanize/time.py:165 msgid "1 year, 1 month" msgstr "۱ سال و ۱ ماه" -#: src/humanize/time.py:105 +#: src/humanize/time.py:168 #, python-format msgid "1 year, %d month" msgid_plural "1 year, %d months" msgstr[0] "۱ سال و %d ماه" msgstr[1] "۱ سال و %d ماه" -#: src/humanize/time.py:110 +#: src/humanize/time.py:173 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d سال" msgstr[1] "%d سال" -#: src/humanize/time.py:128 +#: src/humanize/time.py:201 #, python-format msgid "%s from now" msgstr "%s تا به اکنون" -#: src/humanize/time.py:128 +#: src/humanize/time.py:201 #, python-format msgid "%s ago" msgstr "%s پیش" -#: src/humanize/time.py:132 +#: src/humanize/time.py:205 msgid "now" msgstr "اکنون" -#: src/humanize/time.py:151 +#: src/humanize/time.py:227 msgid "today" msgstr "امروز" -#: src/humanize/time.py:153 +#: src/humanize/time.py:229 msgid "tomorrow" msgstr "فردا" -#: src/humanize/time.py:155 +#: src/humanize/time.py:231 msgid "yesterday" msgstr "دیروز" + +#: src/humanize/time.py:498 +#, python-format +msgid "%s and %s" +msgstr "" diff --git a/src/humanize/locale/fi_FI/LC_MESSAGES/humanize.mo b/src/humanize/locale/fi_FI/LC_MESSAGES/humanize.mo index f2cb0da..d34085f 100644 Binary files a/src/humanize/locale/fi_FI/LC_MESSAGES/humanize.mo and b/src/humanize/locale/fi_FI/LC_MESSAGES/humanize.mo differ diff --git a/src/humanize/locale/fi_FI/LC_MESSAGES/humanize.po b/src/humanize/locale/fi_FI/LC_MESSAGES/humanize.po index 2c5debb..1226296 100644 --- a/src/humanize/locale/fi_FI/LC_MESSAGES/humanize.po +++ b/src/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-03-22 16:30+0200\n" +"POT-Creation-Date: 2020-09-29 21:07+0300\n" "PO-Revision-Date: 2017-03-02 11:26+0200\n" "Last-Translator: Ville Skyttä \n" "Language-Team: Finnish\n" @@ -18,264 +18,269 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 1.8.12\n" -#: src/humanize/number.py:22 +#: src/humanize/number.py:31 msgctxt "0" msgid "th" msgstr "." -#: src/humanize/number.py:23 +#: src/humanize/number.py:32 msgctxt "1" msgid "st" msgstr "." -#: src/humanize/number.py:24 +#: src/humanize/number.py:33 msgctxt "2" msgid "nd" msgstr "." -#: src/humanize/number.py:25 +#: src/humanize/number.py:34 msgctxt "3" msgid "rd" msgstr "." -#: src/humanize/number.py:26 +#: src/humanize/number.py:35 msgctxt "4" msgid "th" msgstr "." -#: src/humanize/number.py:27 +#: src/humanize/number.py:36 msgctxt "5" msgid "th" msgstr "." -#: src/humanize/number.py:28 +#: src/humanize/number.py:37 msgctxt "6" msgid "th" msgstr "." -#: src/humanize/number.py:29 +#: src/humanize/number.py:38 msgctxt "7" msgid "th" msgstr "." -#: src/humanize/number.py:30 +#: src/humanize/number.py:39 msgctxt "8" msgid "th" msgstr "." -#: src/humanize/number.py:31 +#: src/humanize/number.py:40 msgctxt "9" msgid "th" msgstr "." -#: src/humanize/number.py:73 +#: src/humanize/number.py:82 msgid "million" msgstr "miljoonaa" -#: src/humanize/number.py:74 +#: src/humanize/number.py:83 msgid "billion" msgstr "miljardia" -#: src/humanize/number.py:75 +#: src/humanize/number.py:84 msgid "trillion" msgstr "biljoonaa" -#: src/humanize/number.py:76 +#: src/humanize/number.py:85 msgid "quadrillion" msgstr "kvadriljoonaa" -#: src/humanize/number.py:77 +#: src/humanize/number.py:86 msgid "quintillion" msgstr "kvintiljoonaa" -#: src/humanize/number.py:78 +#: src/humanize/number.py:87 msgid "sextillion" msgstr "sekstiljoonaa" -#: src/humanize/number.py:79 +#: src/humanize/number.py:88 msgid "septillion" msgstr "septiljoonaa" -#: src/humanize/number.py:80 +#: src/humanize/number.py:89 msgid "octillion" msgstr "oktiljoonaa" -#: src/humanize/number.py:81 +#: src/humanize/number.py:90 msgid "nonillion" msgstr "noniljoonaa" -#: src/humanize/number.py:82 +#: src/humanize/number.py:91 msgid "decillion" msgstr "dekiljoonaa" -#: src/humanize/number.py:83 +#: src/humanize/number.py:92 msgid "googol" msgstr "googol" -#: src/humanize/number.py:138 +#: src/humanize/number.py:147 msgid "zero" msgstr "nolla" -#: src/humanize/number.py:139 +#: src/humanize/number.py:148 msgid "one" msgstr "yksi" -#: src/humanize/number.py:140 +#: src/humanize/number.py:149 msgid "two" msgstr "kaksi" -#: src/humanize/number.py:141 +#: src/humanize/number.py:150 msgid "three" msgstr "kolme" -#: src/humanize/number.py:142 +#: src/humanize/number.py:151 msgid "four" msgstr "neljä" -#: src/humanize/number.py:143 +#: src/humanize/number.py:152 msgid "five" msgstr "viisi" -#: src/humanize/number.py:144 +#: src/humanize/number.py:153 msgid "six" msgstr "kuusi" -#: src/humanize/number.py:145 +#: src/humanize/number.py:154 msgid "seven" msgstr "seitsemän" -#: src/humanize/number.py:146 +#: src/humanize/number.py:155 msgid "eight" msgstr "kahdeksan" -#: src/humanize/number.py:147 +#: src/humanize/number.py:156 msgid "nine" msgstr "yhdeksän" -#: src/humanize/time.py:87 +#: src/humanize/time.py:119 #, fuzzy, python-format msgid "%d microsecond" msgid_plural "%d microseconds" msgstr[0] "%d mikrosekunti" msgstr[1] "%d mikrosekuntia" -#: src/humanize/time.py:93 +#: src/humanize/time.py:128 #, fuzzy, python-format msgid "%d millisecond" msgid_plural "%d milliseconds" msgstr[0] "%d millisekunti" msgstr[1] "%d millisekuntia" -#: src/humanize/time.py:96 src/humanize/time.py:170 +#: src/humanize/time.py:131 src/humanize/time.py:204 msgid "a moment" msgstr "hetki" -#: src/humanize/time.py:98 +#: src/humanize/time.py:133 msgid "a second" msgstr "sekunti" -#: src/humanize/time.py:100 +#: src/humanize/time.py:135 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d sekunti" msgstr[1] "%d sekuntia" -#: src/humanize/time.py:102 +#: src/humanize/time.py:137 msgid "a minute" msgstr "minuutti" -#: src/humanize/time.py:105 +#: src/humanize/time.py:140 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minuutti" msgstr[1] "%d minuuttia" -#: src/humanize/time.py:107 +#: src/humanize/time.py:142 msgid "an hour" msgstr "tunti" -#: src/humanize/time.py:110 +#: src/humanize/time.py:145 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d tunti" msgstr[1] "%d tuntia" -#: src/humanize/time.py:113 +#: src/humanize/time.py:148 msgid "a day" msgstr "päivä" -#: src/humanize/time.py:115 src/humanize/time.py:118 +#: src/humanize/time.py:150 src/humanize/time.py:153 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d päivä" msgstr[1] "%d päivää" -#: src/humanize/time.py:120 +#: src/humanize/time.py:155 msgid "a month" msgstr "kuukausi" -#: src/humanize/time.py:122 +#: src/humanize/time.py:157 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d kuukausi" msgstr[1] "%d kuukautta" -#: src/humanize/time.py:125 +#: src/humanize/time.py:160 msgid "a year" msgstr "vuosi" -#: src/humanize/time.py:127 src/humanize/time.py:136 +#: src/humanize/time.py:162 src/humanize/time.py:171 #, 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:130 +#: src/humanize/time.py:165 msgid "1 year, 1 month" msgstr "1 vuosi, 1 kuukausi" -#: src/humanize/time.py:133 +#: src/humanize/time.py:168 #, 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:138 +#: src/humanize/time.py:173 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d vuosi" msgstr[1] "%d vuotta" -#: src/humanize/time.py:167 +#: src/humanize/time.py:201 #, python-format msgid "%s from now" msgstr "%s tästä" -#: src/humanize/time.py:167 +#: src/humanize/time.py:201 #, python-format msgid "%s ago" msgstr "%s sitten" -#: src/humanize/time.py:171 +#: src/humanize/time.py:205 msgid "now" msgstr "nyt" -#: src/humanize/time.py:190 +#: src/humanize/time.py:227 msgid "today" msgstr "tänään" -#: src/humanize/time.py:192 +#: src/humanize/time.py:229 msgid "tomorrow" msgstr "huomenna" -#: src/humanize/time.py:194 +#: src/humanize/time.py:231 msgid "yesterday" msgstr "eilen" + +#: src/humanize/time.py:498 +#, python-format +msgid "%s and %s" +msgstr "%s ja %s" diff --git a/src/humanize/locale/fr_FR/LC_MESSAGES/humanize.mo b/src/humanize/locale/fr_FR/LC_MESSAGES/humanize.mo index 36cd436..f2aae3b 100644 Binary files a/src/humanize/locale/fr_FR/LC_MESSAGES/humanize.mo and b/src/humanize/locale/fr_FR/LC_MESSAGES/humanize.mo differ diff --git a/src/humanize/locale/fr_FR/LC_MESSAGES/humanize.po b/src/humanize/locale/fr_FR/LC_MESSAGES/humanize.po index e2b3c06..df85d62 100644 --- a/src/humanize/locale/fr_FR/LC_MESSAGES/humanize.po +++ b/src/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-03-22 16:30+0200\n" +"POT-Creation-Date: 2020-09-29 21:07+0300\n" "PO-Revision-Date: 2013-06-22 08:52+0100\n" "Last-Translator: Olivier Cortès \n" "Language-Team: fr_FR \n" @@ -19,284 +19,289 @@ msgstr "" "Generated-By: Babel 0.9.6\n" "X-Generator: Poedit 1.5.5\n" -#: src/humanize/number.py:22 +#: src/humanize/number.py:31 #, fuzzy msgctxt "0" msgid "th" msgstr "e" -#: src/humanize/number.py:23 +#: src/humanize/number.py:32 #, fuzzy msgctxt "1" msgid "st" msgstr "er" -#: src/humanize/number.py:24 +#: src/humanize/number.py:33 #, fuzzy msgctxt "2" msgid "nd" msgstr "e" -#: src/humanize/number.py:25 +#: src/humanize/number.py:34 #, fuzzy msgctxt "3" msgid "rd" msgstr "e" -#: src/humanize/number.py:26 +#: src/humanize/number.py:35 #, fuzzy msgctxt "4" msgid "th" msgstr "e" -#: src/humanize/number.py:27 +#: src/humanize/number.py:36 #, fuzzy msgctxt "5" msgid "th" msgstr "e" -#: src/humanize/number.py:28 +#: src/humanize/number.py:37 #, fuzzy msgctxt "6" msgid "th" msgstr "e" -#: src/humanize/number.py:29 +#: src/humanize/number.py:38 #, fuzzy msgctxt "7" msgid "th" msgstr "e" -#: src/humanize/number.py:30 +#: src/humanize/number.py:39 #, fuzzy msgctxt "8" msgid "th" msgstr "e" -#: src/humanize/number.py:31 +#: src/humanize/number.py:40 #, fuzzy msgctxt "9" msgid "th" msgstr "e" -#: src/humanize/number.py:73 +#: src/humanize/number.py:82 #, fuzzy msgid "million" msgstr "%(value)s million" -#: src/humanize/number.py:74 +#: src/humanize/number.py:83 msgid "billion" msgstr "milliard" -#: src/humanize/number.py:75 +#: src/humanize/number.py:84 #, fuzzy msgid "trillion" msgstr "%(value)s billion" -#: src/humanize/number.py:76 +#: src/humanize/number.py:85 #, fuzzy msgid "quadrillion" msgstr "%(value)s billiard" -#: src/humanize/number.py:77 +#: src/humanize/number.py:86 #, fuzzy msgid "quintillion" msgstr "%(value)s trillion" -#: src/humanize/number.py:78 +#: src/humanize/number.py:87 #, fuzzy msgid "sextillion" msgstr "%(value)s trilliard" -#: src/humanize/number.py:79 +#: src/humanize/number.py:88 #, fuzzy msgid "septillion" msgstr "%(value)s quatrillion" -#: src/humanize/number.py:80 +#: src/humanize/number.py:89 #, fuzzy msgid "octillion" msgstr "%(value)s quadrilliard" -#: src/humanize/number.py:81 +#: src/humanize/number.py:90 #, fuzzy msgid "nonillion" msgstr "%(value)s quintillion" -#: src/humanize/number.py:82 +#: src/humanize/number.py:91 #, fuzzy msgid "decillion" msgstr "%(value)s quintilliard" -#: src/humanize/number.py:83 +#: src/humanize/number.py:92 #, fuzzy msgid "googol" msgstr "%(value)s gogol" -#: src/humanize/number.py:138 +#: src/humanize/number.py:147 msgid "zero" msgstr "zéro" -#: src/humanize/number.py:139 +#: src/humanize/number.py:148 msgid "one" msgstr "un" -#: src/humanize/number.py:140 +#: src/humanize/number.py:149 msgid "two" msgstr "deux" -#: src/humanize/number.py:141 +#: src/humanize/number.py:150 msgid "three" msgstr "trois" -#: src/humanize/number.py:142 +#: src/humanize/number.py:151 msgid "four" msgstr "quatre" -#: src/humanize/number.py:143 +#: src/humanize/number.py:152 msgid "five" msgstr "cinq" -#: src/humanize/number.py:144 +#: src/humanize/number.py:153 msgid "six" msgstr "six" -#: src/humanize/number.py:145 +#: src/humanize/number.py:154 msgid "seven" msgstr "sept" -#: src/humanize/number.py:146 +#: src/humanize/number.py:155 msgid "eight" msgstr "huit" -#: src/humanize/number.py:147 +#: src/humanize/number.py:156 msgid "nine" msgstr "neuf" -#: src/humanize/time.py:87 +#: src/humanize/time.py:119 #, fuzzy, python-format msgid "%d microsecond" msgid_plural "%d microseconds" msgstr[0] "%d microseconde" msgstr[1] "%d microsecondes" -#: src/humanize/time.py:93 +#: src/humanize/time.py:128 #, fuzzy, python-format msgid "%d millisecond" msgid_plural "%d milliseconds" msgstr[0] "%d milliseconde" msgstr[1] "%d millisecondes" -#: src/humanize/time.py:96 src/humanize/time.py:170 +#: src/humanize/time.py:131 src/humanize/time.py:204 msgid "a moment" msgstr "un moment" -#: src/humanize/time.py:98 +#: src/humanize/time.py:133 msgid "a second" msgstr "une seconde" -#: src/humanize/time.py:100 +#: src/humanize/time.py:135 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d seconde" msgstr[1] "%d secondes" -#: src/humanize/time.py:102 +#: src/humanize/time.py:137 msgid "a minute" msgstr "une minute" -#: src/humanize/time.py:105 +#: src/humanize/time.py:140 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minute" msgstr[1] "%d minutes" -#: src/humanize/time.py:107 +#: src/humanize/time.py:142 msgid "an hour" msgstr "une heure" -#: src/humanize/time.py:110 +#: src/humanize/time.py:145 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d heure" msgstr[1] "%d heures" -#: src/humanize/time.py:113 +#: src/humanize/time.py:148 msgid "a day" msgstr "un jour" -#: src/humanize/time.py:115 src/humanize/time.py:118 +#: src/humanize/time.py:150 src/humanize/time.py:153 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d jour" msgstr[1] "%d jours" -#: src/humanize/time.py:120 +#: src/humanize/time.py:155 msgid "a month" msgstr "un mois" -#: src/humanize/time.py:122 +#: src/humanize/time.py:157 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d mois" msgstr[1] "%d mois" -#: src/humanize/time.py:125 +#: src/humanize/time.py:160 msgid "a year" msgstr "un an" -#: src/humanize/time.py:127 src/humanize/time.py:136 +#: src/humanize/time.py:162 src/humanize/time.py:171 #, 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:130 +#: src/humanize/time.py:165 msgid "1 year, 1 month" msgstr "un an et un mois" -#: src/humanize/time.py:133 +#: src/humanize/time.py:168 #, 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:138 +#: src/humanize/time.py:173 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d an" msgstr[1] "%d ans" -#: src/humanize/time.py:167 +#: src/humanize/time.py:201 #, python-format msgid "%s from now" msgstr "dans %s" -#: src/humanize/time.py:167 +#: src/humanize/time.py:201 #, python-format msgid "%s ago" msgstr "il y a %s" -#: src/humanize/time.py:171 +#: src/humanize/time.py:205 msgid "now" msgstr "maintenant" -#: src/humanize/time.py:190 +#: src/humanize/time.py:227 msgid "today" msgstr "aujourd'hui" -#: src/humanize/time.py:192 +#: src/humanize/time.py:229 msgid "tomorrow" msgstr "demain" -#: src/humanize/time.py:194 +#: src/humanize/time.py:231 msgid "yesterday" msgstr "hier" + +#: src/humanize/time.py:498 +#, python-format +msgid "%s and %s" +msgstr "%s et %s" diff --git a/src/humanize/locale/id_ID/LC_MESSAGES/humanize.po b/src/humanize/locale/id_ID/LC_MESSAGES/humanize.po index c544ea8..1fa1fb8 100644 --- a/src/humanize/locale/id_ID/LC_MESSAGES/humanize.po +++ b/src/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-02-08 20:05+0200\n" +"POT-Creation-Date: 2020-09-29 21:07+0300\n" "PO-Revision-Date: 2017-03-18 15:41+0700\n" "Last-Translator: adie.rebel@gmail.com\n" "Language-Team: Indonesian\n" @@ -18,238 +18,259 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Poedit 1.8.11\n" -#: src/humanize/number.py:24 +#: src/humanize/number.py:31 msgctxt "0" msgid "th" msgstr "." -#: src/humanize/number.py:25 +#: src/humanize/number.py:32 msgctxt "1" msgid "st" msgstr "." -#: src/humanize/number.py:26 +#: src/humanize/number.py:33 msgctxt "2" msgid "nd" msgstr "." -#: src/humanize/number.py:27 +#: src/humanize/number.py:34 msgctxt "3" msgid "rd" msgstr "." -#: src/humanize/number.py:28 +#: src/humanize/number.py:35 msgctxt "4" msgid "th" msgstr "." -#: src/humanize/number.py:29 +#: src/humanize/number.py:36 msgctxt "5" msgid "th" msgstr "." -#: src/humanize/number.py:30 +#: src/humanize/number.py:37 msgctxt "6" msgid "th" msgstr "." -#: src/humanize/number.py:31 +#: src/humanize/number.py:38 msgctxt "7" msgid "th" msgstr "." -#: src/humanize/number.py:32 +#: src/humanize/number.py:39 msgctxt "8" msgid "th" msgstr "." -#: src/humanize/number.py:33 +#: src/humanize/number.py:40 msgctxt "9" msgid "th" msgstr "." -#: src/humanize/number.py:62 +#: src/humanize/number.py:82 msgid "million" msgstr "juta" -#: src/humanize/number.py:63 +#: src/humanize/number.py:83 msgid "billion" msgstr "miliar" -#: src/humanize/number.py:64 +#: src/humanize/number.py:84 msgid "trillion" msgstr "triliun" -#: src/humanize/number.py:65 +#: src/humanize/number.py:85 msgid "quadrillion" msgstr "quadrillion" -#: src/humanize/number.py:66 +#: src/humanize/number.py:86 msgid "quintillion" msgstr "quintillion" -#: src/humanize/number.py:67 +#: src/humanize/number.py:87 msgid "sextillion" msgstr "sextillion" -#: src/humanize/number.py:68 +#: src/humanize/number.py:88 msgid "septillion" msgstr "septillion" -#: src/humanize/number.py:69 +#: src/humanize/number.py:89 msgid "octillion" msgstr "octillion" -#: src/humanize/number.py:70 +#: src/humanize/number.py:90 msgid "nonillion" msgstr "nonillion" -#: src/humanize/number.py:71 +#: src/humanize/number.py:91 msgid "decillion" msgstr "decillion" -#: src/humanize/number.py:72 +#: src/humanize/number.py:92 msgid "googol" msgstr "googol" -#: src/humanize/number.py:108 +#: src/humanize/number.py:147 +msgid "zero" +msgstr "" + +#: src/humanize/number.py:148 msgid "one" msgstr "satu" -#: src/humanize/number.py:109 +#: src/humanize/number.py:149 msgid "two" msgstr "dua" -#: src/humanize/number.py:110 +#: src/humanize/number.py:150 msgid "three" msgstr "tiga" -#: src/humanize/number.py:111 +#: src/humanize/number.py:151 msgid "four" msgstr "empat" -#: src/humanize/number.py:112 +#: src/humanize/number.py:152 msgid "five" msgstr "lima" -#: src/humanize/number.py:113 +#: src/humanize/number.py:153 msgid "six" msgstr "enam" -#: src/humanize/number.py:114 +#: src/humanize/number.py:154 msgid "seven" msgstr "tujuh" -#: src/humanize/number.py:115 +#: src/humanize/number.py:155 msgid "eight" msgstr "delapan" -#: src/humanize/number.py:116 +#: src/humanize/number.py:156 msgid "nine" msgstr "sembilan" -#: src/humanize/time.py:68 src/humanize/time.py:131 +#: src/humanize/time.py:119 +#, fuzzy, python-format +msgid "%d microsecond" +msgid_plural "%d microseconds" +msgstr[0] "" + +#: src/humanize/time.py:128 +#, fuzzy, python-format +msgid "%d millisecond" +msgid_plural "%d milliseconds" +msgstr[0] "" + +#: src/humanize/time.py:131 src/humanize/time.py:204 msgid "a moment" msgstr "beberapa saat" -#: src/humanize/time.py:70 +#: src/humanize/time.py:133 msgid "a second" msgstr "sedetik" -#: src/humanize/time.py:72 +#: src/humanize/time.py:135 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d detik" -#: src/humanize/time.py:74 +#: src/humanize/time.py:137 msgid "a minute" msgstr "semenit" -#: src/humanize/time.py:77 +#: src/humanize/time.py:140 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d menit" -#: src/humanize/time.py:79 +#: src/humanize/time.py:142 msgid "an hour" msgstr "sejam" -#: src/humanize/time.py:82 +#: src/humanize/time.py:145 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d jam" -#: src/humanize/time.py:85 +#: src/humanize/time.py:148 msgid "a day" msgstr "sehari" -#: src/humanize/time.py:87 src/humanize/time.py:90 +#: src/humanize/time.py:150 src/humanize/time.py:153 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d hari" -#: src/humanize/time.py:92 +#: src/humanize/time.py:155 msgid "a month" msgstr "sebulan" -#: src/humanize/time.py:94 +#: src/humanize/time.py:157 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d bulan" -#: src/humanize/time.py:97 +#: src/humanize/time.py:160 msgid "a year" msgstr "setahun" -#: src/humanize/time.py:99 src/humanize/time.py:108 +#: src/humanize/time.py:162 src/humanize/time.py:171 #, python-format msgid "1 year, %d day" msgid_plural "1 year, %d days" msgstr[0] "1 tahun, %d hari" -#: src/humanize/time.py:102 +#: src/humanize/time.py:165 msgid "1 year, 1 month" msgstr "1 tahun, 1 bulan" -#: src/humanize/time.py:105 +#: src/humanize/time.py:168 #, python-format msgid "1 year, %d month" msgid_plural "1 year, %d months" msgstr[0] "1 tahun, %d bulan" -#: src/humanize/time.py:110 +#: src/humanize/time.py:173 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d tahun" -#: src/humanize/time.py:128 +#: src/humanize/time.py:201 #, python-format msgid "%s from now" msgstr "%s dari sekarang" -#: src/humanize/time.py:128 +#: src/humanize/time.py:201 #, python-format msgid "%s ago" msgstr "%s yang lalu" -#: src/humanize/time.py:132 +#: src/humanize/time.py:205 msgid "now" msgstr "sekarang" -#: src/humanize/time.py:151 +#: src/humanize/time.py:227 msgid "today" msgstr "hari ini" -#: src/humanize/time.py:153 +#: src/humanize/time.py:229 msgid "tomorrow" msgstr "besok" -#: src/humanize/time.py:155 +#: src/humanize/time.py:231 msgid "yesterday" msgstr "kemarin" + +#: src/humanize/time.py:498 +#, python-format +msgid "%s and %s" +msgstr "" diff --git a/src/humanize/locale/it_IT/LC_MESSAGES/humanize.po b/src/humanize/locale/it_IT/LC_MESSAGES/humanize.po index b80e720..a0992bc 100644 --- a/src/humanize/locale/it_IT/LC_MESSAGES/humanize.po +++ b/src/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-03-22 16:30+0200\n" +"POT-Creation-Date: 2020-09-29 21:07+0300\n" "PO-Revision-Date: 2018-10-27 22:52+0200\n" "Last-Translator: derfel \n" "Language-Team: Italian\n" @@ -18,264 +18,269 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 2.2\n" -#: src/humanize/number.py:22 +#: src/humanize/number.py:31 msgctxt "0" msgid "th" msgstr "º" -#: src/humanize/number.py:23 +#: src/humanize/number.py:32 msgctxt "1" msgid "st" msgstr "º" -#: src/humanize/number.py:24 +#: src/humanize/number.py:33 msgctxt "2" msgid "nd" msgstr "º" -#: src/humanize/number.py:25 +#: src/humanize/number.py:34 msgctxt "3" msgid "rd" msgstr "º" -#: src/humanize/number.py:26 +#: src/humanize/number.py:35 msgctxt "4" msgid "th" msgstr "º" -#: src/humanize/number.py:27 +#: src/humanize/number.py:36 msgctxt "5" msgid "th" msgstr "º" -#: src/humanize/number.py:28 +#: src/humanize/number.py:37 msgctxt "6" msgid "th" msgstr "º" -#: src/humanize/number.py:29 +#: src/humanize/number.py:38 msgctxt "7" msgid "th" msgstr "º" -#: src/humanize/number.py:30 +#: src/humanize/number.py:39 msgctxt "8" msgid "th" msgstr "º" -#: src/humanize/number.py:31 +#: src/humanize/number.py:40 msgctxt "9" msgid "th" msgstr "º" -#: src/humanize/number.py:73 +#: src/humanize/number.py:82 msgid "million" msgstr "milioni" -#: src/humanize/number.py:74 +#: src/humanize/number.py:83 msgid "billion" msgstr "miliardi" -#: src/humanize/number.py:75 +#: src/humanize/number.py:84 msgid "trillion" msgstr "bilioni" -#: src/humanize/number.py:76 +#: src/humanize/number.py:85 msgid "quadrillion" msgstr "biliardi" -#: src/humanize/number.py:77 +#: src/humanize/number.py:86 msgid "quintillion" msgstr "trilioni" -#: src/humanize/number.py:78 +#: src/humanize/number.py:87 msgid "sextillion" msgstr "triliardi" -#: src/humanize/number.py:79 +#: src/humanize/number.py:88 msgid "septillion" msgstr "quadrilioni" -#: src/humanize/number.py:80 +#: src/humanize/number.py:89 msgid "octillion" msgstr "quadriliardi" -#: src/humanize/number.py:81 +#: src/humanize/number.py:90 msgid "nonillion" msgstr "quintilioni" -#: src/humanize/number.py:82 +#: src/humanize/number.py:91 msgid "decillion" msgstr "quintiliardi" -#: src/humanize/number.py:83 +#: src/humanize/number.py:92 msgid "googol" msgstr "googol" -#: src/humanize/number.py:138 +#: src/humanize/number.py:147 msgid "zero" msgstr "zero" -#: src/humanize/number.py:139 +#: src/humanize/number.py:148 msgid "one" msgstr "uno" -#: src/humanize/number.py:140 +#: src/humanize/number.py:149 msgid "two" msgstr "due" -#: src/humanize/number.py:141 +#: src/humanize/number.py:150 msgid "three" msgstr "tre" -#: src/humanize/number.py:142 +#: src/humanize/number.py:151 msgid "four" msgstr "quattro" -#: src/humanize/number.py:143 +#: src/humanize/number.py:152 msgid "five" msgstr "cinque" -#: src/humanize/number.py:144 +#: src/humanize/number.py:153 msgid "six" msgstr "sei" -#: src/humanize/number.py:145 +#: src/humanize/number.py:154 msgid "seven" msgstr "sette" -#: src/humanize/number.py:146 +#: src/humanize/number.py:155 msgid "eight" msgstr "otto" -#: src/humanize/number.py:147 +#: src/humanize/number.py:156 msgid "nine" msgstr "nove" -#: src/humanize/time.py:87 +#: src/humanize/time.py:119 #, fuzzy, python-format msgid "%d microsecond" msgid_plural "%d microseconds" msgstr[0] "%d microsecondo" msgstr[1] "%d microsecondi" -#: src/humanize/time.py:93 +#: src/humanize/time.py:128 #, fuzzy, python-format msgid "%d millisecond" msgid_plural "%d milliseconds" msgstr[0] "%d millisecondo" msgstr[1] "%d millisecondi" -#: src/humanize/time.py:96 src/humanize/time.py:170 +#: src/humanize/time.py:131 src/humanize/time.py:204 msgid "a moment" msgstr "un momento" -#: src/humanize/time.py:98 +#: src/humanize/time.py:133 msgid "a second" msgstr "un secondo" -#: src/humanize/time.py:100 +#: src/humanize/time.py:135 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d secondo" msgstr[1] "%d secondi" -#: src/humanize/time.py:102 +#: src/humanize/time.py:137 msgid "a minute" msgstr "un minuto" -#: src/humanize/time.py:105 +#: src/humanize/time.py:140 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minuto" msgstr[1] "%d minuti" -#: src/humanize/time.py:107 +#: src/humanize/time.py:142 msgid "an hour" msgstr "un'ora" -#: src/humanize/time.py:110 +#: src/humanize/time.py:145 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d ora" msgstr[1] "%d ore" -#: src/humanize/time.py:113 +#: src/humanize/time.py:148 msgid "a day" msgstr "un giorno" -#: src/humanize/time.py:115 src/humanize/time.py:118 +#: src/humanize/time.py:150 src/humanize/time.py:153 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d giorno" msgstr[1] "%d giorni" -#: src/humanize/time.py:120 +#: src/humanize/time.py:155 msgid "a month" msgstr "un mese" -#: src/humanize/time.py:122 +#: src/humanize/time.py:157 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d mese" msgstr[1] "%d mesi" -#: src/humanize/time.py:125 +#: src/humanize/time.py:160 msgid "a year" msgstr "un anno" -#: src/humanize/time.py:127 src/humanize/time.py:136 +#: src/humanize/time.py:162 src/humanize/time.py:171 #, 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:130 +#: src/humanize/time.py:165 msgid "1 year, 1 month" msgstr "un anno ed un mese" -#: src/humanize/time.py:133 +#: src/humanize/time.py:168 #, 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:138 +#: src/humanize/time.py:173 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d anno" msgstr[1] "%d anni" -#: src/humanize/time.py:167 +#: src/humanize/time.py:201 #, python-format msgid "%s from now" msgstr "fra %s" -#: src/humanize/time.py:167 +#: src/humanize/time.py:201 #, python-format msgid "%s ago" msgstr "%s fa" -#: src/humanize/time.py:171 +#: src/humanize/time.py:205 msgid "now" msgstr "adesso" -#: src/humanize/time.py:190 +#: src/humanize/time.py:227 msgid "today" msgstr "oggi" -#: src/humanize/time.py:192 +#: src/humanize/time.py:229 msgid "tomorrow" msgstr "domani" -#: src/humanize/time.py:194 +#: src/humanize/time.py:231 msgid "yesterday" msgstr "ieri" + +#: src/humanize/time.py:498 +#, python-format +msgid "%s and %s" +msgstr "" diff --git a/src/humanize/locale/ja_JP/LC_MESSAGES/humanize.po b/src/humanize/locale/ja_JP/LC_MESSAGES/humanize.po index b4820d6..c055cae 100644 --- a/src/humanize/locale/ja_JP/LC_MESSAGES/humanize.po +++ b/src/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-02-08 20:05+0200\n" +"POT-Creation-Date: 2020-09-29 21:07+0300\n" "PO-Revision-Date: 2018-01-22 10:48+0900\n" "Last-Translator: Kan Torii \n" "Language-Team: Japanese\n" @@ -19,249 +19,270 @@ msgstr "" "Generated-By: Babel 0.9.6\n" "X-Generator: Poedit 2.0.6\n" -#: src/humanize/number.py:24 +#: src/humanize/number.py:31 msgctxt "0" msgid "th" msgstr "番目" -#: src/humanize/number.py:25 +#: src/humanize/number.py:32 msgctxt "1" msgid "st" msgstr "番目" -#: src/humanize/number.py:26 +#: src/humanize/number.py:33 msgctxt "2" msgid "nd" msgstr "番目" -#: src/humanize/number.py:27 +#: src/humanize/number.py:34 msgctxt "3" msgid "rd" msgstr "番目" -#: src/humanize/number.py:28 +#: src/humanize/number.py:35 msgctxt "4" msgid "th" msgstr "番目" -#: src/humanize/number.py:29 +#: src/humanize/number.py:36 msgctxt "5" msgid "th" msgstr "番目" -#: src/humanize/number.py:30 +#: src/humanize/number.py:37 msgctxt "6" msgid "th" msgstr "番目" -#: src/humanize/number.py:31 +#: src/humanize/number.py:38 msgctxt "7" msgid "th" msgstr "番目" -#: src/humanize/number.py:32 +#: src/humanize/number.py:39 msgctxt "8" msgid "th" msgstr "番目" -#: src/humanize/number.py:33 +#: src/humanize/number.py:40 msgctxt "9" msgid "th" msgstr "番目" -#: src/humanize/number.py:62 +#: src/humanize/number.py:82 msgid "million" msgstr "百万" -#: src/humanize/number.py:63 +#: src/humanize/number.py:83 #, fuzzy msgid "billion" msgstr "十億" -#: src/humanize/number.py:64 +#: src/humanize/number.py:84 msgid "trillion" msgstr "兆" -#: src/humanize/number.py:65 +#: src/humanize/number.py:85 #, fuzzy msgid "quadrillion" msgstr "千兆" -#: src/humanize/number.py:66 +#: src/humanize/number.py:86 #, fuzzy msgid "quintillion" msgstr "百京" -#: src/humanize/number.py:67 +#: src/humanize/number.py:87 #, fuzzy msgid "sextillion" msgstr "十垓" -#: src/humanize/number.py:68 +#: src/humanize/number.py:88 #, fuzzy msgid "septillion" msgstr "じょ" -#: src/humanize/number.py:69 +#: src/humanize/number.py:89 #, fuzzy msgid "octillion" msgstr "千じょ" -#: src/humanize/number.py:70 +#: src/humanize/number.py:90 #, fuzzy msgid "nonillion" msgstr "百穣" -#: src/humanize/number.py:71 +#: src/humanize/number.py:91 #, fuzzy msgid "decillion" msgstr "十溝" -#: src/humanize/number.py:72 +#: src/humanize/number.py:92 #, fuzzy msgid "googol" msgstr "溝無量大数" -#: src/humanize/number.py:108 +#: src/humanize/number.py:147 +msgid "zero" +msgstr "" + +#: src/humanize/number.py:148 msgid "one" msgstr "一" -#: src/humanize/number.py:109 +#: src/humanize/number.py:149 msgid "two" msgstr "二" -#: src/humanize/number.py:110 +#: src/humanize/number.py:150 msgid "three" msgstr "三" -#: src/humanize/number.py:111 +#: src/humanize/number.py:151 msgid "four" msgstr "四" -#: src/humanize/number.py:112 +#: src/humanize/number.py:152 msgid "five" msgstr "五" -#: src/humanize/number.py:113 +#: src/humanize/number.py:153 msgid "six" msgstr "六" -#: src/humanize/number.py:114 +#: src/humanize/number.py:154 msgid "seven" msgstr "七" -#: src/humanize/number.py:115 +#: src/humanize/number.py:155 msgid "eight" msgstr "八" -#: src/humanize/number.py:116 +#: src/humanize/number.py:156 msgid "nine" msgstr "九" -#: src/humanize/time.py:68 src/humanize/time.py:131 +#: src/humanize/time.py:119 +#, fuzzy, python-format +msgid "%d microsecond" +msgid_plural "%d microseconds" +msgstr[0] "" + +#: src/humanize/time.py:128 +#, fuzzy, python-format +msgid "%d millisecond" +msgid_plural "%d milliseconds" +msgstr[0] "" + +#: src/humanize/time.py:131 src/humanize/time.py:204 #, fuzzy msgid "a moment" msgstr "短時間" -#: src/humanize/time.py:70 +#: src/humanize/time.py:133 msgid "a second" msgstr "1秒" -#: src/humanize/time.py:72 +#: src/humanize/time.py:135 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d秒" -#: src/humanize/time.py:74 +#: src/humanize/time.py:137 msgid "a minute" msgstr "1分" -#: src/humanize/time.py:77 +#: src/humanize/time.py:140 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d分" -#: src/humanize/time.py:79 +#: src/humanize/time.py:142 msgid "an hour" msgstr "1時間" -#: src/humanize/time.py:82 +#: src/humanize/time.py:145 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d時間" -#: src/humanize/time.py:85 +#: src/humanize/time.py:148 msgid "a day" msgstr "1日" -#: src/humanize/time.py:87 src/humanize/time.py:90 +#: src/humanize/time.py:150 src/humanize/time.py:153 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d日" -#: src/humanize/time.py:92 +#: src/humanize/time.py:155 msgid "a month" msgstr "1ヶ月" -#: src/humanize/time.py:94 +#: src/humanize/time.py:157 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%dヶ月" -#: src/humanize/time.py:97 +#: src/humanize/time.py:160 msgid "a year" msgstr "1年" -#: src/humanize/time.py:99 src/humanize/time.py:108 +#: src/humanize/time.py:162 src/humanize/time.py:171 #, python-format msgid "1 year, %d day" msgid_plural "1 year, %d days" msgstr[0] "1年 %d日" -#: src/humanize/time.py:102 +#: src/humanize/time.py:165 msgid "1 year, 1 month" msgstr "1年 1ヶ月" -#: src/humanize/time.py:105 +#: src/humanize/time.py:168 #, python-format msgid "1 year, %d month" msgid_plural "1 year, %d months" msgstr[0] "1年 %dヶ月" -#: src/humanize/time.py:110 +#: src/humanize/time.py:173 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d年" -#: src/humanize/time.py:128 +#: src/humanize/time.py:201 #, python-format msgid "%s from now" msgstr "%s後" -#: src/humanize/time.py:128 +#: src/humanize/time.py:201 #, python-format msgid "%s ago" msgstr "%s前" -#: src/humanize/time.py:132 +#: src/humanize/time.py:205 #, fuzzy msgid "now" msgstr "今" -#: src/humanize/time.py:151 +#: src/humanize/time.py:227 msgid "today" msgstr "本日" -#: src/humanize/time.py:153 +#: src/humanize/time.py:229 msgid "tomorrow" msgstr "明日" -#: src/humanize/time.py:155 +#: src/humanize/time.py:231 msgid "yesterday" msgstr "昨日" + +#: src/humanize/time.py:498 +#, python-format +msgid "%s and %s" +msgstr "" diff --git a/src/humanize/locale/ko_KR/LC_MESSAGES/humanize.po b/src/humanize/locale/ko_KR/LC_MESSAGES/humanize.po index 05be5ad..27c274e 100644 --- a/src/humanize/locale/ko_KR/LC_MESSAGES/humanize.po +++ b/src/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-02-08 20:05+0200\n" +"POT-Creation-Date: 2020-09-29 21:07+0300\n" "PO-Revision-Date: 2013-07-10 11:38+0900\n" "Last-Translator: @youngrok\n" "Language-Team: ko_KR \n" @@ -19,265 +19,288 @@ msgstr "" "Generated-By: Babel 0.9.6\n" "X-Generator: Poedit 1.5.7\n" -#: src/humanize/number.py:24 +#: src/humanize/number.py:31 #, fuzzy msgctxt "0" msgid "th" msgstr "번째" -#: src/humanize/number.py:25 +#: src/humanize/number.py:32 #, fuzzy msgctxt "1" msgid "st" msgstr "번째" -#: src/humanize/number.py:26 +#: src/humanize/number.py:33 #, fuzzy msgctxt "2" msgid "nd" msgstr "번째" -#: src/humanize/number.py:27 +#: src/humanize/number.py:34 #, fuzzy msgctxt "3" msgid "rd" msgstr "번째" -#: src/humanize/number.py:28 +#: src/humanize/number.py:35 #, fuzzy msgctxt "4" msgid "th" msgstr "번째" -#: src/humanize/number.py:29 +#: src/humanize/number.py:36 #, fuzzy msgctxt "5" msgid "th" msgstr "번째" -#: src/humanize/number.py:30 +#: src/humanize/number.py:37 #, fuzzy msgctxt "6" msgid "th" msgstr "번째" -#: src/humanize/number.py:31 +#: src/humanize/number.py:38 #, fuzzy msgctxt "7" msgid "th" msgstr "번째" -#: src/humanize/number.py:32 +#: src/humanize/number.py:39 #, fuzzy msgctxt "8" msgid "th" msgstr "번째" -#: src/humanize/number.py:33 +#: src/humanize/number.py:40 #, fuzzy msgctxt "9" msgid "th" msgstr "번째" -#: src/humanize/number.py:62 +#: src/humanize/number.py:82 msgid "million" msgstr "%(value)s million" -#: src/humanize/number.py:63 +#: src/humanize/number.py:83 msgid "billion" msgstr "milliard" -#: src/humanize/number.py:64 +#: src/humanize/number.py:84 #, fuzzy msgid "trillion" msgstr "%(value)s billion" -#: src/humanize/number.py:65 +#: src/humanize/number.py:85 #, fuzzy msgid "quadrillion" msgstr "%(value)s quadrillion" -#: src/humanize/number.py:66 +#: src/humanize/number.py:86 #, fuzzy msgid "quintillion" msgstr "%(value)s quintillion" -#: src/humanize/number.py:67 +#: src/humanize/number.py:87 #, fuzzy msgid "sextillion" msgstr "%(value)s sextillion" -#: src/humanize/number.py:68 +#: src/humanize/number.py:88 #, fuzzy msgid "septillion" msgstr "%(value)s septillion" -#: src/humanize/number.py:69 +#: src/humanize/number.py:89 #, fuzzy msgid "octillion" msgstr "%(value)s octillion" -#: src/humanize/number.py:70 +#: src/humanize/number.py:90 #, fuzzy msgid "nonillion" msgstr "%(value)s nonillion" -#: src/humanize/number.py:71 +#: src/humanize/number.py:91 #, fuzzy msgid "decillion" msgstr "%(value)s décillion" -#: src/humanize/number.py:72 +#: src/humanize/number.py:92 #, fuzzy msgid "googol" msgstr "%(value)s gogol" -#: src/humanize/number.py:108 +#: src/humanize/number.py:147 +msgid "zero" +msgstr "" + +#: src/humanize/number.py:148 msgid "one" msgstr "하나" -#: src/humanize/number.py:109 +#: src/humanize/number.py:149 msgid "two" msgstr "둘" -#: src/humanize/number.py:110 +#: src/humanize/number.py:150 msgid "three" msgstr "셋" -#: src/humanize/number.py:111 +#: src/humanize/number.py:151 msgid "four" msgstr "넷" -#: src/humanize/number.py:112 +#: src/humanize/number.py:152 msgid "five" msgstr "다섯" -#: src/humanize/number.py:113 +#: src/humanize/number.py:153 msgid "six" msgstr "여섯" -#: src/humanize/number.py:114 +#: src/humanize/number.py:154 msgid "seven" msgstr "일곱" -#: src/humanize/number.py:115 +#: src/humanize/number.py:155 msgid "eight" msgstr "여덟" -#: src/humanize/number.py:116 +#: src/humanize/number.py:156 msgid "nine" msgstr "아홉" -#: src/humanize/time.py:68 src/humanize/time.py:131 +#: src/humanize/time.py:119 +#, fuzzy, python-format +msgid "%d microsecond" +msgid_plural "%d microseconds" +msgstr[0] "" +msgstr[1] "" + +#: src/humanize/time.py:128 +#, fuzzy, python-format +msgid "%d millisecond" +msgid_plural "%d milliseconds" +msgstr[0] "" +msgstr[1] "" + +#: src/humanize/time.py:131 src/humanize/time.py:204 msgid "a moment" msgstr "잠깐" -#: src/humanize/time.py:70 +#: src/humanize/time.py:133 msgid "a second" msgstr "1초" -#: src/humanize/time.py:72 +#: src/humanize/time.py:135 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d초" msgstr[1] "%d초" -#: src/humanize/time.py:74 +#: src/humanize/time.py:137 msgid "a minute" msgstr "1분" -#: src/humanize/time.py:77 +#: src/humanize/time.py:140 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d분" msgstr[1] "%d분" -#: src/humanize/time.py:79 +#: src/humanize/time.py:142 msgid "an hour" msgstr "1시간" -#: src/humanize/time.py:82 +#: src/humanize/time.py:145 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d heure" msgstr[1] "%d시간" -#: src/humanize/time.py:85 +#: src/humanize/time.py:148 msgid "a day" msgstr "하루" -#: src/humanize/time.py:87 src/humanize/time.py:90 +#: src/humanize/time.py:150 src/humanize/time.py:153 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d jour" msgstr[1] "%d일" -#: src/humanize/time.py:92 +#: src/humanize/time.py:155 msgid "a month" msgstr "한달" -#: src/humanize/time.py:94 +#: src/humanize/time.py:157 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d mois" msgstr[1] "%d개월" -#: src/humanize/time.py:97 +#: src/humanize/time.py:160 msgid "a year" msgstr "1년" -#: src/humanize/time.py:99 src/humanize/time.py:108 +#: src/humanize/time.py:162 src/humanize/time.py:171 #, 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:102 +#: src/humanize/time.py:165 msgid "1 year, 1 month" msgstr "1년, 1개월" -#: src/humanize/time.py:105 +#: src/humanize/time.py:168 #, 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:110 +#: src/humanize/time.py:173 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d 년" msgstr[1] "%d ans" -#: src/humanize/time.py:128 +#: src/humanize/time.py:201 #, python-format msgid "%s from now" msgstr "%s 후" -#: src/humanize/time.py:128 +#: src/humanize/time.py:201 #, python-format msgid "%s ago" msgstr "%s 전" -#: src/humanize/time.py:132 +#: src/humanize/time.py:205 msgid "now" msgstr "방금" -#: src/humanize/time.py:151 +#: src/humanize/time.py:227 msgid "today" msgstr "오늘" -#: src/humanize/time.py:153 +#: src/humanize/time.py:229 msgid "tomorrow" msgstr "내일" -#: src/humanize/time.py:155 +#: src/humanize/time.py:231 msgid "yesterday" msgstr "어제" + +#: src/humanize/time.py:498 +#, python-format +msgid "%s and %s" +msgstr "" diff --git a/src/humanize/locale/nl_NL/LC_MESSAGES/humanize.mo b/src/humanize/locale/nl_NL/LC_MESSAGES/humanize.mo index b0601b7..541391f 100644 Binary files a/src/humanize/locale/nl_NL/LC_MESSAGES/humanize.mo and b/src/humanize/locale/nl_NL/LC_MESSAGES/humanize.mo differ diff --git a/src/humanize/locale/nl_NL/LC_MESSAGES/humanize.po b/src/humanize/locale/nl_NL/LC_MESSAGES/humanize.po index 9dcfd4c..fdb0480 100644 --- a/src/humanize/locale/nl_NL/LC_MESSAGES/humanize.po +++ b/src/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-03-22 16:30+0200\n" +"POT-Creation-Date: 2020-09-29 21:07+0300\n" "PO-Revision-Date: 2015-03-25 21:08+0100\n" "Last-Translator: Martin van Wingerden\n" "Language-Team: nl_NL\n" @@ -19,264 +19,269 @@ msgstr "" "Generated-By: Babel 0.9.6\n" "X-Generator: Poedit 1.7.5\n" -#: src/humanize/number.py:22 +#: src/humanize/number.py:31 msgctxt "0" msgid "th" msgstr "de" -#: src/humanize/number.py:23 +#: src/humanize/number.py:32 msgctxt "1" msgid "st" msgstr "ste" -#: src/humanize/number.py:24 +#: src/humanize/number.py:33 msgctxt "2" msgid "nd" msgstr "de" -#: src/humanize/number.py:25 +#: src/humanize/number.py:34 msgctxt "3" msgid "rd" msgstr "de" -#: src/humanize/number.py:26 +#: src/humanize/number.py:35 msgctxt "4" msgid "th" msgstr "de" -#: src/humanize/number.py:27 +#: src/humanize/number.py:36 msgctxt "5" msgid "th" msgstr "de" -#: src/humanize/number.py:28 +#: src/humanize/number.py:37 msgctxt "6" msgid "th" msgstr "de" -#: src/humanize/number.py:29 +#: src/humanize/number.py:38 msgctxt "7" msgid "th" msgstr "de" -#: src/humanize/number.py:30 +#: src/humanize/number.py:39 msgctxt "8" msgid "th" msgstr "de" -#: src/humanize/number.py:31 +#: src/humanize/number.py:40 msgctxt "9" msgid "th" msgstr "de" -#: src/humanize/number.py:73 +#: src/humanize/number.py:82 msgid "million" msgstr "miljoen" -#: src/humanize/number.py:74 +#: src/humanize/number.py:83 msgid "billion" msgstr "miljard" -#: src/humanize/number.py:75 +#: src/humanize/number.py:84 msgid "trillion" msgstr "biljoen" -#: src/humanize/number.py:76 +#: src/humanize/number.py:85 msgid "quadrillion" msgstr "biljard" -#: src/humanize/number.py:77 +#: src/humanize/number.py:86 msgid "quintillion" msgstr "triljoen" -#: src/humanize/number.py:78 +#: src/humanize/number.py:87 msgid "sextillion" msgstr "triljard" -#: src/humanize/number.py:79 +#: src/humanize/number.py:88 msgid "septillion" msgstr "quadriljoen" -#: src/humanize/number.py:80 +#: src/humanize/number.py:89 msgid "octillion" msgstr "quadriljard" -#: src/humanize/number.py:81 +#: src/humanize/number.py:90 msgid "nonillion" msgstr "quintiljoen" -#: src/humanize/number.py:82 +#: src/humanize/number.py:91 msgid "decillion" msgstr "quintiljard" -#: src/humanize/number.py:83 +#: src/humanize/number.py:92 msgid "googol" msgstr "googol" -#: src/humanize/number.py:138 +#: src/humanize/number.py:147 msgid "zero" msgstr "nul" -#: src/humanize/number.py:139 +#: src/humanize/number.py:148 msgid "one" msgstr "één" -#: src/humanize/number.py:140 +#: src/humanize/number.py:149 msgid "two" msgstr "twee" -#: src/humanize/number.py:141 +#: src/humanize/number.py:150 msgid "three" msgstr "drie" -#: src/humanize/number.py:142 +#: src/humanize/number.py:151 msgid "four" msgstr "vier" -#: src/humanize/number.py:143 +#: src/humanize/number.py:152 msgid "five" msgstr "vijf" -#: src/humanize/number.py:144 +#: src/humanize/number.py:153 msgid "six" msgstr "zes" -#: src/humanize/number.py:145 +#: src/humanize/number.py:154 msgid "seven" msgstr "zeven" -#: src/humanize/number.py:146 +#: src/humanize/number.py:155 msgid "eight" msgstr "acht" -#: src/humanize/number.py:147 +#: src/humanize/number.py:156 msgid "nine" msgstr "negen" -#: src/humanize/time.py:87 +#: src/humanize/time.py:119 #, fuzzy, python-format msgid "%d microsecond" msgid_plural "%d microseconds" msgstr[0] "%d microseconde" msgstr[1] "%d microseconden" -#: src/humanize/time.py:93 +#: src/humanize/time.py:128 #, fuzzy, python-format msgid "%d millisecond" msgid_plural "%d milliseconds" msgstr[0] "%d milliseconde" msgstr[1] "%d milliseconden" -#: src/humanize/time.py:96 src/humanize/time.py:170 +#: src/humanize/time.py:131 src/humanize/time.py:204 msgid "a moment" msgstr "een moment" -#: src/humanize/time.py:98 +#: src/humanize/time.py:133 msgid "a second" msgstr "een seconde" -#: src/humanize/time.py:100 +#: src/humanize/time.py:135 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d seconde" msgstr[1] "%d seconden" -#: src/humanize/time.py:102 +#: src/humanize/time.py:137 msgid "a minute" msgstr "een minuut" -#: src/humanize/time.py:105 +#: src/humanize/time.py:140 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minuut" msgstr[1] "%d minuten" -#: src/humanize/time.py:107 +#: src/humanize/time.py:142 msgid "an hour" msgstr "een uur" -#: src/humanize/time.py:110 +#: src/humanize/time.py:145 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d uur" msgstr[1] "%d uren" -#: src/humanize/time.py:113 +#: src/humanize/time.py:148 msgid "a day" msgstr "een dag" -#: src/humanize/time.py:115 src/humanize/time.py:118 +#: src/humanize/time.py:150 src/humanize/time.py:153 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d dag" msgstr[1] "%d dagen" -#: src/humanize/time.py:120 +#: src/humanize/time.py:155 msgid "a month" msgstr "een maand" -#: src/humanize/time.py:122 +#: src/humanize/time.py:157 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d maand" msgstr[1] "%d maanden" -#: src/humanize/time.py:125 +#: src/humanize/time.py:160 msgid "a year" msgstr "een jaar" -#: src/humanize/time.py:127 src/humanize/time.py:136 +#: src/humanize/time.py:162 src/humanize/time.py:171 #, 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:130 +#: src/humanize/time.py:165 msgid "1 year, 1 month" msgstr "1 jaar, 1 maand" -#: src/humanize/time.py:133 +#: src/humanize/time.py:168 #, 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:138 +#: src/humanize/time.py:173 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d jaar" msgstr[1] "%d jaar" -#: src/humanize/time.py:167 +#: src/humanize/time.py:201 #, python-format msgid "%s from now" msgstr "over %s" -#: src/humanize/time.py:167 +#: src/humanize/time.py:201 #, python-format msgid "%s ago" msgstr "%s geleden" -#: src/humanize/time.py:171 +#: src/humanize/time.py:205 msgid "now" msgstr "nu" -#: src/humanize/time.py:190 +#: src/humanize/time.py:227 msgid "today" msgstr "vandaag" -#: src/humanize/time.py:192 +#: src/humanize/time.py:229 msgid "tomorrow" msgstr "morgen" -#: src/humanize/time.py:194 +#: src/humanize/time.py:231 msgid "yesterday" msgstr "gisteren" + +#: src/humanize/time.py:498 +#, python-format +msgid "%s and %s" +msgstr "%s en %s" diff --git a/src/humanize/locale/pl_PL/LC_MESSAGES/humanize.po b/src/humanize/locale/pl_PL/LC_MESSAGES/humanize.po index 25b5a39..34dd72d 100644 --- a/src/humanize/locale/pl_PL/LC_MESSAGES/humanize.po +++ b/src/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-04-22 10:01+0200\n" +"POT-Creation-Date: 2020-09-29 21:07+0300\n" "PO-Revision-Date: 2020-04-22 10:02+0200\n" "Last-Translator: Bartosz Bubak \n" "Language-Team: Polish\n" @@ -18,141 +18,141 @@ 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:22 +#: src/humanize/number.py:31 msgctxt "0" msgid "th" msgstr "." -#: src/humanize/number.py:23 +#: src/humanize/number.py:32 msgctxt "1" msgid "st" msgstr "." -#: src/humanize/number.py:24 +#: src/humanize/number.py:33 msgctxt "2" msgid "nd" msgstr "." -#: src/humanize/number.py:25 +#: src/humanize/number.py:34 msgctxt "3" msgid "rd" msgstr "." -#: src/humanize/number.py:26 +#: src/humanize/number.py:35 msgctxt "4" msgid "th" msgstr "." -#: src/humanize/number.py:27 +#: src/humanize/number.py:36 msgctxt "5" msgid "th" msgstr "." -#: src/humanize/number.py:28 +#: src/humanize/number.py:37 msgctxt "6" msgid "th" msgstr "." -#: src/humanize/number.py:29 +#: src/humanize/number.py:38 msgctxt "7" msgid "th" msgstr "." -#: src/humanize/number.py:30 +#: src/humanize/number.py:39 msgctxt "8" msgid "th" msgstr "." -#: src/humanize/number.py:31 +#: src/humanize/number.py:40 msgctxt "9" msgid "th" msgstr "." -#: src/humanize/number.py:73 +#: src/humanize/number.py:82 msgid "million" msgstr "milion" -#: src/humanize/number.py:74 +#: src/humanize/number.py:83 msgid "billion" msgstr "bilion" -#: src/humanize/number.py:75 +#: src/humanize/number.py:84 msgid "trillion" msgstr "trylion" -#: src/humanize/number.py:76 +#: src/humanize/number.py:85 msgid "quadrillion" msgstr "kwadrylion" -#: src/humanize/number.py:77 +#: src/humanize/number.py:86 msgid "quintillion" msgstr "kwintylion" -#: src/humanize/number.py:78 +#: src/humanize/number.py:87 msgid "sextillion" msgstr "sekstylion" -#: src/humanize/number.py:79 +#: src/humanize/number.py:88 msgid "septillion" msgstr "septylion" -#: src/humanize/number.py:80 +#: src/humanize/number.py:89 msgid "octillion" msgstr "oktylion" -#: src/humanize/number.py:81 +#: src/humanize/number.py:90 msgid "nonillion" msgstr "nonilion" -#: src/humanize/number.py:82 +#: src/humanize/number.py:91 msgid "decillion" msgstr "decylion" -#: src/humanize/number.py:83 +#: src/humanize/number.py:92 msgid "googol" msgstr "googol" -#: src/humanize/number.py:138 +#: src/humanize/number.py:147 msgid "zero" msgstr "zero" -#: src/humanize/number.py:139 +#: src/humanize/number.py:148 msgid "one" msgstr "jeden" -#: src/humanize/number.py:140 +#: src/humanize/number.py:149 msgid "two" msgstr "dwa" -#: src/humanize/number.py:141 +#: src/humanize/number.py:150 msgid "three" msgstr "trzy" -#: src/humanize/number.py:142 +#: src/humanize/number.py:151 msgid "four" msgstr "cztery" -#: src/humanize/number.py:143 +#: src/humanize/number.py:152 msgid "five" msgstr "pięć" -#: src/humanize/number.py:144 +#: src/humanize/number.py:153 msgid "six" msgstr "sześć" -#: src/humanize/number.py:145 +#: src/humanize/number.py:154 msgid "seven" msgstr "siedem" -#: src/humanize/number.py:146 +#: src/humanize/number.py:155 msgid "eight" msgstr "osiem" -#: src/humanize/number.py:147 +#: src/humanize/number.py:156 msgid "nine" msgstr "dziewięć" -#: src/humanize/time.py:87 +#: src/humanize/time.py:119 #, python-format msgid "%d microsecond" msgid_plural "%d microseconds" @@ -160,7 +160,7 @@ msgstr[0] "%d mikrosekunda" msgstr[1] "%d mikrosekundy" msgstr[2] "%d mikrosekund" -#: src/humanize/time.py:93 +#: src/humanize/time.py:128 #, python-format msgid "%d millisecond" msgid_plural "%d milliseconds" @@ -168,15 +168,15 @@ msgstr[0] "%d milisekunda" msgstr[1] "%d milisekundy" msgstr[2] "%d milisekund" -#: src/humanize/time.py:96 src/humanize/time.py:170 +#: src/humanize/time.py:131 src/humanize/time.py:204 msgid "a moment" msgstr "chwila" -#: src/humanize/time.py:98 +#: src/humanize/time.py:133 msgid "a second" msgstr "sekunda" -#: src/humanize/time.py:100 +#: src/humanize/time.py:135 #, python-format msgid "%d second" msgid_plural "%d seconds" @@ -184,11 +184,11 @@ msgstr[0] "%d sekunda" msgstr[1] "%d sekundy" msgstr[2] "%d sekund" -#: src/humanize/time.py:102 +#: src/humanize/time.py:137 msgid "a minute" msgstr "minuta" -#: src/humanize/time.py:105 +#: src/humanize/time.py:140 #, python-format msgid "%d minute" msgid_plural "%d minutes" @@ -196,11 +196,11 @@ msgstr[0] "%d minuta" msgstr[1] "%d minuty" msgstr[2] "%d minut" -#: src/humanize/time.py:107 +#: src/humanize/time.py:142 msgid "an hour" msgstr "godzina" -#: src/humanize/time.py:110 +#: src/humanize/time.py:145 #, python-format msgid "%d hour" msgid_plural "%d hours" @@ -208,11 +208,11 @@ msgstr[0] "%d godzina" msgstr[1] "%d godziny" msgstr[2] "%d godzin" -#: src/humanize/time.py:113 +#: src/humanize/time.py:148 msgid "a day" msgstr "dzień" -#: src/humanize/time.py:115 src/humanize/time.py:118 +#: src/humanize/time.py:150 src/humanize/time.py:153 #, python-format msgid "%d day" msgid_plural "%d days" @@ -220,11 +220,11 @@ msgstr[0] "%d dzień" msgstr[1] "%d dni" msgstr[2] "%d dni" -#: src/humanize/time.py:120 +#: src/humanize/time.py:155 msgid "a month" msgstr "miesiąc" -#: src/humanize/time.py:122 +#: src/humanize/time.py:157 #, python-format msgid "%d month" msgid_plural "%d months" @@ -232,11 +232,11 @@ msgstr[0] "%d miesiąc" msgstr[1] "%d miesiące" msgstr[2] "%d miesięcy" -#: src/humanize/time.py:125 +#: src/humanize/time.py:160 msgid "a year" msgstr "rok" -#: src/humanize/time.py:127 src/humanize/time.py:136 +#: src/humanize/time.py:162 src/humanize/time.py:171 #, python-format msgid "1 year, %d day" msgid_plural "1 year, %d days" @@ -244,11 +244,11 @@ msgstr[0] "1 rok, %d dzień" msgstr[1] "1 rok, %d dni" msgstr[2] "1 rok, %d dni" -#: src/humanize/time.py:130 +#: src/humanize/time.py:165 msgid "1 year, 1 month" msgstr "" -#: src/humanize/time.py:133 +#: src/humanize/time.py:168 #, python-format msgid "1 year, %d month" msgid_plural "1 year, %d months" @@ -256,7 +256,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:138 +#: src/humanize/time.py:173 #, python-format msgid "%d year" msgid_plural "%d years" @@ -264,28 +264,33 @@ msgstr[0] "%d rok" msgstr[1] "%d lat" msgstr[2] "%d lata" -#: src/humanize/time.py:167 +#: src/humanize/time.py:201 #, python-format msgid "%s from now" msgstr "%s od teraz" -#: src/humanize/time.py:167 +#: src/humanize/time.py:201 #, python-format msgid "%s ago" msgstr "%s temu" -#: src/humanize/time.py:171 +#: src/humanize/time.py:205 msgid "now" msgstr "teraz" -#: src/humanize/time.py:190 +#: src/humanize/time.py:227 msgid "today" msgstr "dziś" -#: src/humanize/time.py:192 +#: src/humanize/time.py:229 msgid "tomorrow" msgstr "jutro" -#: src/humanize/time.py:194 +#: src/humanize/time.py:231 msgid "yesterday" msgstr "wczoraj" + +#: src/humanize/time.py:498 +#, python-format +msgid "%s and %s" +msgstr "" diff --git a/src/humanize/locale/pt_BR/LC_MESSAGES/humanize.mo b/src/humanize/locale/pt_BR/LC_MESSAGES/humanize.mo index 32653b6..a79ea93 100644 Binary files a/src/humanize/locale/pt_BR/LC_MESSAGES/humanize.mo and b/src/humanize/locale/pt_BR/LC_MESSAGES/humanize.mo differ diff --git a/src/humanize/locale/pt_BR/LC_MESSAGES/humanize.po b/src/humanize/locale/pt_BR/LC_MESSAGES/humanize.po index 91a2be9..27688c7 100644 --- a/src/humanize/locale/pt_BR/LC_MESSAGES/humanize.po +++ b/src/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-06-20 23:04-0300\n" +"POT-Creation-Date: 2020-09-29 21:07+0300\n" "PO-Revision-Date: 2016-06-15 15:58-0300\n" "Last-Translator: \n" "Language-Team: \n" @@ -18,264 +18,269 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Poedit 1.8.5\n" -#: src/humanize/number.py:22 +#: src/humanize/number.py:31 msgctxt "0" msgid "th" msgstr "º" -#: src/humanize/number.py:23 +#: src/humanize/number.py:32 msgctxt "1" msgid "st" msgstr "º" -#: src/humanize/number.py:24 +#: src/humanize/number.py:33 msgctxt "2" msgid "nd" msgstr "º" -#: src/humanize/number.py:25 +#: src/humanize/number.py:34 msgctxt "3" msgid "rd" msgstr "º" -#: src/humanize/number.py:26 +#: src/humanize/number.py:35 msgctxt "4" msgid "th" msgstr "º" -#: src/humanize/number.py:27 +#: src/humanize/number.py:36 msgctxt "5" msgid "th" msgstr "º" -#: src/humanize/number.py:28 +#: src/humanize/number.py:37 msgctxt "6" msgid "th" msgstr "º" -#: src/humanize/number.py:29 +#: src/humanize/number.py:38 msgctxt "7" msgid "th" msgstr "º" -#: src/humanize/number.py:30 +#: src/humanize/number.py:39 msgctxt "8" msgid "th" msgstr "º" -#: src/humanize/number.py:31 +#: src/humanize/number.py:40 msgctxt "9" msgid "th" msgstr "º" -#: src/humanize/number.py:73 +#: src/humanize/number.py:82 msgid "million" msgstr "milhão" -#: src/humanize/number.py:74 +#: src/humanize/number.py:83 msgid "billion" msgstr "bilhão" -#: src/humanize/number.py:75 +#: src/humanize/number.py:84 msgid "trillion" msgstr "trilhão" -#: src/humanize/number.py:76 +#: src/humanize/number.py:85 msgid "quadrillion" msgstr "quatrilhão" -#: src/humanize/number.py:77 +#: src/humanize/number.py:86 msgid "quintillion" msgstr "quintilhão" -#: src/humanize/number.py:78 +#: src/humanize/number.py:87 msgid "sextillion" msgstr "sextilhão" -#: src/humanize/number.py:79 +#: src/humanize/number.py:88 msgid "septillion" msgstr "septilhão" -#: src/humanize/number.py:80 +#: src/humanize/number.py:89 msgid "octillion" msgstr "octilhão" -#: src/humanize/number.py:81 +#: src/humanize/number.py:90 msgid "nonillion" msgstr "nonilhão" -#: src/humanize/number.py:82 +#: src/humanize/number.py:91 msgid "decillion" msgstr "decilhão" -#: src/humanize/number.py:83 +#: src/humanize/number.py:92 msgid "googol" msgstr "undecilhão" -#: src/humanize/number.py:138 +#: src/humanize/number.py:147 msgid "zero" msgstr "zero" -#: src/humanize/number.py:139 +#: src/humanize/number.py:148 msgid "one" msgstr "um" -#: src/humanize/number.py:140 +#: src/humanize/number.py:149 msgid "two" msgstr "dois" -#: src/humanize/number.py:141 +#: src/humanize/number.py:150 msgid "three" msgstr "três" -#: src/humanize/number.py:142 +#: src/humanize/number.py:151 msgid "four" msgstr "quatro" -#: src/humanize/number.py:143 +#: src/humanize/number.py:152 msgid "five" msgstr "cinco" -#: src/humanize/number.py:144 +#: src/humanize/number.py:153 msgid "six" msgstr "seis" -#: src/humanize/number.py:145 +#: src/humanize/number.py:154 msgid "seven" msgstr "sete" -#: src/humanize/number.py:146 +#: src/humanize/number.py:155 msgid "eight" msgstr "oito" -#: src/humanize/number.py:147 +#: src/humanize/number.py:156 msgid "nine" msgstr "nove" -#: src/humanize/time.py:87 +#: src/humanize/time.py:119 #, fuzzy, python-format msgid "%d microsecond" msgid_plural "%d microseconds" msgstr[0] "%d microssegundo" msgstr[1] "%d microssegundos" -#: src/humanize/time.py:93 +#: src/humanize/time.py:128 #, fuzzy, python-format msgid "%d millisecond" msgid_plural "%d milliseconds" msgstr[0] "%d milissegundo" msgstr[1] "%d milissegundos" -#: src/humanize/time.py:96 src/humanize/time.py:170 +#: src/humanize/time.py:131 src/humanize/time.py:204 msgid "a moment" msgstr "um momento" -#: src/humanize/time.py:98 +#: src/humanize/time.py:133 msgid "a second" msgstr "um segundo" -#: src/humanize/time.py:100 +#: src/humanize/time.py:135 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d segundo" msgstr[1] "%d segundos" -#: src/humanize/time.py:102 +#: src/humanize/time.py:137 msgid "a minute" msgstr "um minuto" -#: src/humanize/time.py:105 +#: src/humanize/time.py:140 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minuto" msgstr[1] "%d minutos" -#: src/humanize/time.py:107 +#: src/humanize/time.py:142 msgid "an hour" msgstr "uma hora" -#: src/humanize/time.py:110 +#: src/humanize/time.py:145 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d hora" msgstr[1] "%d horas" -#: src/humanize/time.py:113 +#: src/humanize/time.py:148 msgid "a day" msgstr "um dia" -#: src/humanize/time.py:115 src/humanize/time.py:118 +#: src/humanize/time.py:150 src/humanize/time.py:153 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d dia" msgstr[1] "%d dias" -#: src/humanize/time.py:120 +#: src/humanize/time.py:155 msgid "a month" msgstr "um mês" -#: src/humanize/time.py:122 +#: src/humanize/time.py:157 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d mês" msgstr[1] "%d meses" -#: src/humanize/time.py:125 +#: src/humanize/time.py:160 msgid "a year" msgstr "um ano" -#: src/humanize/time.py:127 src/humanize/time.py:136 +#: src/humanize/time.py:162 src/humanize/time.py:171 #, 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:130 +#: src/humanize/time.py:165 msgid "1 year, 1 month" msgstr "1 ano e 1 mês" -#: src/humanize/time.py:133 +#: src/humanize/time.py:168 #, 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:138 +#: src/humanize/time.py:173 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d ano" msgstr[1] "%d anos" -#: src/humanize/time.py:167 +#: src/humanize/time.py:201 #, python-format msgid "%s from now" msgstr "em %s" -#: src/humanize/time.py:167 +#: src/humanize/time.py:201 #, python-format msgid "%s ago" msgstr "há %s" -#: src/humanize/time.py:171 +#: src/humanize/time.py:205 msgid "now" msgstr "agora" -#: src/humanize/time.py:190 +#: src/humanize/time.py:227 msgid "today" msgstr "hoje" -#: src/humanize/time.py:192 +#: src/humanize/time.py:229 msgid "tomorrow" msgstr "amanhã" -#: src/humanize/time.py:194 +#: src/humanize/time.py:231 msgid "yesterday" msgstr "ontem" + +#: src/humanize/time.py:498 +#, python-format +msgid "%s and %s" +msgstr "%s e %s" diff --git a/src/humanize/locale/pt_PT/LC_MESSAGES/humanize.mo b/src/humanize/locale/pt_PT/LC_MESSAGES/humanize.mo index 24a7c37..1dea0ae 100644 Binary files a/src/humanize/locale/pt_PT/LC_MESSAGES/humanize.mo and b/src/humanize/locale/pt_PT/LC_MESSAGES/humanize.mo differ diff --git a/src/humanize/locale/pt_PT/LC_MESSAGES/humanize.po b/src/humanize/locale/pt_PT/LC_MESSAGES/humanize.po index 5449442..eecd597 100644 --- a/src/humanize/locale/pt_PT/LC_MESSAGES/humanize.po +++ b/src/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-06-20 23:04-0300\n" +"POT-Creation-Date: 2020-09-29 21:07+0300\n" "PO-Revision-Date: 2020-07-05 18:17+0100\n" "Last-Translator: \n" "Language-Team: \n" @@ -18,264 +18,269 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Poedit 2.3.1\n" -#: src/humanize/number.py:22 +#: src/humanize/number.py:31 msgctxt "0" msgid "th" msgstr "º" -#: src/humanize/number.py:23 +#: src/humanize/number.py:32 msgctxt "1" msgid "st" msgstr "º" -#: src/humanize/number.py:24 +#: src/humanize/number.py:33 msgctxt "2" msgid "nd" msgstr "º" -#: src/humanize/number.py:25 +#: src/humanize/number.py:34 msgctxt "3" msgid "rd" msgstr "º" -#: src/humanize/number.py:26 +#: src/humanize/number.py:35 msgctxt "4" msgid "th" msgstr "º" -#: src/humanize/number.py:27 +#: src/humanize/number.py:36 msgctxt "5" msgid "th" msgstr "º" -#: src/humanize/number.py:28 +#: src/humanize/number.py:37 msgctxt "6" msgid "th" msgstr "º" -#: src/humanize/number.py:29 +#: src/humanize/number.py:38 msgctxt "7" msgid "th" msgstr "º" -#: src/humanize/number.py:30 +#: src/humanize/number.py:39 msgctxt "8" msgid "th" msgstr "º" -#: src/humanize/number.py:31 +#: src/humanize/number.py:40 msgctxt "9" msgid "th" msgstr "º" -#: src/humanize/number.py:73 +#: src/humanize/number.py:82 msgid "million" msgstr "milhão" -#: src/humanize/number.py:74 +#: src/humanize/number.py:83 msgid "billion" msgstr "milhar de milhão" -#: src/humanize/number.py:75 +#: src/humanize/number.py:84 msgid "trillion" msgstr "bilião" -#: src/humanize/number.py:76 +#: src/humanize/number.py:85 msgid "quadrillion" msgstr "mil biliões" -#: src/humanize/number.py:77 +#: src/humanize/number.py:86 msgid "quintillion" msgstr "trilião" -#: src/humanize/number.py:78 +#: src/humanize/number.py:87 msgid "sextillion" msgstr "mil triliões" -#: src/humanize/number.py:79 +#: src/humanize/number.py:88 msgid "septillion" msgstr "quatrilião" -#: src/humanize/number.py:80 +#: src/humanize/number.py:89 msgid "octillion" msgstr "mil quatriliões" -#: src/humanize/number.py:81 +#: src/humanize/number.py:90 msgid "nonillion" msgstr "quintilhão" -#: src/humanize/number.py:82 +#: src/humanize/number.py:91 msgid "decillion" msgstr "mil quintilhões" -#: src/humanize/number.py:83 +#: src/humanize/number.py:92 msgid "googol" msgstr "sextilhão" -#: src/humanize/number.py:138 +#: src/humanize/number.py:147 msgid "zero" msgstr "zero" -#: src/humanize/number.py:139 +#: src/humanize/number.py:148 msgid "one" msgstr "um" -#: src/humanize/number.py:140 +#: src/humanize/number.py:149 msgid "two" msgstr "dois" -#: src/humanize/number.py:141 +#: src/humanize/number.py:150 msgid "three" msgstr "três" -#: src/humanize/number.py:142 +#: src/humanize/number.py:151 msgid "four" msgstr "quatro" -#: src/humanize/number.py:143 +#: src/humanize/number.py:152 msgid "five" msgstr "cinco" -#: src/humanize/number.py:144 +#: src/humanize/number.py:153 msgid "six" msgstr "seis" -#: src/humanize/number.py:145 +#: src/humanize/number.py:154 msgid "seven" msgstr "sete" -#: src/humanize/number.py:146 +#: src/humanize/number.py:155 msgid "eight" msgstr "oito" -#: src/humanize/number.py:147 +#: src/humanize/number.py:156 msgid "nine" msgstr "nove" -#: src/humanize/time.py:87 +#: src/humanize/time.py:119 #, python-format msgid "%d microsecond" msgid_plural "%d microseconds" msgstr[0] "%d microssegundo" msgstr[1] "%d microssegundos" -#: src/humanize/time.py:93 +#: src/humanize/time.py:128 #, python-format msgid "%d millisecond" msgid_plural "%d milliseconds" msgstr[0] "%d milissegundo" msgstr[1] "%d milissegundos" -#: src/humanize/time.py:96 src/humanize/time.py:170 +#: src/humanize/time.py:131 src/humanize/time.py:204 msgid "a moment" msgstr "um momento" -#: src/humanize/time.py:98 +#: src/humanize/time.py:133 msgid "a second" msgstr "um segundo" -#: src/humanize/time.py:100 +#: src/humanize/time.py:135 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d segundo" msgstr[1] "%d segundos" -#: src/humanize/time.py:102 +#: src/humanize/time.py:137 msgid "a minute" msgstr "um minuto" -#: src/humanize/time.py:105 +#: src/humanize/time.py:140 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minuto" msgstr[1] "%d minutos" -#: src/humanize/time.py:107 +#: src/humanize/time.py:142 msgid "an hour" msgstr "uma hora" -#: src/humanize/time.py:110 +#: src/humanize/time.py:145 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d hora" msgstr[1] "%d horas" -#: src/humanize/time.py:113 +#: src/humanize/time.py:148 msgid "a day" msgstr "um dia" -#: src/humanize/time.py:115 src/humanize/time.py:118 +#: src/humanize/time.py:150 src/humanize/time.py:153 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d dia" msgstr[1] "%d dias" -#: src/humanize/time.py:120 +#: src/humanize/time.py:155 msgid "a month" msgstr "um mês" -#: src/humanize/time.py:122 +#: src/humanize/time.py:157 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d mês" msgstr[1] "%d meses" -#: src/humanize/time.py:125 +#: src/humanize/time.py:160 msgid "a year" msgstr "um ano" -#: src/humanize/time.py:127 src/humanize/time.py:136 +#: src/humanize/time.py:162 src/humanize/time.py:171 #, 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:130 +#: src/humanize/time.py:165 msgid "1 year, 1 month" msgstr "1 ano e 1 mês" -#: src/humanize/time.py:133 +#: src/humanize/time.py:168 #, 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:138 +#: src/humanize/time.py:173 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d ano" msgstr[1] "%d anos" -#: src/humanize/time.py:167 +#: src/humanize/time.py:201 #, python-format msgid "%s from now" msgstr "daqui a %s" -#: src/humanize/time.py:167 +#: src/humanize/time.py:201 #, python-format msgid "%s ago" msgstr "há %s" -#: src/humanize/time.py:171 +#: src/humanize/time.py:205 msgid "now" msgstr "agora" -#: src/humanize/time.py:190 +#: src/humanize/time.py:227 msgid "today" msgstr "hoje" -#: src/humanize/time.py:192 +#: src/humanize/time.py:229 msgid "tomorrow" msgstr "amanhã" -#: src/humanize/time.py:194 +#: src/humanize/time.py:231 msgid "yesterday" msgstr "ontem" + +#: src/humanize/time.py:498 +#, python-format +msgid "%s and %s" +msgstr "%s e %s" diff --git a/src/humanize/locale/ru_RU/LC_MESSAGES/humanize.mo b/src/humanize/locale/ru_RU/LC_MESSAGES/humanize.mo index e13bac6..054849c 100644 Binary files a/src/humanize/locale/ru_RU/LC_MESSAGES/humanize.mo and b/src/humanize/locale/ru_RU/LC_MESSAGES/humanize.mo differ diff --git a/src/humanize/locale/ru_RU/LC_MESSAGES/humanize.po b/src/humanize/locale/ru_RU/LC_MESSAGES/humanize.po index fc58b2d..cfa8ad4 100644 --- a/src/humanize/locale/ru_RU/LC_MESSAGES/humanize.po +++ b/src/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-02-08 19:58+0200\n" +"POT-Creation-Date: 2020-09-29 20:53+0300\n" "PO-Revision-Date: 2014-03-24 20:32+0300\n" "Last-Translator: Sergey Prokhorov \n" "Language-Team: ru_RU \n" @@ -21,151 +21,171 @@ msgstr "" "X-Generator: Poedit 1.5.4\n" # в Django тут "ий" но на самом деле оба варианта работают плохо -#: src/humanize/number.py:24 +#: src/humanize/number.py:31 msgctxt "0" msgid "th" msgstr "ой" -#: src/humanize/number.py:25 +#: src/humanize/number.py:32 msgctxt "1" msgid "st" msgstr "ый" -#: src/humanize/number.py:26 +#: src/humanize/number.py:33 msgctxt "2" msgid "nd" msgstr "ой" -#: src/humanize/number.py:27 +#: src/humanize/number.py:34 msgctxt "3" msgid "rd" msgstr "ий" # в Django тут "ий" но на самом деле оба варианта работают плохо -#: src/humanize/number.py:28 +#: src/humanize/number.py:35 msgctxt "4" msgid "th" msgstr "ый" # в Django тут "ий" но на самом деле оба варианта работают плохо -#: src/humanize/number.py:29 +#: src/humanize/number.py:36 msgctxt "5" msgid "th" msgstr "ый" # в Django тут "ий" но на самом деле оба варианта работают плохо -#: src/humanize/number.py:30 +#: src/humanize/number.py:37 msgctxt "6" msgid "th" msgstr "ой" # в Django тут "ий" но на самом деле оба варианта работают плохо -#: src/humanize/number.py:31 +#: src/humanize/number.py:38 msgctxt "7" msgid "th" msgstr "ой" # в Django тут "ий" но на самом деле оба варианта работают плохо -#: src/humanize/number.py:32 +#: src/humanize/number.py:39 msgctxt "8" msgid "th" msgstr "ой" # в Django тут "ий" но на самом деле оба варианта работают плохо -#: src/humanize/number.py:33 +#: src/humanize/number.py:40 msgctxt "9" msgid "th" msgstr "ый" -#: src/humanize/number.py:62 +#: src/humanize/number.py:82 msgid "million" msgstr "миллиона" -#: src/humanize/number.py:63 +#: src/humanize/number.py:83 msgid "billion" msgstr "миллиарда" -#: src/humanize/number.py:64 +#: src/humanize/number.py:84 msgid "trillion" msgstr "триллиона" -#: src/humanize/number.py:65 +#: src/humanize/number.py:85 msgid "quadrillion" msgstr "квадриллиона" -#: src/humanize/number.py:66 +#: src/humanize/number.py:86 msgid "quintillion" msgstr "квинтиллиона" -#: src/humanize/number.py:67 +#: src/humanize/number.py:87 msgid "sextillion" msgstr "сикстиллиона" -#: src/humanize/number.py:68 +#: src/humanize/number.py:88 msgid "septillion" msgstr "септиллиона" -#: src/humanize/number.py:69 +#: src/humanize/number.py:89 msgid "octillion" msgstr "октиллиона" -#: src/humanize/number.py:70 +#: src/humanize/number.py:90 msgid "nonillion" msgstr "нониллиона" -#: src/humanize/number.py:71 +#: src/humanize/number.py:91 msgid "decillion" msgstr "децилиона" -#: src/humanize/number.py:72 +#: src/humanize/number.py:92 msgid "googol" msgstr "гогола" -#: src/humanize/number.py:108 +#: src/humanize/number.py:147 +msgid "zero" +msgstr "" + +#: src/humanize/number.py:148 msgid "one" msgstr "один" -#: src/humanize/number.py:109 +#: src/humanize/number.py:149 msgid "two" msgstr "два" -#: src/humanize/number.py:110 +#: src/humanize/number.py:150 msgid "three" msgstr "три" -#: src/humanize/number.py:111 +#: src/humanize/number.py:151 msgid "four" msgstr "четыре" -#: src/humanize/number.py:112 +#: src/humanize/number.py:152 msgid "five" msgstr "пять" -#: src/humanize/number.py:113 +#: src/humanize/number.py:153 msgid "six" msgstr "шесть" -#: src/humanize/number.py:114 +#: src/humanize/number.py:154 msgid "seven" msgstr "семь" -#: src/humanize/number.py:115 +#: src/humanize/number.py:155 msgid "eight" msgstr "восемь" -#: src/humanize/number.py:116 +#: src/humanize/number.py:156 msgid "nine" msgstr "девять" -#: src/humanize/time.py:68 src/humanize/time.py:131 +#: src/humanize/time.py:119 +#, fuzzy, python-format +msgid "%d microsecond" +msgid_plural "%d microseconds" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: src/humanize/time.py:128 +#, fuzzy, 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 msgid "a moment" msgstr "только что" -#: src/humanize/time.py:70 +#: src/humanize/time.py:133 msgid "a second" msgstr "секунду" -#: src/humanize/time.py:72 +#: src/humanize/time.py:135 #, python-format msgid "%d second" msgid_plural "%d seconds" @@ -173,11 +193,11 @@ msgstr[0] "%d секунда" msgstr[1] "%d секунды" msgstr[2] "%d секунд" -#: src/humanize/time.py:74 +#: src/humanize/time.py:137 msgid "a minute" msgstr "минуту" -#: src/humanize/time.py:77 +#: src/humanize/time.py:140 #, python-format msgid "%d minute" msgid_plural "%d minutes" @@ -185,11 +205,11 @@ msgstr[0] "%d минута" msgstr[1] "%d минуты" msgstr[2] "%d минут" -#: src/humanize/time.py:79 +#: src/humanize/time.py:142 msgid "an hour" msgstr "час" -#: src/humanize/time.py:82 +#: src/humanize/time.py:145 #, python-format msgid "%d hour" msgid_plural "%d hours" @@ -197,11 +217,11 @@ msgstr[0] "%d час" msgstr[1] "%d часа" msgstr[2] "%d часов" -#: src/humanize/time.py:85 +#: src/humanize/time.py:148 msgid "a day" msgstr "день" -#: src/humanize/time.py:87 src/humanize/time.py:90 +#: src/humanize/time.py:150 src/humanize/time.py:153 #, python-format msgid "%d day" msgid_plural "%d days" @@ -209,11 +229,11 @@ msgstr[0] "%d день" msgstr[1] "%d дня" msgstr[2] "%d дней" -#: src/humanize/time.py:92 +#: src/humanize/time.py:155 msgid "a month" msgstr "месяц" -#: src/humanize/time.py:94 +#: src/humanize/time.py:157 #, python-format msgid "%d month" msgid_plural "%d months" @@ -221,11 +241,11 @@ msgstr[0] "%d месяц" msgstr[1] "%d месяца" msgstr[2] "%d месяцев" -#: src/humanize/time.py:97 +#: src/humanize/time.py:160 msgid "a year" msgstr "год" -#: src/humanize/time.py:99 src/humanize/time.py:108 +#: src/humanize/time.py:162 src/humanize/time.py:171 #, python-format msgid "1 year, %d day" msgid_plural "1 year, %d days" @@ -233,11 +253,11 @@ msgstr[0] "1 год, %d день" msgstr[1] "1 год, %d дня" msgstr[2] "1 год, %d дней" -#: src/humanize/time.py:102 +#: src/humanize/time.py:165 msgid "1 year, 1 month" msgstr "1 год, 1 месяц" -#: src/humanize/time.py:105 +#: src/humanize/time.py:168 #, python-format msgid "1 year, %d month" msgid_plural "1 year, %d months" @@ -245,7 +265,7 @@ msgstr[0] "1 год, %d месяц" msgstr[1] "1 год, %d месяца" msgstr[2] "1 год, %d месяцев" -#: src/humanize/time.py:110 +#: src/humanize/time.py:173 #, python-format msgid "%d year" msgid_plural "%d years" @@ -253,28 +273,33 @@ msgstr[0] "%d год" msgstr[1] "%d года" msgstr[2] "%d лет" -#: src/humanize/time.py:128 +#: src/humanize/time.py:201 #, python-format msgid "%s from now" msgstr "через %s" -#: src/humanize/time.py:128 +#: src/humanize/time.py:201 #, python-format msgid "%s ago" msgstr "%s назад" -#: src/humanize/time.py:132 +#: src/humanize/time.py:205 msgid "now" msgstr "сейчас" -#: src/humanize/time.py:151 +#: src/humanize/time.py:227 msgid "today" msgstr "сегодня" -#: src/humanize/time.py:153 +#: src/humanize/time.py:229 msgid "tomorrow" msgstr "завтра" -#: src/humanize/time.py:155 +#: src/humanize/time.py:231 msgid "yesterday" msgstr "вчера" + +#: src/humanize/time.py:498 +#, python-format +msgid "%s and %s" +msgstr "%s и %s" diff --git a/src/humanize/locale/sk_SK/LC_MESSAGES/humanize.mo b/src/humanize/locale/sk_SK/LC_MESSAGES/humanize.mo index 0308eb4..921ce40 100644 Binary files a/src/humanize/locale/sk_SK/LC_MESSAGES/humanize.mo and b/src/humanize/locale/sk_SK/LC_MESSAGES/humanize.mo differ diff --git a/src/humanize/locale/sk_SK/LC_MESSAGES/humanize.po b/src/humanize/locale/sk_SK/LC_MESSAGES/humanize.po index b74cb8d..04c206a 100644 --- a/src/humanize/locale/sk_SK/LC_MESSAGES/humanize.po +++ b/src/humanize/locale/sk_SK/LC_MESSAGES/humanize.po @@ -6,10 +6,10 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: humanize\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-03-22 16:30+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"POT-Creation-Date: 2020-09-29 21:07+0300\n" +"PO-Revision-Date: 2020-09-29 22:43+0300\n" "Last-Translator: Jose Riha \n" "Language-Team: sk \n" "Language: Slovak\n" @@ -18,141 +18,141 @@ 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:22 +#: src/humanize/number.py:31 msgctxt "0" msgid "th" msgstr "." -#: src/humanize/number.py:23 +#: src/humanize/number.py:32 msgctxt "1" msgid "st" msgstr "." -#: src/humanize/number.py:24 +#: src/humanize/number.py:33 msgctxt "2" msgid "nd" msgstr "." -#: src/humanize/number.py:25 +#: src/humanize/number.py:34 msgctxt "3" msgid "rd" msgstr "." -#: src/humanize/number.py:26 +#: src/humanize/number.py:35 msgctxt "4" msgid "th" msgstr "." -#: src/humanize/number.py:27 +#: src/humanize/number.py:36 msgctxt "5" msgid "th" msgstr "." -#: src/humanize/number.py:28 +#: src/humanize/number.py:37 msgctxt "6" msgid "th" msgstr "." -#: src/humanize/number.py:29 +#: src/humanize/number.py:38 msgctxt "7" msgid "th" msgstr "." -#: src/humanize/number.py:30 +#: src/humanize/number.py:39 msgctxt "8" msgid "th" msgstr "." -#: src/humanize/number.py:31 +#: src/humanize/number.py:40 msgctxt "9" msgid "th" msgstr "." -#: src/humanize/number.py:73 +#: src/humanize/number.py:82 msgid "million" msgstr "milióna/ov" -#: src/humanize/number.py:74 +#: src/humanize/number.py:83 msgid "billion" msgstr "miliardy/árd" -#: src/humanize/number.py:75 +#: src/humanize/number.py:84 msgid "trillion" msgstr "bilióna/ov" -#: src/humanize/number.py:76 +#: src/humanize/number.py:85 msgid "quadrillion" msgstr "biliardy/árd" -#: src/humanize/number.py:77 +#: src/humanize/number.py:86 msgid "quintillion" msgstr "trilióna/árd" -#: src/humanize/number.py:78 +#: src/humanize/number.py:87 msgid "sextillion" msgstr "triliardy/árd" -#: src/humanize/number.py:79 +#: src/humanize/number.py:88 msgid "septillion" msgstr "kvadrilióna/ov" -#: src/humanize/number.py:80 +#: src/humanize/number.py:89 msgid "octillion" msgstr "kvadriliardy/árd" -#: src/humanize/number.py:81 +#: src/humanize/number.py:90 msgid "nonillion" msgstr "kvintilióna/ov" -#: src/humanize/number.py:82 +#: src/humanize/number.py:91 msgid "decillion" msgstr "kvintiliardy/árd" -#: src/humanize/number.py:83 +#: src/humanize/number.py:92 msgid "googol" msgstr "googola/ov" -#: src/humanize/number.py:138 +#: src/humanize/number.py:147 msgid "zero" msgstr "nula" -#: src/humanize/number.py:139 +#: src/humanize/number.py:148 msgid "one" msgstr "jedna" -#: src/humanize/number.py:140 +#: src/humanize/number.py:149 msgid "two" msgstr "dve" -#: src/humanize/number.py:141 +#: src/humanize/number.py:150 msgid "three" msgstr "tri" -#: src/humanize/number.py:142 +#: src/humanize/number.py:151 msgid "four" msgstr "štyri" -#: src/humanize/number.py:143 +#: src/humanize/number.py:152 msgid "five" msgstr "päť" -#: src/humanize/number.py:144 +#: src/humanize/number.py:153 msgid "six" msgstr "šesť" -#: src/humanize/number.py:145 +#: src/humanize/number.py:154 msgid "seven" msgstr "sedem" -#: src/humanize/number.py:146 +#: src/humanize/number.py:155 msgid "eight" msgstr "osem" -#: src/humanize/number.py:147 +#: src/humanize/number.py:156 msgid "nine" msgstr "deväť" -#: src/humanize/time.py:87 +#: src/humanize/time.py:119 #, fuzzy, python-format msgid "%d microsecond" msgid_plural "%d microseconds" @@ -160,7 +160,7 @@ msgstr[0] "%d mikrosekundu" msgstr[1] "%d mikrosekundy" msgstr[2] "%d mikrosekúnd" -#: src/humanize/time.py:93 +#: src/humanize/time.py:128 #, fuzzy, python-format msgid "%d millisecond" msgid_plural "%d milliseconds" @@ -168,15 +168,15 @@ msgstr[0] "%d milisekundu" msgstr[1] "%d milisekundy" msgstr[2] "%d milisekúnd" -#: src/humanize/time.py:96 src/humanize/time.py:170 +#: src/humanize/time.py:131 src/humanize/time.py:204 msgid "a moment" msgstr "chvíľku" -#: src/humanize/time.py:98 +#: src/humanize/time.py:133 msgid "a second" msgstr "sekundu" -#: src/humanize/time.py:100 +#: src/humanize/time.py:135 #, python-format msgid "%d second" msgid_plural "%d seconds" @@ -184,11 +184,11 @@ msgstr[0] "%d sekundu" msgstr[1] "%d sekundy" msgstr[2] "%d sekúnd" -#: src/humanize/time.py:102 +#: src/humanize/time.py:137 msgid "a minute" msgstr "minútu" -#: src/humanize/time.py:105 +#: src/humanize/time.py:140 #, python-format msgid "%d minute" msgid_plural "%d minutes" @@ -196,11 +196,11 @@ msgstr[0] "%d minútu" msgstr[1] "%d minúty" msgstr[2] "%d minút" -#: src/humanize/time.py:107 +#: src/humanize/time.py:142 msgid "an hour" msgstr "hodinu" -#: src/humanize/time.py:110 +#: src/humanize/time.py:145 #, python-format msgid "%d hour" msgid_plural "%d hours" @@ -208,11 +208,11 @@ msgstr[0] "%d hodina" msgstr[1] "%d hodiny" msgstr[2] "%d hodín" -#: src/humanize/time.py:113 +#: src/humanize/time.py:148 msgid "a day" msgstr "deň" -#: src/humanize/time.py:115 src/humanize/time.py:118 +#: src/humanize/time.py:150 src/humanize/time.py:153 #, python-format msgid "%d day" msgid_plural "%d days" @@ -220,11 +220,11 @@ msgstr[0] "%d deň" msgstr[1] "%d dni" msgstr[2] "%d dní" -#: src/humanize/time.py:120 +#: src/humanize/time.py:155 msgid "a month" msgstr "mesiac" -#: src/humanize/time.py:122 +#: src/humanize/time.py:157 #, python-format msgid "%d month" msgid_plural "%d months" @@ -232,11 +232,11 @@ msgstr[0] "%d mesiac" msgstr[1] "%d mesiace" msgstr[2] "%d mesiacov" -#: src/humanize/time.py:125 +#: src/humanize/time.py:160 msgid "a year" msgstr "rok" -#: src/humanize/time.py:127 src/humanize/time.py:136 +#: src/humanize/time.py:162 src/humanize/time.py:171 #, python-format msgid "1 year, %d day" msgid_plural "1 year, %d days" @@ -244,11 +244,11 @@ msgstr[0] "1 rok, %d deň" msgstr[1] "1 rok, %d dni" msgstr[2] "1 rok, %d dní" -#: src/humanize/time.py:130 +#: src/humanize/time.py:165 msgid "1 year, 1 month" msgstr "1 rok, 1 mesiac" -#: src/humanize/time.py:133 +#: src/humanize/time.py:168 #, python-format msgid "1 year, %d month" msgid_plural "1 year, %d months" @@ -256,7 +256,7 @@ msgstr[0] "1 rok, %d mesiac" msgstr[1] "1 rok, %d mesiace" msgstr[2] "1 rok, %d mesiacov" -#: src/humanize/time.py:138 +#: src/humanize/time.py:173 #, python-format msgid "%d year" msgid_plural "%d years" @@ -264,28 +264,33 @@ msgstr[0] "%d rok" msgstr[1] "%d roky" msgstr[2] "%d rokov" -#: src/humanize/time.py:167 +#: src/humanize/time.py:201 #, python-format msgid "%s from now" msgstr "o %s" -#: src/humanize/time.py:167 +#: src/humanize/time.py:201 #, python-format msgid "%s ago" msgstr "%s naspäť" -#: src/humanize/time.py:171 +#: src/humanize/time.py:205 msgid "now" msgstr "teraz" -#: src/humanize/time.py:190 +#: src/humanize/time.py:227 msgid "today" msgstr "dnes" -#: src/humanize/time.py:192 +#: src/humanize/time.py:229 msgid "tomorrow" msgstr "zajtra" -#: src/humanize/time.py:194 +#: src/humanize/time.py:231 msgid "yesterday" msgstr "včera" + +#: src/humanize/time.py:498 +#, python-format +msgid "%s and %s" +msgstr "" diff --git a/src/humanize/locale/tr_TR/LC_MESSAGES/humanize.po b/src/humanize/locale/tr_TR/LC_MESSAGES/humanize.po index 0694bea..a3da4da 100644 --- a/src/humanize/locale/tr_TR/LC_MESSAGES/humanize.po +++ b/src/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-02-08 20:05+0200\n" +"POT-Creation-Date: 2020-09-29 21:07+0300\n" "PO-Revision-Date: 2017-02-23 20:00+0300\n" "Last-Translator: Emre Çintay \n" "Language-Team: Turkish\n" @@ -19,246 +19,269 @@ msgstr "" "X-Generator: Poedit 1.8.7.1\n" "Generated-By: Emre Çintay\n" -#: src/humanize/number.py:24 +#: src/humanize/number.py:31 msgctxt "0" msgid "th" msgstr "." -#: src/humanize/number.py:25 +#: src/humanize/number.py:32 msgctxt "1" msgid "st" msgstr "." -#: src/humanize/number.py:26 +#: src/humanize/number.py:33 msgctxt "2" msgid "nd" msgstr "." -#: src/humanize/number.py:27 +#: src/humanize/number.py:34 msgctxt "3" msgid "rd" msgstr "." -#: src/humanize/number.py:28 +#: src/humanize/number.py:35 msgctxt "4" msgid "th" msgstr "." -#: src/humanize/number.py:29 +#: src/humanize/number.py:36 msgctxt "5" msgid "th" msgstr "." -#: src/humanize/number.py:30 +#: src/humanize/number.py:37 msgctxt "6" msgid "th" msgstr "." -#: src/humanize/number.py:31 +#: src/humanize/number.py:38 msgctxt "7" msgid "th" msgstr "." -#: src/humanize/number.py:32 +#: src/humanize/number.py:39 msgctxt "8" msgid "th" msgstr "." -#: src/humanize/number.py:33 +#: src/humanize/number.py:40 msgctxt "9" msgid "th" msgstr "." -#: src/humanize/number.py:62 +#: src/humanize/number.py:82 msgid "million" msgstr "milyon" -#: src/humanize/number.py:63 +#: src/humanize/number.py:83 msgid "billion" msgstr "milyar" -#: src/humanize/number.py:64 +#: src/humanize/number.py:84 msgid "trillion" msgstr "trilyon" -#: src/humanize/number.py:65 +#: src/humanize/number.py:85 msgid "quadrillion" msgstr "katrilyon" -#: src/humanize/number.py:66 +#: src/humanize/number.py:86 msgid "quintillion" msgstr "kentilyon" -#: src/humanize/number.py:67 +#: src/humanize/number.py:87 msgid "sextillion" msgstr "sekstilyon" -#: src/humanize/number.py:68 +#: src/humanize/number.py:88 msgid "septillion" msgstr "septilyon" -#: src/humanize/number.py:69 +#: src/humanize/number.py:89 msgid "octillion" msgstr "oktilyon" -#: src/humanize/number.py:70 +#: src/humanize/number.py:90 msgid "nonillion" msgstr "nonilyon" -#: src/humanize/number.py:71 +#: src/humanize/number.py:91 msgid "decillion" msgstr "desilyon" -#: src/humanize/number.py:72 +#: src/humanize/number.py:92 msgid "googol" msgstr "googol" -#: src/humanize/number.py:108 +#: src/humanize/number.py:147 +msgid "zero" +msgstr "" + +#: src/humanize/number.py:148 msgid "one" msgstr "bir" -#: src/humanize/number.py:109 +#: src/humanize/number.py:149 msgid "two" msgstr "iki" -#: src/humanize/number.py:110 +#: src/humanize/number.py:150 msgid "three" msgstr "üç" -#: src/humanize/number.py:111 +#: src/humanize/number.py:151 msgid "four" msgstr "dört" -#: src/humanize/number.py:112 +#: src/humanize/number.py:152 msgid "five" msgstr "beş" -#: src/humanize/number.py:113 +#: src/humanize/number.py:153 msgid "six" msgstr "altı" -#: src/humanize/number.py:114 +#: src/humanize/number.py:154 msgid "seven" msgstr "yedi" -#: src/humanize/number.py:115 +#: src/humanize/number.py:155 msgid "eight" msgstr "sekiz" -#: src/humanize/number.py:116 +#: src/humanize/number.py:156 msgid "nine" msgstr "dokuz" -#: src/humanize/time.py:68 src/humanize/time.py:131 +#: src/humanize/time.py:119 +#, fuzzy, python-format +msgid "%d microsecond" +msgid_plural "%d microseconds" +msgstr[0] "" +msgstr[1] "" + +#: src/humanize/time.py:128 +#, fuzzy, python-format +msgid "%d millisecond" +msgid_plural "%d milliseconds" +msgstr[0] "" +msgstr[1] "" + +#: src/humanize/time.py:131 src/humanize/time.py:204 msgid "a moment" msgstr "biraz" -#: src/humanize/time.py:70 +#: src/humanize/time.py:133 msgid "a second" msgstr "bir saniye" -#: src/humanize/time.py:72 +#: src/humanize/time.py:135 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d saniye" msgstr[1] "%d saniye" -#: src/humanize/time.py:74 +#: src/humanize/time.py:137 msgid "a minute" msgstr "bir dakika" -#: src/humanize/time.py:77 +#: src/humanize/time.py:140 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d dakika" msgstr[1] "%d dakika" -#: src/humanize/time.py:79 +#: src/humanize/time.py:142 msgid "an hour" msgstr "bir saat" -#: src/humanize/time.py:82 +#: src/humanize/time.py:145 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d saat" msgstr[1] "%d saat" -#: src/humanize/time.py:85 +#: src/humanize/time.py:148 msgid "a day" msgstr "bir gün" -#: src/humanize/time.py:87 src/humanize/time.py:90 +#: src/humanize/time.py:150 src/humanize/time.py:153 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d gün" msgstr[1] "%d gün" -#: src/humanize/time.py:92 +#: src/humanize/time.py:155 msgid "a month" msgstr "bir ay" -#: src/humanize/time.py:94 +#: src/humanize/time.py:157 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d ay" msgstr[1] "%d ay" -#: src/humanize/time.py:97 +#: src/humanize/time.py:160 msgid "a year" msgstr "bir yıl" -#: src/humanize/time.py:99 src/humanize/time.py:108 +#: src/humanize/time.py:162 src/humanize/time.py:171 #, 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:102 +#: src/humanize/time.py:165 msgid "1 year, 1 month" msgstr "1 yıl, 1 ay" -#: src/humanize/time.py:105 +#: src/humanize/time.py:168 #, 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:110 +#: src/humanize/time.py:173 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d yıl" msgstr[1] "%d yıl" -#: src/humanize/time.py:128 +#: src/humanize/time.py:201 #, python-format msgid "%s from now" msgstr "şu andan itibaren %s" -#: src/humanize/time.py:128 +#: src/humanize/time.py:201 #, python-format msgid "%s ago" msgstr "%s önce" -#: src/humanize/time.py:132 +#: src/humanize/time.py:205 msgid "now" msgstr "şimdi" -#: src/humanize/time.py:151 +#: src/humanize/time.py:227 msgid "today" msgstr "bugün" -#: src/humanize/time.py:153 +#: src/humanize/time.py:229 msgid "tomorrow" msgstr "yarın" -#: src/humanize/time.py:155 +#: src/humanize/time.py:231 msgid "yesterday" msgstr "dün" + +#: src/humanize/time.py:498 +#, python-format +msgid "%s and %s" +msgstr "" diff --git a/src/humanize/locale/uk_UA/LC_MESSAGES/humanize.po b/src/humanize/locale/uk_UA/LC_MESSAGES/humanize.po index 5ef5016..c4d1d98 100644 --- a/src/humanize/locale/uk_UA/LC_MESSAGES/humanize.po +++ b/src/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-03-22 16:59+0200\n" +"POT-Creation-Date: 2020-09-29 21:07+0300\n" "PO-Revision-Date: \n" "Last-Translator: TL\n" "Language-Team: uk_UA\n" @@ -15,141 +15,141 @@ msgstr "" "Generated-By:\n" "X-Generator: \n" -#: src/humanize/number.py:22 +#: src/humanize/number.py:31 msgctxt "0" msgid "th" msgstr "ий" -#: src/humanize/number.py:23 +#: src/humanize/number.py:32 msgctxt "1" msgid "st" msgstr "ий" -#: src/humanize/number.py:24 +#: src/humanize/number.py:33 msgctxt "2" msgid "nd" msgstr "ий" -#: src/humanize/number.py:25 +#: src/humanize/number.py:34 msgctxt "3" msgid "rd" msgstr "ій" -#: src/humanize/number.py:26 +#: src/humanize/number.py:35 msgctxt "4" msgid "th" msgstr "ий" -#: src/humanize/number.py:27 +#: src/humanize/number.py:36 msgctxt "5" msgid "th" msgstr "ий" -#: src/humanize/number.py:28 +#: src/humanize/number.py:37 msgctxt "6" msgid "th" msgstr "ий" -#: src/humanize/number.py:29 +#: src/humanize/number.py:38 msgctxt "7" msgid "th" msgstr "ий" -#: src/humanize/number.py:30 +#: src/humanize/number.py:39 msgctxt "8" msgid "th" msgstr "ий" -#: src/humanize/number.py:31 +#: src/humanize/number.py:40 msgctxt "9" msgid "th" msgstr "ий" -#: src/humanize/number.py:73 +#: src/humanize/number.py:82 msgid "million" msgstr "мільйонів" -#: src/humanize/number.py:74 +#: src/humanize/number.py:83 msgid "billion" msgstr "мільярдів" -#: src/humanize/number.py:75 +#: src/humanize/number.py:84 msgid "trillion" msgstr "трильйонів" -#: src/humanize/number.py:76 +#: src/humanize/number.py:85 msgid "quadrillion" msgstr "квадрильйонів" -#: src/humanize/number.py:77 +#: src/humanize/number.py:86 msgid "quintillion" msgstr "квинтиліонів" -#: src/humanize/number.py:78 +#: src/humanize/number.py:87 msgid "sextillion" msgstr "сикстильйонів" -#: src/humanize/number.py:79 +#: src/humanize/number.py:88 msgid "septillion" msgstr "септильйонів" -#: src/humanize/number.py:80 +#: src/humanize/number.py:89 msgid "octillion" msgstr "октильйонів" -#: src/humanize/number.py:81 +#: src/humanize/number.py:90 msgid "nonillion" msgstr "нонильйонів" -#: src/humanize/number.py:82 +#: src/humanize/number.py:91 msgid "decillion" msgstr "децильйонів" -#: src/humanize/number.py:83 +#: src/humanize/number.py:92 msgid "googol" msgstr "гугола" -#: src/humanize/number.py:138 +#: src/humanize/number.py:147 msgid "zero" msgstr "нуль" -#: src/humanize/number.py:139 +#: src/humanize/number.py:148 msgid "one" msgstr "один" -#: src/humanize/number.py:140 +#: src/humanize/number.py:149 msgid "two" msgstr "два" -#: src/humanize/number.py:141 +#: src/humanize/number.py:150 msgid "three" msgstr "три" -#: src/humanize/number.py:142 +#: src/humanize/number.py:151 msgid "four" msgstr "чотири" -#: src/humanize/number.py:143 +#: src/humanize/number.py:152 msgid "five" msgstr "п'ять" -#: src/humanize/number.py:144 +#: src/humanize/number.py:153 msgid "six" msgstr "шість" -#: src/humanize/number.py:145 +#: src/humanize/number.py:154 msgid "seven" msgstr "сім" -#: src/humanize/number.py:146 +#: src/humanize/number.py:155 msgid "eight" msgstr "вісім" -#: src/humanize/number.py:147 +#: src/humanize/number.py:156 msgid "nine" msgstr "дев'ять" -#: src/humanize/time.py:87 +#: src/humanize/time.py:119 #, fuzzy, python-format msgid "%d microsecond" msgid_plural "%d microseconds" @@ -157,7 +157,7 @@ msgstr[0] "%d мікросекунда" msgstr[1] "%d мікросекунд" msgstr[2] "%d мікросекунди" -#: src/humanize/time.py:93 +#: src/humanize/time.py:128 #, fuzzy, python-format msgid "%d millisecond" msgid_plural "%d milliseconds" @@ -165,15 +165,15 @@ msgstr[0] "%d мілісекунда" msgstr[1] "%d мілісекунди" msgstr[2] "%d мілісекунди" -#: src/humanize/time.py:96 src/humanize/time.py:170 +#: src/humanize/time.py:131 src/humanize/time.py:204 msgid "a moment" msgstr "у цей момент" -#: src/humanize/time.py:98 +#: src/humanize/time.py:133 msgid "a second" msgstr "секунду" -#: src/humanize/time.py:100 +#: src/humanize/time.py:135 #, python-format msgid "%d second" msgid_plural "%d seconds" @@ -181,11 +181,11 @@ msgstr[0] "%d секунда" msgstr[1] "%d секунд" msgstr[2] "%d секунд" -#: src/humanize/time.py:102 +#: src/humanize/time.py:137 msgid "a minute" msgstr "хвилина" -#: src/humanize/time.py:105 +#: src/humanize/time.py:140 #, python-format msgid "%d minute" msgid_plural "%d minutes" @@ -193,11 +193,11 @@ msgstr[0] "%d хвилина" msgstr[1] "%d хвилини" msgstr[2] "%d хвилин" -#: src/humanize/time.py:107 +#: src/humanize/time.py:142 msgid "an hour" msgstr "година" -#: src/humanize/time.py:110 +#: src/humanize/time.py:145 #, python-format msgid "%d hour" msgid_plural "%d hours" @@ -205,11 +205,11 @@ msgstr[0] "%d година" msgstr[1] "%d годин" msgstr[2] "%d годин" -#: src/humanize/time.py:113 +#: src/humanize/time.py:148 msgid "a day" msgstr "день" -#: src/humanize/time.py:115 src/humanize/time.py:118 +#: src/humanize/time.py:150 src/humanize/time.py:153 #, python-format msgid "%d day" msgid_plural "%d days" @@ -217,11 +217,11 @@ msgstr[0] "%d день" msgstr[1] "%d дня" msgstr[2] "%d дні" -#: src/humanize/time.py:120 +#: src/humanize/time.py:155 msgid "a month" msgstr "місяць" -#: src/humanize/time.py:122 +#: src/humanize/time.py:157 #, python-format msgid "%d month" msgid_plural "%d months" @@ -229,11 +229,11 @@ msgstr[0] "%d місяць" msgstr[1] "%d місяця" msgstr[2] "%d місяців" -#: src/humanize/time.py:125 +#: src/humanize/time.py:160 msgid "a year" msgstr "рік" -#: src/humanize/time.py:127 src/humanize/time.py:136 +#: src/humanize/time.py:162 src/humanize/time.py:171 #, python-format msgid "1 year, %d day" msgid_plural "1 year, %d days" @@ -241,11 +241,11 @@ msgstr[0] "1 рік, %d день" msgstr[1] "1 рік, %d дня" msgstr[2] "1 рік, %d днів" -#: src/humanize/time.py:130 +#: src/humanize/time.py:165 msgid "1 year, 1 month" msgstr "1 рік, 1 місяць" -#: src/humanize/time.py:133 +#: src/humanize/time.py:168 #, python-format msgid "1 year, %d month" msgid_plural "1 year, %d months" @@ -253,7 +253,7 @@ msgstr[0] "1 рік, %d місяць" msgstr[1] "1 рік, %d місяця" msgstr[2] "1 рік, %d місяців" -#: src/humanize/time.py:138 +#: src/humanize/time.py:173 #, python-format msgid "%d year" msgid_plural "%d years" @@ -261,28 +261,33 @@ msgstr[0] "%d рік" msgstr[1] "%d роки" msgstr[2] "%d років" -#: src/humanize/time.py:167 +#: src/humanize/time.py:201 #, python-format msgid "%s from now" msgstr "через %s" -#: src/humanize/time.py:167 +#: src/humanize/time.py:201 #, python-format msgid "%s ago" msgstr "%s назад" -#: src/humanize/time.py:171 +#: src/humanize/time.py:205 msgid "now" msgstr "зараз" -#: src/humanize/time.py:190 +#: src/humanize/time.py:227 msgid "today" msgstr "сьогодні" -#: src/humanize/time.py:192 +#: src/humanize/time.py:229 msgid "tomorrow" msgstr "завтра" -#: src/humanize/time.py:194 +#: src/humanize/time.py:231 msgid "yesterday" msgstr "вчора" + +#: src/humanize/time.py:498 +#, python-format +msgid "%s and %s" +msgstr "" diff --git a/src/humanize/locale/vi_VI/LC_MESSAGES/humanize.po b/src/humanize/locale/vi_VI/LC_MESSAGES/humanize.po index 06d224e..cb403bd 100644 --- a/src/humanize/locale/vi_VI/LC_MESSAGES/humanize.po +++ b/src/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-02-08 20:05+0200\n" +"POT-Creation-Date: 2020-09-29 21:07+0300\n" "PO-Revision-Date: 2017-05-30 11:51+0700\n" "Last-Translator: Olivier Cortès \n" "Language-Team: vi_VI \n" @@ -19,253 +19,276 @@ msgstr "" "Generated-By: Babel 0.9.6\n" "X-Generator: Poedit 1.8.7.1\n" -#: src/humanize/number.py:24 +#: src/humanize/number.py:31 msgctxt "0" msgid "th" msgstr "." -#: src/humanize/number.py:25 +#: src/humanize/number.py:32 msgctxt "1" msgid "st" msgstr "." -#: src/humanize/number.py:26 +#: src/humanize/number.py:33 msgctxt "2" msgid "nd" msgstr "." -#: src/humanize/number.py:27 +#: src/humanize/number.py:34 msgctxt "3" msgid "rd" msgstr "." -#: src/humanize/number.py:28 +#: src/humanize/number.py:35 msgctxt "4" msgid "th" msgstr "." -#: src/humanize/number.py:29 +#: src/humanize/number.py:36 msgctxt "5" msgid "th" msgstr "." -#: src/humanize/number.py:30 +#: src/humanize/number.py:37 msgctxt "6" msgid "th" msgstr "." -#: src/humanize/number.py:31 +#: src/humanize/number.py:38 msgctxt "7" msgid "th" msgstr "." -#: src/humanize/number.py:32 +#: src/humanize/number.py:39 msgctxt "8" msgid "th" msgstr "." -#: src/humanize/number.py:33 +#: src/humanize/number.py:40 msgctxt "9" msgid "th" msgstr "." -#: src/humanize/number.py:62 +#: src/humanize/number.py:82 msgid "million" msgstr "%(value)s triệu" -#: src/humanize/number.py:63 +#: src/humanize/number.py:83 msgid "billion" msgstr "tỷ" -#: src/humanize/number.py:64 +#: src/humanize/number.py:84 msgid "trillion" msgstr "%(value)s nghìn tỷ" -#: src/humanize/number.py:65 +#: src/humanize/number.py:85 msgid "quadrillion" msgstr "%(value)s triệu tỷ" -#: src/humanize/number.py:66 +#: src/humanize/number.py:86 #, fuzzy msgid "quintillion" msgstr "%(value)s quintillion" -#: src/humanize/number.py:67 +#: src/humanize/number.py:87 #, fuzzy msgid "sextillion" msgstr "%(value)s sextillion" -#: src/humanize/number.py:68 +#: src/humanize/number.py:88 #, fuzzy msgid "septillion" msgstr "%(value)s septillion" -#: src/humanize/number.py:69 +#: src/humanize/number.py:89 #, fuzzy msgid "octillion" msgstr "%(value)s octillion" -#: src/humanize/number.py:70 +#: src/humanize/number.py:90 #, fuzzy msgid "nonillion" msgstr "%(value)s nonillion" -#: src/humanize/number.py:71 +#: src/humanize/number.py:91 #, fuzzy msgid "decillion" msgstr "%(value)s décillion" -#: src/humanize/number.py:72 +#: src/humanize/number.py:92 #, fuzzy msgid "googol" msgstr "%(value)s gogol" -#: src/humanize/number.py:108 +#: src/humanize/number.py:147 +msgid "zero" +msgstr "" + +#: src/humanize/number.py:148 msgid "one" msgstr "một" -#: src/humanize/number.py:109 +#: src/humanize/number.py:149 msgid "two" msgstr "hai" -#: src/humanize/number.py:110 +#: src/humanize/number.py:150 msgid "three" msgstr "ba" -#: src/humanize/number.py:111 +#: src/humanize/number.py:151 msgid "four" msgstr "bốn" -#: src/humanize/number.py:112 +#: src/humanize/number.py:152 msgid "five" msgstr "năm" -#: src/humanize/number.py:113 +#: src/humanize/number.py:153 msgid "six" msgstr "sáu" -#: src/humanize/number.py:114 +#: src/humanize/number.py:154 msgid "seven" msgstr "bảy" -#: src/humanize/number.py:115 +#: src/humanize/number.py:155 msgid "eight" msgstr "tám" -#: src/humanize/number.py:116 +#: src/humanize/number.py:156 msgid "nine" msgstr "chín" -#: src/humanize/time.py:68 src/humanize/time.py:131 +#: src/humanize/time.py:119 +#, fuzzy, python-format +msgid "%d microsecond" +msgid_plural "%d microseconds" +msgstr[0] "" +msgstr[1] "" + +#: src/humanize/time.py:128 +#, fuzzy, python-format +msgid "%d millisecond" +msgid_plural "%d milliseconds" +msgstr[0] "" +msgstr[1] "" + +#: src/humanize/time.py:131 src/humanize/time.py:204 msgid "a moment" msgstr "ngay lúc này" -#: src/humanize/time.py:70 +#: src/humanize/time.py:133 msgid "a second" msgstr "một giây" -#: src/humanize/time.py:72 +#: src/humanize/time.py:135 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d giây" msgstr[1] "%d giây" -#: src/humanize/time.py:74 +#: src/humanize/time.py:137 msgid "a minute" msgstr "một phút" -#: src/humanize/time.py:77 +#: src/humanize/time.py:140 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d phút" msgstr[1] "%d phút" -#: src/humanize/time.py:79 +#: src/humanize/time.py:142 msgid "an hour" msgstr "một giờ" -#: src/humanize/time.py:82 +#: src/humanize/time.py:145 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d giờ" msgstr[1] "%d giờ" -#: src/humanize/time.py:85 +#: src/humanize/time.py:148 msgid "a day" msgstr "một ngày" -#: src/humanize/time.py:87 src/humanize/time.py:90 +#: src/humanize/time.py:150 src/humanize/time.py:153 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d ngày" msgstr[1] "%d ngày" -#: src/humanize/time.py:92 +#: src/humanize/time.py:155 msgid "a month" msgstr "một tháng" -#: src/humanize/time.py:94 +#: src/humanize/time.py:157 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d tháng" msgstr[1] "%d tháng" -#: src/humanize/time.py:97 +#: src/humanize/time.py:160 msgid "a year" msgstr "một năm" -#: src/humanize/time.py:99 src/humanize/time.py:108 +#: src/humanize/time.py:162 src/humanize/time.py:171 #, 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:102 +#: src/humanize/time.py:165 msgid "1 year, 1 month" msgstr "1 năm 1 tháng" -#: src/humanize/time.py:105 +#: src/humanize/time.py:168 #, 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:110 +#: src/humanize/time.py:173 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d năm" msgstr[1] "%d năm" -#: src/humanize/time.py:128 +#: src/humanize/time.py:201 #, python-format msgid "%s from now" msgstr "%s ngày tới" -#: src/humanize/time.py:128 +#: src/humanize/time.py:201 #, python-format msgid "%s ago" msgstr "%s trước" -#: src/humanize/time.py:132 +#: src/humanize/time.py:205 msgid "now" msgstr "ngay bây giờ" -#: src/humanize/time.py:151 +#: src/humanize/time.py:227 msgid "today" msgstr "hôm nay" -#: src/humanize/time.py:153 +#: src/humanize/time.py:229 msgid "tomorrow" msgstr "ngày mai" -#: src/humanize/time.py:155 +#: src/humanize/time.py:231 msgid "yesterday" msgstr "ngày hôm qua" + +#: src/humanize/time.py:498 +#, python-format +msgid "%s and %s" +msgstr "" diff --git a/src/humanize/locale/zh_CN/LC_MESSAGES/humanize.po b/src/humanize/locale/zh_CN/LC_MESSAGES/humanize.po index b45e0ca..5433598 100644 --- a/src/humanize/locale/zh_CN/LC_MESSAGES/humanize.po +++ b/src/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-02-08 20:05+0200\n" +"POT-Creation-Date: 2020-09-29 21:07+0300\n" "PO-Revision-Date: 2016-11-14 23:02+0000\n" "Last-Translator: Liwen SUN \n" "Language-Team: Chinese (simplified)\n" @@ -18,246 +18,269 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: src/humanize/number.py:24 +#: src/humanize/number.py:31 msgctxt "0" msgid "th" msgstr "第" -#: src/humanize/number.py:25 +#: src/humanize/number.py:32 msgctxt "1" msgid "st" msgstr "第" -#: src/humanize/number.py:26 +#: src/humanize/number.py:33 msgctxt "2" msgid "nd" msgstr "第" -#: src/humanize/number.py:27 +#: src/humanize/number.py:34 msgctxt "3" msgid "rd" msgstr "第" -#: src/humanize/number.py:28 +#: src/humanize/number.py:35 msgctxt "4" msgid "th" msgstr "第" -#: src/humanize/number.py:29 +#: src/humanize/number.py:36 msgctxt "5" msgid "th" msgstr "第" -#: src/humanize/number.py:30 +#: src/humanize/number.py:37 msgctxt "6" msgid "th" msgstr "第" -#: src/humanize/number.py:31 +#: src/humanize/number.py:38 msgctxt "7" msgid "th" msgstr "第" -#: src/humanize/number.py:32 +#: src/humanize/number.py:39 msgctxt "8" msgid "th" msgstr "第" -#: src/humanize/number.py:33 +#: src/humanize/number.py:40 msgctxt "9" msgid "th" msgstr "第" -#: src/humanize/number.py:62 +#: src/humanize/number.py:82 msgid "million" msgstr "百万" -#: src/humanize/number.py:63 +#: src/humanize/number.py:83 msgid "billion" msgstr "十亿" -#: src/humanize/number.py:64 +#: src/humanize/number.py:84 msgid "trillion" msgstr "兆" -#: src/humanize/number.py:65 +#: src/humanize/number.py:85 msgid "quadrillion" msgstr "万亿" -#: src/humanize/number.py:66 +#: src/humanize/number.py:86 msgid "quintillion" msgstr "百京" -#: src/humanize/number.py:67 +#: src/humanize/number.py:87 msgid "sextillion" msgstr "十垓" -#: src/humanize/number.py:68 +#: src/humanize/number.py:88 msgid "septillion" msgstr "秭" -#: src/humanize/number.py:69 +#: src/humanize/number.py:89 msgid "octillion" msgstr "千秭" -#: src/humanize/number.py:70 +#: src/humanize/number.py:90 msgid "nonillion" msgstr "百穰" -#: src/humanize/number.py:71 +#: src/humanize/number.py:91 msgid "decillion" msgstr "十沟" -#: src/humanize/number.py:72 +#: src/humanize/number.py:92 msgid "googol" msgstr "古高尔" -#: src/humanize/number.py:108 +#: src/humanize/number.py:147 +msgid "zero" +msgstr "" + +#: src/humanize/number.py:148 msgid "one" msgstr "一" -#: src/humanize/number.py:109 +#: src/humanize/number.py:149 msgid "two" msgstr "二" -#: src/humanize/number.py:110 +#: src/humanize/number.py:150 msgid "three" msgstr "三" -#: src/humanize/number.py:111 +#: src/humanize/number.py:151 msgid "four" msgstr "四" -#: src/humanize/number.py:112 +#: src/humanize/number.py:152 msgid "five" msgstr "五" -#: src/humanize/number.py:113 +#: src/humanize/number.py:153 msgid "six" msgstr "六" -#: src/humanize/number.py:114 +#: src/humanize/number.py:154 msgid "seven" msgstr "七" -#: src/humanize/number.py:115 +#: src/humanize/number.py:155 msgid "eight" msgstr "八" -#: src/humanize/number.py:116 +#: src/humanize/number.py:156 msgid "nine" msgstr "九" -#: src/humanize/time.py:68 src/humanize/time.py:131 +#: src/humanize/time.py:119 +#, fuzzy, python-format +msgid "%d microsecond" +msgid_plural "%d microseconds" +msgstr[0] "" +msgstr[1] "" + +#: src/humanize/time.py:128 +#, fuzzy, python-format +msgid "%d millisecond" +msgid_plural "%d milliseconds" +msgstr[0] "" +msgstr[1] "" + +#: src/humanize/time.py:131 src/humanize/time.py:204 msgid "a moment" msgstr "一会儿" -#: src/humanize/time.py:70 +#: src/humanize/time.py:133 msgid "a second" msgstr "1秒" -#: src/humanize/time.py:72 +#: src/humanize/time.py:135 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d秒" msgstr[1] "%d秒" -#: src/humanize/time.py:74 +#: src/humanize/time.py:137 msgid "a minute" msgstr "1分" -#: src/humanize/time.py:77 +#: src/humanize/time.py:140 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d分" msgstr[1] "%d分" -#: src/humanize/time.py:79 +#: src/humanize/time.py:142 msgid "an hour" msgstr "1小时" -#: src/humanize/time.py:82 +#: src/humanize/time.py:145 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d小时" msgstr[1] "%d小时" -#: src/humanize/time.py:85 +#: src/humanize/time.py:148 msgid "a day" msgstr "1天" -#: src/humanize/time.py:87 src/humanize/time.py:90 +#: src/humanize/time.py:150 src/humanize/time.py:153 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d天" msgstr[1] "%d天" -#: src/humanize/time.py:92 +#: src/humanize/time.py:155 msgid "a month" msgstr "1月" -#: src/humanize/time.py:94 +#: src/humanize/time.py:157 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d月" msgstr[1] "%d月" -#: src/humanize/time.py:97 +#: src/humanize/time.py:160 msgid "a year" msgstr "1年" -#: src/humanize/time.py:99 src/humanize/time.py:108 +#: src/humanize/time.py:162 src/humanize/time.py:171 #, python-format msgid "1 year, %d day" msgid_plural "1 year, %d days" msgstr[0] "%d年" msgstr[1] "%d年" -#: src/humanize/time.py:102 +#: src/humanize/time.py:165 msgid "1 year, 1 month" msgstr "1年又1月" -#: src/humanize/time.py:105 +#: src/humanize/time.py:168 #, 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:110 +#: src/humanize/time.py:173 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d年" msgstr[1] "%d年" -#: src/humanize/time.py:128 +#: src/humanize/time.py:201 #, python-format msgid "%s from now" msgstr "%s之后" -#: src/humanize/time.py:128 +#: src/humanize/time.py:201 #, python-format msgid "%s ago" msgstr "%s之前" -#: src/humanize/time.py:132 +#: src/humanize/time.py:205 msgid "now" msgstr "现在" -#: src/humanize/time.py:151 +#: src/humanize/time.py:227 msgid "today" msgstr "今天" -#: src/humanize/time.py:153 +#: src/humanize/time.py:229 msgid "tomorrow" msgstr "明天" -#: src/humanize/time.py:155 +#: src/humanize/time.py:231 msgid "yesterday" msgstr "昨天" + +#: src/humanize/time.py:498 +#, python-format +msgid "%s and %s" +msgstr "" diff --git a/src/humanize/time.py b/src/humanize/time.py index f75e4dd..b0bf85b 100644 --- a/src/humanize/time.py +++ b/src/humanize/time.py @@ -495,4 +495,4 @@ def precisedelta(value, minimum_unit="seconds", suppress=(), format="%0.2f"): head = ", ".join(texts[:-1]) tail = texts[-1] - return " and ".join((head, tail)) + return _("%s and %s") % (head, tail) diff --git a/tests/test_i18n.py b/tests/test_i18n.py index f3fe2d4..385be25 100644 --- a/tests/test_i18n.py +++ b/tests/test_i18n.py @@ -7,18 +7,23 @@ def test_i18n(): three_seconds = dt.timedelta(seconds=3) + one_min_three_seconds = dt.timedelta(milliseconds=67_000) assert humanize.naturaltime(three_seconds) == "3 seconds ago" assert humanize.ordinal(5) == "5th" + assert humanize.precisedelta(one_min_three_seconds) == "1 minute and 7 seconds" try: humanize.i18n.activate("ru_RU") assert humanize.naturaltime(three_seconds) == "3 секунды назад" assert humanize.ordinal(5) == "5ый" + assert humanize.precisedelta(one_min_three_seconds) == "1 минута и 7 секунд" + finally: humanize.i18n.deactivate() assert humanize.naturaltime(three_seconds) == "3 seconds ago" assert humanize.ordinal(5) == "5th" + assert humanize.precisedelta(one_min_three_seconds) == "1 minute and 7 seconds" def test_default_locale_path_defined__file__():