diff --git a/dashboard/templates/cards/sleep_day.html b/dashboard/templates/cards/sleep_day.html deleted file mode 100644 index 6f1a8d61..00000000 --- a/dashboard/templates/cards/sleep_day.html +++ /dev/null @@ -1,22 +0,0 @@ -{% extends 'cards/base.html' %} -{% load duration i18n %} - -{% block header %} - - {% trans "Today's Sleep" %} - -{% endblock %} - -{% block title %} - {% if total %} - {{ total|duration_string }} - {% else %} - {% trans "None" %} - {% endif %} -{% endblock %} - -{% block content %} - {% if count > 0 %} - {% blocktrans %}{{ count }} sleep entries{% endblocktrans %} - {% endif %} -{% endblock %} \ No newline at end of file diff --git a/dashboard/templates/cards/sleep_recent.html b/dashboard/templates/cards/sleep_recent.html new file mode 100644 index 00000000..4aaf542e --- /dev/null +++ b/dashboard/templates/cards/sleep_recent.html @@ -0,0 +1,54 @@ +{% extends 'cards/base.html' %} +{% load duration i18n %} + +{% block header %} + + {% trans "Recent Sleep" %} + +{% endblock %} + +{% block title %} +{% if sleeps|length > 0 %} + +{% else %} +{% trans "None" %} +{% endif %} +{% endblock %} \ No newline at end of file diff --git a/dashboard/templates/dashboard/child.html b/dashboard/templates/dashboard/child.html index c2cc0e08..464fd47b 100644 --- a/dashboard/templates/dashboard/child.html +++ b/dashboard/templates/dashboard/child.html @@ -18,7 +18,7 @@ {% card_feeding_last_method object %} {% card_feeding_day object %} {% card_statistics object %} - {% card_sleep_day object %} + {% card_sleep_recent object %} {% card_sleep_naps_day object %} {% card_tummytime_day object %} {% card_diaperchange_types object %} diff --git a/dashboard/templatetags/cards.py b/dashboard/templatetags/cards.py index 55924856..d5e9400c 100644 --- a/dashboard/templatetags/cards.py +++ b/dashboard/templatetags/cards.py @@ -221,42 +221,71 @@ def card_sleep_last(context, child): } -@register.inclusion_tag("cards/sleep_day.html", takes_context=True) -def card_sleep_day(context, child, date=None): +@register.inclusion_tag("cards/sleep_recent.html", takes_context=True) +def card_sleep_recent(context, child, end_date=None): """ - Filters Sleep instances to get count and total values for a specific date. + Filters sleeping instances to get total amount for a specific date and for 7 days before :param child: an instance of the Child model. - :param date: a Date object for the day to filter. - :returns: a dictionary with count and total values for the Sleep instances. + :param end_date: a Date object for the day to filter. + :returns: a dict with count and total amount for the sleeping instances. """ - if not date: - date = timezone.localtime().date() - instances = models.Sleep.objects.filter(child=child).filter( - start__year=date.year, start__month=date.month, start__day=date.day - ) | models.Sleep.objects.filter(child=child).filter( - end__year=date.year, end__month=date.month, end__day=date.day - ) - empty = len(instances) == 0 + if not end_date: + end_date = timezone.localtime() - total = timezone.timedelta(seconds=0) + # push end_date to very end of that day + end_date = end_date.replace(hour=23, minute=59, second=59, microsecond=9999) + # we need a datetime to use the range helper in the model + start_date = end_date - timezone.timedelta( + days=8 + ) # end of the -8th day so we get the FULL 7th day + + instances = models.Sleep.objects.filter(child=child).filter( + start__range=[start_date, end_date] + ) | models.Sleep.objects.filter(child=child).filter( + end__range=[start_date, end_date] + ) + + # prepare the result list for the last 7 days + dates = [end_date - timezone.timedelta(days=i) for i in range(8)] + results = [{"date": d, "total": timezone.timedelta(), "count": 0} for d in dates] + + # do one pass over the data and add it to the appropriate day for instance in instances: + # convert to local tz and push feed_date to end so we're comparing apples to apples for the date start = timezone.localtime(instance.start) end = timezone.localtime(instance.end) - # Account for dates crossing midnight. - if start.date() != date: - start = start.replace( - year=end.year, month=end.month, day=end.day, hour=0, minute=0, second=0 - ) + sleep_start_date = start.replace( + hour=23, minute=59, second=59, microsecond=9999 + ) + sleep_end_date = end.replace(hour=23, minute=59, second=59, microsecond=9999) + start_idx = (end_date - sleep_start_date).days + end_idx = (end_date - sleep_end_date).days + # this is more complicated than feedings because we only want to capture the PORTION of sleep + # that is a part of this day (e.g. starts sleep at 7PM and finished at 7AM = 5 hrs yesterday 7 hrs today) + # (Assuming you have a unicorn sleeper. Congratulations) + if start_idx == end_idx: # if we're in the same day it's simple + result = results[start_idx] + result["total"] += end - start + result["count"] += 1 + else: # otherwise we need to split the time up + midnight = end.replace(hour=0, minute=0, second=0) - total += end - start + if 0 <= start_idx < len(results): + result = results[start_idx] + # only the portion that is today + result["total"] += midnight - start + result["count"] += 1 - count = len(instances) + if 0 <= end_idx < len(results): + result = results[end_idx] + # only the portion that is tomorrow + result["total"] += end - midnight + result["count"] += 1 return { + "sleeps": results, "type": "sleep", - "total": total, - "count": count, - "empty": empty, + "empty": len(instances) == 0, "hide_empty": _hide_empty(context), } diff --git a/dashboard/tests/tests_templatetags.py b/dashboard/tests/tests_templatetags.py index cc5180de..1e22e30e 100644 --- a/dashboard/tests/tests_templatetags.py +++ b/dashboard/tests/tests_templatetags.py @@ -204,12 +204,15 @@ class TemplateTagsTestCase(TestCase): self.assertFalse(data["hide_empty"]) def test_card_sleep_day(self): - data = cards.card_sleep_day(self.context, self.child, self.date) + data = cards.card_sleep_recent(self.context, self.child, self.date) self.assertEqual(data["type"], "sleep") self.assertFalse(data["empty"]) self.assertFalse(data["hide_empty"]) - self.assertEqual(data["total"], timezone.timedelta(2, 7200)) - self.assertEqual(data["count"], 4) + self.assertEqual(data["sleeps"][0]["total"], timezone.timedelta(hours=7)) + self.assertEqual(data["sleeps"][0]["count"], 4) + + self.assertEqual(data["sleeps"][1]["total"], timezone.timedelta(minutes=30)) + self.assertEqual(data["sleeps"][1]["count"], 1) def test_card_sleep_naps_day(self): data = cards.card_sleep_naps_day(self.context, self.child, self.date) diff --git a/locale/ca/LC_MESSAGES/django.mo b/locale/ca/LC_MESSAGES/django.mo index 2f1d70d7..2a759d37 100644 Binary files a/locale/ca/LC_MESSAGES/django.mo and b/locale/ca/LC_MESSAGES/django.mo differ diff --git a/locale/ca/LC_MESSAGES/django.po b/locale/ca/LC_MESSAGES/django.po index e5be6d93..d9319846 100644 --- a/locale/ca/LC_MESSAGES/django.po +++ b/locale/ca/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Baby Buddy\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-06-05 13:25+0000\n" +"POT-Creation-Date: 2022-06-17 22:25+0000\n" "Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -11,12 +11,12 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: babybuddy/admin.py:12 babybuddy/admin.py:13 -#: babybuddy/templates/babybuddy/nav-dropdown.html:347 +#: babybuddy/templates/babybuddy/nav-dropdown.html:327 #: babybuddy/templates/babybuddy/user_settings_form.html:8 msgid "Settings" msgstr "Opcions" -#: babybuddy/admin.py:17 babybuddy/templates/babybuddy/nav-dropdown.html:111 +#: babybuddy/admin.py:17 babybuddy/templates/babybuddy/nav-dropdown.html:92 #: babybuddy/templates/babybuddy/user_settings_form.html:61 #: dashboard/templates/dashboard/child.html:4 #: dashboard/templates/dashboard/child.html:9 @@ -179,7 +179,7 @@ msgstr "Turc" #: babybuddy/templates/admin/base_site.html:4 #: babybuddy/templates/admin/base_site.html:7 -#: babybuddy/templates/babybuddy/nav-dropdown.html:359 +#: babybuddy/templates/babybuddy/nav-dropdown.html:339 msgid "Database Admin" msgstr "BBDD Admin" @@ -226,19 +226,19 @@ msgid "Diaper Change" msgstr "Canvi Bolquers" #: babybuddy/templates/babybuddy/nav-dropdown.html:57 -#: babybuddy/templates/babybuddy/nav-dropdown.html:281 core/models.py:312 +#: babybuddy/templates/babybuddy/nav-dropdown.html:262 core/models.py:312 #: core/models.py:316 core/templates/core/timer_detail.html:43 msgid "Feeding" msgstr "Biberó" #: babybuddy/templates/babybuddy/nav-dropdown.html:63 -#: babybuddy/templates/babybuddy/nav-dropdown.html:157 core/models.py:396 +#: babybuddy/templates/babybuddy/nav-dropdown.html:138 core/models.py:396 #: core/models.py:407 core/models.py:411 core/templates/core/note_list.html:29 msgid "Note" msgstr "Nota" #: babybuddy/templates/babybuddy/nav-dropdown.html:69 -#: babybuddy/templates/babybuddy/nav-dropdown.html:288 +#: babybuddy/templates/babybuddy/nav-dropdown.html:283 #: babybuddy/templates/babybuddy/welcome.html:42 core/models.py:467 #: core/models.py:468 core/models.py:471 #: core/templates/core/sleep_confirm_delete.html:7 @@ -249,19 +249,7 @@ msgid "Sleep" msgstr "Dormir" #: babybuddy/templates/babybuddy/nav-dropdown.html:75 -#: babybuddy/templates/babybuddy/nav-dropdown.html:179 core/models.py:506 -#: core/models.py:519 core/models.py:520 core/models.py:523 -#: core/templates/core/temperature_confirm_delete.html:7 -#: core/templates/core/temperature_form.html:13 -#: core/templates/core/temperature_list.html:4 -#: core/templates/core/temperature_list.html:7 -#: core/templates/core/temperature_list.html:12 -#: core/templates/core/temperature_list.html:29 -msgid "Temperature" -msgstr "Temperatura" - -#: babybuddy/templates/babybuddy/nav-dropdown.html:81 -#: babybuddy/templates/babybuddy/nav-dropdown.html:301 +#: babybuddy/templates/babybuddy/nav-dropdown.html:296 #: babybuddy/templates/babybuddy/welcome.html:50 core/models.py:647 #: core/models.py:648 core/models.py:651 #: core/templates/core/timer_detail.html:59 @@ -273,44 +261,15 @@ msgstr "Temperatura" msgid "Tummy Time" msgstr "Temps de panxa" -#: babybuddy/templates/babybuddy/nav-dropdown.html:87 -#: babybuddy/templates/babybuddy/nav-dropdown.html:193 core/models.py:673 -#: core/models.py:685 core/models.py:686 core/models.py:689 -#: core/templates/core/weight_confirm_delete.html:7 -#: core/templates/core/weight_form.html:13 -#: core/templates/core/weight_list.html:4 -#: core/templates/core/weight_list.html:7 -#: core/templates/core/weight_list.html:12 -#: core/templates/core/weight_list.html:29 reports/graphs/weight_change.py:19 -#: reports/graphs/weight_change.py:30 -#: reports/templates/reports/report_list.html:22 -#: reports/templates/reports/weight_change.html:4 -#: reports/templates/reports/weight_change.html:8 -msgid "Weight" -msgstr "Pes" - -#: babybuddy/templates/babybuddy/nav-dropdown.html:93 -#: babybuddy/templates/babybuddy/nav-dropdown.html:316 core/models.py:437 -#: core/models.py:438 core/models.py:441 -#: core/templates/core/pumping_confirm_delete.html:7 -#: core/templates/core/pumping_form.html:13 -#: core/templates/core/pumping_list.html:4 -#: core/templates/core/pumping_list.html:7 -#: core/templates/core/pumping_list.html:12 -#: reports/templates/reports/pumping_amounts.html:4 -#: reports/templates/reports/pumping_amounts.html:8 -msgid "Pumping" -msgstr "" - -#: babybuddy/templates/babybuddy/nav-dropdown.html:118 +#: babybuddy/templates/babybuddy/nav-dropdown.html:99 #: core/templates/timeline/timeline.html:4 #: core/templates/timeline/timeline.html:7 #: dashboard/templates/dashboard/child_button_group.html:9 msgid "Timeline" msgstr "Línia de Temps" -#: babybuddy/templates/babybuddy/nav-dropdown.html:129 -#: babybuddy/templates/babybuddy/nav-dropdown.html:137 core/models.py:188 +#: babybuddy/templates/babybuddy/nav-dropdown.html:110 +#: babybuddy/templates/babybuddy/nav-dropdown.html:118 core/models.py:188 #: core/templates/core/child_confirm_delete.html:7 #: core/templates/core/child_detail.html:7 #: core/templates/core/child_form.html:13 core/templates/core/child_list.html:4 @@ -320,7 +279,7 @@ msgstr "Línia de Temps" msgid "Children" msgstr "Nadons" -#: babybuddy/templates/babybuddy/nav-dropdown.html:143 core/models.py:137 +#: babybuddy/templates/babybuddy/nav-dropdown.html:124 core/models.py:137 #: core/models.py:187 core/models.py:221 core/models.py:274 core/models.py:335 #: core/models.py:367 core/models.py:394 core/models.py:426 core/models.py:450 #: core/models.py:503 core/models.py:537 core/models.py:630 core/models.py:671 @@ -339,7 +298,7 @@ msgstr "Nadons" msgid "Child" msgstr "Nadó" -#: babybuddy/templates/babybuddy/nav-dropdown.html:151 core/models.py:143 +#: babybuddy/templates/babybuddy/nav-dropdown.html:132 core/models.py:143 #: core/models.py:240 core/models.py:304 core/models.py:343 core/models.py:373 #: core/models.py:408 core/models.py:430 core/models.py:458 core/models.py:511 #: core/models.py:677 core/templates/core/note_confirm_delete.html:7 @@ -348,38 +307,26 @@ msgstr "Nadó" msgid "Notes" msgstr "Notes" -#: babybuddy/templates/babybuddy/nav-dropdown.html:171 +#: babybuddy/templates/babybuddy/nav-dropdown.html:152 msgid "Measurements" msgstr "Mides" -#: babybuddy/templates/babybuddy/nav-dropdown.html:185 -msgid "Temperature reading" -msgstr "Lectura Temperatura" +#: babybuddy/templates/babybuddy/nav-dropdown.html:160 core/models.py:139 +#: core/models.py:151 core/models.py:152 core/models.py:155 +#: core/templates/core/bmi_confirm_delete.html:7 +#: core/templates/core/bmi_form.html:13 core/templates/core/bmi_list.html:4 +#: core/templates/core/bmi_list.html:7 core/templates/core/bmi_list.html:12 +#: core/templates/core/bmi_list.html:29 reports/graphs/bmi_change.py:19 +#: reports/graphs/bmi_change.py:30 reports/templates/reports/bmi_change.html:4 +#: reports/templates/reports/bmi_change.html:8 +msgid "BMI" +msgstr "BMI" -#: babybuddy/templates/babybuddy/nav-dropdown.html:199 -msgid "Weight entry" -msgstr "Entrada Pes" +#: babybuddy/templates/babybuddy/nav-dropdown.html:166 +msgid "BMI entry" +msgstr "Entrada BMI" -#: babybuddy/templates/babybuddy/nav-dropdown.html:207 core/models.py:369 -#: core/models.py:381 core/models.py:382 core/models.py:385 -#: core/templates/core/height_confirm_delete.html:7 -#: core/templates/core/height_form.html:13 -#: core/templates/core/height_list.html:4 -#: core/templates/core/height_list.html:7 -#: core/templates/core/height_list.html:12 -#: core/templates/core/height_list.html:29 reports/graphs/height_change.py:19 -#: reports/graphs/height_change.py:30 -#: reports/templates/reports/height_change.html:4 -#: reports/templates/reports/height_change.html:8 -#: reports/templates/reports/report_list.html:17 -msgid "Height" -msgstr "Alçada" - -#: babybuddy/templates/babybuddy/nav-dropdown.html:213 -msgid "Height entry" -msgstr "Entrada Alçada" - -#: babybuddy/templates/babybuddy/nav-dropdown.html:221 core/models.py:338 +#: babybuddy/templates/babybuddy/nav-dropdown.html:174 core/models.py:338 #: core/models.py:351 core/models.py:352 core/models.py:355 #: core/templates/core/head_circumference_confirm_delete.html:7 #: core/templates/core/head_circumference_form.html:13 @@ -395,39 +342,77 @@ msgstr "Entrada Alçada" msgid "Head Circumference" msgstr "" -#: babybuddy/templates/babybuddy/nav-dropdown.html:227 +#: babybuddy/templates/babybuddy/nav-dropdown.html:180 msgid "Head Circumference entry" msgstr "" -#: babybuddy/templates/babybuddy/nav-dropdown.html:235 core/models.py:139 -#: core/models.py:151 core/models.py:152 core/models.py:155 -#: core/templates/core/bmi_confirm_delete.html:7 -#: core/templates/core/bmi_form.html:13 core/templates/core/bmi_list.html:4 -#: core/templates/core/bmi_list.html:7 core/templates/core/bmi_list.html:12 -#: core/templates/core/bmi_list.html:29 reports/graphs/bmi_change.py:19 -#: reports/graphs/bmi_change.py:30 reports/templates/reports/bmi_change.html:4 -#: reports/templates/reports/bmi_change.html:8 -msgid "BMI" -msgstr "BMI" +#: babybuddy/templates/babybuddy/nav-dropdown.html:188 core/models.py:369 +#: core/models.py:381 core/models.py:382 core/models.py:385 +#: core/templates/core/height_confirm_delete.html:7 +#: core/templates/core/height_form.html:13 +#: core/templates/core/height_list.html:4 +#: core/templates/core/height_list.html:7 +#: core/templates/core/height_list.html:12 +#: core/templates/core/height_list.html:29 reports/graphs/height_change.py:19 +#: reports/graphs/height_change.py:30 +#: reports/templates/reports/height_change.html:4 +#: reports/templates/reports/height_change.html:8 +#: reports/templates/reports/report_list.html:17 +msgid "Height" +msgstr "Alçada" -#: babybuddy/templates/babybuddy/nav-dropdown.html:241 -msgid "BMI entry" -msgstr "Entrada BMI" +#: babybuddy/templates/babybuddy/nav-dropdown.html:194 +msgid "Height entry" +msgstr "Entrada Alçada" -#: babybuddy/templates/babybuddy/nav-dropdown.html:255 +#: babybuddy/templates/babybuddy/nav-dropdown.html:202 core/models.py:506 +#: core/models.py:519 core/models.py:520 core/models.py:523 +#: core/templates/core/temperature_confirm_delete.html:7 +#: core/templates/core/temperature_form.html:13 +#: core/templates/core/temperature_list.html:4 +#: core/templates/core/temperature_list.html:7 +#: core/templates/core/temperature_list.html:12 +#: core/templates/core/temperature_list.html:29 +msgid "Temperature" +msgstr "Temperatura" + +#: babybuddy/templates/babybuddy/nav-dropdown.html:208 +msgid "Temperature reading" +msgstr "Lectura Temperatura" + +#: babybuddy/templates/babybuddy/nav-dropdown.html:216 core/models.py:673 +#: core/models.py:685 core/models.py:686 core/models.py:689 +#: core/templates/core/weight_confirm_delete.html:7 +#: core/templates/core/weight_form.html:13 +#: core/templates/core/weight_list.html:4 +#: core/templates/core/weight_list.html:7 +#: core/templates/core/weight_list.html:12 +#: core/templates/core/weight_list.html:29 reports/graphs/weight_change.py:19 +#: reports/graphs/weight_change.py:30 +#: reports/templates/reports/report_list.html:22 +#: reports/templates/reports/weight_change.html:4 +#: reports/templates/reports/weight_change.html:8 +msgid "Weight" +msgstr "Pes" + +#: babybuddy/templates/babybuddy/nav-dropdown.html:222 +msgid "Weight entry" +msgstr "Entrada Pes" + +#: babybuddy/templates/babybuddy/nav-dropdown.html:236 msgid "Activities" msgstr "Activitats" -#: babybuddy/templates/babybuddy/nav-dropdown.html:262 +#: babybuddy/templates/babybuddy/nav-dropdown.html:243 #: reports/graphs/diaperchange_lifetimes.py:27 msgid "Changes" msgstr "Canvis" -#: babybuddy/templates/babybuddy/nav-dropdown.html:268 +#: babybuddy/templates/babybuddy/nav-dropdown.html:249 msgid "Change" msgstr "Canvi" -#: babybuddy/templates/babybuddy/nav-dropdown.html:275 +#: babybuddy/templates/babybuddy/nav-dropdown.html:256 #: babybuddy/templates/babybuddy/welcome.html:34 core/models.py:313 #: core/templates/core/feeding_confirm_delete.html:7 #: core/templates/core/feeding_form.html:13 @@ -437,19 +422,31 @@ msgstr "Canvi" msgid "Feedings" msgstr "Biberons" -#: babybuddy/templates/babybuddy/nav-dropdown.html:294 -msgid "Sleep entry" -msgstr "Entrada Son" +#: babybuddy/templates/babybuddy/nav-dropdown.html:270 core/models.py:437 +#: core/models.py:438 core/models.py:441 +#: core/templates/core/pumping_confirm_delete.html:7 +#: core/templates/core/pumping_form.html:13 +#: core/templates/core/pumping_list.html:4 +#: core/templates/core/pumping_list.html:7 +#: core/templates/core/pumping_list.html:12 +#: reports/templates/reports/pumping_amounts.html:4 +#: reports/templates/reports/pumping_amounts.html:8 +msgid "Pumping" +msgstr "" -#: babybuddy/templates/babybuddy/nav-dropdown.html:307 -msgid "Tummy Time entry" -msgstr "Entrada de temps de panxa" - -#: babybuddy/templates/babybuddy/nav-dropdown.html:322 +#: babybuddy/templates/babybuddy/nav-dropdown.html:276 msgid "Pumping entry" msgstr "" -#: babybuddy/templates/babybuddy/nav-dropdown.html:346 +#: babybuddy/templates/babybuddy/nav-dropdown.html:289 +msgid "Sleep entry" +msgstr "Entrada Son" + +#: babybuddy/templates/babybuddy/nav-dropdown.html:302 +msgid "Tummy Time entry" +msgstr "Entrada de temps de panxa" + +#: babybuddy/templates/babybuddy/nav-dropdown.html:326 #: babybuddy/templates/babybuddy/user_list.html:17 #: babybuddy/templates/babybuddy/user_password_form.html:7 #: babybuddy/templates/babybuddy/user_settings_form.html:7 core/models.py:556 @@ -457,23 +454,23 @@ msgstr "" msgid "User" msgstr "Usuari" -#: babybuddy/templates/babybuddy/nav-dropdown.html:348 +#: babybuddy/templates/babybuddy/nav-dropdown.html:328 msgid "Password" msgstr "Clau" -#: babybuddy/templates/babybuddy/nav-dropdown.html:352 +#: babybuddy/templates/babybuddy/nav-dropdown.html:332 msgid "Logout" msgstr "Tancar" -#: babybuddy/templates/babybuddy/nav-dropdown.html:355 +#: babybuddy/templates/babybuddy/nav-dropdown.html:335 msgid "Site" msgstr "Lloc" -#: babybuddy/templates/babybuddy/nav-dropdown.html:356 +#: babybuddy/templates/babybuddy/nav-dropdown.html:336 msgid "API Browser" msgstr "Navegador API" -#: babybuddy/templates/babybuddy/nav-dropdown.html:358 +#: babybuddy/templates/babybuddy/nav-dropdown.html:338 #: babybuddy/templates/babybuddy/user_confirm_delete.html:7 #: babybuddy/templates/babybuddy/user_form.html:13 #: babybuddy/templates/babybuddy/user_list.html:4 @@ -481,15 +478,15 @@ msgstr "Navegador API" msgid "Users" msgstr "Usuaris" -#: babybuddy/templates/babybuddy/nav-dropdown.html:361 +#: babybuddy/templates/babybuddy/nav-dropdown.html:341 msgid "Support" msgstr "Suport" -#: babybuddy/templates/babybuddy/nav-dropdown.html:363 +#: babybuddy/templates/babybuddy/nav-dropdown.html:343 msgid "Source Code" msgstr "Codi Font" -#: babybuddy/templates/babybuddy/nav-dropdown.html:365 +#: babybuddy/templates/babybuddy/nav-dropdown.html:345 msgid "Chat / Support" msgstr "Xat / Suport" @@ -500,6 +497,7 @@ msgstr "Xat / Suport" #: core/templates/timeline/_timeline.html:73 #: dashboard/templates/cards/feeding_day.html:43 #: dashboard/templates/cards/feeding_last_method.html:34 +#: dashboard/templates/cards/sleep_recent.html:43 #: dashboard/templates/cards/statistics.html:34 msgid "Previous" msgstr "Anterior" @@ -511,6 +509,7 @@ msgstr "Anterior" #: core/templates/timeline/_timeline.html:80 #: dashboard/templates/cards/feeding_day.html:47 #: dashboard/templates/cards/feeding_last_method.html:38 +#: dashboard/templates/cards/sleep_recent.html:47 #: dashboard/templates/cards/statistics.html:38 msgid "Next" msgstr "Següent" @@ -957,7 +956,7 @@ msgstr "" #: reports/graphs/diaperchange_types.py:49 reports/graphs/feeding_amounts.py:70 #: reports/graphs/feeding_duration.py:56 #: reports/graphs/head_circumference_change.py:28 -#: reports/graphs/height_change.py:28 reports/graphs/pumping_amounts.py:58 +#: reports/graphs/height_change.py:28 reports/graphs/pumping_amounts.py:60 #: reports/graphs/sleep_pattern.py:151 reports/graphs/sleep_totals.py:59 #: reports/graphs/tummytime_duration.py:51 reports/graphs/weight_change.py:28 msgid "Date" @@ -1131,7 +1130,9 @@ msgid "Add BMI" msgstr "Afegeix BMI" #: core/templates/core/bmi_list.html:70 -msgid "No bmi entries found." +#, fuzzy +#| msgid "No bmi entries found." +msgid "No BMI entries found." msgstr "Entrades BMI no trobades." #: core/templates/core/child_confirm_delete.html:4 @@ -1428,9 +1429,10 @@ msgstr "Temporitzadors Actius" #: dashboard/templates/cards/feeding_day.html:52 #: dashboard/templates/cards/feeding_last.html:17 #: dashboard/templates/cards/feeding_last_method.html:43 -#: dashboard/templates/cards/sleep_day.html:14 #: dashboard/templates/cards/sleep_last.html:17 #: dashboard/templates/cards/sleep_naps_day.html:18 +#: dashboard/templates/cards/sleep_recent.html:20 +#: dashboard/templates/cards/sleep_recent.html:52 #: dashboard/templates/cards/tummytime_day.html:14 msgid "None" msgstr "Cap" @@ -1548,6 +1550,22 @@ msgstr "{}, {}" msgid "0 days" msgstr "0 dies" +#: core/templatetags/duration.py:111 +#: dashboard/templates/cards/diaperchange_types.html:49 +msgid "today" +msgstr "avui" + +#: core/templatetags/duration.py:113 +#: dashboard/templates/cards/diaperchange_types.html:51 +msgid "yesterday" +msgstr "ahir" + +#: core/templatetags/duration.py:116 +#, fuzzy +#| msgid "%(key)s days ago" +msgid " days ago" +msgstr "Fa %(key)s dies" + #: core/timeline.py:53 #, python-format msgid "%(child)s started tummy time!" @@ -1686,14 +1704,6 @@ msgstr "líquid" msgid "solid" msgstr "sòlid" -#: dashboard/templates/cards/diaperchange_types.html:49 -msgid "today" -msgstr "avui" - -#: dashboard/templates/cards/diaperchange_types.html:51 -msgid "yesterday" -msgstr "ahir" - #: dashboard/templates/cards/diaperchange_types.html:53 #, python-format msgid "%(key)s days ago" @@ -1712,6 +1722,7 @@ msgstr[0] "Total alimentacions" msgstr[1] "Total alimentacions" #: dashboard/templates/cards/feeding_day.html:32 +#: dashboard/templates/cards/sleep_recent.html:32 #, python-format msgid "
%(since)s
" msgstr "" @@ -1736,15 +1747,6 @@ msgid_plural "%(n)s feedings ago" msgstr[0] "Fa %(key)s dies" msgstr[1] "Fa %(key)s dies" -#: dashboard/templates/cards/sleep_day.html:6 -msgid "Today's Sleep" -msgstr "Son d'Avui" - -#: dashboard/templates/cards/sleep_day.html:20 -#, python-format -msgid "%(count)s sleep entries" -msgstr "" - #: dashboard/templates/cards/sleep_last.html:6 msgid "Last Sleep" msgstr "Últim Son" @@ -1760,6 +1762,20 @@ msgid_plural "%(count)s naps" msgstr[0] "" msgstr[1] "" +#: dashboard/templates/cards/sleep_recent.html:6 +#, fuzzy +#| msgid "Last Sleep" +msgid "Recent Sleep" +msgstr "Últim Son" + +#: dashboard/templates/cards/sleep_recent.html:25 +#, fuzzy, python-format +#| msgid "Total feedings" +msgid "%(counter)s sleep" +msgid_plural "%(counter)s sleep" +msgstr[0] "Total alimentacions" +msgstr[1] "Total alimentacions" + #: dashboard/templates/cards/statistics.html:7 msgid "Statistics" msgstr "Estadístiques" @@ -1811,59 +1827,59 @@ msgstr "Accions Nadó" msgid "Reports" msgstr "Informes" -#: dashboard/templatetags/cards.py:328 +#: dashboard/templatetags/cards.py:357 msgid "Average nap duration" msgstr "Mitjana migdiades" -#: dashboard/templatetags/cards.py:335 +#: dashboard/templatetags/cards.py:364 msgid "Average naps per day" msgstr "Mitjana migdiades per dia" -#: dashboard/templatetags/cards.py:345 +#: dashboard/templatetags/cards.py:374 msgid "Average sleep duration" msgstr "Mitjana temps de son" -#: dashboard/templatetags/cards.py:352 +#: dashboard/templatetags/cards.py:381 msgid "Average awake duration" msgstr "Mitjana temps despert" -#: dashboard/templatetags/cards.py:362 +#: dashboard/templatetags/cards.py:391 msgid "Weight change per week" msgstr "Canvi pes setmanal" -#: dashboard/templatetags/cards.py:372 +#: dashboard/templatetags/cards.py:401 msgid "Height change per week" msgstr "" -#: dashboard/templatetags/cards.py:382 +#: dashboard/templatetags/cards.py:411 msgid "Head circumference change per week" msgstr "" -#: dashboard/templatetags/cards.py:392 +#: dashboard/templatetags/cards.py:421 msgid "BMI change per week" msgstr "" -#: dashboard/templatetags/cards.py:410 +#: dashboard/templatetags/cards.py:439 msgid "Diaper change frequency (past 3 days)" msgstr "" -#: dashboard/templatetags/cards.py:414 +#: dashboard/templatetags/cards.py:443 msgid "Diaper change frequency (past 2 weeks)" msgstr "" -#: dashboard/templatetags/cards.py:420 +#: dashboard/templatetags/cards.py:449 msgid "Diaper change frequency" msgstr "Freqüència Canvi Bolquers" -#: dashboard/templatetags/cards.py:456 +#: dashboard/templatetags/cards.py:485 msgid "Feeding frequency (past 3 days)" msgstr "" -#: dashboard/templatetags/cards.py:460 +#: dashboard/templatetags/cards.py:489 msgid "Feeding frequency (past 2 weeks)" msgstr "" -#: dashboard/templatetags/cards.py:466 +#: dashboard/templatetags/cards.py:495 msgid "Feeding frequency" msgstr "Freqüència Alimentació" @@ -1939,11 +1955,11 @@ msgstr "" msgid "Height" msgstr "Alçada" -#: reports/graphs/pumping_amounts.py:57 +#: reports/graphs/pumping_amounts.py:59 msgid "Total Pumping Amount" msgstr "" -#: reports/graphs/pumping_amounts.py:60 +#: reports/graphs/pumping_amounts.py:62 msgid "Pumping Amount" msgstr "" @@ -2056,3 +2072,6 @@ msgstr "" #: reports/templates/reports/tummytime_duration.html:8 msgid "Total Tummy Time Durations" msgstr "" + +#~ msgid "Today's Sleep" +#~ msgstr "Son d'Avui" diff --git a/locale/de/LC_MESSAGES/django.mo b/locale/de/LC_MESSAGES/django.mo index 73dac410..c8cabb54 100644 Binary files a/locale/de/LC_MESSAGES/django.mo and b/locale/de/LC_MESSAGES/django.mo differ diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 7bf34fbc..537ca76f 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Baby Buddy\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-06-05 13:25+0000\n" +"POT-Creation-Date: 2022-06-17 22:25+0000\n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -11,12 +11,12 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: babybuddy/admin.py:12 babybuddy/admin.py:13 -#: babybuddy/templates/babybuddy/nav-dropdown.html:347 +#: babybuddy/templates/babybuddy/nav-dropdown.html:327 #: babybuddy/templates/babybuddy/user_settings_form.html:8 msgid "Settings" msgstr "Einstellungen" -#: babybuddy/admin.py:17 babybuddy/templates/babybuddy/nav-dropdown.html:111 +#: babybuddy/admin.py:17 babybuddy/templates/babybuddy/nav-dropdown.html:92 #: babybuddy/templates/babybuddy/user_settings_form.html:61 #: dashboard/templates/dashboard/child.html:4 #: dashboard/templates/dashboard/child.html:9 @@ -182,7 +182,7 @@ msgstr "Türkisch" #: babybuddy/templates/admin/base_site.html:4 #: babybuddy/templates/admin/base_site.html:7 -#: babybuddy/templates/babybuddy/nav-dropdown.html:359 +#: babybuddy/templates/babybuddy/nav-dropdown.html:339 msgid "Database Admin" msgstr "Datenbankadministration" @@ -231,19 +231,19 @@ msgid "Diaper Change" msgstr "Windelwechsel" #: babybuddy/templates/babybuddy/nav-dropdown.html:57 -#: babybuddy/templates/babybuddy/nav-dropdown.html:281 core/models.py:312 +#: babybuddy/templates/babybuddy/nav-dropdown.html:262 core/models.py:312 #: core/models.py:316 core/templates/core/timer_detail.html:43 msgid "Feeding" msgstr "Mahlzeit" #: babybuddy/templates/babybuddy/nav-dropdown.html:63 -#: babybuddy/templates/babybuddy/nav-dropdown.html:157 core/models.py:396 +#: babybuddy/templates/babybuddy/nav-dropdown.html:138 core/models.py:396 #: core/models.py:407 core/models.py:411 core/templates/core/note_list.html:29 msgid "Note" msgstr "Notiz" #: babybuddy/templates/babybuddy/nav-dropdown.html:69 -#: babybuddy/templates/babybuddy/nav-dropdown.html:288 +#: babybuddy/templates/babybuddy/nav-dropdown.html:283 #: babybuddy/templates/babybuddy/welcome.html:42 core/models.py:467 #: core/models.py:468 core/models.py:471 #: core/templates/core/sleep_confirm_delete.html:7 @@ -254,19 +254,7 @@ msgid "Sleep" msgstr "Schlafen" #: babybuddy/templates/babybuddy/nav-dropdown.html:75 -#: babybuddy/templates/babybuddy/nav-dropdown.html:179 core/models.py:506 -#: core/models.py:519 core/models.py:520 core/models.py:523 -#: core/templates/core/temperature_confirm_delete.html:7 -#: core/templates/core/temperature_form.html:13 -#: core/templates/core/temperature_list.html:4 -#: core/templates/core/temperature_list.html:7 -#: core/templates/core/temperature_list.html:12 -#: core/templates/core/temperature_list.html:29 -msgid "Temperature" -msgstr "Temperatur" - -#: babybuddy/templates/babybuddy/nav-dropdown.html:81 -#: babybuddy/templates/babybuddy/nav-dropdown.html:301 +#: babybuddy/templates/babybuddy/nav-dropdown.html:296 #: babybuddy/templates/babybuddy/welcome.html:50 core/models.py:647 #: core/models.py:648 core/models.py:651 #: core/templates/core/timer_detail.html:59 @@ -278,44 +266,15 @@ msgstr "Temperatur" msgid "Tummy Time" msgstr "Bauchzeit" -#: babybuddy/templates/babybuddy/nav-dropdown.html:87 -#: babybuddy/templates/babybuddy/nav-dropdown.html:193 core/models.py:673 -#: core/models.py:685 core/models.py:686 core/models.py:689 -#: core/templates/core/weight_confirm_delete.html:7 -#: core/templates/core/weight_form.html:13 -#: core/templates/core/weight_list.html:4 -#: core/templates/core/weight_list.html:7 -#: core/templates/core/weight_list.html:12 -#: core/templates/core/weight_list.html:29 reports/graphs/weight_change.py:19 -#: reports/graphs/weight_change.py:30 -#: reports/templates/reports/report_list.html:22 -#: reports/templates/reports/weight_change.html:4 -#: reports/templates/reports/weight_change.html:8 -msgid "Weight" -msgstr "Gewicht" - -#: babybuddy/templates/babybuddy/nav-dropdown.html:93 -#: babybuddy/templates/babybuddy/nav-dropdown.html:316 core/models.py:437 -#: core/models.py:438 core/models.py:441 -#: core/templates/core/pumping_confirm_delete.html:7 -#: core/templates/core/pumping_form.html:13 -#: core/templates/core/pumping_list.html:4 -#: core/templates/core/pumping_list.html:7 -#: core/templates/core/pumping_list.html:12 -#: reports/templates/reports/pumping_amounts.html:4 -#: reports/templates/reports/pumping_amounts.html:8 -msgid "Pumping" -msgstr "" - -#: babybuddy/templates/babybuddy/nav-dropdown.html:118 +#: babybuddy/templates/babybuddy/nav-dropdown.html:99 #: core/templates/timeline/timeline.html:4 #: core/templates/timeline/timeline.html:7 #: dashboard/templates/dashboard/child_button_group.html:9 msgid "Timeline" msgstr "Zeitverlauf" -#: babybuddy/templates/babybuddy/nav-dropdown.html:129 -#: babybuddy/templates/babybuddy/nav-dropdown.html:137 core/models.py:188 +#: babybuddy/templates/babybuddy/nav-dropdown.html:110 +#: babybuddy/templates/babybuddy/nav-dropdown.html:118 core/models.py:188 #: core/templates/core/child_confirm_delete.html:7 #: core/templates/core/child_detail.html:7 #: core/templates/core/child_form.html:13 core/templates/core/child_list.html:4 @@ -325,7 +284,7 @@ msgstr "Zeitverlauf" msgid "Children" msgstr "Kinder" -#: babybuddy/templates/babybuddy/nav-dropdown.html:143 core/models.py:137 +#: babybuddy/templates/babybuddy/nav-dropdown.html:124 core/models.py:137 #: core/models.py:187 core/models.py:221 core/models.py:274 core/models.py:335 #: core/models.py:367 core/models.py:394 core/models.py:426 core/models.py:450 #: core/models.py:503 core/models.py:537 core/models.py:630 core/models.py:671 @@ -344,7 +303,7 @@ msgstr "Kinder" msgid "Child" msgstr "Kind" -#: babybuddy/templates/babybuddy/nav-dropdown.html:151 core/models.py:143 +#: babybuddy/templates/babybuddy/nav-dropdown.html:132 core/models.py:143 #: core/models.py:240 core/models.py:304 core/models.py:343 core/models.py:373 #: core/models.py:408 core/models.py:430 core/models.py:458 core/models.py:511 #: core/models.py:677 core/templates/core/note_confirm_delete.html:7 @@ -353,38 +312,26 @@ msgstr "Kind" msgid "Notes" msgstr "Notizen" -#: babybuddy/templates/babybuddy/nav-dropdown.html:171 +#: babybuddy/templates/babybuddy/nav-dropdown.html:152 msgid "Measurements" msgstr "Messungen" -#: babybuddy/templates/babybuddy/nav-dropdown.html:185 -msgid "Temperature reading" -msgstr "Temperatur Messung" +#: babybuddy/templates/babybuddy/nav-dropdown.html:160 core/models.py:139 +#: core/models.py:151 core/models.py:152 core/models.py:155 +#: core/templates/core/bmi_confirm_delete.html:7 +#: core/templates/core/bmi_form.html:13 core/templates/core/bmi_list.html:4 +#: core/templates/core/bmi_list.html:7 core/templates/core/bmi_list.html:12 +#: core/templates/core/bmi_list.html:29 reports/graphs/bmi_change.py:19 +#: reports/graphs/bmi_change.py:30 reports/templates/reports/bmi_change.html:4 +#: reports/templates/reports/bmi_change.html:8 +msgid "BMI" +msgstr "BMI" -#: babybuddy/templates/babybuddy/nav-dropdown.html:199 -msgid "Weight entry" -msgstr "Gewichtseintrag" +#: babybuddy/templates/babybuddy/nav-dropdown.html:166 +msgid "BMI entry" +msgstr "BMI Eintrag" -#: babybuddy/templates/babybuddy/nav-dropdown.html:207 core/models.py:369 -#: core/models.py:381 core/models.py:382 core/models.py:385 -#: core/templates/core/height_confirm_delete.html:7 -#: core/templates/core/height_form.html:13 -#: core/templates/core/height_list.html:4 -#: core/templates/core/height_list.html:7 -#: core/templates/core/height_list.html:12 -#: core/templates/core/height_list.html:29 reports/graphs/height_change.py:19 -#: reports/graphs/height_change.py:30 -#: reports/templates/reports/height_change.html:4 -#: reports/templates/reports/height_change.html:8 -#: reports/templates/reports/report_list.html:17 -msgid "Height" -msgstr "Größe" - -#: babybuddy/templates/babybuddy/nav-dropdown.html:213 -msgid "Height entry" -msgstr "Größen Eintrag" - -#: babybuddy/templates/babybuddy/nav-dropdown.html:221 core/models.py:338 +#: babybuddy/templates/babybuddy/nav-dropdown.html:174 core/models.py:338 #: core/models.py:351 core/models.py:352 core/models.py:355 #: core/templates/core/head_circumference_confirm_delete.html:7 #: core/templates/core/head_circumference_form.html:13 @@ -400,39 +347,77 @@ msgstr "Größen Eintrag" msgid "Head Circumference" msgstr "Kopfumfang" -#: babybuddy/templates/babybuddy/nav-dropdown.html:227 +#: babybuddy/templates/babybuddy/nav-dropdown.html:180 msgid "Head Circumference entry" msgstr "Kopfumfang Eintrag" -#: babybuddy/templates/babybuddy/nav-dropdown.html:235 core/models.py:139 -#: core/models.py:151 core/models.py:152 core/models.py:155 -#: core/templates/core/bmi_confirm_delete.html:7 -#: core/templates/core/bmi_form.html:13 core/templates/core/bmi_list.html:4 -#: core/templates/core/bmi_list.html:7 core/templates/core/bmi_list.html:12 -#: core/templates/core/bmi_list.html:29 reports/graphs/bmi_change.py:19 -#: reports/graphs/bmi_change.py:30 reports/templates/reports/bmi_change.html:4 -#: reports/templates/reports/bmi_change.html:8 -msgid "BMI" -msgstr "BMI" +#: babybuddy/templates/babybuddy/nav-dropdown.html:188 core/models.py:369 +#: core/models.py:381 core/models.py:382 core/models.py:385 +#: core/templates/core/height_confirm_delete.html:7 +#: core/templates/core/height_form.html:13 +#: core/templates/core/height_list.html:4 +#: core/templates/core/height_list.html:7 +#: core/templates/core/height_list.html:12 +#: core/templates/core/height_list.html:29 reports/graphs/height_change.py:19 +#: reports/graphs/height_change.py:30 +#: reports/templates/reports/height_change.html:4 +#: reports/templates/reports/height_change.html:8 +#: reports/templates/reports/report_list.html:17 +msgid "Height" +msgstr "Größe" -#: babybuddy/templates/babybuddy/nav-dropdown.html:241 -msgid "BMI entry" -msgstr "BMI Eintrag" +#: babybuddy/templates/babybuddy/nav-dropdown.html:194 +msgid "Height entry" +msgstr "Größen Eintrag" -#: babybuddy/templates/babybuddy/nav-dropdown.html:255 +#: babybuddy/templates/babybuddy/nav-dropdown.html:202 core/models.py:506 +#: core/models.py:519 core/models.py:520 core/models.py:523 +#: core/templates/core/temperature_confirm_delete.html:7 +#: core/templates/core/temperature_form.html:13 +#: core/templates/core/temperature_list.html:4 +#: core/templates/core/temperature_list.html:7 +#: core/templates/core/temperature_list.html:12 +#: core/templates/core/temperature_list.html:29 +msgid "Temperature" +msgstr "Temperatur" + +#: babybuddy/templates/babybuddy/nav-dropdown.html:208 +msgid "Temperature reading" +msgstr "Temperatur Messung" + +#: babybuddy/templates/babybuddy/nav-dropdown.html:216 core/models.py:673 +#: core/models.py:685 core/models.py:686 core/models.py:689 +#: core/templates/core/weight_confirm_delete.html:7 +#: core/templates/core/weight_form.html:13 +#: core/templates/core/weight_list.html:4 +#: core/templates/core/weight_list.html:7 +#: core/templates/core/weight_list.html:12 +#: core/templates/core/weight_list.html:29 reports/graphs/weight_change.py:19 +#: reports/graphs/weight_change.py:30 +#: reports/templates/reports/report_list.html:22 +#: reports/templates/reports/weight_change.html:4 +#: reports/templates/reports/weight_change.html:8 +msgid "Weight" +msgstr "Gewicht" + +#: babybuddy/templates/babybuddy/nav-dropdown.html:222 +msgid "Weight entry" +msgstr "Gewichtseintrag" + +#: babybuddy/templates/babybuddy/nav-dropdown.html:236 msgid "Activities" msgstr "Aktivitäten" -#: babybuddy/templates/babybuddy/nav-dropdown.html:262 +#: babybuddy/templates/babybuddy/nav-dropdown.html:243 #: reports/graphs/diaperchange_lifetimes.py:27 msgid "Changes" msgstr "Wechsel" -#: babybuddy/templates/babybuddy/nav-dropdown.html:268 +#: babybuddy/templates/babybuddy/nav-dropdown.html:249 msgid "Change" msgstr "Wechsel" -#: babybuddy/templates/babybuddy/nav-dropdown.html:275 +#: babybuddy/templates/babybuddy/nav-dropdown.html:256 #: babybuddy/templates/babybuddy/welcome.html:34 core/models.py:313 #: core/templates/core/feeding_confirm_delete.html:7 #: core/templates/core/feeding_form.html:13 @@ -442,19 +427,31 @@ msgstr "Wechsel" msgid "Feedings" msgstr "Mahlzeiten" -#: babybuddy/templates/babybuddy/nav-dropdown.html:294 -msgid "Sleep entry" -msgstr "Schlaf-Eintrag" +#: babybuddy/templates/babybuddy/nav-dropdown.html:270 core/models.py:437 +#: core/models.py:438 core/models.py:441 +#: core/templates/core/pumping_confirm_delete.html:7 +#: core/templates/core/pumping_form.html:13 +#: core/templates/core/pumping_list.html:4 +#: core/templates/core/pumping_list.html:7 +#: core/templates/core/pumping_list.html:12 +#: reports/templates/reports/pumping_amounts.html:4 +#: reports/templates/reports/pumping_amounts.html:8 +msgid "Pumping" +msgstr "" -#: babybuddy/templates/babybuddy/nav-dropdown.html:307 -msgid "Tummy Time entry" -msgstr "Bauchzeit-Eintrag" - -#: babybuddy/templates/babybuddy/nav-dropdown.html:322 +#: babybuddy/templates/babybuddy/nav-dropdown.html:276 msgid "Pumping entry" msgstr "" -#: babybuddy/templates/babybuddy/nav-dropdown.html:346 +#: babybuddy/templates/babybuddy/nav-dropdown.html:289 +msgid "Sleep entry" +msgstr "Schlaf-Eintrag" + +#: babybuddy/templates/babybuddy/nav-dropdown.html:302 +msgid "Tummy Time entry" +msgstr "Bauchzeit-Eintrag" + +#: babybuddy/templates/babybuddy/nav-dropdown.html:326 #: babybuddy/templates/babybuddy/user_list.html:17 #: babybuddy/templates/babybuddy/user_password_form.html:7 #: babybuddy/templates/babybuddy/user_settings_form.html:7 core/models.py:556 @@ -462,23 +459,23 @@ msgstr "" msgid "User" msgstr "Benutzer" -#: babybuddy/templates/babybuddy/nav-dropdown.html:348 +#: babybuddy/templates/babybuddy/nav-dropdown.html:328 msgid "Password" msgstr "Passwort" -#: babybuddy/templates/babybuddy/nav-dropdown.html:352 +#: babybuddy/templates/babybuddy/nav-dropdown.html:332 msgid "Logout" msgstr "Logout" -#: babybuddy/templates/babybuddy/nav-dropdown.html:355 +#: babybuddy/templates/babybuddy/nav-dropdown.html:335 msgid "Site" msgstr "Seite" -#: babybuddy/templates/babybuddy/nav-dropdown.html:356 +#: babybuddy/templates/babybuddy/nav-dropdown.html:336 msgid "API Browser" msgstr "API Browser" -#: babybuddy/templates/babybuddy/nav-dropdown.html:358 +#: babybuddy/templates/babybuddy/nav-dropdown.html:338 #: babybuddy/templates/babybuddy/user_confirm_delete.html:7 #: babybuddy/templates/babybuddy/user_form.html:13 #: babybuddy/templates/babybuddy/user_list.html:4 @@ -486,15 +483,15 @@ msgstr "API Browser" msgid "Users" msgstr "Benutzer" -#: babybuddy/templates/babybuddy/nav-dropdown.html:361 +#: babybuddy/templates/babybuddy/nav-dropdown.html:341 msgid "Support" msgstr "Support" -#: babybuddy/templates/babybuddy/nav-dropdown.html:363 +#: babybuddy/templates/babybuddy/nav-dropdown.html:343 msgid "Source Code" msgstr "Quellcode" -#: babybuddy/templates/babybuddy/nav-dropdown.html:365 +#: babybuddy/templates/babybuddy/nav-dropdown.html:345 msgid "Chat / Support" msgstr "Chat / Support" @@ -505,6 +502,7 @@ msgstr "Chat / Support" #: core/templates/timeline/_timeline.html:73 #: dashboard/templates/cards/feeding_day.html:43 #: dashboard/templates/cards/feeding_last_method.html:34 +#: dashboard/templates/cards/sleep_recent.html:43 #: dashboard/templates/cards/statistics.html:34 msgid "Previous" msgstr "Zurück" @@ -516,6 +514,7 @@ msgstr "Zurück" #: core/templates/timeline/_timeline.html:80 #: dashboard/templates/cards/feeding_day.html:47 #: dashboard/templates/cards/feeding_last_method.html:38 +#: dashboard/templates/cards/sleep_recent.html:47 #: dashboard/templates/cards/statistics.html:38 msgid "Next" msgstr "Weiter" @@ -985,7 +984,7 @@ msgstr "" #: reports/graphs/diaperchange_types.py:49 reports/graphs/feeding_amounts.py:70 #: reports/graphs/feeding_duration.py:56 #: reports/graphs/head_circumference_change.py:28 -#: reports/graphs/height_change.py:28 reports/graphs/pumping_amounts.py:58 +#: reports/graphs/height_change.py:28 reports/graphs/pumping_amounts.py:60 #: reports/graphs/sleep_pattern.py:151 reports/graphs/sleep_totals.py:59 #: reports/graphs/tummytime_duration.py:51 reports/graphs/weight_change.py:28 msgid "Date" @@ -1159,7 +1158,9 @@ msgid "Add BMI" msgstr "Füge BMI hinzu" #: core/templates/core/bmi_list.html:70 -msgid "No bmi entries found." +#, fuzzy +#| msgid "No bmi entries found." +msgid "No BMI entries found." msgstr "Keine BMI Einträge gefunden." #: core/templates/core/child_confirm_delete.html:4 @@ -1460,9 +1461,10 @@ msgstr "Aktive Timer" #: dashboard/templates/cards/feeding_day.html:52 #: dashboard/templates/cards/feeding_last.html:17 #: dashboard/templates/cards/feeding_last_method.html:43 -#: dashboard/templates/cards/sleep_day.html:14 #: dashboard/templates/cards/sleep_last.html:17 #: dashboard/templates/cards/sleep_naps_day.html:18 +#: dashboard/templates/cards/sleep_recent.html:20 +#: dashboard/templates/cards/sleep_recent.html:52 #: dashboard/templates/cards/tummytime_day.html:14 msgid "None" msgstr "Keine" @@ -1580,6 +1582,22 @@ msgstr "{}, {}" msgid "0 days" msgstr "0 Tage" +#: core/templatetags/duration.py:111 +#: dashboard/templates/cards/diaperchange_types.html:49 +msgid "today" +msgstr "heute" + +#: core/templatetags/duration.py:113 +#: dashboard/templates/cards/diaperchange_types.html:51 +msgid "yesterday" +msgstr "gestern" + +#: core/templatetags/duration.py:116 +#, fuzzy +#| msgid "%(key)s days ago" +msgid " days ago" +msgstr "Vor %(key)s Tagen" + #: core/timeline.py:53 #, python-format msgid "%(child)s started tummy time!" @@ -1718,14 +1736,6 @@ msgstr "nass" msgid "solid" msgstr "fest" -#: dashboard/templates/cards/diaperchange_types.html:49 -msgid "today" -msgstr "heute" - -#: dashboard/templates/cards/diaperchange_types.html:51 -msgid "yesterday" -msgstr "gestern" - #: dashboard/templates/cards/diaperchange_types.html:53 #, python-format msgid "%(key)s days ago" @@ -1744,6 +1754,7 @@ msgstr[0] "%(count)s Schlaf-Einträge" msgstr[1] "%(count)s Schlaf-Einträge" #: dashboard/templates/cards/feeding_day.html:32 +#: dashboard/templates/cards/sleep_recent.html:32 #, python-format msgid "
%(since)s
" msgstr "" @@ -1768,15 +1779,6 @@ msgid_plural "%(n)s feedings ago" msgstr[0] "vor %(n)s Mahlzeit%(plural)sen" msgstr[1] "vor %(n)s Mahlzeit%(plural)sen" -#: dashboard/templates/cards/sleep_day.html:6 -msgid "Today's Sleep" -msgstr "Schlaf heute" - -#: dashboard/templates/cards/sleep_day.html:20 -#, python-format -msgid "%(count)s sleep entries" -msgstr "%(count)s Schlaf-Einträge" - #: dashboard/templates/cards/sleep_last.html:6 msgid "Last Sleep" msgstr "Letzter Schlaf" @@ -1793,6 +1795,20 @@ msgid_plural "%(count)s naps" msgstr[0] "%(count)s Nickerchen%(plural)s." msgstr[1] "%(count)s Nickerchen%(plural)s." +#: dashboard/templates/cards/sleep_recent.html:6 +#, fuzzy +#| msgid "Last Sleep" +msgid "Recent Sleep" +msgstr "Letzter Schlaf" + +#: dashboard/templates/cards/sleep_recent.html:25 +#, fuzzy, python-format +#| msgid "%(count)s sleep entries" +msgid "%(counter)s sleep" +msgid_plural "%(counter)s sleep" +msgstr[0] "%(count)s Schlaf-Einträge" +msgstr[1] "%(count)s Schlaf-Einträge" + #: dashboard/templates/cards/statistics.html:7 msgid "Statistics" msgstr "Statistiken" @@ -1845,59 +1861,59 @@ msgstr "Aktionen des Kindes" msgid "Reports" msgstr "Reports" -#: dashboard/templatetags/cards.py:328 +#: dashboard/templatetags/cards.py:357 msgid "Average nap duration" msgstr "Durschnittliche Nickerchen-Dauer" -#: dashboard/templatetags/cards.py:335 +#: dashboard/templatetags/cards.py:364 msgid "Average naps per day" msgstr "Durschnittliche Anzahl Nickerchen" -#: dashboard/templatetags/cards.py:345 +#: dashboard/templatetags/cards.py:374 msgid "Average sleep duration" msgstr "Durchschnittliche Schlafdauer" -#: dashboard/templatetags/cards.py:352 +#: dashboard/templatetags/cards.py:381 msgid "Average awake duration" msgstr "Durchschnittlich wach" -#: dashboard/templatetags/cards.py:362 +#: dashboard/templatetags/cards.py:391 msgid "Weight change per week" msgstr "Gewichtsänderung pro Woche" -#: dashboard/templatetags/cards.py:372 +#: dashboard/templatetags/cards.py:401 msgid "Height change per week" msgstr "Größenänderung pro Woche" -#: dashboard/templatetags/cards.py:382 +#: dashboard/templatetags/cards.py:411 msgid "Head circumference change per week" msgstr "Kopfumfang Änderung pro woche" -#: dashboard/templatetags/cards.py:392 +#: dashboard/templatetags/cards.py:421 msgid "BMI change per week" msgstr "BMI Änderung pro Woche" -#: dashboard/templatetags/cards.py:410 +#: dashboard/templatetags/cards.py:439 msgid "Diaper change frequency (past 3 days)" msgstr "" -#: dashboard/templatetags/cards.py:414 +#: dashboard/templatetags/cards.py:443 msgid "Diaper change frequency (past 2 weeks)" msgstr "" -#: dashboard/templatetags/cards.py:420 +#: dashboard/templatetags/cards.py:449 msgid "Diaper change frequency" msgstr "Frequenz Windelwechsel" -#: dashboard/templatetags/cards.py:456 +#: dashboard/templatetags/cards.py:485 msgid "Feeding frequency (past 3 days)" msgstr "Mahlzeitenintervall (letzte 3 Tage)" -#: dashboard/templatetags/cards.py:460 +#: dashboard/templatetags/cards.py:489 msgid "Feeding frequency (past 2 weeks)" msgstr "Mahlzeitenintervall (letzte 2 Wochen)" -#: dashboard/templatetags/cards.py:466 +#: dashboard/templatetags/cards.py:495 msgid "Feeding frequency" msgstr "Frequenz Mahlzeiten" @@ -1973,11 +1989,11 @@ msgstr "Kopfumfang" msgid "Height" msgstr "Größe" -#: reports/graphs/pumping_amounts.py:57 +#: reports/graphs/pumping_amounts.py:59 msgid "Total Pumping Amount" msgstr "" -#: reports/graphs/pumping_amounts.py:60 +#: reports/graphs/pumping_amounts.py:62 msgid "Pumping Amount" msgstr "" @@ -2090,3 +2106,10 @@ msgstr "Bauchzeit Dauer (Summe)" #: reports/templates/reports/tummytime_duration.html:8 msgid "Total Tummy Time Durations" msgstr "Totalle Bauchzeit Dauer" + +#~ msgid "Today's Sleep" +#~ msgstr "Schlaf heute" + +#, python-format +#~ msgid "%(count)s sleep entries" +#~ msgstr "%(count)s Schlaf-Einträge" diff --git a/locale/en_GB/LC_MESSAGES/django.po b/locale/en_GB/LC_MESSAGES/django.po index 33e3b592..5550ecc0 100644 --- a/locale/en_GB/LC_MESSAGES/django.po +++ b/locale/en_GB/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Baby Buddy\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-06-05 13:25+0000\n" +"POT-Creation-Date: 2022-06-17 22:25+0000\n" "Language: en-GB\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -10,12 +10,12 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: babybuddy/admin.py:12 babybuddy/admin.py:13 -#: babybuddy/templates/babybuddy/nav-dropdown.html:347 +#: babybuddy/templates/babybuddy/nav-dropdown.html:327 #: babybuddy/templates/babybuddy/user_settings_form.html:8 msgid "Settings" msgstr "" -#: babybuddy/admin.py:17 babybuddy/templates/babybuddy/nav-dropdown.html:111 +#: babybuddy/admin.py:17 babybuddy/templates/babybuddy/nav-dropdown.html:92 #: babybuddy/templates/babybuddy/user_settings_form.html:61 #: dashboard/templates/dashboard/child.html:4 #: dashboard/templates/dashboard/child.html:9 @@ -178,7 +178,7 @@ msgstr "" #: babybuddy/templates/admin/base_site.html:4 #: babybuddy/templates/admin/base_site.html:7 -#: babybuddy/templates/babybuddy/nav-dropdown.html:359 +#: babybuddy/templates/babybuddy/nav-dropdown.html:339 msgid "Database Admin" msgstr "" @@ -225,19 +225,19 @@ msgid "Diaper Change" msgstr "Nappy Change" #: babybuddy/templates/babybuddy/nav-dropdown.html:57 -#: babybuddy/templates/babybuddy/nav-dropdown.html:281 core/models.py:312 +#: babybuddy/templates/babybuddy/nav-dropdown.html:262 core/models.py:312 #: core/models.py:316 core/templates/core/timer_detail.html:43 msgid "Feeding" msgstr "" #: babybuddy/templates/babybuddy/nav-dropdown.html:63 -#: babybuddy/templates/babybuddy/nav-dropdown.html:157 core/models.py:396 +#: babybuddy/templates/babybuddy/nav-dropdown.html:138 core/models.py:396 #: core/models.py:407 core/models.py:411 core/templates/core/note_list.html:29 msgid "Note" msgstr "" #: babybuddy/templates/babybuddy/nav-dropdown.html:69 -#: babybuddy/templates/babybuddy/nav-dropdown.html:288 +#: babybuddy/templates/babybuddy/nav-dropdown.html:283 #: babybuddy/templates/babybuddy/welcome.html:42 core/models.py:467 #: core/models.py:468 core/models.py:471 #: core/templates/core/sleep_confirm_delete.html:7 @@ -248,19 +248,7 @@ msgid "Sleep" msgstr "" #: babybuddy/templates/babybuddy/nav-dropdown.html:75 -#: babybuddy/templates/babybuddy/nav-dropdown.html:179 core/models.py:506 -#: core/models.py:519 core/models.py:520 core/models.py:523 -#: core/templates/core/temperature_confirm_delete.html:7 -#: core/templates/core/temperature_form.html:13 -#: core/templates/core/temperature_list.html:4 -#: core/templates/core/temperature_list.html:7 -#: core/templates/core/temperature_list.html:12 -#: core/templates/core/temperature_list.html:29 -msgid "Temperature" -msgstr "" - -#: babybuddy/templates/babybuddy/nav-dropdown.html:81 -#: babybuddy/templates/babybuddy/nav-dropdown.html:301 +#: babybuddy/templates/babybuddy/nav-dropdown.html:296 #: babybuddy/templates/babybuddy/welcome.html:50 core/models.py:647 #: core/models.py:648 core/models.py:651 #: core/templates/core/timer_detail.html:59 @@ -272,44 +260,15 @@ msgstr "" msgid "Tummy Time" msgstr "" -#: babybuddy/templates/babybuddy/nav-dropdown.html:87 -#: babybuddy/templates/babybuddy/nav-dropdown.html:193 core/models.py:673 -#: core/models.py:685 core/models.py:686 core/models.py:689 -#: core/templates/core/weight_confirm_delete.html:7 -#: core/templates/core/weight_form.html:13 -#: core/templates/core/weight_list.html:4 -#: core/templates/core/weight_list.html:7 -#: core/templates/core/weight_list.html:12 -#: core/templates/core/weight_list.html:29 reports/graphs/weight_change.py:19 -#: reports/graphs/weight_change.py:30 -#: reports/templates/reports/report_list.html:22 -#: reports/templates/reports/weight_change.html:4 -#: reports/templates/reports/weight_change.html:8 -msgid "Weight" -msgstr "" - -#: babybuddy/templates/babybuddy/nav-dropdown.html:93 -#: babybuddy/templates/babybuddy/nav-dropdown.html:316 core/models.py:437 -#: core/models.py:438 core/models.py:441 -#: core/templates/core/pumping_confirm_delete.html:7 -#: core/templates/core/pumping_form.html:13 -#: core/templates/core/pumping_list.html:4 -#: core/templates/core/pumping_list.html:7 -#: core/templates/core/pumping_list.html:12 -#: reports/templates/reports/pumping_amounts.html:4 -#: reports/templates/reports/pumping_amounts.html:8 -msgid "Pumping" -msgstr "" - -#: babybuddy/templates/babybuddy/nav-dropdown.html:118 +#: babybuddy/templates/babybuddy/nav-dropdown.html:99 #: core/templates/timeline/timeline.html:4 #: core/templates/timeline/timeline.html:7 #: dashboard/templates/dashboard/child_button_group.html:9 msgid "Timeline" msgstr "" -#: babybuddy/templates/babybuddy/nav-dropdown.html:129 -#: babybuddy/templates/babybuddy/nav-dropdown.html:137 core/models.py:188 +#: babybuddy/templates/babybuddy/nav-dropdown.html:110 +#: babybuddy/templates/babybuddy/nav-dropdown.html:118 core/models.py:188 #: core/templates/core/child_confirm_delete.html:7 #: core/templates/core/child_detail.html:7 #: core/templates/core/child_form.html:13 core/templates/core/child_list.html:4 @@ -319,7 +278,7 @@ msgstr "" msgid "Children" msgstr "" -#: babybuddy/templates/babybuddy/nav-dropdown.html:143 core/models.py:137 +#: babybuddy/templates/babybuddy/nav-dropdown.html:124 core/models.py:137 #: core/models.py:187 core/models.py:221 core/models.py:274 core/models.py:335 #: core/models.py:367 core/models.py:394 core/models.py:426 core/models.py:450 #: core/models.py:503 core/models.py:537 core/models.py:630 core/models.py:671 @@ -338,7 +297,7 @@ msgstr "" msgid "Child" msgstr "" -#: babybuddy/templates/babybuddy/nav-dropdown.html:151 core/models.py:143 +#: babybuddy/templates/babybuddy/nav-dropdown.html:132 core/models.py:143 #: core/models.py:240 core/models.py:304 core/models.py:343 core/models.py:373 #: core/models.py:408 core/models.py:430 core/models.py:458 core/models.py:511 #: core/models.py:677 core/templates/core/note_confirm_delete.html:7 @@ -347,38 +306,26 @@ msgstr "" msgid "Notes" msgstr "" -#: babybuddy/templates/babybuddy/nav-dropdown.html:171 +#: babybuddy/templates/babybuddy/nav-dropdown.html:152 msgid "Measurements" msgstr "" -#: babybuddy/templates/babybuddy/nav-dropdown.html:185 -msgid "Temperature reading" +#: babybuddy/templates/babybuddy/nav-dropdown.html:160 core/models.py:139 +#: core/models.py:151 core/models.py:152 core/models.py:155 +#: core/templates/core/bmi_confirm_delete.html:7 +#: core/templates/core/bmi_form.html:13 core/templates/core/bmi_list.html:4 +#: core/templates/core/bmi_list.html:7 core/templates/core/bmi_list.html:12 +#: core/templates/core/bmi_list.html:29 reports/graphs/bmi_change.py:19 +#: reports/graphs/bmi_change.py:30 reports/templates/reports/bmi_change.html:4 +#: reports/templates/reports/bmi_change.html:8 +msgid "BMI" msgstr "" -#: babybuddy/templates/babybuddy/nav-dropdown.html:199 -msgid "Weight entry" +#: babybuddy/templates/babybuddy/nav-dropdown.html:166 +msgid "BMI entry" msgstr "" -#: babybuddy/templates/babybuddy/nav-dropdown.html:207 core/models.py:369 -#: core/models.py:381 core/models.py:382 core/models.py:385 -#: core/templates/core/height_confirm_delete.html:7 -#: core/templates/core/height_form.html:13 -#: core/templates/core/height_list.html:4 -#: core/templates/core/height_list.html:7 -#: core/templates/core/height_list.html:12 -#: core/templates/core/height_list.html:29 reports/graphs/height_change.py:19 -#: reports/graphs/height_change.py:30 -#: reports/templates/reports/height_change.html:4 -#: reports/templates/reports/height_change.html:8 -#: reports/templates/reports/report_list.html:17 -msgid "Height" -msgstr "" - -#: babybuddy/templates/babybuddy/nav-dropdown.html:213 -msgid "Height entry" -msgstr "" - -#: babybuddy/templates/babybuddy/nav-dropdown.html:221 core/models.py:338 +#: babybuddy/templates/babybuddy/nav-dropdown.html:174 core/models.py:338 #: core/models.py:351 core/models.py:352 core/models.py:355 #: core/templates/core/head_circumference_confirm_delete.html:7 #: core/templates/core/head_circumference_form.html:13 @@ -394,39 +341,77 @@ msgstr "" msgid "Head Circumference" msgstr "" -#: babybuddy/templates/babybuddy/nav-dropdown.html:227 +#: babybuddy/templates/babybuddy/nav-dropdown.html:180 msgid "Head Circumference entry" msgstr "" -#: babybuddy/templates/babybuddy/nav-dropdown.html:235 core/models.py:139 -#: core/models.py:151 core/models.py:152 core/models.py:155 -#: core/templates/core/bmi_confirm_delete.html:7 -#: core/templates/core/bmi_form.html:13 core/templates/core/bmi_list.html:4 -#: core/templates/core/bmi_list.html:7 core/templates/core/bmi_list.html:12 -#: core/templates/core/bmi_list.html:29 reports/graphs/bmi_change.py:19 -#: reports/graphs/bmi_change.py:30 reports/templates/reports/bmi_change.html:4 -#: reports/templates/reports/bmi_change.html:8 -msgid "BMI" +#: babybuddy/templates/babybuddy/nav-dropdown.html:188 core/models.py:369 +#: core/models.py:381 core/models.py:382 core/models.py:385 +#: core/templates/core/height_confirm_delete.html:7 +#: core/templates/core/height_form.html:13 +#: core/templates/core/height_list.html:4 +#: core/templates/core/height_list.html:7 +#: core/templates/core/height_list.html:12 +#: core/templates/core/height_list.html:29 reports/graphs/height_change.py:19 +#: reports/graphs/height_change.py:30 +#: reports/templates/reports/height_change.html:4 +#: reports/templates/reports/height_change.html:8 +#: reports/templates/reports/report_list.html:17 +msgid "Height" msgstr "" -#: babybuddy/templates/babybuddy/nav-dropdown.html:241 -msgid "BMI entry" +#: babybuddy/templates/babybuddy/nav-dropdown.html:194 +msgid "Height entry" msgstr "" -#: babybuddy/templates/babybuddy/nav-dropdown.html:255 +#: babybuddy/templates/babybuddy/nav-dropdown.html:202 core/models.py:506 +#: core/models.py:519 core/models.py:520 core/models.py:523 +#: core/templates/core/temperature_confirm_delete.html:7 +#: core/templates/core/temperature_form.html:13 +#: core/templates/core/temperature_list.html:4 +#: core/templates/core/temperature_list.html:7 +#: core/templates/core/temperature_list.html:12 +#: core/templates/core/temperature_list.html:29 +msgid "Temperature" +msgstr "" + +#: babybuddy/templates/babybuddy/nav-dropdown.html:208 +msgid "Temperature reading" +msgstr "" + +#: babybuddy/templates/babybuddy/nav-dropdown.html:216 core/models.py:673 +#: core/models.py:685 core/models.py:686 core/models.py:689 +#: core/templates/core/weight_confirm_delete.html:7 +#: core/templates/core/weight_form.html:13 +#: core/templates/core/weight_list.html:4 +#: core/templates/core/weight_list.html:7 +#: core/templates/core/weight_list.html:12 +#: core/templates/core/weight_list.html:29 reports/graphs/weight_change.py:19 +#: reports/graphs/weight_change.py:30 +#: reports/templates/reports/report_list.html:22 +#: reports/templates/reports/weight_change.html:4 +#: reports/templates/reports/weight_change.html:8 +msgid "Weight" +msgstr "" + +#: babybuddy/templates/babybuddy/nav-dropdown.html:222 +msgid "Weight entry" +msgstr "" + +#: babybuddy/templates/babybuddy/nav-dropdown.html:236 msgid "Activities" msgstr "" -#: babybuddy/templates/babybuddy/nav-dropdown.html:262 +#: babybuddy/templates/babybuddy/nav-dropdown.html:243 #: reports/graphs/diaperchange_lifetimes.py:27 msgid "Changes" msgstr "" -#: babybuddy/templates/babybuddy/nav-dropdown.html:268 +#: babybuddy/templates/babybuddy/nav-dropdown.html:249 msgid "Change" msgstr "" -#: babybuddy/templates/babybuddy/nav-dropdown.html:275 +#: babybuddy/templates/babybuddy/nav-dropdown.html:256 #: babybuddy/templates/babybuddy/welcome.html:34 core/models.py:313 #: core/templates/core/feeding_confirm_delete.html:7 #: core/templates/core/feeding_form.html:13 @@ -436,19 +421,31 @@ msgstr "" msgid "Feedings" msgstr "" -#: babybuddy/templates/babybuddy/nav-dropdown.html:294 -msgid "Sleep entry" +#: babybuddy/templates/babybuddy/nav-dropdown.html:270 core/models.py:437 +#: core/models.py:438 core/models.py:441 +#: core/templates/core/pumping_confirm_delete.html:7 +#: core/templates/core/pumping_form.html:13 +#: core/templates/core/pumping_list.html:4 +#: core/templates/core/pumping_list.html:7 +#: core/templates/core/pumping_list.html:12 +#: reports/templates/reports/pumping_amounts.html:4 +#: reports/templates/reports/pumping_amounts.html:8 +msgid "Pumping" msgstr "" -#: babybuddy/templates/babybuddy/nav-dropdown.html:307 -msgid "Tummy Time entry" -msgstr "" - -#: babybuddy/templates/babybuddy/nav-dropdown.html:322 +#: babybuddy/templates/babybuddy/nav-dropdown.html:276 msgid "Pumping entry" msgstr "" -#: babybuddy/templates/babybuddy/nav-dropdown.html:346 +#: babybuddy/templates/babybuddy/nav-dropdown.html:289 +msgid "Sleep entry" +msgstr "" + +#: babybuddy/templates/babybuddy/nav-dropdown.html:302 +msgid "Tummy Time entry" +msgstr "" + +#: babybuddy/templates/babybuddy/nav-dropdown.html:326 #: babybuddy/templates/babybuddy/user_list.html:17 #: babybuddy/templates/babybuddy/user_password_form.html:7 #: babybuddy/templates/babybuddy/user_settings_form.html:7 core/models.py:556 @@ -456,23 +453,23 @@ msgstr "" msgid "User" msgstr "" -#: babybuddy/templates/babybuddy/nav-dropdown.html:348 +#: babybuddy/templates/babybuddy/nav-dropdown.html:328 msgid "Password" msgstr "" -#: babybuddy/templates/babybuddy/nav-dropdown.html:352 +#: babybuddy/templates/babybuddy/nav-dropdown.html:332 msgid "Logout" msgstr "" -#: babybuddy/templates/babybuddy/nav-dropdown.html:355 +#: babybuddy/templates/babybuddy/nav-dropdown.html:335 msgid "Site" msgstr "" -#: babybuddy/templates/babybuddy/nav-dropdown.html:356 +#: babybuddy/templates/babybuddy/nav-dropdown.html:336 msgid "API Browser" msgstr "" -#: babybuddy/templates/babybuddy/nav-dropdown.html:358 +#: babybuddy/templates/babybuddy/nav-dropdown.html:338 #: babybuddy/templates/babybuddy/user_confirm_delete.html:7 #: babybuddy/templates/babybuddy/user_form.html:13 #: babybuddy/templates/babybuddy/user_list.html:4 @@ -480,15 +477,15 @@ msgstr "" msgid "Users" msgstr "" -#: babybuddy/templates/babybuddy/nav-dropdown.html:361 +#: babybuddy/templates/babybuddy/nav-dropdown.html:341 msgid "Support" msgstr "" -#: babybuddy/templates/babybuddy/nav-dropdown.html:363 +#: babybuddy/templates/babybuddy/nav-dropdown.html:343 msgid "Source Code" msgstr "" -#: babybuddy/templates/babybuddy/nav-dropdown.html:365 +#: babybuddy/templates/babybuddy/nav-dropdown.html:345 msgid "Chat / Support" msgstr "" @@ -499,6 +496,7 @@ msgstr "" #: core/templates/timeline/_timeline.html:73 #: dashboard/templates/cards/feeding_day.html:43 #: dashboard/templates/cards/feeding_last_method.html:34 +#: dashboard/templates/cards/sleep_recent.html:43 #: dashboard/templates/cards/statistics.html:34 msgid "Previous" msgstr "" @@ -510,6 +508,7 @@ msgstr "" #: core/templates/timeline/_timeline.html:80 #: dashboard/templates/cards/feeding_day.html:47 #: dashboard/templates/cards/feeding_last_method.html:38 +#: dashboard/templates/cards/sleep_recent.html:47 #: dashboard/templates/cards/statistics.html:38 msgid "Next" msgstr "" @@ -960,7 +959,7 @@ msgstr "" #: reports/graphs/diaperchange_types.py:49 reports/graphs/feeding_amounts.py:70 #: reports/graphs/feeding_duration.py:56 #: reports/graphs/head_circumference_change.py:28 -#: reports/graphs/height_change.py:28 reports/graphs/pumping_amounts.py:58 +#: reports/graphs/height_change.py:28 reports/graphs/pumping_amounts.py:60 #: reports/graphs/sleep_pattern.py:151 reports/graphs/sleep_totals.py:59 #: reports/graphs/tummytime_duration.py:51 reports/graphs/weight_change.py:28 msgid "Date" @@ -1134,8 +1133,10 @@ msgid "Add BMI" msgstr "" #: core/templates/core/bmi_list.html:70 -msgid "No bmi entries found." -msgstr "" +#, fuzzy +#| msgid "No diaper changes found." +msgid "No BMI entries found." +msgstr "No nappy changes found." #: core/templates/core/child_confirm_delete.html:4 msgid "Delete a Child" @@ -1431,9 +1432,10 @@ msgstr "" #: dashboard/templates/cards/feeding_day.html:52 #: dashboard/templates/cards/feeding_last.html:17 #: dashboard/templates/cards/feeding_last_method.html:43 -#: dashboard/templates/cards/sleep_day.html:14 #: dashboard/templates/cards/sleep_last.html:17 #: dashboard/templates/cards/sleep_naps_day.html:18 +#: dashboard/templates/cards/sleep_recent.html:20 +#: dashboard/templates/cards/sleep_recent.html:52 #: dashboard/templates/cards/tummytime_day.html:14 msgid "None" msgstr "" @@ -1551,6 +1553,20 @@ msgstr "" msgid "0 days" msgstr "" +#: core/templatetags/duration.py:111 +#: dashboard/templates/cards/diaperchange_types.html:49 +msgid "today" +msgstr "" + +#: core/templatetags/duration.py:113 +#: dashboard/templates/cards/diaperchange_types.html:51 +msgid "yesterday" +msgstr "" + +#: core/templatetags/duration.py:116 +msgid " days ago" +msgstr "" + #: core/timeline.py:53 #, python-format msgid "%(child)s started tummy time!" @@ -1689,14 +1705,6 @@ msgstr "" msgid "solid" msgstr "" -#: dashboard/templates/cards/diaperchange_types.html:49 -msgid "today" -msgstr "" - -#: dashboard/templates/cards/diaperchange_types.html:51 -msgid "yesterday" -msgstr "" - #: dashboard/templates/cards/diaperchange_types.html:53 #, python-format msgid "%(key)s days ago" @@ -1714,6 +1722,7 @@ msgstr[0] "" msgstr[1] "" #: dashboard/templates/cards/feeding_day.html:32 +#: dashboard/templates/cards/sleep_recent.html:32 #, python-format msgid "
%(since)s
" msgstr "" @@ -1737,15 +1746,6 @@ msgid_plural "%(n)s feedings ago" msgstr[0] "" msgstr[1] "" -#: dashboard/templates/cards/sleep_day.html:6 -msgid "Today's Sleep" -msgstr "" - -#: dashboard/templates/cards/sleep_day.html:20 -#, python-format -msgid "%(count)s sleep entries" -msgstr "" - #: dashboard/templates/cards/sleep_last.html:6 msgid "Last Sleep" msgstr "" @@ -1761,6 +1761,17 @@ msgid_plural "%(count)s naps" msgstr[0] "" msgstr[1] "" +#: dashboard/templates/cards/sleep_recent.html:6 +msgid "Recent Sleep" +msgstr "" + +#: dashboard/templates/cards/sleep_recent.html:25 +#, python-format +msgid "%(counter)s sleep" +msgid_plural "%(counter)s sleep" +msgstr[0] "" +msgstr[1] "" + #: dashboard/templates/cards/statistics.html:7 msgid "Statistics" msgstr "" @@ -1812,59 +1823,59 @@ msgstr "" msgid "Reports" msgstr "" -#: dashboard/templatetags/cards.py:328 +#: dashboard/templatetags/cards.py:357 msgid "Average nap duration" msgstr "" -#: dashboard/templatetags/cards.py:335 +#: dashboard/templatetags/cards.py:364 msgid "Average naps per day" msgstr "" -#: dashboard/templatetags/cards.py:345 +#: dashboard/templatetags/cards.py:374 msgid "Average sleep duration" msgstr "" -#: dashboard/templatetags/cards.py:352 +#: dashboard/templatetags/cards.py:381 msgid "Average awake duration" msgstr "" -#: dashboard/templatetags/cards.py:362 +#: dashboard/templatetags/cards.py:391 msgid "Weight change per week" msgstr "" -#: dashboard/templatetags/cards.py:372 +#: dashboard/templatetags/cards.py:401 msgid "Height change per week" msgstr "" -#: dashboard/templatetags/cards.py:382 +#: dashboard/templatetags/cards.py:411 msgid "Head circumference change per week" msgstr "" -#: dashboard/templatetags/cards.py:392 +#: dashboard/templatetags/cards.py:421 msgid "BMI change per week" msgstr "" -#: dashboard/templatetags/cards.py:410 +#: dashboard/templatetags/cards.py:439 msgid "Diaper change frequency (past 3 days)" msgstr "Nappy change frequency (past 3 days)" -#: dashboard/templatetags/cards.py:414 +#: dashboard/templatetags/cards.py:443 msgid "Diaper change frequency (past 2 weeks)" msgstr "Nappy change frequency (past 2 weeks)" -#: dashboard/templatetags/cards.py:420 +#: dashboard/templatetags/cards.py:449 msgid "Diaper change frequency" msgstr "Nappy change frequency" -#: dashboard/templatetags/cards.py:456 +#: dashboard/templatetags/cards.py:485 msgid "Feeding frequency (past 3 days)" msgstr "" -#: dashboard/templatetags/cards.py:460 +#: dashboard/templatetags/cards.py:489 msgid "Feeding frequency (past 2 weeks)" msgstr "" -#: dashboard/templatetags/cards.py:466 +#: dashboard/templatetags/cards.py:495 msgid "Feeding frequency" msgstr "" @@ -1940,11 +1951,11 @@ msgstr "" msgid "Height" msgstr "" -#: reports/graphs/pumping_amounts.py:57 +#: reports/graphs/pumping_amounts.py:59 msgid "Total Pumping Amount" msgstr "" -#: reports/graphs/pumping_amounts.py:60 +#: reports/graphs/pumping_amounts.py:62 msgid "Pumping Amount" msgstr "" diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo index 94ff9b1e..e91fa809 100644 Binary files a/locale/es/LC_MESSAGES/django.mo and b/locale/es/LC_MESSAGES/django.mo differ diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po index 362cf4f3..0c54b293 100644 --- a/locale/es/LC_MESSAGES/django.po +++ b/locale/es/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Baby Buddy\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-06-05 13:25+0000\n" +"POT-Creation-Date: 2022-06-17 22:25+0000\n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -11,12 +11,12 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: babybuddy/admin.py:12 babybuddy/admin.py:13 -#: babybuddy/templates/babybuddy/nav-dropdown.html:347 +#: babybuddy/templates/babybuddy/nav-dropdown.html:327 #: babybuddy/templates/babybuddy/user_settings_form.html:8 msgid "Settings" msgstr "Configuración" -#: babybuddy/admin.py:17 babybuddy/templates/babybuddy/nav-dropdown.html:111 +#: babybuddy/admin.py:17 babybuddy/templates/babybuddy/nav-dropdown.html:92 #: babybuddy/templates/babybuddy/user_settings_form.html:61 #: dashboard/templates/dashboard/child.html:4 #: dashboard/templates/dashboard/child.html:9 @@ -181,7 +181,7 @@ msgstr "Turco" #: babybuddy/templates/admin/base_site.html:4 #: babybuddy/templates/admin/base_site.html:7 -#: babybuddy/templates/babybuddy/nav-dropdown.html:359 +#: babybuddy/templates/babybuddy/nav-dropdown.html:339 msgid "Database Admin" msgstr "Administrar Base de Datos" @@ -230,19 +230,19 @@ msgid "Diaper Change" msgstr "Cambio de Pañal" #: babybuddy/templates/babybuddy/nav-dropdown.html:57 -#: babybuddy/templates/babybuddy/nav-dropdown.html:281 core/models.py:312 +#: babybuddy/templates/babybuddy/nav-dropdown.html:262 core/models.py:312 #: core/models.py:316 core/templates/core/timer_detail.html:43 msgid "Feeding" msgstr "Toma" #: babybuddy/templates/babybuddy/nav-dropdown.html:63 -#: babybuddy/templates/babybuddy/nav-dropdown.html:157 core/models.py:396 +#: babybuddy/templates/babybuddy/nav-dropdown.html:138 core/models.py:396 #: core/models.py:407 core/models.py:411 core/templates/core/note_list.html:29 msgid "Note" msgstr "Nota" #: babybuddy/templates/babybuddy/nav-dropdown.html:69 -#: babybuddy/templates/babybuddy/nav-dropdown.html:288 +#: babybuddy/templates/babybuddy/nav-dropdown.html:283 #: babybuddy/templates/babybuddy/welcome.html:42 core/models.py:467 #: core/models.py:468 core/models.py:471 #: core/templates/core/sleep_confirm_delete.html:7 @@ -253,19 +253,7 @@ msgid "Sleep" msgstr "Sueño" #: babybuddy/templates/babybuddy/nav-dropdown.html:75 -#: babybuddy/templates/babybuddy/nav-dropdown.html:179 core/models.py:506 -#: core/models.py:519 core/models.py:520 core/models.py:523 -#: core/templates/core/temperature_confirm_delete.html:7 -#: core/templates/core/temperature_form.html:13 -#: core/templates/core/temperature_list.html:4 -#: core/templates/core/temperature_list.html:7 -#: core/templates/core/temperature_list.html:12 -#: core/templates/core/temperature_list.html:29 -msgid "Temperature" -msgstr "Temperatura" - -#: babybuddy/templates/babybuddy/nav-dropdown.html:81 -#: babybuddy/templates/babybuddy/nav-dropdown.html:301 +#: babybuddy/templates/babybuddy/nav-dropdown.html:296 #: babybuddy/templates/babybuddy/welcome.html:50 core/models.py:647 #: core/models.py:648 core/models.py:651 #: core/templates/core/timer_detail.html:59 @@ -277,44 +265,15 @@ msgstr "Temperatura" msgid "Tummy Time" msgstr "Tiempo boca abajo" -#: babybuddy/templates/babybuddy/nav-dropdown.html:87 -#: babybuddy/templates/babybuddy/nav-dropdown.html:193 core/models.py:673 -#: core/models.py:685 core/models.py:686 core/models.py:689 -#: core/templates/core/weight_confirm_delete.html:7 -#: core/templates/core/weight_form.html:13 -#: core/templates/core/weight_list.html:4 -#: core/templates/core/weight_list.html:7 -#: core/templates/core/weight_list.html:12 -#: core/templates/core/weight_list.html:29 reports/graphs/weight_change.py:19 -#: reports/graphs/weight_change.py:30 -#: reports/templates/reports/report_list.html:22 -#: reports/templates/reports/weight_change.html:4 -#: reports/templates/reports/weight_change.html:8 -msgid "Weight" -msgstr "Peso" - -#: babybuddy/templates/babybuddy/nav-dropdown.html:93 -#: babybuddy/templates/babybuddy/nav-dropdown.html:316 core/models.py:437 -#: core/models.py:438 core/models.py:441 -#: core/templates/core/pumping_confirm_delete.html:7 -#: core/templates/core/pumping_form.html:13 -#: core/templates/core/pumping_list.html:4 -#: core/templates/core/pumping_list.html:7 -#: core/templates/core/pumping_list.html:12 -#: reports/templates/reports/pumping_amounts.html:4 -#: reports/templates/reports/pumping_amounts.html:8 -msgid "Pumping" -msgstr "Extracciones" - -#: babybuddy/templates/babybuddy/nav-dropdown.html:118 +#: babybuddy/templates/babybuddy/nav-dropdown.html:99 #: core/templates/timeline/timeline.html:4 #: core/templates/timeline/timeline.html:7 #: dashboard/templates/dashboard/child_button_group.html:9 msgid "Timeline" msgstr "Cronología" -#: babybuddy/templates/babybuddy/nav-dropdown.html:129 -#: babybuddy/templates/babybuddy/nav-dropdown.html:137 core/models.py:188 +#: babybuddy/templates/babybuddy/nav-dropdown.html:110 +#: babybuddy/templates/babybuddy/nav-dropdown.html:118 core/models.py:188 #: core/templates/core/child_confirm_delete.html:7 #: core/templates/core/child_detail.html:7 #: core/templates/core/child_form.html:13 core/templates/core/child_list.html:4 @@ -324,7 +283,7 @@ msgstr "Cronología" msgid "Children" msgstr "Niños" -#: babybuddy/templates/babybuddy/nav-dropdown.html:143 core/models.py:137 +#: babybuddy/templates/babybuddy/nav-dropdown.html:124 core/models.py:137 #: core/models.py:187 core/models.py:221 core/models.py:274 core/models.py:335 #: core/models.py:367 core/models.py:394 core/models.py:426 core/models.py:450 #: core/models.py:503 core/models.py:537 core/models.py:630 core/models.py:671 @@ -343,7 +302,7 @@ msgstr "Niños" msgid "Child" msgstr "Niño" -#: babybuddy/templates/babybuddy/nav-dropdown.html:151 core/models.py:143 +#: babybuddy/templates/babybuddy/nav-dropdown.html:132 core/models.py:143 #: core/models.py:240 core/models.py:304 core/models.py:343 core/models.py:373 #: core/models.py:408 core/models.py:430 core/models.py:458 core/models.py:511 #: core/models.py:677 core/templates/core/note_confirm_delete.html:7 @@ -352,38 +311,26 @@ msgstr "Niño" msgid "Notes" msgstr "Notas" -#: babybuddy/templates/babybuddy/nav-dropdown.html:171 +#: babybuddy/templates/babybuddy/nav-dropdown.html:152 msgid "Measurements" msgstr "Mediciones" -#: babybuddy/templates/babybuddy/nav-dropdown.html:185 -msgid "Temperature reading" -msgstr "Lectura de temperatura" +#: babybuddy/templates/babybuddy/nav-dropdown.html:160 core/models.py:139 +#: core/models.py:151 core/models.py:152 core/models.py:155 +#: core/templates/core/bmi_confirm_delete.html:7 +#: core/templates/core/bmi_form.html:13 core/templates/core/bmi_list.html:4 +#: core/templates/core/bmi_list.html:7 core/templates/core/bmi_list.html:12 +#: core/templates/core/bmi_list.html:29 reports/graphs/bmi_change.py:19 +#: reports/graphs/bmi_change.py:30 reports/templates/reports/bmi_change.html:4 +#: reports/templates/reports/bmi_change.html:8 +msgid "BMI" +msgstr "IMC" -#: babybuddy/templates/babybuddy/nav-dropdown.html:199 -msgid "Weight entry" -msgstr "Introducir peso" +#: babybuddy/templates/babybuddy/nav-dropdown.html:166 +msgid "BMI entry" +msgstr "Entrada de IMC" -#: babybuddy/templates/babybuddy/nav-dropdown.html:207 core/models.py:369 -#: core/models.py:381 core/models.py:382 core/models.py:385 -#: core/templates/core/height_confirm_delete.html:7 -#: core/templates/core/height_form.html:13 -#: core/templates/core/height_list.html:4 -#: core/templates/core/height_list.html:7 -#: core/templates/core/height_list.html:12 -#: core/templates/core/height_list.html:29 reports/graphs/height_change.py:19 -#: reports/graphs/height_change.py:30 -#: reports/templates/reports/height_change.html:4 -#: reports/templates/reports/height_change.html:8 -#: reports/templates/reports/report_list.html:17 -msgid "Height" -msgstr "Altura" - -#: babybuddy/templates/babybuddy/nav-dropdown.html:213 -msgid "Height entry" -msgstr "Entrada de altura" - -#: babybuddy/templates/babybuddy/nav-dropdown.html:221 core/models.py:338 +#: babybuddy/templates/babybuddy/nav-dropdown.html:174 core/models.py:338 #: core/models.py:351 core/models.py:352 core/models.py:355 #: core/templates/core/head_circumference_confirm_delete.html:7 #: core/templates/core/head_circumference_form.html:13 @@ -399,39 +346,77 @@ msgstr "Entrada de altura" msgid "Head Circumference" msgstr "Perímetro craneal" -#: babybuddy/templates/babybuddy/nav-dropdown.html:227 +#: babybuddy/templates/babybuddy/nav-dropdown.html:180 msgid "Head Circumference entry" msgstr "Entrada de perímetro craneal" -#: babybuddy/templates/babybuddy/nav-dropdown.html:235 core/models.py:139 -#: core/models.py:151 core/models.py:152 core/models.py:155 -#: core/templates/core/bmi_confirm_delete.html:7 -#: core/templates/core/bmi_form.html:13 core/templates/core/bmi_list.html:4 -#: core/templates/core/bmi_list.html:7 core/templates/core/bmi_list.html:12 -#: core/templates/core/bmi_list.html:29 reports/graphs/bmi_change.py:19 -#: reports/graphs/bmi_change.py:30 reports/templates/reports/bmi_change.html:4 -#: reports/templates/reports/bmi_change.html:8 -msgid "BMI" -msgstr "IMC" +#: babybuddy/templates/babybuddy/nav-dropdown.html:188 core/models.py:369 +#: core/models.py:381 core/models.py:382 core/models.py:385 +#: core/templates/core/height_confirm_delete.html:7 +#: core/templates/core/height_form.html:13 +#: core/templates/core/height_list.html:4 +#: core/templates/core/height_list.html:7 +#: core/templates/core/height_list.html:12 +#: core/templates/core/height_list.html:29 reports/graphs/height_change.py:19 +#: reports/graphs/height_change.py:30 +#: reports/templates/reports/height_change.html:4 +#: reports/templates/reports/height_change.html:8 +#: reports/templates/reports/report_list.html:17 +msgid "Height" +msgstr "Altura" -#: babybuddy/templates/babybuddy/nav-dropdown.html:241 -msgid "BMI entry" -msgstr "Entrada de IMC" +#: babybuddy/templates/babybuddy/nav-dropdown.html:194 +msgid "Height entry" +msgstr "Entrada de altura" -#: babybuddy/templates/babybuddy/nav-dropdown.html:255 +#: babybuddy/templates/babybuddy/nav-dropdown.html:202 core/models.py:506 +#: core/models.py:519 core/models.py:520 core/models.py:523 +#: core/templates/core/temperature_confirm_delete.html:7 +#: core/templates/core/temperature_form.html:13 +#: core/templates/core/temperature_list.html:4 +#: core/templates/core/temperature_list.html:7 +#: core/templates/core/temperature_list.html:12 +#: core/templates/core/temperature_list.html:29 +msgid "Temperature" +msgstr "Temperatura" + +#: babybuddy/templates/babybuddy/nav-dropdown.html:208 +msgid "Temperature reading" +msgstr "Lectura de temperatura" + +#: babybuddy/templates/babybuddy/nav-dropdown.html:216 core/models.py:673 +#: core/models.py:685 core/models.py:686 core/models.py:689 +#: core/templates/core/weight_confirm_delete.html:7 +#: core/templates/core/weight_form.html:13 +#: core/templates/core/weight_list.html:4 +#: core/templates/core/weight_list.html:7 +#: core/templates/core/weight_list.html:12 +#: core/templates/core/weight_list.html:29 reports/graphs/weight_change.py:19 +#: reports/graphs/weight_change.py:30 +#: reports/templates/reports/report_list.html:22 +#: reports/templates/reports/weight_change.html:4 +#: reports/templates/reports/weight_change.html:8 +msgid "Weight" +msgstr "Peso" + +#: babybuddy/templates/babybuddy/nav-dropdown.html:222 +msgid "Weight entry" +msgstr "Introducir peso" + +#: babybuddy/templates/babybuddy/nav-dropdown.html:236 msgid "Activities" msgstr "Actividades" -#: babybuddy/templates/babybuddy/nav-dropdown.html:262 +#: babybuddy/templates/babybuddy/nav-dropdown.html:243 #: reports/graphs/diaperchange_lifetimes.py:27 msgid "Changes" msgstr "Cambios" -#: babybuddy/templates/babybuddy/nav-dropdown.html:268 +#: babybuddy/templates/babybuddy/nav-dropdown.html:249 msgid "Change" msgstr "Cambio" -#: babybuddy/templates/babybuddy/nav-dropdown.html:275 +#: babybuddy/templates/babybuddy/nav-dropdown.html:256 #: babybuddy/templates/babybuddy/welcome.html:34 core/models.py:313 #: core/templates/core/feeding_confirm_delete.html:7 #: core/templates/core/feeding_form.html:13 @@ -441,19 +426,31 @@ msgstr "Cambio" msgid "Feedings" msgstr "Tomas" -#: babybuddy/templates/babybuddy/nav-dropdown.html:294 -msgid "Sleep entry" -msgstr "Entrada de sueño" +#: babybuddy/templates/babybuddy/nav-dropdown.html:270 core/models.py:437 +#: core/models.py:438 core/models.py:441 +#: core/templates/core/pumping_confirm_delete.html:7 +#: core/templates/core/pumping_form.html:13 +#: core/templates/core/pumping_list.html:4 +#: core/templates/core/pumping_list.html:7 +#: core/templates/core/pumping_list.html:12 +#: reports/templates/reports/pumping_amounts.html:4 +#: reports/templates/reports/pumping_amounts.html:8 +msgid "Pumping" +msgstr "Extracciones" -#: babybuddy/templates/babybuddy/nav-dropdown.html:307 -msgid "Tummy Time entry" -msgstr "Entrada de tiempo boca abajo" - -#: babybuddy/templates/babybuddy/nav-dropdown.html:322 +#: babybuddy/templates/babybuddy/nav-dropdown.html:276 msgid "Pumping entry" msgstr "Entrada de extracción" -#: babybuddy/templates/babybuddy/nav-dropdown.html:346 +#: babybuddy/templates/babybuddy/nav-dropdown.html:289 +msgid "Sleep entry" +msgstr "Entrada de sueño" + +#: babybuddy/templates/babybuddy/nav-dropdown.html:302 +msgid "Tummy Time entry" +msgstr "Entrada de tiempo boca abajo" + +#: babybuddy/templates/babybuddy/nav-dropdown.html:326 #: babybuddy/templates/babybuddy/user_list.html:17 #: babybuddy/templates/babybuddy/user_password_form.html:7 #: babybuddy/templates/babybuddy/user_settings_form.html:7 core/models.py:556 @@ -461,23 +458,23 @@ msgstr "Entrada de extracción" msgid "User" msgstr "Usuario" -#: babybuddy/templates/babybuddy/nav-dropdown.html:348 +#: babybuddy/templates/babybuddy/nav-dropdown.html:328 msgid "Password" msgstr "Contraseña" -#: babybuddy/templates/babybuddy/nav-dropdown.html:352 +#: babybuddy/templates/babybuddy/nav-dropdown.html:332 msgid "Logout" msgstr "Cerrar sesión" -#: babybuddy/templates/babybuddy/nav-dropdown.html:355 +#: babybuddy/templates/babybuddy/nav-dropdown.html:335 msgid "Site" msgstr "Sitio" -#: babybuddy/templates/babybuddy/nav-dropdown.html:356 +#: babybuddy/templates/babybuddy/nav-dropdown.html:336 msgid "API Browser" msgstr "Navegador API" -#: babybuddy/templates/babybuddy/nav-dropdown.html:358 +#: babybuddy/templates/babybuddy/nav-dropdown.html:338 #: babybuddy/templates/babybuddy/user_confirm_delete.html:7 #: babybuddy/templates/babybuddy/user_form.html:13 #: babybuddy/templates/babybuddy/user_list.html:4 @@ -485,15 +482,15 @@ msgstr "Navegador API" msgid "Users" msgstr "Usuarios" -#: babybuddy/templates/babybuddy/nav-dropdown.html:361 +#: babybuddy/templates/babybuddy/nav-dropdown.html:341 msgid "Support" msgstr "Soporte" -#: babybuddy/templates/babybuddy/nav-dropdown.html:363 +#: babybuddy/templates/babybuddy/nav-dropdown.html:343 msgid "Source Code" msgstr "Código Fuente" -#: babybuddy/templates/babybuddy/nav-dropdown.html:365 +#: babybuddy/templates/babybuddy/nav-dropdown.html:345 msgid "Chat / Support" msgstr "Chat / Soporte" @@ -504,6 +501,7 @@ msgstr "Chat / Soporte" #: core/templates/timeline/_timeline.html:73 #: dashboard/templates/cards/feeding_day.html:43 #: dashboard/templates/cards/feeding_last_method.html:34 +#: dashboard/templates/cards/sleep_recent.html:43 #: dashboard/templates/cards/statistics.html:34 msgid "Previous" msgstr "Anterior" @@ -515,6 +513,7 @@ msgstr "Anterior" #: core/templates/timeline/_timeline.html:80 #: dashboard/templates/cards/feeding_day.html:47 #: dashboard/templates/cards/feeding_last_method.html:38 +#: dashboard/templates/cards/sleep_recent.html:47 #: dashboard/templates/cards/statistics.html:38 msgid "Next" msgstr "Siguiente" @@ -788,7 +787,7 @@ msgstr "Cómo arreglarlo" #, python-format msgid "" "Add %(origin)s to the CSRF_TRUSTED_ORIGINS " -"environment variable. If multiple origins are required separate with commas." +"environment variable. If multiple origins are required separate with commas.\n" msgstr "" "Añade %(origin)s a la variable de entorno " "CSRF_TRUSTED_ORIGINS. Si se requieren orígenes múltiples, " @@ -985,7 +984,7 @@ msgstr "Etiquetas" #: reports/graphs/diaperchange_types.py:49 reports/graphs/feeding_amounts.py:70 #: reports/graphs/feeding_duration.py:56 #: reports/graphs/head_circumference_change.py:28 -#: reports/graphs/height_change.py:28 reports/graphs/pumping_amounts.py:58 +#: reports/graphs/height_change.py:28 reports/graphs/pumping_amounts.py:60 #: reports/graphs/sleep_pattern.py:151 reports/graphs/sleep_totals.py:59 #: reports/graphs/tummytime_duration.py:51 reports/graphs/weight_change.py:28 msgid "Date" @@ -1159,7 +1158,9 @@ msgid "Add BMI" msgstr "Añadir IMC" #: core/templates/core/bmi_list.html:70 -msgid "No bmi entries found." +#, fuzzy +#| msgid "No bmi entries found." +msgid "No BMI entries found." msgstr "No hay entradas de IMC." #: core/templates/core/child_confirm_delete.html:4 @@ -1401,11 +1402,11 @@ msgstr "Eliminar Inactivo" msgid "Are you sure you want to delete %(number)s inactive timer?" msgid_plural "Are you sure you want to delete %(number)s inactive timers?" msgstr[0] "" -"¿Está seguro de que desea eliminar %(number)s temporizador%(plural)s inactivo" -"%(plural)s?" +"¿Está seguro de que desea eliminar %(number)s temporizador%(plural)s " +"inactivo%(plural)s?" msgstr[1] "" -"¿Está seguro de que desea eliminar %(number)s temporizador%(plural)s inactivo" -"%(plural)s?" +"¿Está seguro de que desea eliminar %(number)s temporizador%(plural)s " +"inactivo%(plural)s?" #: core/templates/core/timer_detail.html:28 msgid "Started" @@ -1461,9 +1462,10 @@ msgstr "Temporizadores Activos" #: dashboard/templates/cards/feeding_day.html:52 #: dashboard/templates/cards/feeding_last.html:17 #: dashboard/templates/cards/feeding_last_method.html:43 -#: dashboard/templates/cards/sleep_day.html:14 #: dashboard/templates/cards/sleep_last.html:17 #: dashboard/templates/cards/sleep_naps_day.html:18 +#: dashboard/templates/cards/sleep_recent.html:20 +#: dashboard/templates/cards/sleep_recent.html:52 #: dashboard/templates/cards/tummytime_day.html:14 msgid "None" msgstr "Ninguno" @@ -1581,6 +1583,22 @@ msgstr "{}, {}" msgid "0 days" msgstr "0 días" +#: core/templatetags/duration.py:111 +#: dashboard/templates/cards/diaperchange_types.html:49 +msgid "today" +msgstr "hoy" + +#: core/templatetags/duration.py:113 +#: dashboard/templates/cards/diaperchange_types.html:51 +msgid "yesterday" +msgstr "ayer" + +#: core/templatetags/duration.py:116 +#, fuzzy +#| msgid "%(key)s days ago" +msgid " days ago" +msgstr "hace %(key)s días" + #: core/timeline.py:53 #, python-format msgid "%(child)s started tummy time!" @@ -1719,14 +1737,6 @@ msgstr "mojado" msgid "solid" msgstr "sólido" -#: dashboard/templates/cards/diaperchange_types.html:49 -msgid "today" -msgstr "hoy" - -#: dashboard/templates/cards/diaperchange_types.html:51 -msgid "yesterday" -msgstr "ayer" - #: dashboard/templates/cards/diaperchange_types.html:53 #, python-format msgid "%(key)s days ago" @@ -1745,6 +1755,7 @@ msgstr[0] "%(count)s entradas de sueño" msgstr[1] "%(count)s entradas de sueño" #: dashboard/templates/cards/feeding_day.html:32 +#: dashboard/templates/cards/sleep_recent.html:32 #, python-format msgid "
%(since)s
" msgstr "
%(since)s
" @@ -1769,15 +1780,6 @@ msgid_plural "%(n)s feedings ago" msgstr[0] "hace %(n)s toma%(plural)s" msgstr[1] "hace %(n)s toma%(plural)s" -#: dashboard/templates/cards/sleep_day.html:6 -msgid "Today's Sleep" -msgstr "Sueño Hoy" - -#: dashboard/templates/cards/sleep_day.html:20 -#, python-format -msgid "%(count)s sleep entries" -msgstr "%(count)s entradas de sueño" - #: dashboard/templates/cards/sleep_last.html:6 msgid "Last Sleep" msgstr "Último sueño" @@ -1794,6 +1796,20 @@ msgid_plural "%(count)s naps" msgstr[0] "%(count)s siesta%(plural)s" msgstr[1] "%(count)s siesta%(plural)s" +#: dashboard/templates/cards/sleep_recent.html:6 +#, fuzzy +#| msgid "Last Sleep" +msgid "Recent Sleep" +msgstr "Último sueño" + +#: dashboard/templates/cards/sleep_recent.html:25 +#, fuzzy, python-format +#| msgid "%(count)s sleep entries" +msgid "%(counter)s sleep" +msgid_plural "%(counter)s sleep" +msgstr[0] "%(count)s entradas de sueño" +msgstr[1] "%(count)s entradas de sueño" + #: dashboard/templates/cards/statistics.html:7 msgid "Statistics" msgstr "Estadísticas" @@ -1846,59 +1862,59 @@ msgstr "Acciones de niño" msgid "Reports" msgstr "Reportes" -#: dashboard/templatetags/cards.py:328 +#: dashboard/templatetags/cards.py:357 msgid "Average nap duration" msgstr "Duración media siesta" -#: dashboard/templatetags/cards.py:335 +#: dashboard/templatetags/cards.py:364 msgid "Average naps per day" msgstr "Media de siestas por día" -#: dashboard/templatetags/cards.py:345 +#: dashboard/templatetags/cards.py:374 msgid "Average sleep duration" msgstr "Duración media sueño" -#: dashboard/templatetags/cards.py:352 +#: dashboard/templatetags/cards.py:381 msgid "Average awake duration" msgstr "Duración media despierto" -#: dashboard/templatetags/cards.py:362 +#: dashboard/templatetags/cards.py:391 msgid "Weight change per week" msgstr "Cambio de peso por semana" -#: dashboard/templatetags/cards.py:372 +#: dashboard/templatetags/cards.py:401 msgid "Height change per week" msgstr "Cambio de altura por semana" -#: dashboard/templatetags/cards.py:382 +#: dashboard/templatetags/cards.py:411 msgid "Head circumference change per week" msgstr "Cambio de perímetro craneal por semana" -#: dashboard/templatetags/cards.py:392 +#: dashboard/templatetags/cards.py:421 msgid "BMI change per week" msgstr "Cambio de IMC por semana" -#: dashboard/templatetags/cards.py:410 +#: dashboard/templatetags/cards.py:439 msgid "Diaper change frequency (past 3 days)" msgstr "Frecuencia de pañales (últimos 3 días)" -#: dashboard/templatetags/cards.py:414 +#: dashboard/templatetags/cards.py:443 msgid "Diaper change frequency (past 2 weeks)" msgstr "Frecuencia de pañales (últimas 2 semanas)" -#: dashboard/templatetags/cards.py:420 +#: dashboard/templatetags/cards.py:449 msgid "Diaper change frequency" msgstr "Frecuencia de cambio de pañal" -#: dashboard/templatetags/cards.py:456 +#: dashboard/templatetags/cards.py:485 msgid "Feeding frequency (past 3 days)" msgstr "Frecuenca de tomas (últimos 3 días)" -#: dashboard/templatetags/cards.py:460 +#: dashboard/templatetags/cards.py:489 msgid "Feeding frequency (past 2 weeks)" msgstr "Frecuenca de tomas (últimas 2 semanas)" -#: dashboard/templatetags/cards.py:466 +#: dashboard/templatetags/cards.py:495 msgid "Feeding frequency" msgstr "Frecuencia de tomas" @@ -1974,11 +1990,11 @@ msgstr "Perímetro craneal" msgid "Height" msgstr "Altura" -#: reports/graphs/pumping_amounts.py:57 +#: reports/graphs/pumping_amounts.py:59 msgid "Total Pumping Amount" msgstr "Cantidad total extraída" -#: reports/graphs/pumping_amounts.py:60 +#: reports/graphs/pumping_amounts.py:62 msgid "Pumping Amount" msgstr "Cantidad de extracción" @@ -2092,6 +2108,13 @@ msgstr "Tiempo Boca Abajo (Suma)" msgid "Total Tummy Time Durations" msgstr "Duración Total Tiempo Boca Abajo" +#~ msgid "Today's Sleep" +#~ msgstr "Sueño Hoy" + +#, python-format +#~ msgid "%(count)s sleep entries" +#~ msgstr "%(count)s entradas de sueño" + #~ msgid "" #~ "This setting will only be used when a browser does not support refresh on " #~ "focus." diff --git a/locale/fi/LC_MESSAGES/django.mo b/locale/fi/LC_MESSAGES/django.mo index c2978d53..99173f45 100644 Binary files a/locale/fi/LC_MESSAGES/django.mo and b/locale/fi/LC_MESSAGES/django.mo differ diff --git a/locale/fi/LC_MESSAGES/django.po b/locale/fi/LC_MESSAGES/django.po index e9010006..29f23318 100644 --- a/locale/fi/LC_MESSAGES/django.po +++ b/locale/fi/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Baby Buddy\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-06-05 13:25+0000\n" +"POT-Creation-Date: 2022-06-17 22:25+0000\n" "Language: fi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -11,12 +11,12 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: babybuddy/admin.py:12 babybuddy/admin.py:13 -#: babybuddy/templates/babybuddy/nav-dropdown.html:347 +#: babybuddy/templates/babybuddy/nav-dropdown.html:327 #: babybuddy/templates/babybuddy/user_settings_form.html:8 msgid "Settings" msgstr "Asetukset" -#: babybuddy/admin.py:17 babybuddy/templates/babybuddy/nav-dropdown.html:111 +#: babybuddy/admin.py:17 babybuddy/templates/babybuddy/nav-dropdown.html:92 #: babybuddy/templates/babybuddy/user_settings_form.html:61 #: dashboard/templates/dashboard/child.html:4 #: dashboard/templates/dashboard/child.html:9 @@ -179,7 +179,7 @@ msgstr "turkki" #: babybuddy/templates/admin/base_site.html:4 #: babybuddy/templates/admin/base_site.html:7 -#: babybuddy/templates/babybuddy/nav-dropdown.html:359 +#: babybuddy/templates/babybuddy/nav-dropdown.html:339 msgid "Database Admin" msgstr "Tietokantahallinta" @@ -227,19 +227,19 @@ msgid "Diaper Change" msgstr "Vaipanvaihto" #: babybuddy/templates/babybuddy/nav-dropdown.html:57 -#: babybuddy/templates/babybuddy/nav-dropdown.html:281 core/models.py:312 +#: babybuddy/templates/babybuddy/nav-dropdown.html:262 core/models.py:312 #: core/models.py:316 core/templates/core/timer_detail.html:43 msgid "Feeding" msgstr "Syöttö" #: babybuddy/templates/babybuddy/nav-dropdown.html:63 -#: babybuddy/templates/babybuddy/nav-dropdown.html:157 core/models.py:396 +#: babybuddy/templates/babybuddy/nav-dropdown.html:138 core/models.py:396 #: core/models.py:407 core/models.py:411 core/templates/core/note_list.html:29 msgid "Note" msgstr "Muistiinpano" #: babybuddy/templates/babybuddy/nav-dropdown.html:69 -#: babybuddy/templates/babybuddy/nav-dropdown.html:288 +#: babybuddy/templates/babybuddy/nav-dropdown.html:283 #: babybuddy/templates/babybuddy/welcome.html:42 core/models.py:467 #: core/models.py:468 core/models.py:471 #: core/templates/core/sleep_confirm_delete.html:7 @@ -250,19 +250,7 @@ msgid "Sleep" msgstr "Uni" #: babybuddy/templates/babybuddy/nav-dropdown.html:75 -#: babybuddy/templates/babybuddy/nav-dropdown.html:179 core/models.py:506 -#: core/models.py:519 core/models.py:520 core/models.py:523 -#: core/templates/core/temperature_confirm_delete.html:7 -#: core/templates/core/temperature_form.html:13 -#: core/templates/core/temperature_list.html:4 -#: core/templates/core/temperature_list.html:7 -#: core/templates/core/temperature_list.html:12 -#: core/templates/core/temperature_list.html:29 -msgid "Temperature" -msgstr "Lämpötila" - -#: babybuddy/templates/babybuddy/nav-dropdown.html:81 -#: babybuddy/templates/babybuddy/nav-dropdown.html:301 +#: babybuddy/templates/babybuddy/nav-dropdown.html:296 #: babybuddy/templates/babybuddy/welcome.html:50 core/models.py:647 #: core/models.py:648 core/models.py:651 #: core/templates/core/timer_detail.html:59 @@ -274,44 +262,15 @@ msgstr "Lämpötila" msgid "Tummy Time" msgstr "Ihokontakti" -#: babybuddy/templates/babybuddy/nav-dropdown.html:87 -#: babybuddy/templates/babybuddy/nav-dropdown.html:193 core/models.py:673 -#: core/models.py:685 core/models.py:686 core/models.py:689 -#: core/templates/core/weight_confirm_delete.html:7 -#: core/templates/core/weight_form.html:13 -#: core/templates/core/weight_list.html:4 -#: core/templates/core/weight_list.html:7 -#: core/templates/core/weight_list.html:12 -#: core/templates/core/weight_list.html:29 reports/graphs/weight_change.py:19 -#: reports/graphs/weight_change.py:30 -#: reports/templates/reports/report_list.html:22 -#: reports/templates/reports/weight_change.html:4 -#: reports/templates/reports/weight_change.html:8 -msgid "Weight" -msgstr "Paino" - -#: babybuddy/templates/babybuddy/nav-dropdown.html:93 -#: babybuddy/templates/babybuddy/nav-dropdown.html:316 core/models.py:437 -#: core/models.py:438 core/models.py:441 -#: core/templates/core/pumping_confirm_delete.html:7 -#: core/templates/core/pumping_form.html:13 -#: core/templates/core/pumping_list.html:4 -#: core/templates/core/pumping_list.html:7 -#: core/templates/core/pumping_list.html:12 -#: reports/templates/reports/pumping_amounts.html:4 -#: reports/templates/reports/pumping_amounts.html:8 -msgid "Pumping" -msgstr "" - -#: babybuddy/templates/babybuddy/nav-dropdown.html:118 +#: babybuddy/templates/babybuddy/nav-dropdown.html:99 #: core/templates/timeline/timeline.html:4 #: core/templates/timeline/timeline.html:7 #: dashboard/templates/dashboard/child_button_group.html:9 msgid "Timeline" msgstr "" -#: babybuddy/templates/babybuddy/nav-dropdown.html:129 -#: babybuddy/templates/babybuddy/nav-dropdown.html:137 core/models.py:188 +#: babybuddy/templates/babybuddy/nav-dropdown.html:110 +#: babybuddy/templates/babybuddy/nav-dropdown.html:118 core/models.py:188 #: core/templates/core/child_confirm_delete.html:7 #: core/templates/core/child_detail.html:7 #: core/templates/core/child_form.html:13 core/templates/core/child_list.html:4 @@ -321,7 +280,7 @@ msgstr "" msgid "Children" msgstr "Lapset" -#: babybuddy/templates/babybuddy/nav-dropdown.html:143 core/models.py:137 +#: babybuddy/templates/babybuddy/nav-dropdown.html:124 core/models.py:137 #: core/models.py:187 core/models.py:221 core/models.py:274 core/models.py:335 #: core/models.py:367 core/models.py:394 core/models.py:426 core/models.py:450 #: core/models.py:503 core/models.py:537 core/models.py:630 core/models.py:671 @@ -340,7 +299,7 @@ msgstr "Lapset" msgid "Child" msgstr "Lapsi" -#: babybuddy/templates/babybuddy/nav-dropdown.html:151 core/models.py:143 +#: babybuddy/templates/babybuddy/nav-dropdown.html:132 core/models.py:143 #: core/models.py:240 core/models.py:304 core/models.py:343 core/models.py:373 #: core/models.py:408 core/models.py:430 core/models.py:458 core/models.py:511 #: core/models.py:677 core/templates/core/note_confirm_delete.html:7 @@ -349,38 +308,26 @@ msgstr "Lapsi" msgid "Notes" msgstr "Muistiinpanot" -#: babybuddy/templates/babybuddy/nav-dropdown.html:171 +#: babybuddy/templates/babybuddy/nav-dropdown.html:152 msgid "Measurements" msgstr "" -#: babybuddy/templates/babybuddy/nav-dropdown.html:185 -msgid "Temperature reading" -msgstr "Lämpötilalukema" - -#: babybuddy/templates/babybuddy/nav-dropdown.html:199 -msgid "Weight entry" -msgstr "Painomerkintä" - -#: babybuddy/templates/babybuddy/nav-dropdown.html:207 core/models.py:369 -#: core/models.py:381 core/models.py:382 core/models.py:385 -#: core/templates/core/height_confirm_delete.html:7 -#: core/templates/core/height_form.html:13 -#: core/templates/core/height_list.html:4 -#: core/templates/core/height_list.html:7 -#: core/templates/core/height_list.html:12 -#: core/templates/core/height_list.html:29 reports/graphs/height_change.py:19 -#: reports/graphs/height_change.py:30 -#: reports/templates/reports/height_change.html:4 -#: reports/templates/reports/height_change.html:8 -#: reports/templates/reports/report_list.html:17 -msgid "Height" +#: babybuddy/templates/babybuddy/nav-dropdown.html:160 core/models.py:139 +#: core/models.py:151 core/models.py:152 core/models.py:155 +#: core/templates/core/bmi_confirm_delete.html:7 +#: core/templates/core/bmi_form.html:13 core/templates/core/bmi_list.html:4 +#: core/templates/core/bmi_list.html:7 core/templates/core/bmi_list.html:12 +#: core/templates/core/bmi_list.html:29 reports/graphs/bmi_change.py:19 +#: reports/graphs/bmi_change.py:30 reports/templates/reports/bmi_change.html:4 +#: reports/templates/reports/bmi_change.html:8 +msgid "BMI" msgstr "" -#: babybuddy/templates/babybuddy/nav-dropdown.html:213 -msgid "Height entry" +#: babybuddy/templates/babybuddy/nav-dropdown.html:166 +msgid "BMI entry" msgstr "" -#: babybuddy/templates/babybuddy/nav-dropdown.html:221 core/models.py:338 +#: babybuddy/templates/babybuddy/nav-dropdown.html:174 core/models.py:338 #: core/models.py:351 core/models.py:352 core/models.py:355 #: core/templates/core/head_circumference_confirm_delete.html:7 #: core/templates/core/head_circumference_form.html:13 @@ -396,39 +343,77 @@ msgstr "" msgid "Head Circumference" msgstr "" -#: babybuddy/templates/babybuddy/nav-dropdown.html:227 +#: babybuddy/templates/babybuddy/nav-dropdown.html:180 msgid "Head Circumference entry" msgstr "" -#: babybuddy/templates/babybuddy/nav-dropdown.html:235 core/models.py:139 -#: core/models.py:151 core/models.py:152 core/models.py:155 -#: core/templates/core/bmi_confirm_delete.html:7 -#: core/templates/core/bmi_form.html:13 core/templates/core/bmi_list.html:4 -#: core/templates/core/bmi_list.html:7 core/templates/core/bmi_list.html:12 -#: core/templates/core/bmi_list.html:29 reports/graphs/bmi_change.py:19 -#: reports/graphs/bmi_change.py:30 reports/templates/reports/bmi_change.html:4 -#: reports/templates/reports/bmi_change.html:8 -msgid "BMI" +#: babybuddy/templates/babybuddy/nav-dropdown.html:188 core/models.py:369 +#: core/models.py:381 core/models.py:382 core/models.py:385 +#: core/templates/core/height_confirm_delete.html:7 +#: core/templates/core/height_form.html:13 +#: core/templates/core/height_list.html:4 +#: core/templates/core/height_list.html:7 +#: core/templates/core/height_list.html:12 +#: core/templates/core/height_list.html:29 reports/graphs/height_change.py:19 +#: reports/graphs/height_change.py:30 +#: reports/templates/reports/height_change.html:4 +#: reports/templates/reports/height_change.html:8 +#: reports/templates/reports/report_list.html:17 +msgid "Height" msgstr "" -#: babybuddy/templates/babybuddy/nav-dropdown.html:241 -msgid "BMI entry" +#: babybuddy/templates/babybuddy/nav-dropdown.html:194 +msgid "Height entry" msgstr "" -#: babybuddy/templates/babybuddy/nav-dropdown.html:255 +#: babybuddy/templates/babybuddy/nav-dropdown.html:202 core/models.py:506 +#: core/models.py:519 core/models.py:520 core/models.py:523 +#: core/templates/core/temperature_confirm_delete.html:7 +#: core/templates/core/temperature_form.html:13 +#: core/templates/core/temperature_list.html:4 +#: core/templates/core/temperature_list.html:7 +#: core/templates/core/temperature_list.html:12 +#: core/templates/core/temperature_list.html:29 +msgid "Temperature" +msgstr "Lämpötila" + +#: babybuddy/templates/babybuddy/nav-dropdown.html:208 +msgid "Temperature reading" +msgstr "Lämpötilalukema" + +#: babybuddy/templates/babybuddy/nav-dropdown.html:216 core/models.py:673 +#: core/models.py:685 core/models.py:686 core/models.py:689 +#: core/templates/core/weight_confirm_delete.html:7 +#: core/templates/core/weight_form.html:13 +#: core/templates/core/weight_list.html:4 +#: core/templates/core/weight_list.html:7 +#: core/templates/core/weight_list.html:12 +#: core/templates/core/weight_list.html:29 reports/graphs/weight_change.py:19 +#: reports/graphs/weight_change.py:30 +#: reports/templates/reports/report_list.html:22 +#: reports/templates/reports/weight_change.html:4 +#: reports/templates/reports/weight_change.html:8 +msgid "Weight" +msgstr "Paino" + +#: babybuddy/templates/babybuddy/nav-dropdown.html:222 +msgid "Weight entry" +msgstr "Painomerkintä" + +#: babybuddy/templates/babybuddy/nav-dropdown.html:236 msgid "Activities" msgstr "Aktiviteetit" -#: babybuddy/templates/babybuddy/nav-dropdown.html:262 +#: babybuddy/templates/babybuddy/nav-dropdown.html:243 #: reports/graphs/diaperchange_lifetimes.py:27 msgid "Changes" msgstr "Muutokset" -#: babybuddy/templates/babybuddy/nav-dropdown.html:268 +#: babybuddy/templates/babybuddy/nav-dropdown.html:249 msgid "Change" msgstr "Muutos" -#: babybuddy/templates/babybuddy/nav-dropdown.html:275 +#: babybuddy/templates/babybuddy/nav-dropdown.html:256 #: babybuddy/templates/babybuddy/welcome.html:34 core/models.py:313 #: core/templates/core/feeding_confirm_delete.html:7 #: core/templates/core/feeding_form.html:13 @@ -438,19 +423,31 @@ msgstr "Muutos" msgid "Feedings" msgstr "Syötöt" -#: babybuddy/templates/babybuddy/nav-dropdown.html:294 -msgid "Sleep entry" -msgstr "Unimerkintä" +#: babybuddy/templates/babybuddy/nav-dropdown.html:270 core/models.py:437 +#: core/models.py:438 core/models.py:441 +#: core/templates/core/pumping_confirm_delete.html:7 +#: core/templates/core/pumping_form.html:13 +#: core/templates/core/pumping_list.html:4 +#: core/templates/core/pumping_list.html:7 +#: core/templates/core/pumping_list.html:12 +#: reports/templates/reports/pumping_amounts.html:4 +#: reports/templates/reports/pumping_amounts.html:8 +msgid "Pumping" +msgstr "" -#: babybuddy/templates/babybuddy/nav-dropdown.html:307 -msgid "Tummy Time entry" -msgstr "Ihokontakti" - -#: babybuddy/templates/babybuddy/nav-dropdown.html:322 +#: babybuddy/templates/babybuddy/nav-dropdown.html:276 msgid "Pumping entry" msgstr "" -#: babybuddy/templates/babybuddy/nav-dropdown.html:346 +#: babybuddy/templates/babybuddy/nav-dropdown.html:289 +msgid "Sleep entry" +msgstr "Unimerkintä" + +#: babybuddy/templates/babybuddy/nav-dropdown.html:302 +msgid "Tummy Time entry" +msgstr "Ihokontakti" + +#: babybuddy/templates/babybuddy/nav-dropdown.html:326 #: babybuddy/templates/babybuddy/user_list.html:17 #: babybuddy/templates/babybuddy/user_password_form.html:7 #: babybuddy/templates/babybuddy/user_settings_form.html:7 core/models.py:556 @@ -458,23 +455,23 @@ msgstr "" msgid "User" msgstr "Käyttäjä" -#: babybuddy/templates/babybuddy/nav-dropdown.html:348 +#: babybuddy/templates/babybuddy/nav-dropdown.html:328 msgid "Password" msgstr "Salasana" -#: babybuddy/templates/babybuddy/nav-dropdown.html:352 +#: babybuddy/templates/babybuddy/nav-dropdown.html:332 msgid "Logout" msgstr "Kirjaudu ulos" -#: babybuddy/templates/babybuddy/nav-dropdown.html:355 +#: babybuddy/templates/babybuddy/nav-dropdown.html:335 msgid "Site" msgstr "Sivusto" -#: babybuddy/templates/babybuddy/nav-dropdown.html:356 +#: babybuddy/templates/babybuddy/nav-dropdown.html:336 msgid "API Browser" msgstr "API-selain" -#: babybuddy/templates/babybuddy/nav-dropdown.html:358 +#: babybuddy/templates/babybuddy/nav-dropdown.html:338 #: babybuddy/templates/babybuddy/user_confirm_delete.html:7 #: babybuddy/templates/babybuddy/user_form.html:13 #: babybuddy/templates/babybuddy/user_list.html:4 @@ -482,15 +479,15 @@ msgstr "API-selain" msgid "Users" msgstr "Käyttäjät" -#: babybuddy/templates/babybuddy/nav-dropdown.html:361 +#: babybuddy/templates/babybuddy/nav-dropdown.html:341 msgid "Support" msgstr "Tuki" -#: babybuddy/templates/babybuddy/nav-dropdown.html:363 +#: babybuddy/templates/babybuddy/nav-dropdown.html:343 msgid "Source Code" msgstr "Lähdekoodi" -#: babybuddy/templates/babybuddy/nav-dropdown.html:365 +#: babybuddy/templates/babybuddy/nav-dropdown.html:345 msgid "Chat / Support" msgstr "Chat / tuki" @@ -501,6 +498,7 @@ msgstr "Chat / tuki" #: core/templates/timeline/_timeline.html:73 #: dashboard/templates/cards/feeding_day.html:43 #: dashboard/templates/cards/feeding_last_method.html:34 +#: dashboard/templates/cards/sleep_recent.html:43 #: dashboard/templates/cards/statistics.html:34 msgid "Previous" msgstr "Edellinen" @@ -512,6 +510,7 @@ msgstr "Edellinen" #: core/templates/timeline/_timeline.html:80 #: dashboard/templates/cards/feeding_day.html:47 #: dashboard/templates/cards/feeding_last_method.html:38 +#: dashboard/templates/cards/sleep_recent.html:47 #: dashboard/templates/cards/statistics.html:38 msgid "Next" msgstr "Seuraava" @@ -973,7 +972,7 @@ msgstr "" #: reports/graphs/diaperchange_types.py:49 reports/graphs/feeding_amounts.py:70 #: reports/graphs/feeding_duration.py:56 #: reports/graphs/head_circumference_change.py:28 -#: reports/graphs/height_change.py:28 reports/graphs/pumping_amounts.py:58 +#: reports/graphs/height_change.py:28 reports/graphs/pumping_amounts.py:60 #: reports/graphs/sleep_pattern.py:151 reports/graphs/sleep_totals.py:59 #: reports/graphs/tummytime_duration.py:51 reports/graphs/weight_change.py:28 msgid "Date" @@ -1147,8 +1146,10 @@ msgid "Add BMI" msgstr "" #: core/templates/core/bmi_list.html:70 -msgid "No bmi entries found." -msgstr "" +#, fuzzy +#| msgid "No sleep entries found." +msgid "No BMI entries found." +msgstr "Unia ei löytynyt." #: core/templates/core/child_confirm_delete.html:4 msgid "Delete a Child" @@ -1445,9 +1446,10 @@ msgstr "Aktiiviset ajastimet" #: dashboard/templates/cards/feeding_day.html:52 #: dashboard/templates/cards/feeding_last.html:17 #: dashboard/templates/cards/feeding_last_method.html:43 -#: dashboard/templates/cards/sleep_day.html:14 #: dashboard/templates/cards/sleep_last.html:17 #: dashboard/templates/cards/sleep_naps_day.html:18 +#: dashboard/templates/cards/sleep_recent.html:20 +#: dashboard/templates/cards/sleep_recent.html:52 #: dashboard/templates/cards/tummytime_day.html:14 msgid "None" msgstr "Ei mitään" @@ -1565,6 +1567,22 @@ msgstr "" msgid "0 days" msgstr "" +#: core/templatetags/duration.py:111 +#: dashboard/templates/cards/diaperchange_types.html:49 +msgid "today" +msgstr "tänään" + +#: core/templatetags/duration.py:113 +#: dashboard/templates/cards/diaperchange_types.html:51 +msgid "yesterday" +msgstr "eilen" + +#: core/templatetags/duration.py:116 +#, fuzzy +#| msgid "%(key)s days ago" +msgid " days ago" +msgstr "%(key)s päivää sitten" + #: core/timeline.py:53 #, python-format msgid "%(child)s started tummy time!" @@ -1703,14 +1721,6 @@ msgstr "märkä" msgid "solid" msgstr "kiinteä" -#: dashboard/templates/cards/diaperchange_types.html:49 -msgid "today" -msgstr "tänään" - -#: dashboard/templates/cards/diaperchange_types.html:51 -msgid "yesterday" -msgstr "eilen" - #: dashboard/templates/cards/diaperchange_types.html:53 #, python-format msgid "%(key)s days ago" @@ -1729,6 +1739,7 @@ msgstr[0] "%(count)s unimerkintä" msgstr[1] "%(count)s unimerkintä" #: dashboard/templates/cards/feeding_day.html:32 +#: dashboard/templates/cards/sleep_recent.html:32 #, python-format msgid "
%(since)s
" msgstr "" @@ -1753,15 +1764,6 @@ msgid_plural "%(n)s feedings ago" msgstr[0] "%(n)s syöttöä%(plural)s sitten" msgstr[1] "%(n)s syöttöä%(plural)s sitten" -#: dashboard/templates/cards/sleep_day.html:6 -msgid "Today's Sleep" -msgstr "Uni tänään" - -#: dashboard/templates/cards/sleep_day.html:20 -#, python-format -msgid "%(count)s sleep entries" -msgstr "%(count)s unimerkintä" - #: dashboard/templates/cards/sleep_last.html:6 msgid "Last Sleep" msgstr "Edellinen uni" @@ -1778,6 +1780,20 @@ msgid_plural "%(count)s naps" msgstr[0] "%(count)s unimerkintä" msgstr[1] "%(count)s unimerkintä" +#: dashboard/templates/cards/sleep_recent.html:6 +#, fuzzy +#| msgid "Last Sleep" +msgid "Recent Sleep" +msgstr "Edellinen uni" + +#: dashboard/templates/cards/sleep_recent.html:25 +#, fuzzy, python-format +#| msgid "%(count)s sleep entries" +msgid "%(counter)s sleep" +msgid_plural "%(counter)s sleep" +msgstr[0] "%(count)s unimerkintä" +msgstr[1] "%(count)s unimerkintä" + #: dashboard/templates/cards/statistics.html:7 msgid "Statistics" msgstr "Tilastot" @@ -1830,59 +1846,59 @@ msgstr "Lapsen toiminnot" msgid "Reports" msgstr "Raportit" -#: dashboard/templatetags/cards.py:328 +#: dashboard/templatetags/cards.py:357 msgid "Average nap duration" msgstr "Päiväunen kesto keskimäärin" -#: dashboard/templatetags/cards.py:335 +#: dashboard/templatetags/cards.py:364 msgid "Average naps per day" msgstr "Päiväunia päivässä" -#: dashboard/templatetags/cards.py:345 +#: dashboard/templatetags/cards.py:374 msgid "Average sleep duration" msgstr "Unen kesto keskimäärin" -#: dashboard/templatetags/cards.py:352 +#: dashboard/templatetags/cards.py:381 msgid "Average awake duration" msgstr "Hereilläoloaika keskimäärin" -#: dashboard/templatetags/cards.py:362 +#: dashboard/templatetags/cards.py:391 msgid "Weight change per week" msgstr "Painonmuutos viikossa" -#: dashboard/templatetags/cards.py:372 +#: dashboard/templatetags/cards.py:401 msgid "Height change per week" msgstr "" -#: dashboard/templatetags/cards.py:382 +#: dashboard/templatetags/cards.py:411 msgid "Head circumference change per week" msgstr "" -#: dashboard/templatetags/cards.py:392 +#: dashboard/templatetags/cards.py:421 msgid "BMI change per week" msgstr "" -#: dashboard/templatetags/cards.py:410 +#: dashboard/templatetags/cards.py:439 msgid "Diaper change frequency (past 3 days)" msgstr "Vaipanvaihtotaajuus (past 3 days)" -#: dashboard/templatetags/cards.py:414 +#: dashboard/templatetags/cards.py:443 msgid "Diaper change frequency (past 2 weeks)" msgstr "Vaipanvaihtotaajuus (past 2 weeks)" -#: dashboard/templatetags/cards.py:420 +#: dashboard/templatetags/cards.py:449 msgid "Diaper change frequency" msgstr "Vaipanvaihtotaajuus" -#: dashboard/templatetags/cards.py:456 +#: dashboard/templatetags/cards.py:485 msgid "Feeding frequency (past 3 days)" msgstr "" -#: dashboard/templatetags/cards.py:460 +#: dashboard/templatetags/cards.py:489 msgid "Feeding frequency (past 2 weeks)" msgstr "" -#: dashboard/templatetags/cards.py:466 +#: dashboard/templatetags/cards.py:495 msgid "Feeding frequency" msgstr "Syöttötaajuus" @@ -1958,11 +1974,11 @@ msgstr "" msgid "Height" msgstr "" -#: reports/graphs/pumping_amounts.py:57 +#: reports/graphs/pumping_amounts.py:59 msgid "Total Pumping Amount" msgstr "" -#: reports/graphs/pumping_amounts.py:60 +#: reports/graphs/pumping_amounts.py:62 msgid "Pumping Amount" msgstr "" @@ -2075,3 +2091,10 @@ msgstr "" #: reports/templates/reports/tummytime_duration.html:8 msgid "Total Tummy Time Durations" msgstr "" + +#~ msgid "Today's Sleep" +#~ msgstr "Uni tänään" + +#, python-format +#~ msgid "%(count)s sleep entries" +#~ msgstr "%(count)s unimerkintä" diff --git a/locale/fr/LC_MESSAGES/django.mo b/locale/fr/LC_MESSAGES/django.mo index afcd4ac9..fff13d5b 100644 Binary files a/locale/fr/LC_MESSAGES/django.mo and b/locale/fr/LC_MESSAGES/django.mo differ diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index c100fb37..85399e67 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Baby Buddy\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-06-05 13:25+0000\n" +"POT-Creation-Date: 2022-06-17 22:25+0000\n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -11,12 +11,12 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #: babybuddy/admin.py:12 babybuddy/admin.py:13 -#: babybuddy/templates/babybuddy/nav-dropdown.html:347 +#: babybuddy/templates/babybuddy/nav-dropdown.html:327 #: babybuddy/templates/babybuddy/user_settings_form.html:8 msgid "Settings" msgstr "Paramètres" -#: babybuddy/admin.py:17 babybuddy/templates/babybuddy/nav-dropdown.html:111 +#: babybuddy/admin.py:17 babybuddy/templates/babybuddy/nav-dropdown.html:92 #: babybuddy/templates/babybuddy/user_settings_form.html:61 #: dashboard/templates/dashboard/child.html:4 #: dashboard/templates/dashboard/child.html:9 @@ -187,7 +187,7 @@ msgstr "Turc" #: babybuddy/templates/admin/base_site.html:4 #: babybuddy/templates/admin/base_site.html:7 -#: babybuddy/templates/babybuddy/nav-dropdown.html:359 +#: babybuddy/templates/babybuddy/nav-dropdown.html:339 msgid "Database Admin" msgstr "Base de Données" @@ -236,19 +236,19 @@ msgid "Diaper Change" msgstr "Changement de couche" #: babybuddy/templates/babybuddy/nav-dropdown.html:57 -#: babybuddy/templates/babybuddy/nav-dropdown.html:281 core/models.py:312 +#: babybuddy/templates/babybuddy/nav-dropdown.html:262 core/models.py:312 #: core/models.py:316 core/templates/core/timer_detail.html:43 msgid "Feeding" msgstr "Allaitement" #: babybuddy/templates/babybuddy/nav-dropdown.html:63 -#: babybuddy/templates/babybuddy/nav-dropdown.html:157 core/models.py:396 +#: babybuddy/templates/babybuddy/nav-dropdown.html:138 core/models.py:396 #: core/models.py:407 core/models.py:411 core/templates/core/note_list.html:29 msgid "Note" msgstr "Note" #: babybuddy/templates/babybuddy/nav-dropdown.html:69 -#: babybuddy/templates/babybuddy/nav-dropdown.html:288 +#: babybuddy/templates/babybuddy/nav-dropdown.html:283 #: babybuddy/templates/babybuddy/welcome.html:42 core/models.py:467 #: core/models.py:468 core/models.py:471 #: core/templates/core/sleep_confirm_delete.html:7 @@ -259,19 +259,7 @@ msgid "Sleep" msgstr "Sommeil" #: babybuddy/templates/babybuddy/nav-dropdown.html:75 -#: babybuddy/templates/babybuddy/nav-dropdown.html:179 core/models.py:506 -#: core/models.py:519 core/models.py:520 core/models.py:523 -#: core/templates/core/temperature_confirm_delete.html:7 -#: core/templates/core/temperature_form.html:13 -#: core/templates/core/temperature_list.html:4 -#: core/templates/core/temperature_list.html:7 -#: core/templates/core/temperature_list.html:12 -#: core/templates/core/temperature_list.html:29 -msgid "Temperature" -msgstr "Température" - -#: babybuddy/templates/babybuddy/nav-dropdown.html:81 -#: babybuddy/templates/babybuddy/nav-dropdown.html:301 +#: babybuddy/templates/babybuddy/nav-dropdown.html:296 #: babybuddy/templates/babybuddy/welcome.html:50 core/models.py:647 #: core/models.py:648 core/models.py:651 #: core/templates/core/timer_detail.html:59 @@ -283,44 +271,15 @@ msgstr "Température" msgid "Tummy Time" msgstr "Motricité libre" -#: babybuddy/templates/babybuddy/nav-dropdown.html:87 -#: babybuddy/templates/babybuddy/nav-dropdown.html:193 core/models.py:673 -#: core/models.py:685 core/models.py:686 core/models.py:689 -#: core/templates/core/weight_confirm_delete.html:7 -#: core/templates/core/weight_form.html:13 -#: core/templates/core/weight_list.html:4 -#: core/templates/core/weight_list.html:7 -#: core/templates/core/weight_list.html:12 -#: core/templates/core/weight_list.html:29 reports/graphs/weight_change.py:19 -#: reports/graphs/weight_change.py:30 -#: reports/templates/reports/report_list.html:22 -#: reports/templates/reports/weight_change.html:4 -#: reports/templates/reports/weight_change.html:8 -msgid "Weight" -msgstr "Poids" - -#: babybuddy/templates/babybuddy/nav-dropdown.html:93 -#: babybuddy/templates/babybuddy/nav-dropdown.html:316 core/models.py:437 -#: core/models.py:438 core/models.py:441 -#: core/templates/core/pumping_confirm_delete.html:7 -#: core/templates/core/pumping_form.html:13 -#: core/templates/core/pumping_list.html:4 -#: core/templates/core/pumping_list.html:7 -#: core/templates/core/pumping_list.html:12 -#: reports/templates/reports/pumping_amounts.html:4 -#: reports/templates/reports/pumping_amounts.html:8 -msgid "Pumping" -msgstr "" - -#: babybuddy/templates/babybuddy/nav-dropdown.html:118 +#: babybuddy/templates/babybuddy/nav-dropdown.html:99 #: core/templates/timeline/timeline.html:4 #: core/templates/timeline/timeline.html:7 #: dashboard/templates/dashboard/child_button_group.html:9 msgid "Timeline" msgstr "Chronologie" -#: babybuddy/templates/babybuddy/nav-dropdown.html:129 -#: babybuddy/templates/babybuddy/nav-dropdown.html:137 core/models.py:188 +#: babybuddy/templates/babybuddy/nav-dropdown.html:110 +#: babybuddy/templates/babybuddy/nav-dropdown.html:118 core/models.py:188 #: core/templates/core/child_confirm_delete.html:7 #: core/templates/core/child_detail.html:7 #: core/templates/core/child_form.html:13 core/templates/core/child_list.html:4 @@ -330,7 +289,7 @@ msgstr "Chronologie" msgid "Children" msgstr "Enfants" -#: babybuddy/templates/babybuddy/nav-dropdown.html:143 core/models.py:137 +#: babybuddy/templates/babybuddy/nav-dropdown.html:124 core/models.py:137 #: core/models.py:187 core/models.py:221 core/models.py:274 core/models.py:335 #: core/models.py:367 core/models.py:394 core/models.py:426 core/models.py:450 #: core/models.py:503 core/models.py:537 core/models.py:630 core/models.py:671 @@ -349,7 +308,7 @@ msgstr "Enfants" msgid "Child" msgstr "Nouvel enfant" -#: babybuddy/templates/babybuddy/nav-dropdown.html:151 core/models.py:143 +#: babybuddy/templates/babybuddy/nav-dropdown.html:132 core/models.py:143 #: core/models.py:240 core/models.py:304 core/models.py:343 core/models.py:373 #: core/models.py:408 core/models.py:430 core/models.py:458 core/models.py:511 #: core/models.py:677 core/templates/core/note_confirm_delete.html:7 @@ -358,19 +317,48 @@ msgstr "Nouvel enfant" msgid "Notes" msgstr "Notes" -#: babybuddy/templates/babybuddy/nav-dropdown.html:171 +#: babybuddy/templates/babybuddy/nav-dropdown.html:152 msgid "Measurements" msgstr "" -#: babybuddy/templates/babybuddy/nav-dropdown.html:185 -msgid "Temperature reading" -msgstr "Lecture de la température" +#: babybuddy/templates/babybuddy/nav-dropdown.html:160 core/models.py:139 +#: core/models.py:151 core/models.py:152 core/models.py:155 +#: core/templates/core/bmi_confirm_delete.html:7 +#: core/templates/core/bmi_form.html:13 core/templates/core/bmi_list.html:4 +#: core/templates/core/bmi_list.html:7 core/templates/core/bmi_list.html:12 +#: core/templates/core/bmi_list.html:29 reports/graphs/bmi_change.py:19 +#: reports/graphs/bmi_change.py:30 reports/templates/reports/bmi_change.html:4 +#: reports/templates/reports/bmi_change.html:8 +msgid "BMI" +msgstr "" -#: babybuddy/templates/babybuddy/nav-dropdown.html:199 -msgid "Weight entry" -msgstr "Nouvelle prise de poids" +#: babybuddy/templates/babybuddy/nav-dropdown.html:166 +#, fuzzy +#| msgid "Sleep entry" +msgid "BMI entry" +msgstr "Nouveau sommeil" -#: babybuddy/templates/babybuddy/nav-dropdown.html:207 core/models.py:369 +#: babybuddy/templates/babybuddy/nav-dropdown.html:174 core/models.py:338 +#: core/models.py:351 core/models.py:352 core/models.py:355 +#: core/templates/core/head_circumference_confirm_delete.html:7 +#: core/templates/core/head_circumference_form.html:13 +#: core/templates/core/head_circumference_list.html:4 +#: core/templates/core/head_circumference_list.html:7 +#: core/templates/core/head_circumference_list.html:12 +#: core/templates/core/head_circumference_list.html:29 +#: reports/graphs/head_circumference_change.py:19 +#: reports/graphs/head_circumference_change.py:30 +#: reports/templates/reports/head_circumference_change.html:4 +#: reports/templates/reports/head_circumference_change.html:8 +#: reports/templates/reports/report_list.html:16 +msgid "Head Circumference" +msgstr "" + +#: babybuddy/templates/babybuddy/nav-dropdown.html:180 +msgid "Head Circumference entry" +msgstr "" + +#: babybuddy/templates/babybuddy/nav-dropdown.html:188 core/models.py:369 #: core/models.py:381 core/models.py:382 core/models.py:385 #: core/templates/core/height_confirm_delete.html:7 #: core/templates/core/height_form.html:13 @@ -387,63 +375,60 @@ msgstr "Nouvelle prise de poids" msgid "Height" msgstr "Poids" -#: babybuddy/templates/babybuddy/nav-dropdown.html:213 +#: babybuddy/templates/babybuddy/nav-dropdown.html:194 #, fuzzy #| msgid "Weight entry" msgid "Height entry" msgstr "Nouvelle prise de poids" -#: babybuddy/templates/babybuddy/nav-dropdown.html:221 core/models.py:338 -#: core/models.py:351 core/models.py:352 core/models.py:355 -#: core/templates/core/head_circumference_confirm_delete.html:7 -#: core/templates/core/head_circumference_form.html:13 -#: core/templates/core/head_circumference_list.html:4 -#: core/templates/core/head_circumference_list.html:7 -#: core/templates/core/head_circumference_list.html:12 -#: core/templates/core/head_circumference_list.html:29 -#: reports/graphs/head_circumference_change.py:19 -#: reports/graphs/head_circumference_change.py:30 -#: reports/templates/reports/head_circumference_change.html:4 -#: reports/templates/reports/head_circumference_change.html:8 -#: reports/templates/reports/report_list.html:16 -msgid "Head Circumference" -msgstr "" +#: babybuddy/templates/babybuddy/nav-dropdown.html:202 core/models.py:506 +#: core/models.py:519 core/models.py:520 core/models.py:523 +#: core/templates/core/temperature_confirm_delete.html:7 +#: core/templates/core/temperature_form.html:13 +#: core/templates/core/temperature_list.html:4 +#: core/templates/core/temperature_list.html:7 +#: core/templates/core/temperature_list.html:12 +#: core/templates/core/temperature_list.html:29 +msgid "Temperature" +msgstr "Température" -#: babybuddy/templates/babybuddy/nav-dropdown.html:227 -msgid "Head Circumference entry" -msgstr "" +#: babybuddy/templates/babybuddy/nav-dropdown.html:208 +msgid "Temperature reading" +msgstr "Lecture de la température" -#: babybuddy/templates/babybuddy/nav-dropdown.html:235 core/models.py:139 -#: core/models.py:151 core/models.py:152 core/models.py:155 -#: core/templates/core/bmi_confirm_delete.html:7 -#: core/templates/core/bmi_form.html:13 core/templates/core/bmi_list.html:4 -#: core/templates/core/bmi_list.html:7 core/templates/core/bmi_list.html:12 -#: core/templates/core/bmi_list.html:29 reports/graphs/bmi_change.py:19 -#: reports/graphs/bmi_change.py:30 reports/templates/reports/bmi_change.html:4 -#: reports/templates/reports/bmi_change.html:8 -msgid "BMI" -msgstr "" +#: babybuddy/templates/babybuddy/nav-dropdown.html:216 core/models.py:673 +#: core/models.py:685 core/models.py:686 core/models.py:689 +#: core/templates/core/weight_confirm_delete.html:7 +#: core/templates/core/weight_form.html:13 +#: core/templates/core/weight_list.html:4 +#: core/templates/core/weight_list.html:7 +#: core/templates/core/weight_list.html:12 +#: core/templates/core/weight_list.html:29 reports/graphs/weight_change.py:19 +#: reports/graphs/weight_change.py:30 +#: reports/templates/reports/report_list.html:22 +#: reports/templates/reports/weight_change.html:4 +#: reports/templates/reports/weight_change.html:8 +msgid "Weight" +msgstr "Poids" -#: babybuddy/templates/babybuddy/nav-dropdown.html:241 -#, fuzzy -#| msgid "Sleep entry" -msgid "BMI entry" -msgstr "Nouveau sommeil" +#: babybuddy/templates/babybuddy/nav-dropdown.html:222 +msgid "Weight entry" +msgstr "Nouvelle prise de poids" -#: babybuddy/templates/babybuddy/nav-dropdown.html:255 +#: babybuddy/templates/babybuddy/nav-dropdown.html:236 msgid "Activities" msgstr "Activités" -#: babybuddy/templates/babybuddy/nav-dropdown.html:262 +#: babybuddy/templates/babybuddy/nav-dropdown.html:243 #: reports/graphs/diaperchange_lifetimes.py:27 msgid "Changes" msgstr "Changement de couches" -#: babybuddy/templates/babybuddy/nav-dropdown.html:268 +#: babybuddy/templates/babybuddy/nav-dropdown.html:249 msgid "Change" msgstr "Nouveau change" -#: babybuddy/templates/babybuddy/nav-dropdown.html:275 +#: babybuddy/templates/babybuddy/nav-dropdown.html:256 #: babybuddy/templates/babybuddy/welcome.html:34 core/models.py:313 #: core/templates/core/feeding_confirm_delete.html:7 #: core/templates/core/feeding_form.html:13 @@ -453,21 +438,33 @@ msgstr "Nouveau change" msgid "Feedings" msgstr "Allaitements" -#: babybuddy/templates/babybuddy/nav-dropdown.html:294 -msgid "Sleep entry" -msgstr "Nouveau sommeil" +#: babybuddy/templates/babybuddy/nav-dropdown.html:270 core/models.py:437 +#: core/models.py:438 core/models.py:441 +#: core/templates/core/pumping_confirm_delete.html:7 +#: core/templates/core/pumping_form.html:13 +#: core/templates/core/pumping_list.html:4 +#: core/templates/core/pumping_list.html:7 +#: core/templates/core/pumping_list.html:12 +#: reports/templates/reports/pumping_amounts.html:4 +#: reports/templates/reports/pumping_amounts.html:8 +msgid "Pumping" +msgstr "" -#: babybuddy/templates/babybuddy/nav-dropdown.html:307 -msgid "Tummy Time entry" -msgstr "Nouvelle période de motricité libre" - -#: babybuddy/templates/babybuddy/nav-dropdown.html:322 +#: babybuddy/templates/babybuddy/nav-dropdown.html:276 #, fuzzy #| msgid "Weight entry" msgid "Pumping entry" msgstr "Nouvelle prise de poids" -#: babybuddy/templates/babybuddy/nav-dropdown.html:346 +#: babybuddy/templates/babybuddy/nav-dropdown.html:289 +msgid "Sleep entry" +msgstr "Nouveau sommeil" + +#: babybuddy/templates/babybuddy/nav-dropdown.html:302 +msgid "Tummy Time entry" +msgstr "Nouvelle période de motricité libre" + +#: babybuddy/templates/babybuddy/nav-dropdown.html:326 #: babybuddy/templates/babybuddy/user_list.html:17 #: babybuddy/templates/babybuddy/user_password_form.html:7 #: babybuddy/templates/babybuddy/user_settings_form.html:7 core/models.py:556 @@ -475,23 +472,23 @@ msgstr "Nouvelle prise de poids" msgid "User" msgstr "Utilisateur" -#: babybuddy/templates/babybuddy/nav-dropdown.html:348 +#: babybuddy/templates/babybuddy/nav-dropdown.html:328 msgid "Password" msgstr "Mot de passe" -#: babybuddy/templates/babybuddy/nav-dropdown.html:352 +#: babybuddy/templates/babybuddy/nav-dropdown.html:332 msgid "Logout" msgstr "Se déconnecter" -#: babybuddy/templates/babybuddy/nav-dropdown.html:355 +#: babybuddy/templates/babybuddy/nav-dropdown.html:335 msgid "Site" msgstr "Site" -#: babybuddy/templates/babybuddy/nav-dropdown.html:356 +#: babybuddy/templates/babybuddy/nav-dropdown.html:336 msgid "API Browser" msgstr "Navigateur d'API" -#: babybuddy/templates/babybuddy/nav-dropdown.html:358 +#: babybuddy/templates/babybuddy/nav-dropdown.html:338 #: babybuddy/templates/babybuddy/user_confirm_delete.html:7 #: babybuddy/templates/babybuddy/user_form.html:13 #: babybuddy/templates/babybuddy/user_list.html:4 @@ -499,15 +496,15 @@ msgstr "Navigateur d'API" msgid "Users" msgstr "Utilisateurs" -#: babybuddy/templates/babybuddy/nav-dropdown.html:361 +#: babybuddy/templates/babybuddy/nav-dropdown.html:341 msgid "Support" msgstr "Support" -#: babybuddy/templates/babybuddy/nav-dropdown.html:363 +#: babybuddy/templates/babybuddy/nav-dropdown.html:343 msgid "Source Code" msgstr "Code source" -#: babybuddy/templates/babybuddy/nav-dropdown.html:365 +#: babybuddy/templates/babybuddy/nav-dropdown.html:345 msgid "Chat / Support" msgstr "Tchat / Support" @@ -518,6 +515,7 @@ msgstr "Tchat / Support" #: core/templates/timeline/_timeline.html:73 #: dashboard/templates/cards/feeding_day.html:43 #: dashboard/templates/cards/feeding_last_method.html:34 +#: dashboard/templates/cards/sleep_recent.html:43 #: dashboard/templates/cards/statistics.html:34 msgid "Previous" msgstr "Précédente" @@ -529,6 +527,7 @@ msgstr "Précédente" #: core/templates/timeline/_timeline.html:80 #: dashboard/templates/cards/feeding_day.html:47 #: dashboard/templates/cards/feeding_last_method.html:38 +#: dashboard/templates/cards/sleep_recent.html:47 #: dashboard/templates/cards/statistics.html:38 msgid "Next" msgstr "Suivante" @@ -1002,7 +1001,7 @@ msgstr "" #: reports/graphs/diaperchange_types.py:49 reports/graphs/feeding_amounts.py:70 #: reports/graphs/feeding_duration.py:56 #: reports/graphs/head_circumference_change.py:28 -#: reports/graphs/height_change.py:28 reports/graphs/pumping_amounts.py:58 +#: reports/graphs/height_change.py:28 reports/graphs/pumping_amounts.py:60 #: reports/graphs/sleep_pattern.py:151 reports/graphs/sleep_totals.py:59 #: reports/graphs/tummytime_duration.py:51 reports/graphs/weight_change.py:28 msgid "Date" @@ -1182,7 +1181,7 @@ msgstr "" #: core/templates/core/bmi_list.html:70 #, fuzzy #| msgid "No timer entries found." -msgid "No bmi entries found." +msgid "No BMI entries found." msgstr "Aucun chronomètre trouvé." #: core/templates/core/child_confirm_delete.html:4 @@ -1505,9 +1504,10 @@ msgstr "Chronomètres actifs" #: dashboard/templates/cards/feeding_day.html:52 #: dashboard/templates/cards/feeding_last.html:17 #: dashboard/templates/cards/feeding_last_method.html:43 -#: dashboard/templates/cards/sleep_day.html:14 #: dashboard/templates/cards/sleep_last.html:17 #: dashboard/templates/cards/sleep_naps_day.html:18 +#: dashboard/templates/cards/sleep_recent.html:20 +#: dashboard/templates/cards/sleep_recent.html:52 #: dashboard/templates/cards/tummytime_day.html:14 msgid "None" msgstr "Aucun" @@ -1628,6 +1628,22 @@ msgstr "{}, {}" msgid "0 days" msgstr "0 jours" +#: core/templatetags/duration.py:111 +#: dashboard/templates/cards/diaperchange_types.html:49 +msgid "today" +msgstr "aujourd'hui" + +#: core/templatetags/duration.py:113 +#: dashboard/templates/cards/diaperchange_types.html:51 +msgid "yesterday" +msgstr "hier" + +#: core/templatetags/duration.py:116 +#, fuzzy +#| msgid "%(key)s days ago" +msgid " days ago" +msgstr "il y a %(key)s jours" + #: core/timeline.py:53 #, python-format msgid "%(child)s started tummy time!" @@ -1767,14 +1783,6 @@ msgstr "humide" msgid "solid" msgstr "solide" -#: dashboard/templates/cards/diaperchange_types.html:49 -msgid "today" -msgstr "aujourd'hui" - -#: dashboard/templates/cards/diaperchange_types.html:51 -msgid "yesterday" -msgstr "hier" - #: dashboard/templates/cards/diaperchange_types.html:53 #, python-format msgid "%(key)s days ago" @@ -1793,6 +1801,7 @@ msgstr[0] "%(count)s entrées de sommeil." msgstr[1] "%(count)s entrées de sommeil." #: dashboard/templates/cards/feeding_day.html:32 +#: dashboard/templates/cards/sleep_recent.html:32 #, python-format msgid "
%(since)s
" msgstr "" @@ -1817,15 +1826,6 @@ msgid_plural "%(n)s feedings ago" msgstr[0] "il y a %(n)s alimentation%(plural)s" msgstr[1] "il y a %(n)s alimentation%(plural)s" -#: dashboard/templates/cards/sleep_day.html:6 -msgid "Today's Sleep" -msgstr "Sommeil d'aujourd'hui" - -#: dashboard/templates/cards/sleep_day.html:20 -#, python-format -msgid "%(count)s sleep entries" -msgstr "%(count)s entrées de sommeil." - #: dashboard/templates/cards/sleep_last.html:6 msgid "Last Sleep" msgstr "Dernier sommeil" @@ -1842,6 +1842,20 @@ msgid_plural "%(count)s naps" msgstr[0] "%(count)s Sieste%(plural)s" msgstr[1] "%(count)s Sieste%(plural)s" +#: dashboard/templates/cards/sleep_recent.html:6 +#, fuzzy +#| msgid "Last Sleep" +msgid "Recent Sleep" +msgstr "Dernier sommeil" + +#: dashboard/templates/cards/sleep_recent.html:25 +#, fuzzy, python-format +#| msgid "%(count)s sleep entries" +msgid "%(counter)s sleep" +msgid_plural "%(counter)s sleep" +msgstr[0] "%(count)s entrées de sommeil." +msgstr[1] "%(count)s entrées de sommeil." + #: dashboard/templates/cards/statistics.html:7 msgid "Statistics" msgstr "Statistiques" @@ -1894,69 +1908,69 @@ msgstr "Opérations sur l'enfant" msgid "Reports" msgstr "Rapports" -#: dashboard/templatetags/cards.py:328 +#: dashboard/templatetags/cards.py:357 msgid "Average nap duration" msgstr "Durée moyenne des siestes" -#: dashboard/templatetags/cards.py:335 +#: dashboard/templatetags/cards.py:364 msgid "Average naps per day" msgstr "Moyen de siestes par jour" -#: dashboard/templatetags/cards.py:345 +#: dashboard/templatetags/cards.py:374 msgid "Average sleep duration" msgstr "Durée moyenne du sommeil" -#: dashboard/templatetags/cards.py:352 +#: dashboard/templatetags/cards.py:381 msgid "Average awake duration" msgstr "Durée moyenne de veille" -#: dashboard/templatetags/cards.py:362 +#: dashboard/templatetags/cards.py:391 msgid "Weight change per week" msgstr "Changement de poids par semaine" -#: dashboard/templatetags/cards.py:372 +#: dashboard/templatetags/cards.py:401 #, fuzzy #| msgid "Weight change per week" msgid "Height change per week" msgstr "Changement de poids par semaine" -#: dashboard/templatetags/cards.py:382 +#: dashboard/templatetags/cards.py:411 #, fuzzy #| msgid "Weight change per week" msgid "Head circumference change per week" msgstr "Changement de poids par semaine" -#: dashboard/templatetags/cards.py:392 +#: dashboard/templatetags/cards.py:421 #, fuzzy #| msgid "Weight change per week" msgid "BMI change per week" msgstr "Changement de poids par semaine" -#: dashboard/templatetags/cards.py:410 +#: dashboard/templatetags/cards.py:439 #, fuzzy #| msgid "Feeding frequency (past 3 days)" msgid "Diaper change frequency (past 3 days)" msgstr "Fréquence d'alimentation (3 derniers jours)" -#: dashboard/templatetags/cards.py:414 +#: dashboard/templatetags/cards.py:443 #, fuzzy #| msgid "Feeding frequency (past 2 weeks)" msgid "Diaper change frequency (past 2 weeks)" msgstr "Fréquence d'alimentation (2 dernières semaines)" -#: dashboard/templatetags/cards.py:420 +#: dashboard/templatetags/cards.py:449 msgid "Diaper change frequency" msgstr "Fréquence de change" -#: dashboard/templatetags/cards.py:456 +#: dashboard/templatetags/cards.py:485 msgid "Feeding frequency (past 3 days)" msgstr "Fréquence d'alimentation (3 derniers jours)" -#: dashboard/templatetags/cards.py:460 +#: dashboard/templatetags/cards.py:489 msgid "Feeding frequency (past 2 weeks)" msgstr "Fréquence d'alimentation (2 dernières semaines)" -#: dashboard/templatetags/cards.py:466 +#: dashboard/templatetags/cards.py:495 msgid "Feeding frequency" msgstr "Fréquence des repas" @@ -2038,13 +2052,13 @@ msgstr "" msgid "Height" msgstr "Poids" -#: reports/graphs/pumping_amounts.py:57 +#: reports/graphs/pumping_amounts.py:59 #, fuzzy #| msgid "Total Feeding Amounts" msgid "Total Pumping Amount" msgstr "Durée d'Alimentation Moyenne" -#: reports/graphs/pumping_amounts.py:60 +#: reports/graphs/pumping_amounts.py:62 #, fuzzy #| msgid "Feeding Amounts" msgid "Pumping Amount" @@ -2161,3 +2175,10 @@ msgstr "Durées du temps sur le ventre (Somme)" #: reports/templates/reports/tummytime_duration.html:8 msgid "Total Tummy Time Durations" msgstr "Durées totales du temps sur le ventre" + +#~ msgid "Today's Sleep" +#~ msgstr "Sommeil d'aujourd'hui" + +#, python-format +#~ msgid "%(count)s sleep entries" +#~ msgstr "%(count)s entrées de sommeil." diff --git a/locale/it/LC_MESSAGES/django.mo b/locale/it/LC_MESSAGES/django.mo index 8e47c513..104b4fb8 100644 Binary files a/locale/it/LC_MESSAGES/django.mo and b/locale/it/LC_MESSAGES/django.mo differ diff --git a/locale/it/LC_MESSAGES/django.po b/locale/it/LC_MESSAGES/django.po index 4a211e2f..c606ed27 100644 --- a/locale/it/LC_MESSAGES/django.po +++ b/locale/it/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Baby Buddy\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-06-05 13:25+0000\n" +"POT-Creation-Date: 2022-06-17 22:25+0000\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -11,12 +11,12 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: babybuddy/admin.py:12 babybuddy/admin.py:13 -#: babybuddy/templates/babybuddy/nav-dropdown.html:347 +#: babybuddy/templates/babybuddy/nav-dropdown.html:327 #: babybuddy/templates/babybuddy/user_settings_form.html:8 msgid "Settings" msgstr "Impostazioni" -#: babybuddy/admin.py:17 babybuddy/templates/babybuddy/nav-dropdown.html:111 +#: babybuddy/admin.py:17 babybuddy/templates/babybuddy/nav-dropdown.html:92 #: babybuddy/templates/babybuddy/user_settings_form.html:61 #: dashboard/templates/dashboard/child.html:4 #: dashboard/templates/dashboard/child.html:9 @@ -187,7 +187,7 @@ msgstr "Turco" #: babybuddy/templates/admin/base_site.html:4 #: babybuddy/templates/admin/base_site.html:7 -#: babybuddy/templates/babybuddy/nav-dropdown.html:359 +#: babybuddy/templates/babybuddy/nav-dropdown.html:339 msgid "Database Admin" msgstr "Database Admin" @@ -236,19 +236,19 @@ msgid "Diaper Change" msgstr "Cambio Pannolino" #: babybuddy/templates/babybuddy/nav-dropdown.html:57 -#: babybuddy/templates/babybuddy/nav-dropdown.html:281 core/models.py:312 +#: babybuddy/templates/babybuddy/nav-dropdown.html:262 core/models.py:312 #: core/models.py:316 core/templates/core/timer_detail.html:43 msgid "Feeding" msgstr "Pasto" #: babybuddy/templates/babybuddy/nav-dropdown.html:63 -#: babybuddy/templates/babybuddy/nav-dropdown.html:157 core/models.py:396 +#: babybuddy/templates/babybuddy/nav-dropdown.html:138 core/models.py:396 #: core/models.py:407 core/models.py:411 core/templates/core/note_list.html:29 msgid "Note" msgstr "Note" #: babybuddy/templates/babybuddy/nav-dropdown.html:69 -#: babybuddy/templates/babybuddy/nav-dropdown.html:288 +#: babybuddy/templates/babybuddy/nav-dropdown.html:283 #: babybuddy/templates/babybuddy/welcome.html:42 core/models.py:467 #: core/models.py:468 core/models.py:471 #: core/templates/core/sleep_confirm_delete.html:7 @@ -259,19 +259,7 @@ msgid "Sleep" msgstr "Riposo" #: babybuddy/templates/babybuddy/nav-dropdown.html:75 -#: babybuddy/templates/babybuddy/nav-dropdown.html:179 core/models.py:506 -#: core/models.py:519 core/models.py:520 core/models.py:523 -#: core/templates/core/temperature_confirm_delete.html:7 -#: core/templates/core/temperature_form.html:13 -#: core/templates/core/temperature_list.html:4 -#: core/templates/core/temperature_list.html:7 -#: core/templates/core/temperature_list.html:12 -#: core/templates/core/temperature_list.html:29 -msgid "Temperature" -msgstr "Temperatura" - -#: babybuddy/templates/babybuddy/nav-dropdown.html:81 -#: babybuddy/templates/babybuddy/nav-dropdown.html:301 +#: babybuddy/templates/babybuddy/nav-dropdown.html:296 #: babybuddy/templates/babybuddy/welcome.html:50 core/models.py:647 #: core/models.py:648 core/models.py:651 #: core/templates/core/timer_detail.html:59 @@ -283,44 +271,15 @@ msgstr "Temperatura" msgid "Tummy Time" msgstr "Tummy Time" -#: babybuddy/templates/babybuddy/nav-dropdown.html:87 -#: babybuddy/templates/babybuddy/nav-dropdown.html:193 core/models.py:673 -#: core/models.py:685 core/models.py:686 core/models.py:689 -#: core/templates/core/weight_confirm_delete.html:7 -#: core/templates/core/weight_form.html:13 -#: core/templates/core/weight_list.html:4 -#: core/templates/core/weight_list.html:7 -#: core/templates/core/weight_list.html:12 -#: core/templates/core/weight_list.html:29 reports/graphs/weight_change.py:19 -#: reports/graphs/weight_change.py:30 -#: reports/templates/reports/report_list.html:22 -#: reports/templates/reports/weight_change.html:4 -#: reports/templates/reports/weight_change.html:8 -msgid "Weight" -msgstr "Peso" - -#: babybuddy/templates/babybuddy/nav-dropdown.html:93 -#: babybuddy/templates/babybuddy/nav-dropdown.html:316 core/models.py:437 -#: core/models.py:438 core/models.py:441 -#: core/templates/core/pumping_confirm_delete.html:7 -#: core/templates/core/pumping_form.html:13 -#: core/templates/core/pumping_list.html:4 -#: core/templates/core/pumping_list.html:7 -#: core/templates/core/pumping_list.html:12 -#: reports/templates/reports/pumping_amounts.html:4 -#: reports/templates/reports/pumping_amounts.html:8 -msgid "Pumping" -msgstr "" - -#: babybuddy/templates/babybuddy/nav-dropdown.html:118 +#: babybuddy/templates/babybuddy/nav-dropdown.html:99 #: core/templates/timeline/timeline.html:4 #: core/templates/timeline/timeline.html:7 #: dashboard/templates/dashboard/child_button_group.html:9 msgid "Timeline" msgstr "Andamento temporale" -#: babybuddy/templates/babybuddy/nav-dropdown.html:129 -#: babybuddy/templates/babybuddy/nav-dropdown.html:137 core/models.py:188 +#: babybuddy/templates/babybuddy/nav-dropdown.html:110 +#: babybuddy/templates/babybuddy/nav-dropdown.html:118 core/models.py:188 #: core/templates/core/child_confirm_delete.html:7 #: core/templates/core/child_detail.html:7 #: core/templates/core/child_form.html:13 core/templates/core/child_list.html:4 @@ -330,7 +289,7 @@ msgstr "Andamento temporale" msgid "Children" msgstr "Bambino" -#: babybuddy/templates/babybuddy/nav-dropdown.html:143 core/models.py:137 +#: babybuddy/templates/babybuddy/nav-dropdown.html:124 core/models.py:137 #: core/models.py:187 core/models.py:221 core/models.py:274 core/models.py:335 #: core/models.py:367 core/models.py:394 core/models.py:426 core/models.py:450 #: core/models.py:503 core/models.py:537 core/models.py:630 core/models.py:671 @@ -349,7 +308,7 @@ msgstr "Bambino" msgid "Child" msgstr "Figlio" -#: babybuddy/templates/babybuddy/nav-dropdown.html:151 core/models.py:143 +#: babybuddy/templates/babybuddy/nav-dropdown.html:132 core/models.py:143 #: core/models.py:240 core/models.py:304 core/models.py:343 core/models.py:373 #: core/models.py:408 core/models.py:430 core/models.py:458 core/models.py:511 #: core/models.py:677 core/templates/core/note_confirm_delete.html:7 @@ -358,19 +317,48 @@ msgstr "Figlio" msgid "Notes" msgstr "Note" -#: babybuddy/templates/babybuddy/nav-dropdown.html:171 +#: babybuddy/templates/babybuddy/nav-dropdown.html:152 msgid "Measurements" msgstr "" -#: babybuddy/templates/babybuddy/nav-dropdown.html:185 -msgid "Temperature reading" -msgstr "Lettura temperatura" +#: babybuddy/templates/babybuddy/nav-dropdown.html:160 core/models.py:139 +#: core/models.py:151 core/models.py:152 core/models.py:155 +#: core/templates/core/bmi_confirm_delete.html:7 +#: core/templates/core/bmi_form.html:13 core/templates/core/bmi_list.html:4 +#: core/templates/core/bmi_list.html:7 core/templates/core/bmi_list.html:12 +#: core/templates/core/bmi_list.html:29 reports/graphs/bmi_change.py:19 +#: reports/graphs/bmi_change.py:30 reports/templates/reports/bmi_change.html:4 +#: reports/templates/reports/bmi_change.html:8 +msgid "BMI" +msgstr "" -#: babybuddy/templates/babybuddy/nav-dropdown.html:199 -msgid "Weight entry" -msgstr "Pesata" +#: babybuddy/templates/babybuddy/nav-dropdown.html:166 +#, fuzzy +#| msgid "Sleep entry" +msgid "BMI entry" +msgstr "Aggiungi Riposo" -#: babybuddy/templates/babybuddy/nav-dropdown.html:207 core/models.py:369 +#: babybuddy/templates/babybuddy/nav-dropdown.html:174 core/models.py:338 +#: core/models.py:351 core/models.py:352 core/models.py:355 +#: core/templates/core/head_circumference_confirm_delete.html:7 +#: core/templates/core/head_circumference_form.html:13 +#: core/templates/core/head_circumference_list.html:4 +#: core/templates/core/head_circumference_list.html:7 +#: core/templates/core/head_circumference_list.html:12 +#: core/templates/core/head_circumference_list.html:29 +#: reports/graphs/head_circumference_change.py:19 +#: reports/graphs/head_circumference_change.py:30 +#: reports/templates/reports/head_circumference_change.html:4 +#: reports/templates/reports/head_circumference_change.html:8 +#: reports/templates/reports/report_list.html:16 +msgid "Head Circumference" +msgstr "" + +#: babybuddy/templates/babybuddy/nav-dropdown.html:180 +msgid "Head Circumference entry" +msgstr "" + +#: babybuddy/templates/babybuddy/nav-dropdown.html:188 core/models.py:369 #: core/models.py:381 core/models.py:382 core/models.py:385 #: core/templates/core/height_confirm_delete.html:7 #: core/templates/core/height_form.html:13 @@ -387,63 +375,60 @@ msgstr "Pesata" msgid "Height" msgstr "Peso" -#: babybuddy/templates/babybuddy/nav-dropdown.html:213 +#: babybuddy/templates/babybuddy/nav-dropdown.html:194 #, fuzzy #| msgid "Weight entry" msgid "Height entry" msgstr "Pesata" -#: babybuddy/templates/babybuddy/nav-dropdown.html:221 core/models.py:338 -#: core/models.py:351 core/models.py:352 core/models.py:355 -#: core/templates/core/head_circumference_confirm_delete.html:7 -#: core/templates/core/head_circumference_form.html:13 -#: core/templates/core/head_circumference_list.html:4 -#: core/templates/core/head_circumference_list.html:7 -#: core/templates/core/head_circumference_list.html:12 -#: core/templates/core/head_circumference_list.html:29 -#: reports/graphs/head_circumference_change.py:19 -#: reports/graphs/head_circumference_change.py:30 -#: reports/templates/reports/head_circumference_change.html:4 -#: reports/templates/reports/head_circumference_change.html:8 -#: reports/templates/reports/report_list.html:16 -msgid "Head Circumference" -msgstr "" +#: babybuddy/templates/babybuddy/nav-dropdown.html:202 core/models.py:506 +#: core/models.py:519 core/models.py:520 core/models.py:523 +#: core/templates/core/temperature_confirm_delete.html:7 +#: core/templates/core/temperature_form.html:13 +#: core/templates/core/temperature_list.html:4 +#: core/templates/core/temperature_list.html:7 +#: core/templates/core/temperature_list.html:12 +#: core/templates/core/temperature_list.html:29 +msgid "Temperature" +msgstr "Temperatura" -#: babybuddy/templates/babybuddy/nav-dropdown.html:227 -msgid "Head Circumference entry" -msgstr "" +#: babybuddy/templates/babybuddy/nav-dropdown.html:208 +msgid "Temperature reading" +msgstr "Lettura temperatura" -#: babybuddy/templates/babybuddy/nav-dropdown.html:235 core/models.py:139 -#: core/models.py:151 core/models.py:152 core/models.py:155 -#: core/templates/core/bmi_confirm_delete.html:7 -#: core/templates/core/bmi_form.html:13 core/templates/core/bmi_list.html:4 -#: core/templates/core/bmi_list.html:7 core/templates/core/bmi_list.html:12 -#: core/templates/core/bmi_list.html:29 reports/graphs/bmi_change.py:19 -#: reports/graphs/bmi_change.py:30 reports/templates/reports/bmi_change.html:4 -#: reports/templates/reports/bmi_change.html:8 -msgid "BMI" -msgstr "" +#: babybuddy/templates/babybuddy/nav-dropdown.html:216 core/models.py:673 +#: core/models.py:685 core/models.py:686 core/models.py:689 +#: core/templates/core/weight_confirm_delete.html:7 +#: core/templates/core/weight_form.html:13 +#: core/templates/core/weight_list.html:4 +#: core/templates/core/weight_list.html:7 +#: core/templates/core/weight_list.html:12 +#: core/templates/core/weight_list.html:29 reports/graphs/weight_change.py:19 +#: reports/graphs/weight_change.py:30 +#: reports/templates/reports/report_list.html:22 +#: reports/templates/reports/weight_change.html:4 +#: reports/templates/reports/weight_change.html:8 +msgid "Weight" +msgstr "Peso" -#: babybuddy/templates/babybuddy/nav-dropdown.html:241 -#, fuzzy -#| msgid "Sleep entry" -msgid "BMI entry" -msgstr "Aggiungi Riposo" +#: babybuddy/templates/babybuddy/nav-dropdown.html:222 +msgid "Weight entry" +msgstr "Pesata" -#: babybuddy/templates/babybuddy/nav-dropdown.html:255 +#: babybuddy/templates/babybuddy/nav-dropdown.html:236 msgid "Activities" msgstr "Azioni" -#: babybuddy/templates/babybuddy/nav-dropdown.html:262 +#: babybuddy/templates/babybuddy/nav-dropdown.html:243 #: reports/graphs/diaperchange_lifetimes.py:27 msgid "Changes" msgstr "Cambi" -#: babybuddy/templates/babybuddy/nav-dropdown.html:268 +#: babybuddy/templates/babybuddy/nav-dropdown.html:249 msgid "Change" msgstr "Cambio" -#: babybuddy/templates/babybuddy/nav-dropdown.html:275 +#: babybuddy/templates/babybuddy/nav-dropdown.html:256 #: babybuddy/templates/babybuddy/welcome.html:34 core/models.py:313 #: core/templates/core/feeding_confirm_delete.html:7 #: core/templates/core/feeding_form.html:13 @@ -453,21 +438,33 @@ msgstr "Cambio" msgid "Feedings" msgstr "Pasti" -#: babybuddy/templates/babybuddy/nav-dropdown.html:294 -msgid "Sleep entry" -msgstr "Aggiungi Riposo" +#: babybuddy/templates/babybuddy/nav-dropdown.html:270 core/models.py:437 +#: core/models.py:438 core/models.py:441 +#: core/templates/core/pumping_confirm_delete.html:7 +#: core/templates/core/pumping_form.html:13 +#: core/templates/core/pumping_list.html:4 +#: core/templates/core/pumping_list.html:7 +#: core/templates/core/pumping_list.html:12 +#: reports/templates/reports/pumping_amounts.html:4 +#: reports/templates/reports/pumping_amounts.html:8 +msgid "Pumping" +msgstr "" -#: babybuddy/templates/babybuddy/nav-dropdown.html:307 -msgid "Tummy Time entry" -msgstr "Aggiungi Tummy Time" - -#: babybuddy/templates/babybuddy/nav-dropdown.html:322 +#: babybuddy/templates/babybuddy/nav-dropdown.html:276 #, fuzzy #| msgid "Weight entry" msgid "Pumping entry" msgstr "Pesata" -#: babybuddy/templates/babybuddy/nav-dropdown.html:346 +#: babybuddy/templates/babybuddy/nav-dropdown.html:289 +msgid "Sleep entry" +msgstr "Aggiungi Riposo" + +#: babybuddy/templates/babybuddy/nav-dropdown.html:302 +msgid "Tummy Time entry" +msgstr "Aggiungi Tummy Time" + +#: babybuddy/templates/babybuddy/nav-dropdown.html:326 #: babybuddy/templates/babybuddy/user_list.html:17 #: babybuddy/templates/babybuddy/user_password_form.html:7 #: babybuddy/templates/babybuddy/user_settings_form.html:7 core/models.py:556 @@ -475,23 +472,23 @@ msgstr "Pesata" msgid "User" msgstr "Utente" -#: babybuddy/templates/babybuddy/nav-dropdown.html:348 +#: babybuddy/templates/babybuddy/nav-dropdown.html:328 msgid "Password" msgstr "Password" -#: babybuddy/templates/babybuddy/nav-dropdown.html:352 +#: babybuddy/templates/babybuddy/nav-dropdown.html:332 msgid "Logout" msgstr "Logout" -#: babybuddy/templates/babybuddy/nav-dropdown.html:355 +#: babybuddy/templates/babybuddy/nav-dropdown.html:335 msgid "Site" msgstr "Sito" -#: babybuddy/templates/babybuddy/nav-dropdown.html:356 +#: babybuddy/templates/babybuddy/nav-dropdown.html:336 msgid "API Browser" msgstr "API Browser" -#: babybuddy/templates/babybuddy/nav-dropdown.html:358 +#: babybuddy/templates/babybuddy/nav-dropdown.html:338 #: babybuddy/templates/babybuddy/user_confirm_delete.html:7 #: babybuddy/templates/babybuddy/user_form.html:13 #: babybuddy/templates/babybuddy/user_list.html:4 @@ -499,15 +496,15 @@ msgstr "API Browser" msgid "Users" msgstr "Utenti" -#: babybuddy/templates/babybuddy/nav-dropdown.html:361 +#: babybuddy/templates/babybuddy/nav-dropdown.html:341 msgid "Support" msgstr "Supporto" -#: babybuddy/templates/babybuddy/nav-dropdown.html:363 +#: babybuddy/templates/babybuddy/nav-dropdown.html:343 msgid "Source Code" msgstr "Codice Sorgente" -#: babybuddy/templates/babybuddy/nav-dropdown.html:365 +#: babybuddy/templates/babybuddy/nav-dropdown.html:345 msgid "Chat / Support" msgstr "Chat / Supporto" @@ -518,6 +515,7 @@ msgstr "Chat / Supporto" #: core/templates/timeline/_timeline.html:73 #: dashboard/templates/cards/feeding_day.html:43 #: dashboard/templates/cards/feeding_last_method.html:34 +#: dashboard/templates/cards/sleep_recent.html:43 #: dashboard/templates/cards/statistics.html:34 msgid "Previous" msgstr "Precedente" @@ -529,6 +527,7 @@ msgstr "Precedente" #: core/templates/timeline/_timeline.html:80 #: dashboard/templates/cards/feeding_day.html:47 #: dashboard/templates/cards/feeding_last_method.html:38 +#: dashboard/templates/cards/sleep_recent.html:47 #: dashboard/templates/cards/statistics.html:38 msgid "Next" msgstr "Successivo" @@ -996,7 +995,7 @@ msgstr "" #: reports/graphs/diaperchange_types.py:49 reports/graphs/feeding_amounts.py:70 #: reports/graphs/feeding_duration.py:56 #: reports/graphs/head_circumference_change.py:28 -#: reports/graphs/height_change.py:28 reports/graphs/pumping_amounts.py:58 +#: reports/graphs/height_change.py:28 reports/graphs/pumping_amounts.py:60 #: reports/graphs/sleep_pattern.py:151 reports/graphs/sleep_totals.py:59 #: reports/graphs/tummytime_duration.py:51 reports/graphs/weight_change.py:28 msgid "Date" @@ -1176,7 +1175,7 @@ msgstr "" #: core/templates/core/bmi_list.html:70 #, fuzzy #| msgid "No timer entries found." -msgid "No bmi entries found." +msgid "No BMI entries found." msgstr "Nessuna voce timer trovata." #: core/templates/core/child_confirm_delete.html:4 @@ -1498,9 +1497,10 @@ msgstr "Timer Attivi" #: dashboard/templates/cards/feeding_day.html:52 #: dashboard/templates/cards/feeding_last.html:17 #: dashboard/templates/cards/feeding_last_method.html:43 -#: dashboard/templates/cards/sleep_day.html:14 #: dashboard/templates/cards/sleep_last.html:17 #: dashboard/templates/cards/sleep_naps_day.html:18 +#: dashboard/templates/cards/sleep_recent.html:20 +#: dashboard/templates/cards/sleep_recent.html:52 #: dashboard/templates/cards/tummytime_day.html:14 msgid "None" msgstr "Nessuno" @@ -1621,6 +1621,22 @@ msgstr "{}, {}" msgid "0 days" msgstr "0 giorni" +#: core/templatetags/duration.py:111 +#: dashboard/templates/cards/diaperchange_types.html:49 +msgid "today" +msgstr "oggi" + +#: core/templatetags/duration.py:113 +#: dashboard/templates/cards/diaperchange_types.html:51 +msgid "yesterday" +msgstr "ieri" + +#: core/templatetags/duration.py:116 +#, fuzzy +#| msgid "%(key)s days ago" +msgid " days ago" +msgstr "%(key)s giorni fa" + #: core/timeline.py:53 #, python-format msgid "%(child)s started tummy time!" @@ -1760,14 +1776,6 @@ msgstr "liquida" msgid "solid" msgstr "solida" -#: dashboard/templates/cards/diaperchange_types.html:49 -msgid "today" -msgstr "oggi" - -#: dashboard/templates/cards/diaperchange_types.html:51 -msgid "yesterday" -msgstr "ieri" - #: dashboard/templates/cards/diaperchange_types.html:53 #, python-format msgid "%(key)s days ago" @@ -1786,6 +1794,7 @@ msgstr[0] "%(count)s Riposi" msgstr[1] "%(count)s Riposi" #: dashboard/templates/cards/feeding_day.html:32 +#: dashboard/templates/cards/sleep_recent.html:32 #, python-format msgid "
%(since)s
" msgstr "" @@ -1810,15 +1819,6 @@ msgid_plural "%(n)s feedings ago" msgstr[0] "%(n)s pasti fa" msgstr[1] "%(n)s pasti fa" -#: dashboard/templates/cards/sleep_day.html:6 -msgid "Today's Sleep" -msgstr "Riposi di Oggi" - -#: dashboard/templates/cards/sleep_day.html:20 -#, python-format -msgid "%(count)s sleep entries" -msgstr "%(count)s Riposi" - #: dashboard/templates/cards/sleep_last.html:6 msgid "Last Sleep" msgstr "Ultimo Riposo" @@ -1835,6 +1835,20 @@ msgid_plural "%(count)s naps" msgstr[0] "%(count)s pisolini" msgstr[1] "%(count)s pisolini" +#: dashboard/templates/cards/sleep_recent.html:6 +#, fuzzy +#| msgid "Last Sleep" +msgid "Recent Sleep" +msgstr "Ultimo Riposo" + +#: dashboard/templates/cards/sleep_recent.html:25 +#, fuzzy, python-format +#| msgid "%(count)s sleep entries" +msgid "%(counter)s sleep" +msgid_plural "%(counter)s sleep" +msgstr[0] "%(count)s Riposi" +msgstr[1] "%(count)s Riposi" + #: dashboard/templates/cards/statistics.html:7 msgid "Statistics" msgstr "Statistiche" @@ -1887,69 +1901,69 @@ msgstr "Azioni Bimbo" msgid "Reports" msgstr "Report" -#: dashboard/templatetags/cards.py:328 +#: dashboard/templatetags/cards.py:357 msgid "Average nap duration" msgstr "Durata media riposini" -#: dashboard/templatetags/cards.py:335 +#: dashboard/templatetags/cards.py:364 msgid "Average naps per day" msgstr "Media riposini al giorno" -#: dashboard/templatetags/cards.py:345 +#: dashboard/templatetags/cards.py:374 msgid "Average sleep duration" msgstr "Durata media riposi" -#: dashboard/templatetags/cards.py:352 +#: dashboard/templatetags/cards.py:381 msgid "Average awake duration" msgstr "Durata media bimbo sveglio" -#: dashboard/templatetags/cards.py:362 +#: dashboard/templatetags/cards.py:391 msgid "Weight change per week" msgstr "Cambiamento di peso settimanale" -#: dashboard/templatetags/cards.py:372 +#: dashboard/templatetags/cards.py:401 #, fuzzy #| msgid "Weight change per week" msgid "Height change per week" msgstr "Cambiamento di peso settimanale" -#: dashboard/templatetags/cards.py:382 +#: dashboard/templatetags/cards.py:411 #, fuzzy #| msgid "Weight change per week" msgid "Head circumference change per week" msgstr "Cambiamento di peso settimanale" -#: dashboard/templatetags/cards.py:392 +#: dashboard/templatetags/cards.py:421 #, fuzzy #| msgid "Weight change per week" msgid "BMI change per week" msgstr "Cambiamento di peso settimanale" -#: dashboard/templatetags/cards.py:410 +#: dashboard/templatetags/cards.py:439 #, fuzzy #| msgid "Feeding frequency (past 3 days)" msgid "Diaper change frequency (past 3 days)" msgstr "Frequenza pasti (ultimi 3 giorni)" -#: dashboard/templatetags/cards.py:414 +#: dashboard/templatetags/cards.py:443 #, fuzzy #| msgid "Feeding frequency (past 2 weeks)" msgid "Diaper change frequency (past 2 weeks)" msgstr "Frequenza pasti (ultime 2 settimane)" -#: dashboard/templatetags/cards.py:420 +#: dashboard/templatetags/cards.py:449 msgid "Diaper change frequency" msgstr "Frequenza cambio pannolino" -#: dashboard/templatetags/cards.py:456 +#: dashboard/templatetags/cards.py:485 msgid "Feeding frequency (past 3 days)" msgstr "Frequenza pasti (ultimi 3 giorni)" -#: dashboard/templatetags/cards.py:460 +#: dashboard/templatetags/cards.py:489 msgid "Feeding frequency (past 2 weeks)" msgstr "Frequenza pasti (ultime 2 settimane)" -#: dashboard/templatetags/cards.py:466 +#: dashboard/templatetags/cards.py:495 msgid "Feeding frequency" msgstr "Frequenza pasti" @@ -2031,13 +2045,13 @@ msgstr "" msgid "Height" msgstr "Peso" -#: reports/graphs/pumping_amounts.py:57 +#: reports/graphs/pumping_amounts.py:59 #, fuzzy #| msgid "Total Feeding Amounts" msgid "Total Pumping Amount" msgstr "Totale quantità di cibo" -#: reports/graphs/pumping_amounts.py:60 +#: reports/graphs/pumping_amounts.py:62 #, fuzzy #| msgid "Feeding Amounts" msgid "Pumping Amount" @@ -2154,3 +2168,10 @@ msgstr "Durata totale Tummy Time" #: reports/templates/reports/tummytime_duration.html:8 msgid "Total Tummy Time Durations" msgstr "Durata totale Tummy Time" + +#~ msgid "Today's Sleep" +#~ msgstr "Riposi di Oggi" + +#, python-format +#~ msgid "%(count)s sleep entries" +#~ msgstr "%(count)s Riposi" diff --git a/locale/nl/LC_MESSAGES/django.mo b/locale/nl/LC_MESSAGES/django.mo index 71776eda..8384fd93 100644 Binary files a/locale/nl/LC_MESSAGES/django.mo and b/locale/nl/LC_MESSAGES/django.mo differ diff --git a/locale/nl/LC_MESSAGES/django.po b/locale/nl/LC_MESSAGES/django.po index ada0a7f7..2941bcc9 100644 --- a/locale/nl/LC_MESSAGES/django.po +++ b/locale/nl/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Baby Buddy\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-06-05 13:25+0000\n" +"POT-Creation-Date: 2022-06-17 22:25+0000\n" "Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -11,12 +11,12 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: babybuddy/admin.py:12 babybuddy/admin.py:13 -#: babybuddy/templates/babybuddy/nav-dropdown.html:347 +#: babybuddy/templates/babybuddy/nav-dropdown.html:327 #: babybuddy/templates/babybuddy/user_settings_form.html:8 msgid "Settings" msgstr "Instellingen" -#: babybuddy/admin.py:17 babybuddy/templates/babybuddy/nav-dropdown.html:111 +#: babybuddy/admin.py:17 babybuddy/templates/babybuddy/nav-dropdown.html:92 #: babybuddy/templates/babybuddy/user_settings_form.html:61 #: dashboard/templates/dashboard/child.html:4 #: dashboard/templates/dashboard/child.html:9 @@ -185,7 +185,7 @@ msgstr "Turks" #: babybuddy/templates/admin/base_site.html:4 #: babybuddy/templates/admin/base_site.html:7 -#: babybuddy/templates/babybuddy/nav-dropdown.html:359 +#: babybuddy/templates/babybuddy/nav-dropdown.html:339 msgid "Database Admin" msgstr "Database admin" @@ -234,19 +234,19 @@ msgid "Diaper Change" msgstr "Luierverschoning" #: babybuddy/templates/babybuddy/nav-dropdown.html:57 -#: babybuddy/templates/babybuddy/nav-dropdown.html:281 core/models.py:312 +#: babybuddy/templates/babybuddy/nav-dropdown.html:262 core/models.py:312 #: core/models.py:316 core/templates/core/timer_detail.html:43 msgid "Feeding" msgstr "Voeding" #: babybuddy/templates/babybuddy/nav-dropdown.html:63 -#: babybuddy/templates/babybuddy/nav-dropdown.html:157 core/models.py:396 +#: babybuddy/templates/babybuddy/nav-dropdown.html:138 core/models.py:396 #: core/models.py:407 core/models.py:411 core/templates/core/note_list.html:29 msgid "Note" msgstr "Notitie" #: babybuddy/templates/babybuddy/nav-dropdown.html:69 -#: babybuddy/templates/babybuddy/nav-dropdown.html:288 +#: babybuddy/templates/babybuddy/nav-dropdown.html:283 #: babybuddy/templates/babybuddy/welcome.html:42 core/models.py:467 #: core/models.py:468 core/models.py:471 #: core/templates/core/sleep_confirm_delete.html:7 @@ -257,19 +257,7 @@ msgid "Sleep" msgstr "Slaap" #: babybuddy/templates/babybuddy/nav-dropdown.html:75 -#: babybuddy/templates/babybuddy/nav-dropdown.html:179 core/models.py:506 -#: core/models.py:519 core/models.py:520 core/models.py:523 -#: core/templates/core/temperature_confirm_delete.html:7 -#: core/templates/core/temperature_form.html:13 -#: core/templates/core/temperature_list.html:4 -#: core/templates/core/temperature_list.html:7 -#: core/templates/core/temperature_list.html:12 -#: core/templates/core/temperature_list.html:29 -msgid "Temperature" -msgstr "Temperatuur" - -#: babybuddy/templates/babybuddy/nav-dropdown.html:81 -#: babybuddy/templates/babybuddy/nav-dropdown.html:301 +#: babybuddy/templates/babybuddy/nav-dropdown.html:296 #: babybuddy/templates/babybuddy/welcome.html:50 core/models.py:647 #: core/models.py:648 core/models.py:651 #: core/templates/core/timer_detail.html:59 @@ -281,44 +269,15 @@ msgstr "Temperatuur" msgid "Tummy Time" msgstr "Buikliggen" -#: babybuddy/templates/babybuddy/nav-dropdown.html:87 -#: babybuddy/templates/babybuddy/nav-dropdown.html:193 core/models.py:673 -#: core/models.py:685 core/models.py:686 core/models.py:689 -#: core/templates/core/weight_confirm_delete.html:7 -#: core/templates/core/weight_form.html:13 -#: core/templates/core/weight_list.html:4 -#: core/templates/core/weight_list.html:7 -#: core/templates/core/weight_list.html:12 -#: core/templates/core/weight_list.html:29 reports/graphs/weight_change.py:19 -#: reports/graphs/weight_change.py:30 -#: reports/templates/reports/report_list.html:22 -#: reports/templates/reports/weight_change.html:4 -#: reports/templates/reports/weight_change.html:8 -msgid "Weight" -msgstr "Gewicht" - -#: babybuddy/templates/babybuddy/nav-dropdown.html:93 -#: babybuddy/templates/babybuddy/nav-dropdown.html:316 core/models.py:437 -#: core/models.py:438 core/models.py:441 -#: core/templates/core/pumping_confirm_delete.html:7 -#: core/templates/core/pumping_form.html:13 -#: core/templates/core/pumping_list.html:4 -#: core/templates/core/pumping_list.html:7 -#: core/templates/core/pumping_list.html:12 -#: reports/templates/reports/pumping_amounts.html:4 -#: reports/templates/reports/pumping_amounts.html:8 -msgid "Pumping" -msgstr "" - -#: babybuddy/templates/babybuddy/nav-dropdown.html:118 +#: babybuddy/templates/babybuddy/nav-dropdown.html:99 #: core/templates/timeline/timeline.html:4 #: core/templates/timeline/timeline.html:7 #: dashboard/templates/dashboard/child_button_group.html:9 msgid "Timeline" msgstr "" -#: babybuddy/templates/babybuddy/nav-dropdown.html:129 -#: babybuddy/templates/babybuddy/nav-dropdown.html:137 core/models.py:188 +#: babybuddy/templates/babybuddy/nav-dropdown.html:110 +#: babybuddy/templates/babybuddy/nav-dropdown.html:118 core/models.py:188 #: core/templates/core/child_confirm_delete.html:7 #: core/templates/core/child_detail.html:7 #: core/templates/core/child_form.html:13 core/templates/core/child_list.html:4 @@ -328,7 +287,7 @@ msgstr "" msgid "Children" msgstr "Kinderen" -#: babybuddy/templates/babybuddy/nav-dropdown.html:143 core/models.py:137 +#: babybuddy/templates/babybuddy/nav-dropdown.html:124 core/models.py:137 #: core/models.py:187 core/models.py:221 core/models.py:274 core/models.py:335 #: core/models.py:367 core/models.py:394 core/models.py:426 core/models.py:450 #: core/models.py:503 core/models.py:537 core/models.py:630 core/models.py:671 @@ -347,7 +306,7 @@ msgstr "Kinderen" msgid "Child" msgstr "Kind" -#: babybuddy/templates/babybuddy/nav-dropdown.html:151 core/models.py:143 +#: babybuddy/templates/babybuddy/nav-dropdown.html:132 core/models.py:143 #: core/models.py:240 core/models.py:304 core/models.py:343 core/models.py:373 #: core/models.py:408 core/models.py:430 core/models.py:458 core/models.py:511 #: core/models.py:677 core/templates/core/note_confirm_delete.html:7 @@ -356,38 +315,26 @@ msgstr "Kind" msgid "Notes" msgstr "Notities" -#: babybuddy/templates/babybuddy/nav-dropdown.html:171 +#: babybuddy/templates/babybuddy/nav-dropdown.html:152 msgid "Measurements" msgstr "Metingen" -#: babybuddy/templates/babybuddy/nav-dropdown.html:185 -msgid "Temperature reading" -msgstr "Temperatuur meting" +#: babybuddy/templates/babybuddy/nav-dropdown.html:160 core/models.py:139 +#: core/models.py:151 core/models.py:152 core/models.py:155 +#: core/templates/core/bmi_confirm_delete.html:7 +#: core/templates/core/bmi_form.html:13 core/templates/core/bmi_list.html:4 +#: core/templates/core/bmi_list.html:7 core/templates/core/bmi_list.html:12 +#: core/templates/core/bmi_list.html:29 reports/graphs/bmi_change.py:19 +#: reports/graphs/bmi_change.py:30 reports/templates/reports/bmi_change.html:4 +#: reports/templates/reports/bmi_change.html:8 +msgid "BMI" +msgstr "" -#: babybuddy/templates/babybuddy/nav-dropdown.html:199 -msgid "Weight entry" -msgstr "Gewicht ingave" +#: babybuddy/templates/babybuddy/nav-dropdown.html:166 +msgid "BMI entry" +msgstr "MBI ingave" -#: babybuddy/templates/babybuddy/nav-dropdown.html:207 core/models.py:369 -#: core/models.py:381 core/models.py:382 core/models.py:385 -#: core/templates/core/height_confirm_delete.html:7 -#: core/templates/core/height_form.html:13 -#: core/templates/core/height_list.html:4 -#: core/templates/core/height_list.html:7 -#: core/templates/core/height_list.html:12 -#: core/templates/core/height_list.html:29 reports/graphs/height_change.py:19 -#: reports/graphs/height_change.py:30 -#: reports/templates/reports/height_change.html:4 -#: reports/templates/reports/height_change.html:8 -#: reports/templates/reports/report_list.html:17 -msgid "Height" -msgstr "Lengte" - -#: babybuddy/templates/babybuddy/nav-dropdown.html:213 -msgid "Height entry" -msgstr "Lengte ingave" - -#: babybuddy/templates/babybuddy/nav-dropdown.html:221 core/models.py:338 +#: babybuddy/templates/babybuddy/nav-dropdown.html:174 core/models.py:338 #: core/models.py:351 core/models.py:352 core/models.py:355 #: core/templates/core/head_circumference_confirm_delete.html:7 #: core/templates/core/head_circumference_form.html:13 @@ -403,39 +350,77 @@ msgstr "Lengte ingave" msgid "Head Circumference" msgstr "Hoofd omtrek" -#: babybuddy/templates/babybuddy/nav-dropdown.html:227 +#: babybuddy/templates/babybuddy/nav-dropdown.html:180 msgid "Head Circumference entry" msgstr "Hoofd omtrek ingave" -#: babybuddy/templates/babybuddy/nav-dropdown.html:235 core/models.py:139 -#: core/models.py:151 core/models.py:152 core/models.py:155 -#: core/templates/core/bmi_confirm_delete.html:7 -#: core/templates/core/bmi_form.html:13 core/templates/core/bmi_list.html:4 -#: core/templates/core/bmi_list.html:7 core/templates/core/bmi_list.html:12 -#: core/templates/core/bmi_list.html:29 reports/graphs/bmi_change.py:19 -#: reports/graphs/bmi_change.py:30 reports/templates/reports/bmi_change.html:4 -#: reports/templates/reports/bmi_change.html:8 -msgid "BMI" -msgstr "" +#: babybuddy/templates/babybuddy/nav-dropdown.html:188 core/models.py:369 +#: core/models.py:381 core/models.py:382 core/models.py:385 +#: core/templates/core/height_confirm_delete.html:7 +#: core/templates/core/height_form.html:13 +#: core/templates/core/height_list.html:4 +#: core/templates/core/height_list.html:7 +#: core/templates/core/height_list.html:12 +#: core/templates/core/height_list.html:29 reports/graphs/height_change.py:19 +#: reports/graphs/height_change.py:30 +#: reports/templates/reports/height_change.html:4 +#: reports/templates/reports/height_change.html:8 +#: reports/templates/reports/report_list.html:17 +msgid "Height" +msgstr "Lengte" -#: babybuddy/templates/babybuddy/nav-dropdown.html:241 -msgid "BMI entry" -msgstr "MBI ingave" +#: babybuddy/templates/babybuddy/nav-dropdown.html:194 +msgid "Height entry" +msgstr "Lengte ingave" -#: babybuddy/templates/babybuddy/nav-dropdown.html:255 +#: babybuddy/templates/babybuddy/nav-dropdown.html:202 core/models.py:506 +#: core/models.py:519 core/models.py:520 core/models.py:523 +#: core/templates/core/temperature_confirm_delete.html:7 +#: core/templates/core/temperature_form.html:13 +#: core/templates/core/temperature_list.html:4 +#: core/templates/core/temperature_list.html:7 +#: core/templates/core/temperature_list.html:12 +#: core/templates/core/temperature_list.html:29 +msgid "Temperature" +msgstr "Temperatuur" + +#: babybuddy/templates/babybuddy/nav-dropdown.html:208 +msgid "Temperature reading" +msgstr "Temperatuur meting" + +#: babybuddy/templates/babybuddy/nav-dropdown.html:216 core/models.py:673 +#: core/models.py:685 core/models.py:686 core/models.py:689 +#: core/templates/core/weight_confirm_delete.html:7 +#: core/templates/core/weight_form.html:13 +#: core/templates/core/weight_list.html:4 +#: core/templates/core/weight_list.html:7 +#: core/templates/core/weight_list.html:12 +#: core/templates/core/weight_list.html:29 reports/graphs/weight_change.py:19 +#: reports/graphs/weight_change.py:30 +#: reports/templates/reports/report_list.html:22 +#: reports/templates/reports/weight_change.html:4 +#: reports/templates/reports/weight_change.html:8 +msgid "Weight" +msgstr "Gewicht" + +#: babybuddy/templates/babybuddy/nav-dropdown.html:222 +msgid "Weight entry" +msgstr "Gewicht ingave" + +#: babybuddy/templates/babybuddy/nav-dropdown.html:236 msgid "Activities" msgstr "Activiteiten" -#: babybuddy/templates/babybuddy/nav-dropdown.html:262 +#: babybuddy/templates/babybuddy/nav-dropdown.html:243 #: reports/graphs/diaperchange_lifetimes.py:27 msgid "Changes" msgstr "Verschoningen" -#: babybuddy/templates/babybuddy/nav-dropdown.html:268 +#: babybuddy/templates/babybuddy/nav-dropdown.html:249 msgid "Change" msgstr "Verschoning" -#: babybuddy/templates/babybuddy/nav-dropdown.html:275 +#: babybuddy/templates/babybuddy/nav-dropdown.html:256 #: babybuddy/templates/babybuddy/welcome.html:34 core/models.py:313 #: core/templates/core/feeding_confirm_delete.html:7 #: core/templates/core/feeding_form.html:13 @@ -445,21 +430,33 @@ msgstr "Verschoning" msgid "Feedings" msgstr "Voedingen" -#: babybuddy/templates/babybuddy/nav-dropdown.html:294 -msgid "Sleep entry" -msgstr "Slaap ingave" +#: babybuddy/templates/babybuddy/nav-dropdown.html:270 core/models.py:437 +#: core/models.py:438 core/models.py:441 +#: core/templates/core/pumping_confirm_delete.html:7 +#: core/templates/core/pumping_form.html:13 +#: core/templates/core/pumping_list.html:4 +#: core/templates/core/pumping_list.html:7 +#: core/templates/core/pumping_list.html:12 +#: reports/templates/reports/pumping_amounts.html:4 +#: reports/templates/reports/pumping_amounts.html:8 +msgid "Pumping" +msgstr "" -#: babybuddy/templates/babybuddy/nav-dropdown.html:307 -msgid "Tummy Time entry" -msgstr "Buikliggen ingave" - -#: babybuddy/templates/babybuddy/nav-dropdown.html:322 +#: babybuddy/templates/babybuddy/nav-dropdown.html:276 #, fuzzy #| msgid "Weight entry" msgid "Pumping entry" msgstr "Gewicht ingave" -#: babybuddy/templates/babybuddy/nav-dropdown.html:346 +#: babybuddy/templates/babybuddy/nav-dropdown.html:289 +msgid "Sleep entry" +msgstr "Slaap ingave" + +#: babybuddy/templates/babybuddy/nav-dropdown.html:302 +msgid "Tummy Time entry" +msgstr "Buikliggen ingave" + +#: babybuddy/templates/babybuddy/nav-dropdown.html:326 #: babybuddy/templates/babybuddy/user_list.html:17 #: babybuddy/templates/babybuddy/user_password_form.html:7 #: babybuddy/templates/babybuddy/user_settings_form.html:7 core/models.py:556 @@ -467,23 +464,23 @@ msgstr "Gewicht ingave" msgid "User" msgstr "Gebruiker" -#: babybuddy/templates/babybuddy/nav-dropdown.html:348 +#: babybuddy/templates/babybuddy/nav-dropdown.html:328 msgid "Password" msgstr "Wachtwoord" -#: babybuddy/templates/babybuddy/nav-dropdown.html:352 +#: babybuddy/templates/babybuddy/nav-dropdown.html:332 msgid "Logout" msgstr "Uitloggen" -#: babybuddy/templates/babybuddy/nav-dropdown.html:355 +#: babybuddy/templates/babybuddy/nav-dropdown.html:335 msgid "Site" msgstr "Site" -#: babybuddy/templates/babybuddy/nav-dropdown.html:356 +#: babybuddy/templates/babybuddy/nav-dropdown.html:336 msgid "API Browser" msgstr "API browser" -#: babybuddy/templates/babybuddy/nav-dropdown.html:358 +#: babybuddy/templates/babybuddy/nav-dropdown.html:338 #: babybuddy/templates/babybuddy/user_confirm_delete.html:7 #: babybuddy/templates/babybuddy/user_form.html:13 #: babybuddy/templates/babybuddy/user_list.html:4 @@ -491,15 +488,15 @@ msgstr "API browser" msgid "Users" msgstr "Gebruikers" -#: babybuddy/templates/babybuddy/nav-dropdown.html:361 +#: babybuddy/templates/babybuddy/nav-dropdown.html:341 msgid "Support" msgstr "Ondersteuning" -#: babybuddy/templates/babybuddy/nav-dropdown.html:363 +#: babybuddy/templates/babybuddy/nav-dropdown.html:343 msgid "Source Code" msgstr "Broncode" -#: babybuddy/templates/babybuddy/nav-dropdown.html:365 +#: babybuddy/templates/babybuddy/nav-dropdown.html:345 msgid "Chat / Support" msgstr "Chat / Hulp" @@ -510,6 +507,7 @@ msgstr "Chat / Hulp" #: core/templates/timeline/_timeline.html:73 #: dashboard/templates/cards/feeding_day.html:43 #: dashboard/templates/cards/feeding_last_method.html:34 +#: dashboard/templates/cards/sleep_recent.html:43 #: dashboard/templates/cards/statistics.html:34 msgid "Previous" msgstr "Vorige" @@ -521,6 +519,7 @@ msgstr "Vorige" #: core/templates/timeline/_timeline.html:80 #: dashboard/templates/cards/feeding_day.html:47 #: dashboard/templates/cards/feeding_last_method.html:38 +#: dashboard/templates/cards/sleep_recent.html:47 #: dashboard/templates/cards/statistics.html:38 msgid "Next" msgstr "Volgende" @@ -994,7 +993,7 @@ msgstr "" #: reports/graphs/diaperchange_types.py:49 reports/graphs/feeding_amounts.py:70 #: reports/graphs/feeding_duration.py:56 #: reports/graphs/head_circumference_change.py:28 -#: reports/graphs/height_change.py:28 reports/graphs/pumping_amounts.py:58 +#: reports/graphs/height_change.py:28 reports/graphs/pumping_amounts.py:60 #: reports/graphs/sleep_pattern.py:151 reports/graphs/sleep_totals.py:59 #: reports/graphs/tummytime_duration.py:51 reports/graphs/weight_change.py:28 msgid "Date" @@ -1174,7 +1173,7 @@ msgstr "" #: core/templates/core/bmi_list.html:70 #, fuzzy #| msgid "No timer entries found." -msgid "No bmi entries found." +msgid "No BMI entries found." msgstr "Geen timer gegevens gevonden." #: core/templates/core/child_confirm_delete.html:4 @@ -1498,9 +1497,10 @@ msgstr "Actieve timers" #: dashboard/templates/cards/feeding_day.html:52 #: dashboard/templates/cards/feeding_last.html:17 #: dashboard/templates/cards/feeding_last_method.html:43 -#: dashboard/templates/cards/sleep_day.html:14 #: dashboard/templates/cards/sleep_last.html:17 #: dashboard/templates/cards/sleep_naps_day.html:18 +#: dashboard/templates/cards/sleep_recent.html:20 +#: dashboard/templates/cards/sleep_recent.html:52 #: dashboard/templates/cards/tummytime_day.html:14 msgid "None" msgstr "Geen" @@ -1621,6 +1621,22 @@ msgstr "" msgid "0 days" msgstr "0 dagen" +#: core/templatetags/duration.py:111 +#: dashboard/templates/cards/diaperchange_types.html:49 +msgid "today" +msgstr "vandaag" + +#: core/templatetags/duration.py:113 +#: dashboard/templates/cards/diaperchange_types.html:51 +msgid "yesterday" +msgstr "gisteren" + +#: core/templatetags/duration.py:116 +#, fuzzy +#| msgid "%(key)s days ago" +msgid " days ago" +msgstr "%(key)s dagen geleden" + #: core/timeline.py:53 #, python-format msgid "%(child)s started tummy time!" @@ -1760,14 +1776,6 @@ msgstr "nat" msgid "solid" msgstr "vast" -#: dashboard/templates/cards/diaperchange_types.html:49 -msgid "today" -msgstr "vandaag" - -#: dashboard/templates/cards/diaperchange_types.html:51 -msgid "yesterday" -msgstr "gisteren" - #: dashboard/templates/cards/diaperchange_types.html:53 #, python-format msgid "%(key)s days ago" @@ -1786,6 +1794,7 @@ msgstr[0] "%(count)s slaap gegevens" msgstr[1] "%(count)s slaap gegevens" #: dashboard/templates/cards/feeding_day.html:32 +#: dashboard/templates/cards/sleep_recent.html:32 #, python-format msgid "
%(since)s
" msgstr "" @@ -1810,15 +1819,6 @@ msgid_plural "%(n)s feedings ago" msgstr[0] "%(n)s maaltijd%(plural)s geleden" msgstr[1] "%(n)s maaltijd%(plural)s geleden" -#: dashboard/templates/cards/sleep_day.html:6 -msgid "Today's Sleep" -msgstr "Slaap vandaag" - -#: dashboard/templates/cards/sleep_day.html:20 -#, python-format -msgid "%(count)s sleep entries" -msgstr "%(count)s slaap gegevens" - #: dashboard/templates/cards/sleep_last.html:6 msgid "Last Sleep" msgstr "Laatste slaap" @@ -1835,6 +1835,20 @@ msgid_plural "%(count)s naps" msgstr[0] "%(count)s dutje%(plural)s" msgstr[1] "%(count)s dutje%(plural)s" +#: dashboard/templates/cards/sleep_recent.html:6 +#, fuzzy +#| msgid "Last Sleep" +msgid "Recent Sleep" +msgstr "Laatste slaap" + +#: dashboard/templates/cards/sleep_recent.html:25 +#, fuzzy, python-format +#| msgid "%(count)s sleep entries" +msgid "%(counter)s sleep" +msgid_plural "%(counter)s sleep" +msgstr[0] "%(count)s slaap gegevens" +msgstr[1] "%(count)s slaap gegevens" + #: dashboard/templates/cards/statistics.html:7 msgid "Statistics" msgstr "Statistieken" @@ -1887,69 +1901,69 @@ msgstr "Kind acties" msgid "Reports" msgstr "Rapporten" -#: dashboard/templatetags/cards.py:328 +#: dashboard/templatetags/cards.py:357 msgid "Average nap duration" msgstr "Gemiddelde duur dutjes" -#: dashboard/templatetags/cards.py:335 +#: dashboard/templatetags/cards.py:364 msgid "Average naps per day" msgstr "Gemiddelde dutjes per dag" -#: dashboard/templatetags/cards.py:345 +#: dashboard/templatetags/cards.py:374 msgid "Average sleep duration" msgstr "Gemiddelde slaap duur" -#: dashboard/templatetags/cards.py:352 +#: dashboard/templatetags/cards.py:381 msgid "Average awake duration" msgstr "Gemiddeld wakker duur" -#: dashboard/templatetags/cards.py:362 +#: dashboard/templatetags/cards.py:391 msgid "Weight change per week" msgstr "Gewichtsverandering per week" -#: dashboard/templatetags/cards.py:372 +#: dashboard/templatetags/cards.py:401 #, fuzzy #| msgid "Weight change per week" msgid "Height change per week" msgstr "Gewichtsverandering per week" -#: dashboard/templatetags/cards.py:382 +#: dashboard/templatetags/cards.py:411 #, fuzzy #| msgid "Head Circumference entry" msgid "Head circumference change per week" msgstr "Hoofd omtrek ingave" -#: dashboard/templatetags/cards.py:392 +#: dashboard/templatetags/cards.py:421 #, fuzzy #| msgid "Weight change per week" msgid "BMI change per week" msgstr "Gewichtsverandering per week" -#: dashboard/templatetags/cards.py:410 +#: dashboard/templatetags/cards.py:439 #, fuzzy #| msgid "Feeding frequency (past 3 days)" msgid "Diaper change frequency (past 3 days)" msgstr "Voeding frequenties (afgelopen 3 dagen)" -#: dashboard/templatetags/cards.py:414 +#: dashboard/templatetags/cards.py:443 #, fuzzy #| msgid "Feeding frequency (past 2 weeks)" msgid "Diaper change frequency (past 2 weeks)" msgstr "Voeding frequenties (afgelopen 2 weken)" -#: dashboard/templatetags/cards.py:420 +#: dashboard/templatetags/cards.py:449 msgid "Diaper change frequency" msgstr "Luierverschoning frequentie" -#: dashboard/templatetags/cards.py:456 +#: dashboard/templatetags/cards.py:485 msgid "Feeding frequency (past 3 days)" msgstr "Voeding frequenties (afgelopen 3 dagen)" -#: dashboard/templatetags/cards.py:460 +#: dashboard/templatetags/cards.py:489 msgid "Feeding frequency (past 2 weeks)" msgstr "Voeding frequenties (afgelopen 2 weken)" -#: dashboard/templatetags/cards.py:466 +#: dashboard/templatetags/cards.py:495 msgid "Feeding frequency" msgstr "Eten geven frequentie" @@ -2033,13 +2047,13 @@ msgstr "Hoofd omtrek" msgid "Height" msgstr "Gewichts" -#: reports/graphs/pumping_amounts.py:57 +#: reports/graphs/pumping_amounts.py:59 #, fuzzy #| msgid "Total Feeding Amounts" msgid "Total Pumping Amount" msgstr "Totaal hoeveelheid voeding" -#: reports/graphs/pumping_amounts.py:60 +#: reports/graphs/pumping_amounts.py:62 #, fuzzy #| msgid "Feeding Amounts" msgid "Pumping Amount" @@ -2156,3 +2170,10 @@ msgstr "Duur Buikliggen (Som)" #: reports/templates/reports/tummytime_duration.html:8 msgid "Total Tummy Time Durations" msgstr "Totaal Buikligggen Duur" + +#~ msgid "Today's Sleep" +#~ msgstr "Slaap vandaag" + +#, python-format +#~ msgid "%(count)s sleep entries" +#~ msgstr "%(count)s slaap gegevens" diff --git a/locale/pl/LC_MESSAGES/django.mo b/locale/pl/LC_MESSAGES/django.mo index 88c7e199..8607e7c8 100644 Binary files a/locale/pl/LC_MESSAGES/django.mo and b/locale/pl/LC_MESSAGES/django.mo differ diff --git a/locale/pl/LC_MESSAGES/django.po b/locale/pl/LC_MESSAGES/django.po index d2d95dd2..ccf40a8d 100644 --- a/locale/pl/LC_MESSAGES/django.po +++ b/locale/pl/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: test\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-06-05 13:25+0000\n" +"POT-Creation-Date: 2022-06-17 22:25+0000\n" "Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -12,12 +12,12 @@ msgstr "" "|| n%100>=20) ? 1 : 2);\n" #: babybuddy/admin.py:12 babybuddy/admin.py:13 -#: babybuddy/templates/babybuddy/nav-dropdown.html:347 +#: babybuddy/templates/babybuddy/nav-dropdown.html:327 #: babybuddy/templates/babybuddy/user_settings_form.html:8 msgid "Settings" msgstr "Ustawienia" -#: babybuddy/admin.py:17 babybuddy/templates/babybuddy/nav-dropdown.html:111 +#: babybuddy/admin.py:17 babybuddy/templates/babybuddy/nav-dropdown.html:92 #: babybuddy/templates/babybuddy/user_settings_form.html:61 #: dashboard/templates/dashboard/child.html:4 #: dashboard/templates/dashboard/child.html:9 @@ -184,7 +184,7 @@ msgstr "Turecki" #: babybuddy/templates/admin/base_site.html:4 #: babybuddy/templates/admin/base_site.html:7 -#: babybuddy/templates/babybuddy/nav-dropdown.html:359 +#: babybuddy/templates/babybuddy/nav-dropdown.html:339 msgid "Database Admin" msgstr "Administrator bazy danych" @@ -233,19 +233,19 @@ msgid "Diaper Change" msgstr "Zmiana pieluchy" #: babybuddy/templates/babybuddy/nav-dropdown.html:57 -#: babybuddy/templates/babybuddy/nav-dropdown.html:281 core/models.py:312 +#: babybuddy/templates/babybuddy/nav-dropdown.html:262 core/models.py:312 #: core/models.py:316 core/templates/core/timer_detail.html:43 msgid "Feeding" msgstr "Karmienie" #: babybuddy/templates/babybuddy/nav-dropdown.html:63 -#: babybuddy/templates/babybuddy/nav-dropdown.html:157 core/models.py:396 +#: babybuddy/templates/babybuddy/nav-dropdown.html:138 core/models.py:396 #: core/models.py:407 core/models.py:411 core/templates/core/note_list.html:29 msgid "Note" msgstr "Notatka" #: babybuddy/templates/babybuddy/nav-dropdown.html:69 -#: babybuddy/templates/babybuddy/nav-dropdown.html:288 +#: babybuddy/templates/babybuddy/nav-dropdown.html:283 #: babybuddy/templates/babybuddy/welcome.html:42 core/models.py:467 #: core/models.py:468 core/models.py:471 #: core/templates/core/sleep_confirm_delete.html:7 @@ -256,19 +256,7 @@ msgid "Sleep" msgstr "Spać" #: babybuddy/templates/babybuddy/nav-dropdown.html:75 -#: babybuddy/templates/babybuddy/nav-dropdown.html:179 core/models.py:506 -#: core/models.py:519 core/models.py:520 core/models.py:523 -#: core/templates/core/temperature_confirm_delete.html:7 -#: core/templates/core/temperature_form.html:13 -#: core/templates/core/temperature_list.html:4 -#: core/templates/core/temperature_list.html:7 -#: core/templates/core/temperature_list.html:12 -#: core/templates/core/temperature_list.html:29 -msgid "Temperature" -msgstr "Temperatura" - -#: babybuddy/templates/babybuddy/nav-dropdown.html:81 -#: babybuddy/templates/babybuddy/nav-dropdown.html:301 +#: babybuddy/templates/babybuddy/nav-dropdown.html:296 #: babybuddy/templates/babybuddy/welcome.html:50 core/models.py:647 #: core/models.py:648 core/models.py:651 #: core/templates/core/timer_detail.html:59 @@ -280,44 +268,15 @@ msgstr "Temperatura" msgid "Tummy Time" msgstr "Czas drzemki" -#: babybuddy/templates/babybuddy/nav-dropdown.html:87 -#: babybuddy/templates/babybuddy/nav-dropdown.html:193 core/models.py:673 -#: core/models.py:685 core/models.py:686 core/models.py:689 -#: core/templates/core/weight_confirm_delete.html:7 -#: core/templates/core/weight_form.html:13 -#: core/templates/core/weight_list.html:4 -#: core/templates/core/weight_list.html:7 -#: core/templates/core/weight_list.html:12 -#: core/templates/core/weight_list.html:29 reports/graphs/weight_change.py:19 -#: reports/graphs/weight_change.py:30 -#: reports/templates/reports/report_list.html:22 -#: reports/templates/reports/weight_change.html:4 -#: reports/templates/reports/weight_change.html:8 -msgid "Weight" -msgstr "Waga" - -#: babybuddy/templates/babybuddy/nav-dropdown.html:93 -#: babybuddy/templates/babybuddy/nav-dropdown.html:316 core/models.py:437 -#: core/models.py:438 core/models.py:441 -#: core/templates/core/pumping_confirm_delete.html:7 -#: core/templates/core/pumping_form.html:13 -#: core/templates/core/pumping_list.html:4 -#: core/templates/core/pumping_list.html:7 -#: core/templates/core/pumping_list.html:12 -#: reports/templates/reports/pumping_amounts.html:4 -#: reports/templates/reports/pumping_amounts.html:8 -msgid "Pumping" -msgstr "" - -#: babybuddy/templates/babybuddy/nav-dropdown.html:118 +#: babybuddy/templates/babybuddy/nav-dropdown.html:99 #: core/templates/timeline/timeline.html:4 #: core/templates/timeline/timeline.html:7 #: dashboard/templates/dashboard/child_button_group.html:9 msgid "Timeline" msgstr "" -#: babybuddy/templates/babybuddy/nav-dropdown.html:129 -#: babybuddy/templates/babybuddy/nav-dropdown.html:137 core/models.py:188 +#: babybuddy/templates/babybuddy/nav-dropdown.html:110 +#: babybuddy/templates/babybuddy/nav-dropdown.html:118 core/models.py:188 #: core/templates/core/child_confirm_delete.html:7 #: core/templates/core/child_detail.html:7 #: core/templates/core/child_form.html:13 core/templates/core/child_list.html:4 @@ -327,7 +286,7 @@ msgstr "" msgid "Children" msgstr "Dzieci" -#: babybuddy/templates/babybuddy/nav-dropdown.html:143 core/models.py:137 +#: babybuddy/templates/babybuddy/nav-dropdown.html:124 core/models.py:137 #: core/models.py:187 core/models.py:221 core/models.py:274 core/models.py:335 #: core/models.py:367 core/models.py:394 core/models.py:426 core/models.py:450 #: core/models.py:503 core/models.py:537 core/models.py:630 core/models.py:671 @@ -346,7 +305,7 @@ msgstr "Dzieci" msgid "Child" msgstr "Dziecko" -#: babybuddy/templates/babybuddy/nav-dropdown.html:151 core/models.py:143 +#: babybuddy/templates/babybuddy/nav-dropdown.html:132 core/models.py:143 #: core/models.py:240 core/models.py:304 core/models.py:343 core/models.py:373 #: core/models.py:408 core/models.py:430 core/models.py:458 core/models.py:511 #: core/models.py:677 core/templates/core/note_confirm_delete.html:7 @@ -355,19 +314,48 @@ msgstr "Dziecko" msgid "Notes" msgstr "Notatki" -#: babybuddy/templates/babybuddy/nav-dropdown.html:171 +#: babybuddy/templates/babybuddy/nav-dropdown.html:152 msgid "Measurements" msgstr "" -#: babybuddy/templates/babybuddy/nav-dropdown.html:185 -msgid "Temperature reading" -msgstr "Odczyt temperatury" +#: babybuddy/templates/babybuddy/nav-dropdown.html:160 core/models.py:139 +#: core/models.py:151 core/models.py:152 core/models.py:155 +#: core/templates/core/bmi_confirm_delete.html:7 +#: core/templates/core/bmi_form.html:13 core/templates/core/bmi_list.html:4 +#: core/templates/core/bmi_list.html:7 core/templates/core/bmi_list.html:12 +#: core/templates/core/bmi_list.html:29 reports/graphs/bmi_change.py:19 +#: reports/graphs/bmi_change.py:30 reports/templates/reports/bmi_change.html:4 +#: reports/templates/reports/bmi_change.html:8 +msgid "BMI" +msgstr "" -#: babybuddy/templates/babybuddy/nav-dropdown.html:199 -msgid "Weight entry" -msgstr "Wpis wagi" +#: babybuddy/templates/babybuddy/nav-dropdown.html:166 +#, fuzzy +#| msgid "Sleep entry" +msgid "BMI entry" +msgstr "Czas spania" -#: babybuddy/templates/babybuddy/nav-dropdown.html:207 core/models.py:369 +#: babybuddy/templates/babybuddy/nav-dropdown.html:174 core/models.py:338 +#: core/models.py:351 core/models.py:352 core/models.py:355 +#: core/templates/core/head_circumference_confirm_delete.html:7 +#: core/templates/core/head_circumference_form.html:13 +#: core/templates/core/head_circumference_list.html:4 +#: core/templates/core/head_circumference_list.html:7 +#: core/templates/core/head_circumference_list.html:12 +#: core/templates/core/head_circumference_list.html:29 +#: reports/graphs/head_circumference_change.py:19 +#: reports/graphs/head_circumference_change.py:30 +#: reports/templates/reports/head_circumference_change.html:4 +#: reports/templates/reports/head_circumference_change.html:8 +#: reports/templates/reports/report_list.html:16 +msgid "Head Circumference" +msgstr "" + +#: babybuddy/templates/babybuddy/nav-dropdown.html:180 +msgid "Head Circumference entry" +msgstr "" + +#: babybuddy/templates/babybuddy/nav-dropdown.html:188 core/models.py:369 #: core/models.py:381 core/models.py:382 core/models.py:385 #: core/templates/core/height_confirm_delete.html:7 #: core/templates/core/height_form.html:13 @@ -384,63 +372,60 @@ msgstr "Wpis wagi" msgid "Height" msgstr "Waga" -#: babybuddy/templates/babybuddy/nav-dropdown.html:213 +#: babybuddy/templates/babybuddy/nav-dropdown.html:194 #, fuzzy #| msgid "Weight entry" msgid "Height entry" msgstr "Wpis wagi" -#: babybuddy/templates/babybuddy/nav-dropdown.html:221 core/models.py:338 -#: core/models.py:351 core/models.py:352 core/models.py:355 -#: core/templates/core/head_circumference_confirm_delete.html:7 -#: core/templates/core/head_circumference_form.html:13 -#: core/templates/core/head_circumference_list.html:4 -#: core/templates/core/head_circumference_list.html:7 -#: core/templates/core/head_circumference_list.html:12 -#: core/templates/core/head_circumference_list.html:29 -#: reports/graphs/head_circumference_change.py:19 -#: reports/graphs/head_circumference_change.py:30 -#: reports/templates/reports/head_circumference_change.html:4 -#: reports/templates/reports/head_circumference_change.html:8 -#: reports/templates/reports/report_list.html:16 -msgid "Head Circumference" -msgstr "" +#: babybuddy/templates/babybuddy/nav-dropdown.html:202 core/models.py:506 +#: core/models.py:519 core/models.py:520 core/models.py:523 +#: core/templates/core/temperature_confirm_delete.html:7 +#: core/templates/core/temperature_form.html:13 +#: core/templates/core/temperature_list.html:4 +#: core/templates/core/temperature_list.html:7 +#: core/templates/core/temperature_list.html:12 +#: core/templates/core/temperature_list.html:29 +msgid "Temperature" +msgstr "Temperatura" -#: babybuddy/templates/babybuddy/nav-dropdown.html:227 -msgid "Head Circumference entry" -msgstr "" +#: babybuddy/templates/babybuddy/nav-dropdown.html:208 +msgid "Temperature reading" +msgstr "Odczyt temperatury" -#: babybuddy/templates/babybuddy/nav-dropdown.html:235 core/models.py:139 -#: core/models.py:151 core/models.py:152 core/models.py:155 -#: core/templates/core/bmi_confirm_delete.html:7 -#: core/templates/core/bmi_form.html:13 core/templates/core/bmi_list.html:4 -#: core/templates/core/bmi_list.html:7 core/templates/core/bmi_list.html:12 -#: core/templates/core/bmi_list.html:29 reports/graphs/bmi_change.py:19 -#: reports/graphs/bmi_change.py:30 reports/templates/reports/bmi_change.html:4 -#: reports/templates/reports/bmi_change.html:8 -msgid "BMI" -msgstr "" +#: babybuddy/templates/babybuddy/nav-dropdown.html:216 core/models.py:673 +#: core/models.py:685 core/models.py:686 core/models.py:689 +#: core/templates/core/weight_confirm_delete.html:7 +#: core/templates/core/weight_form.html:13 +#: core/templates/core/weight_list.html:4 +#: core/templates/core/weight_list.html:7 +#: core/templates/core/weight_list.html:12 +#: core/templates/core/weight_list.html:29 reports/graphs/weight_change.py:19 +#: reports/graphs/weight_change.py:30 +#: reports/templates/reports/report_list.html:22 +#: reports/templates/reports/weight_change.html:4 +#: reports/templates/reports/weight_change.html:8 +msgid "Weight" +msgstr "Waga" -#: babybuddy/templates/babybuddy/nav-dropdown.html:241 -#, fuzzy -#| msgid "Sleep entry" -msgid "BMI entry" -msgstr "Czas spania" +#: babybuddy/templates/babybuddy/nav-dropdown.html:222 +msgid "Weight entry" +msgstr "Wpis wagi" -#: babybuddy/templates/babybuddy/nav-dropdown.html:255 +#: babybuddy/templates/babybuddy/nav-dropdown.html:236 msgid "Activities" msgstr "Aktywności" -#: babybuddy/templates/babybuddy/nav-dropdown.html:262 +#: babybuddy/templates/babybuddy/nav-dropdown.html:243 #: reports/graphs/diaperchange_lifetimes.py:27 msgid "Changes" msgstr "Zmiany" -#: babybuddy/templates/babybuddy/nav-dropdown.html:268 +#: babybuddy/templates/babybuddy/nav-dropdown.html:249 msgid "Change" msgstr "Zmiana" -#: babybuddy/templates/babybuddy/nav-dropdown.html:275 +#: babybuddy/templates/babybuddy/nav-dropdown.html:256 #: babybuddy/templates/babybuddy/welcome.html:34 core/models.py:313 #: core/templates/core/feeding_confirm_delete.html:7 #: core/templates/core/feeding_form.html:13 @@ -450,21 +435,33 @@ msgstr "Zmiana" msgid "Feedings" msgstr "Karmienia" -#: babybuddy/templates/babybuddy/nav-dropdown.html:294 -msgid "Sleep entry" -msgstr "Czas spania" +#: babybuddy/templates/babybuddy/nav-dropdown.html:270 core/models.py:437 +#: core/models.py:438 core/models.py:441 +#: core/templates/core/pumping_confirm_delete.html:7 +#: core/templates/core/pumping_form.html:13 +#: core/templates/core/pumping_list.html:4 +#: core/templates/core/pumping_list.html:7 +#: core/templates/core/pumping_list.html:12 +#: reports/templates/reports/pumping_amounts.html:4 +#: reports/templates/reports/pumping_amounts.html:8 +msgid "Pumping" +msgstr "" -#: babybuddy/templates/babybuddy/nav-dropdown.html:307 -msgid "Tummy Time entry" -msgstr "Czas drzemki" - -#: babybuddy/templates/babybuddy/nav-dropdown.html:322 +#: babybuddy/templates/babybuddy/nav-dropdown.html:276 #, fuzzy #| msgid "Weight entry" msgid "Pumping entry" msgstr "Wpis wagi" -#: babybuddy/templates/babybuddy/nav-dropdown.html:346 +#: babybuddy/templates/babybuddy/nav-dropdown.html:289 +msgid "Sleep entry" +msgstr "Czas spania" + +#: babybuddy/templates/babybuddy/nav-dropdown.html:302 +msgid "Tummy Time entry" +msgstr "Czas drzemki" + +#: babybuddy/templates/babybuddy/nav-dropdown.html:326 #: babybuddy/templates/babybuddy/user_list.html:17 #: babybuddy/templates/babybuddy/user_password_form.html:7 #: babybuddy/templates/babybuddy/user_settings_form.html:7 core/models.py:556 @@ -472,23 +469,23 @@ msgstr "Wpis wagi" msgid "User" msgstr "Użytkownik" -#: babybuddy/templates/babybuddy/nav-dropdown.html:348 +#: babybuddy/templates/babybuddy/nav-dropdown.html:328 msgid "Password" msgstr "Hasło" -#: babybuddy/templates/babybuddy/nav-dropdown.html:352 +#: babybuddy/templates/babybuddy/nav-dropdown.html:332 msgid "Logout" msgstr "Wyloguj" -#: babybuddy/templates/babybuddy/nav-dropdown.html:355 +#: babybuddy/templates/babybuddy/nav-dropdown.html:335 msgid "Site" msgstr "Strona" -#: babybuddy/templates/babybuddy/nav-dropdown.html:356 +#: babybuddy/templates/babybuddy/nav-dropdown.html:336 msgid "API Browser" msgstr "Przeglądarka API" -#: babybuddy/templates/babybuddy/nav-dropdown.html:358 +#: babybuddy/templates/babybuddy/nav-dropdown.html:338 #: babybuddy/templates/babybuddy/user_confirm_delete.html:7 #: babybuddy/templates/babybuddy/user_form.html:13 #: babybuddy/templates/babybuddy/user_list.html:4 @@ -496,15 +493,15 @@ msgstr "Przeglądarka API" msgid "Users" msgstr "Użytkownicy" -#: babybuddy/templates/babybuddy/nav-dropdown.html:361 +#: babybuddy/templates/babybuddy/nav-dropdown.html:341 msgid "Support" msgstr "Wsparcie" -#: babybuddy/templates/babybuddy/nav-dropdown.html:363 +#: babybuddy/templates/babybuddy/nav-dropdown.html:343 msgid "Source Code" msgstr "Kod źródłowy" -#: babybuddy/templates/babybuddy/nav-dropdown.html:365 +#: babybuddy/templates/babybuddy/nav-dropdown.html:345 msgid "Chat / Support" msgstr "Czat / Wsparcie" @@ -515,6 +512,7 @@ msgstr "Czat / Wsparcie" #: core/templates/timeline/_timeline.html:73 #: dashboard/templates/cards/feeding_day.html:43 #: dashboard/templates/cards/feeding_last_method.html:34 +#: dashboard/templates/cards/sleep_recent.html:43 #: dashboard/templates/cards/statistics.html:34 msgid "Previous" msgstr "Poprzedni" @@ -526,6 +524,7 @@ msgstr "Poprzedni" #: core/templates/timeline/_timeline.html:80 #: dashboard/templates/cards/feeding_day.html:47 #: dashboard/templates/cards/feeding_last_method.html:38 +#: dashboard/templates/cards/sleep_recent.html:47 #: dashboard/templates/cards/statistics.html:38 msgid "Next" msgstr "Następny" @@ -991,7 +990,7 @@ msgstr "" #: reports/graphs/diaperchange_types.py:49 reports/graphs/feeding_amounts.py:70 #: reports/graphs/feeding_duration.py:56 #: reports/graphs/head_circumference_change.py:28 -#: reports/graphs/height_change.py:28 reports/graphs/pumping_amounts.py:58 +#: reports/graphs/height_change.py:28 reports/graphs/pumping_amounts.py:60 #: reports/graphs/sleep_pattern.py:151 reports/graphs/sleep_totals.py:59 #: reports/graphs/tummytime_duration.py:51 reports/graphs/weight_change.py:28 msgid "Date" @@ -1171,7 +1170,7 @@ msgstr "" #: core/templates/core/bmi_list.html:70 #, fuzzy #| msgid "No timer entries found." -msgid "No bmi entries found." +msgid "No BMI entries found." msgstr "Brak wpisów stopera" #: core/templates/core/child_confirm_delete.html:4 @@ -1492,9 +1491,10 @@ msgstr "Aktywne stopery" #: dashboard/templates/cards/feeding_day.html:52 #: dashboard/templates/cards/feeding_last.html:17 #: dashboard/templates/cards/feeding_last_method.html:43 -#: dashboard/templates/cards/sleep_day.html:14 #: dashboard/templates/cards/sleep_last.html:17 #: dashboard/templates/cards/sleep_naps_day.html:18 +#: dashboard/templates/cards/sleep_recent.html:20 +#: dashboard/templates/cards/sleep_recent.html:52 #: dashboard/templates/cards/tummytime_day.html:14 msgid "None" msgstr "Brak" @@ -1615,6 +1615,22 @@ msgstr "" msgid "0 days" msgstr "" +#: core/templatetags/duration.py:111 +#: dashboard/templates/cards/diaperchange_types.html:49 +msgid "today" +msgstr "Dzisiaj" + +#: core/templatetags/duration.py:113 +#: dashboard/templates/cards/diaperchange_types.html:51 +msgid "yesterday" +msgstr "Wczoraj" + +#: core/templatetags/duration.py:116 +#, fuzzy +#| msgid "%(key)s days ago" +msgid " days ago" +msgstr "%(key)s dni temu" + #: core/timeline.py:53 #, python-format msgid "%(child)s started tummy time!" @@ -1760,14 +1776,6 @@ msgstr "mokry" msgid "solid" msgstr "suchy" -#: dashboard/templates/cards/diaperchange_types.html:49 -msgid "today" -msgstr "Dzisiaj" - -#: dashboard/templates/cards/diaperchange_types.html:51 -msgid "yesterday" -msgstr "Wczoraj" - #: dashboard/templates/cards/diaperchange_types.html:53 #, python-format msgid "%(key)s days ago" @@ -1787,6 +1795,7 @@ msgstr[1] "%(count)s pójść spać" msgstr[2] "%(count)s pójść spać" #: dashboard/templates/cards/feeding_day.html:32 +#: dashboard/templates/cards/sleep_recent.html:32 #, python-format msgid "
%(since)s
" msgstr "" @@ -1812,15 +1821,6 @@ msgstr[0] "%(n)s karmień%(plural)s temu" msgstr[1] "%(n)s karmień%(plural)s temu" msgstr[2] "%(n)s karmień%(plural)s temu" -#: dashboard/templates/cards/sleep_day.html:6 -msgid "Today's Sleep" -msgstr "Dzisiejsze spanie" - -#: dashboard/templates/cards/sleep_day.html:20 -#, python-format -msgid "%(count)s sleep entries" -msgstr "%(count)s pójść spać" - #: dashboard/templates/cards/sleep_last.html:6 msgid "Last Sleep" msgstr "Ostatni sen" @@ -1838,6 +1838,21 @@ msgstr[0] "%(count)s nap%(plural)s" msgstr[1] "%(count)s nap%(plural)s" msgstr[2] "%(count)s nap%(plural)s" +#: dashboard/templates/cards/sleep_recent.html:6 +#, fuzzy +#| msgid "Last Sleep" +msgid "Recent Sleep" +msgstr "Ostatni sen" + +#: dashboard/templates/cards/sleep_recent.html:25 +#, fuzzy, python-format +#| msgid "%(count)s sleep entries" +msgid "%(counter)s sleep" +msgid_plural "%(counter)s sleep" +msgstr[0] "%(count)s pójść spać" +msgstr[1] "%(count)s pójść spać" +msgstr[2] "%(count)s pójść spać" + #: dashboard/templates/cards/statistics.html:7 msgid "Statistics" msgstr "Statystyki" @@ -1891,69 +1906,69 @@ msgstr "Akcje dzieci" msgid "Reports" msgstr "Zgłoszeń" -#: dashboard/templatetags/cards.py:328 +#: dashboard/templatetags/cards.py:357 msgid "Average nap duration" msgstr "Średni czas drzemi" -#: dashboard/templatetags/cards.py:335 +#: dashboard/templatetags/cards.py:364 msgid "Average naps per day" msgstr "Średnie drzemki na dzień" -#: dashboard/templatetags/cards.py:345 +#: dashboard/templatetags/cards.py:374 msgid "Average sleep duration" msgstr "Średni czas spania" -#: dashboard/templatetags/cards.py:352 +#: dashboard/templatetags/cards.py:381 msgid "Average awake duration" msgstr "Średni czas wstawania" -#: dashboard/templatetags/cards.py:362 +#: dashboard/templatetags/cards.py:391 msgid "Weight change per week" msgstr "Zmiana wagi w ciągu tygodnia" -#: dashboard/templatetags/cards.py:372 +#: dashboard/templatetags/cards.py:401 #, fuzzy #| msgid "Weight change per week" msgid "Height change per week" msgstr "Zmiana wagi w ciągu tygodnia" -#: dashboard/templatetags/cards.py:382 +#: dashboard/templatetags/cards.py:411 #, fuzzy #| msgid "Weight change per week" msgid "Head circumference change per week" msgstr "Zmiana wagi w ciągu tygodnia" -#: dashboard/templatetags/cards.py:392 +#: dashboard/templatetags/cards.py:421 #, fuzzy #| msgid "Weight change per week" msgid "BMI change per week" msgstr "Zmiana wagi w ciągu tygodnia" -#: dashboard/templatetags/cards.py:410 +#: dashboard/templatetags/cards.py:439 #, fuzzy #| msgid "Diaper change frequency" msgid "Diaper change frequency (past 3 days)" msgstr "Częstotliwość zmiany pieluchy" -#: dashboard/templatetags/cards.py:414 +#: dashboard/templatetags/cards.py:443 #, fuzzy #| msgid "Diaper change frequency" msgid "Diaper change frequency (past 2 weeks)" msgstr "Częstotliwość zmiany pieluchy" -#: dashboard/templatetags/cards.py:420 +#: dashboard/templatetags/cards.py:449 msgid "Diaper change frequency" msgstr "Częstotliwość zmiany pieluchy" -#: dashboard/templatetags/cards.py:456 +#: dashboard/templatetags/cards.py:485 msgid "Feeding frequency (past 3 days)" msgstr "" -#: dashboard/templatetags/cards.py:460 +#: dashboard/templatetags/cards.py:489 msgid "Feeding frequency (past 2 weeks)" msgstr "" -#: dashboard/templatetags/cards.py:466 +#: dashboard/templatetags/cards.py:495 msgid "Feeding frequency" msgstr "Częstotliwość karmienia" @@ -2035,13 +2050,13 @@ msgstr "" msgid "Height" msgstr "Waga" -#: reports/graphs/pumping_amounts.py:57 +#: reports/graphs/pumping_amounts.py:59 #, fuzzy #| msgid "Total Feeding Amounts" msgid "Total Pumping Amount" msgstr "Łączna ilość karmień" -#: reports/graphs/pumping_amounts.py:60 +#: reports/graphs/pumping_amounts.py:62 #, fuzzy #| msgid "Feeding Amounts" msgid "Pumping Amount" @@ -2158,3 +2173,10 @@ msgstr "" #: reports/templates/reports/tummytime_duration.html:8 msgid "Total Tummy Time Durations" msgstr "" + +#~ msgid "Today's Sleep" +#~ msgstr "Dzisiejsze spanie" + +#, python-format +#~ msgid "%(count)s sleep entries" +#~ msgstr "%(count)s pójść spać" diff --git a/locale/pt/LC_MESSAGES/django.mo b/locale/pt/LC_MESSAGES/django.mo index 287ef0bb..88ec0ecc 100644 Binary files a/locale/pt/LC_MESSAGES/django.mo and b/locale/pt/LC_MESSAGES/django.mo differ diff --git a/locale/pt/LC_MESSAGES/django.po b/locale/pt/LC_MESSAGES/django.po index 0743fa33..282f0c4c 100644 --- a/locale/pt/LC_MESSAGES/django.po +++ b/locale/pt/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Baby Buddy\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-06-05 13:25+0000\n" +"POT-Creation-Date: 2022-06-17 22:25+0000\n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -11,12 +11,12 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: babybuddy/admin.py:12 babybuddy/admin.py:13 -#: babybuddy/templates/babybuddy/nav-dropdown.html:347 +#: babybuddy/templates/babybuddy/nav-dropdown.html:327 #: babybuddy/templates/babybuddy/user_settings_form.html:8 msgid "Settings" msgstr "Preferências" -#: babybuddy/admin.py:17 babybuddy/templates/babybuddy/nav-dropdown.html:111 +#: babybuddy/admin.py:17 babybuddy/templates/babybuddy/nav-dropdown.html:92 #: babybuddy/templates/babybuddy/user_settings_form.html:61 #: dashboard/templates/dashboard/child.html:4 #: dashboard/templates/dashboard/child.html:9 @@ -185,7 +185,7 @@ msgstr "Turco" #: babybuddy/templates/admin/base_site.html:4 #: babybuddy/templates/admin/base_site.html:7 -#: babybuddy/templates/babybuddy/nav-dropdown.html:359 +#: babybuddy/templates/babybuddy/nav-dropdown.html:339 msgid "Database Admin" msgstr "Administrador da Base de Dados" @@ -233,19 +233,19 @@ msgid "Diaper Change" msgstr "Mudança de Fralda" #: babybuddy/templates/babybuddy/nav-dropdown.html:57 -#: babybuddy/templates/babybuddy/nav-dropdown.html:281 core/models.py:312 +#: babybuddy/templates/babybuddy/nav-dropdown.html:262 core/models.py:312 #: core/models.py:316 core/templates/core/timer_detail.html:43 msgid "Feeding" msgstr "Alimentação" #: babybuddy/templates/babybuddy/nav-dropdown.html:63 -#: babybuddy/templates/babybuddy/nav-dropdown.html:157 core/models.py:396 +#: babybuddy/templates/babybuddy/nav-dropdown.html:138 core/models.py:396 #: core/models.py:407 core/models.py:411 core/templates/core/note_list.html:29 msgid "Note" msgstr "Nota" #: babybuddy/templates/babybuddy/nav-dropdown.html:69 -#: babybuddy/templates/babybuddy/nav-dropdown.html:288 +#: babybuddy/templates/babybuddy/nav-dropdown.html:283 #: babybuddy/templates/babybuddy/welcome.html:42 core/models.py:467 #: core/models.py:468 core/models.py:471 #: core/templates/core/sleep_confirm_delete.html:7 @@ -256,19 +256,7 @@ msgid "Sleep" msgstr "Sono" #: babybuddy/templates/babybuddy/nav-dropdown.html:75 -#: babybuddy/templates/babybuddy/nav-dropdown.html:179 core/models.py:506 -#: core/models.py:519 core/models.py:520 core/models.py:523 -#: core/templates/core/temperature_confirm_delete.html:7 -#: core/templates/core/temperature_form.html:13 -#: core/templates/core/temperature_list.html:4 -#: core/templates/core/temperature_list.html:7 -#: core/templates/core/temperature_list.html:12 -#: core/templates/core/temperature_list.html:29 -msgid "Temperature" -msgstr "Temperatura" - -#: babybuddy/templates/babybuddy/nav-dropdown.html:81 -#: babybuddy/templates/babybuddy/nav-dropdown.html:301 +#: babybuddy/templates/babybuddy/nav-dropdown.html:296 #: babybuddy/templates/babybuddy/welcome.html:50 core/models.py:647 #: core/models.py:648 core/models.py:651 #: core/templates/core/timer_detail.html:59 @@ -280,44 +268,15 @@ msgstr "Temperatura" msgid "Tummy Time" msgstr "Tempo de Barriga para Baixo" -#: babybuddy/templates/babybuddy/nav-dropdown.html:87 -#: babybuddy/templates/babybuddy/nav-dropdown.html:193 core/models.py:673 -#: core/models.py:685 core/models.py:686 core/models.py:689 -#: core/templates/core/weight_confirm_delete.html:7 -#: core/templates/core/weight_form.html:13 -#: core/templates/core/weight_list.html:4 -#: core/templates/core/weight_list.html:7 -#: core/templates/core/weight_list.html:12 -#: core/templates/core/weight_list.html:29 reports/graphs/weight_change.py:19 -#: reports/graphs/weight_change.py:30 -#: reports/templates/reports/report_list.html:22 -#: reports/templates/reports/weight_change.html:4 -#: reports/templates/reports/weight_change.html:8 -msgid "Weight" -msgstr "Peso" - -#: babybuddy/templates/babybuddy/nav-dropdown.html:93 -#: babybuddy/templates/babybuddy/nav-dropdown.html:316 core/models.py:437 -#: core/models.py:438 core/models.py:441 -#: core/templates/core/pumping_confirm_delete.html:7 -#: core/templates/core/pumping_form.html:13 -#: core/templates/core/pumping_list.html:4 -#: core/templates/core/pumping_list.html:7 -#: core/templates/core/pumping_list.html:12 -#: reports/templates/reports/pumping_amounts.html:4 -#: reports/templates/reports/pumping_amounts.html:8 -msgid "Pumping" -msgstr "" - -#: babybuddy/templates/babybuddy/nav-dropdown.html:118 +#: babybuddy/templates/babybuddy/nav-dropdown.html:99 #: core/templates/timeline/timeline.html:4 #: core/templates/timeline/timeline.html:7 #: dashboard/templates/dashboard/child_button_group.html:9 msgid "Timeline" msgstr "Linha temporal" -#: babybuddy/templates/babybuddy/nav-dropdown.html:129 -#: babybuddy/templates/babybuddy/nav-dropdown.html:137 core/models.py:188 +#: babybuddy/templates/babybuddy/nav-dropdown.html:110 +#: babybuddy/templates/babybuddy/nav-dropdown.html:118 core/models.py:188 #: core/templates/core/child_confirm_delete.html:7 #: core/templates/core/child_detail.html:7 #: core/templates/core/child_form.html:13 core/templates/core/child_list.html:4 @@ -327,7 +286,7 @@ msgstr "Linha temporal" msgid "Children" msgstr "Crianças" -#: babybuddy/templates/babybuddy/nav-dropdown.html:143 core/models.py:137 +#: babybuddy/templates/babybuddy/nav-dropdown.html:124 core/models.py:137 #: core/models.py:187 core/models.py:221 core/models.py:274 core/models.py:335 #: core/models.py:367 core/models.py:394 core/models.py:426 core/models.py:450 #: core/models.py:503 core/models.py:537 core/models.py:630 core/models.py:671 @@ -346,7 +305,7 @@ msgstr "Crianças" msgid "Child" msgstr "Criança" -#: babybuddy/templates/babybuddy/nav-dropdown.html:151 core/models.py:143 +#: babybuddy/templates/babybuddy/nav-dropdown.html:132 core/models.py:143 #: core/models.py:240 core/models.py:304 core/models.py:343 core/models.py:373 #: core/models.py:408 core/models.py:430 core/models.py:458 core/models.py:511 #: core/models.py:677 core/templates/core/note_confirm_delete.html:7 @@ -355,19 +314,48 @@ msgstr "Criança" msgid "Notes" msgstr "Notas" -#: babybuddy/templates/babybuddy/nav-dropdown.html:171 +#: babybuddy/templates/babybuddy/nav-dropdown.html:152 msgid "Measurements" msgstr "" -#: babybuddy/templates/babybuddy/nav-dropdown.html:185 -msgid "Temperature reading" -msgstr "Leitura de temperatura" +#: babybuddy/templates/babybuddy/nav-dropdown.html:160 core/models.py:139 +#: core/models.py:151 core/models.py:152 core/models.py:155 +#: core/templates/core/bmi_confirm_delete.html:7 +#: core/templates/core/bmi_form.html:13 core/templates/core/bmi_list.html:4 +#: core/templates/core/bmi_list.html:7 core/templates/core/bmi_list.html:12 +#: core/templates/core/bmi_list.html:29 reports/graphs/bmi_change.py:19 +#: reports/graphs/bmi_change.py:30 reports/templates/reports/bmi_change.html:4 +#: reports/templates/reports/bmi_change.html:8 +msgid "BMI" +msgstr "" -#: babybuddy/templates/babybuddy/nav-dropdown.html:199 -msgid "Weight entry" -msgstr "Novo peso" +#: babybuddy/templates/babybuddy/nav-dropdown.html:166 +#, fuzzy +#| msgid "Sleep entry" +msgid "BMI entry" +msgstr "Novo sono" -#: babybuddy/templates/babybuddy/nav-dropdown.html:207 core/models.py:369 +#: babybuddy/templates/babybuddy/nav-dropdown.html:174 core/models.py:338 +#: core/models.py:351 core/models.py:352 core/models.py:355 +#: core/templates/core/head_circumference_confirm_delete.html:7 +#: core/templates/core/head_circumference_form.html:13 +#: core/templates/core/head_circumference_list.html:4 +#: core/templates/core/head_circumference_list.html:7 +#: core/templates/core/head_circumference_list.html:12 +#: core/templates/core/head_circumference_list.html:29 +#: reports/graphs/head_circumference_change.py:19 +#: reports/graphs/head_circumference_change.py:30 +#: reports/templates/reports/head_circumference_change.html:4 +#: reports/templates/reports/head_circumference_change.html:8 +#: reports/templates/reports/report_list.html:16 +msgid "Head Circumference" +msgstr "" + +#: babybuddy/templates/babybuddy/nav-dropdown.html:180 +msgid "Head Circumference entry" +msgstr "" + +#: babybuddy/templates/babybuddy/nav-dropdown.html:188 core/models.py:369 #: core/models.py:381 core/models.py:382 core/models.py:385 #: core/templates/core/height_confirm_delete.html:7 #: core/templates/core/height_form.html:13 @@ -384,63 +372,60 @@ msgstr "Novo peso" msgid "Height" msgstr "Peso" -#: babybuddy/templates/babybuddy/nav-dropdown.html:213 +#: babybuddy/templates/babybuddy/nav-dropdown.html:194 #, fuzzy #| msgid "Weight entry" msgid "Height entry" msgstr "Novo peso" -#: babybuddy/templates/babybuddy/nav-dropdown.html:221 core/models.py:338 -#: core/models.py:351 core/models.py:352 core/models.py:355 -#: core/templates/core/head_circumference_confirm_delete.html:7 -#: core/templates/core/head_circumference_form.html:13 -#: core/templates/core/head_circumference_list.html:4 -#: core/templates/core/head_circumference_list.html:7 -#: core/templates/core/head_circumference_list.html:12 -#: core/templates/core/head_circumference_list.html:29 -#: reports/graphs/head_circumference_change.py:19 -#: reports/graphs/head_circumference_change.py:30 -#: reports/templates/reports/head_circumference_change.html:4 -#: reports/templates/reports/head_circumference_change.html:8 -#: reports/templates/reports/report_list.html:16 -msgid "Head Circumference" -msgstr "" +#: babybuddy/templates/babybuddy/nav-dropdown.html:202 core/models.py:506 +#: core/models.py:519 core/models.py:520 core/models.py:523 +#: core/templates/core/temperature_confirm_delete.html:7 +#: core/templates/core/temperature_form.html:13 +#: core/templates/core/temperature_list.html:4 +#: core/templates/core/temperature_list.html:7 +#: core/templates/core/temperature_list.html:12 +#: core/templates/core/temperature_list.html:29 +msgid "Temperature" +msgstr "Temperatura" -#: babybuddy/templates/babybuddy/nav-dropdown.html:227 -msgid "Head Circumference entry" -msgstr "" +#: babybuddy/templates/babybuddy/nav-dropdown.html:208 +msgid "Temperature reading" +msgstr "Leitura de temperatura" -#: babybuddy/templates/babybuddy/nav-dropdown.html:235 core/models.py:139 -#: core/models.py:151 core/models.py:152 core/models.py:155 -#: core/templates/core/bmi_confirm_delete.html:7 -#: core/templates/core/bmi_form.html:13 core/templates/core/bmi_list.html:4 -#: core/templates/core/bmi_list.html:7 core/templates/core/bmi_list.html:12 -#: core/templates/core/bmi_list.html:29 reports/graphs/bmi_change.py:19 -#: reports/graphs/bmi_change.py:30 reports/templates/reports/bmi_change.html:4 -#: reports/templates/reports/bmi_change.html:8 -msgid "BMI" -msgstr "" +#: babybuddy/templates/babybuddy/nav-dropdown.html:216 core/models.py:673 +#: core/models.py:685 core/models.py:686 core/models.py:689 +#: core/templates/core/weight_confirm_delete.html:7 +#: core/templates/core/weight_form.html:13 +#: core/templates/core/weight_list.html:4 +#: core/templates/core/weight_list.html:7 +#: core/templates/core/weight_list.html:12 +#: core/templates/core/weight_list.html:29 reports/graphs/weight_change.py:19 +#: reports/graphs/weight_change.py:30 +#: reports/templates/reports/report_list.html:22 +#: reports/templates/reports/weight_change.html:4 +#: reports/templates/reports/weight_change.html:8 +msgid "Weight" +msgstr "Peso" -#: babybuddy/templates/babybuddy/nav-dropdown.html:241 -#, fuzzy -#| msgid "Sleep entry" -msgid "BMI entry" -msgstr "Novo sono" +#: babybuddy/templates/babybuddy/nav-dropdown.html:222 +msgid "Weight entry" +msgstr "Novo peso" -#: babybuddy/templates/babybuddy/nav-dropdown.html:255 +#: babybuddy/templates/babybuddy/nav-dropdown.html:236 msgid "Activities" msgstr "Actividades" -#: babybuddy/templates/babybuddy/nav-dropdown.html:262 +#: babybuddy/templates/babybuddy/nav-dropdown.html:243 #: reports/graphs/diaperchange_lifetimes.py:27 msgid "Changes" msgstr "Mudanças de fralda" -#: babybuddy/templates/babybuddy/nav-dropdown.html:268 +#: babybuddy/templates/babybuddy/nav-dropdown.html:249 msgid "Change" msgstr "Mudança de fralda" -#: babybuddy/templates/babybuddy/nav-dropdown.html:275 +#: babybuddy/templates/babybuddy/nav-dropdown.html:256 #: babybuddy/templates/babybuddy/welcome.html:34 core/models.py:313 #: core/templates/core/feeding_confirm_delete.html:7 #: core/templates/core/feeding_form.html:13 @@ -450,21 +435,33 @@ msgstr "Mudança de fralda" msgid "Feedings" msgstr "Alimentações" -#: babybuddy/templates/babybuddy/nav-dropdown.html:294 -msgid "Sleep entry" -msgstr "Novo sono" +#: babybuddy/templates/babybuddy/nav-dropdown.html:270 core/models.py:437 +#: core/models.py:438 core/models.py:441 +#: core/templates/core/pumping_confirm_delete.html:7 +#: core/templates/core/pumping_form.html:13 +#: core/templates/core/pumping_list.html:4 +#: core/templates/core/pumping_list.html:7 +#: core/templates/core/pumping_list.html:12 +#: reports/templates/reports/pumping_amounts.html:4 +#: reports/templates/reports/pumping_amounts.html:8 +msgid "Pumping" +msgstr "" -#: babybuddy/templates/babybuddy/nav-dropdown.html:307 -msgid "Tummy Time entry" -msgstr "Entrada de Tempo de Barriga para Baixo" - -#: babybuddy/templates/babybuddy/nav-dropdown.html:322 +#: babybuddy/templates/babybuddy/nav-dropdown.html:276 #, fuzzy #| msgid "Weight entry" msgid "Pumping entry" msgstr "Novo peso" -#: babybuddy/templates/babybuddy/nav-dropdown.html:346 +#: babybuddy/templates/babybuddy/nav-dropdown.html:289 +msgid "Sleep entry" +msgstr "Novo sono" + +#: babybuddy/templates/babybuddy/nav-dropdown.html:302 +msgid "Tummy Time entry" +msgstr "Entrada de Tempo de Barriga para Baixo" + +#: babybuddy/templates/babybuddy/nav-dropdown.html:326 #: babybuddy/templates/babybuddy/user_list.html:17 #: babybuddy/templates/babybuddy/user_password_form.html:7 #: babybuddy/templates/babybuddy/user_settings_form.html:7 core/models.py:556 @@ -472,23 +469,23 @@ msgstr "Novo peso" msgid "User" msgstr "Utilizador" -#: babybuddy/templates/babybuddy/nav-dropdown.html:348 +#: babybuddy/templates/babybuddy/nav-dropdown.html:328 msgid "Password" msgstr "Password" -#: babybuddy/templates/babybuddy/nav-dropdown.html:352 +#: babybuddy/templates/babybuddy/nav-dropdown.html:332 msgid "Logout" msgstr "Logout" -#: babybuddy/templates/babybuddy/nav-dropdown.html:355 +#: babybuddy/templates/babybuddy/nav-dropdown.html:335 msgid "Site" msgstr "Site" -#: babybuddy/templates/babybuddy/nav-dropdown.html:356 +#: babybuddy/templates/babybuddy/nav-dropdown.html:336 msgid "API Browser" msgstr "Navegador de API" -#: babybuddy/templates/babybuddy/nav-dropdown.html:358 +#: babybuddy/templates/babybuddy/nav-dropdown.html:338 #: babybuddy/templates/babybuddy/user_confirm_delete.html:7 #: babybuddy/templates/babybuddy/user_form.html:13 #: babybuddy/templates/babybuddy/user_list.html:4 @@ -496,15 +493,15 @@ msgstr "Navegador de API" msgid "Users" msgstr "Utilizadores" -#: babybuddy/templates/babybuddy/nav-dropdown.html:361 +#: babybuddy/templates/babybuddy/nav-dropdown.html:341 msgid "Support" msgstr "Suporte" -#: babybuddy/templates/babybuddy/nav-dropdown.html:363 +#: babybuddy/templates/babybuddy/nav-dropdown.html:343 msgid "Source Code" msgstr "Código Fonte" -#: babybuddy/templates/babybuddy/nav-dropdown.html:365 +#: babybuddy/templates/babybuddy/nav-dropdown.html:345 msgid "Chat / Support" msgstr "Chat / Suporte" @@ -515,6 +512,7 @@ msgstr "Chat / Suporte" #: core/templates/timeline/_timeline.html:73 #: dashboard/templates/cards/feeding_day.html:43 #: dashboard/templates/cards/feeding_last_method.html:34 +#: dashboard/templates/cards/sleep_recent.html:43 #: dashboard/templates/cards/statistics.html:34 msgid "Previous" msgstr "Anterior" @@ -526,6 +524,7 @@ msgstr "Anterior" #: core/templates/timeline/_timeline.html:80 #: dashboard/templates/cards/feeding_day.html:47 #: dashboard/templates/cards/feeding_last_method.html:38 +#: dashboard/templates/cards/sleep_recent.html:47 #: dashboard/templates/cards/statistics.html:38 msgid "Next" msgstr "Seguinte" @@ -995,7 +994,7 @@ msgstr "" #: reports/graphs/diaperchange_types.py:49 reports/graphs/feeding_amounts.py:70 #: reports/graphs/feeding_duration.py:56 #: reports/graphs/head_circumference_change.py:28 -#: reports/graphs/height_change.py:28 reports/graphs/pumping_amounts.py:58 +#: reports/graphs/height_change.py:28 reports/graphs/pumping_amounts.py:60 #: reports/graphs/sleep_pattern.py:151 reports/graphs/sleep_totals.py:59 #: reports/graphs/tummytime_duration.py:51 reports/graphs/weight_change.py:28 msgid "Date" @@ -1175,7 +1174,7 @@ msgstr "" #: core/templates/core/bmi_list.html:70 #, fuzzy #| msgid "No timer entries found." -msgid "No bmi entries found." +msgid "No BMI entries found." msgstr "Não foram encontradas entradas de temporizador." #: core/templates/core/child_confirm_delete.html:4 @@ -1439,11 +1438,11 @@ msgstr "Apagar inactivo" msgid "Are you sure you want to delete %(number)s inactive timer?" msgid_plural "Are you sure you want to delete %(number)s inactive timers?" msgstr[0] "" -"Tem a certeza que deseja eliminar %(number)s temporizadore%(plural)s inactivo" -"%(plural)s?" +"Tem a certeza que deseja eliminar %(number)s temporizadore%(plural)s " +"inactivo%(plural)s?" msgstr[1] "" -"Tem a certeza que deseja eliminar %(number)s temporizadore%(plural)s inactivo" -"%(plural)s?" +"Tem a certeza que deseja eliminar %(number)s temporizadore%(plural)s " +"inactivo%(plural)s?" #: core/templates/core/timer_detail.html:28 msgid "Started" @@ -1499,9 +1498,10 @@ msgstr "Temporizadores Activos" #: dashboard/templates/cards/feeding_day.html:52 #: dashboard/templates/cards/feeding_last.html:17 #: dashboard/templates/cards/feeding_last_method.html:43 -#: dashboard/templates/cards/sleep_day.html:14 #: dashboard/templates/cards/sleep_last.html:17 #: dashboard/templates/cards/sleep_naps_day.html:18 +#: dashboard/templates/cards/sleep_recent.html:20 +#: dashboard/templates/cards/sleep_recent.html:52 #: dashboard/templates/cards/tummytime_day.html:14 msgid "None" msgstr "Nenhum" @@ -1622,6 +1622,22 @@ msgstr "{}, {}" msgid "0 days" msgstr "0 dias" +#: core/templatetags/duration.py:111 +#: dashboard/templates/cards/diaperchange_types.html:49 +msgid "today" +msgstr "hoje" + +#: core/templatetags/duration.py:113 +#: dashboard/templates/cards/diaperchange_types.html:51 +msgid "yesterday" +msgstr "ontem" + +#: core/templatetags/duration.py:116 +#, fuzzy +#| msgid "%(key)s days ago" +msgid " days ago" +msgstr "%(key)s dias atrás" + #: core/timeline.py:53 #, python-format msgid "%(child)s started tummy time!" @@ -1761,14 +1777,6 @@ msgstr "molhado" msgid "solid" msgstr "sólido" -#: dashboard/templates/cards/diaperchange_types.html:49 -msgid "today" -msgstr "hoje" - -#: dashboard/templates/cards/diaperchange_types.html:51 -msgid "yesterday" -msgstr "ontem" - #: dashboard/templates/cards/diaperchange_types.html:53 #, python-format msgid "%(key)s days ago" @@ -1787,6 +1795,7 @@ msgstr[0] "%(count)s entradas de sono" msgstr[1] "%(count)s entradas de sono" #: dashboard/templates/cards/feeding_day.html:32 +#: dashboard/templates/cards/sleep_recent.html:32 #, python-format msgid "
%(since)s
" msgstr "" @@ -1811,15 +1820,6 @@ msgid_plural "%(n)s feedings ago" msgstr[0] "%(n)s alimentaçõe%(plural)s atrás" msgstr[1] "%(n)s alimentaçõe%(plural)s atrás" -#: dashboard/templates/cards/sleep_day.html:6 -msgid "Today's Sleep" -msgstr "Sono de Hoje" - -#: dashboard/templates/cards/sleep_day.html:20 -#, python-format -msgid "%(count)s sleep entries" -msgstr "%(count)s entradas de sono" - #: dashboard/templates/cards/sleep_last.html:6 msgid "Last Sleep" msgstr "Último Sono" @@ -1836,6 +1836,20 @@ msgid_plural "%(count)s naps" msgstr[0] "%(count)s sesta%(plural)s" msgstr[1] "%(count)s sesta%(plural)s" +#: dashboard/templates/cards/sleep_recent.html:6 +#, fuzzy +#| msgid "Last Sleep" +msgid "Recent Sleep" +msgstr "Último Sono" + +#: dashboard/templates/cards/sleep_recent.html:25 +#, fuzzy, python-format +#| msgid "%(count)s sleep entries" +msgid "%(counter)s sleep" +msgid_plural "%(counter)s sleep" +msgstr[0] "%(count)s entradas de sono" +msgstr[1] "%(count)s entradas de sono" + #: dashboard/templates/cards/statistics.html:7 msgid "Statistics" msgstr "Estatísticas" @@ -1888,69 +1902,69 @@ msgstr "Acções da criança" msgid "Reports" msgstr "Relatórios" -#: dashboard/templatetags/cards.py:328 +#: dashboard/templatetags/cards.py:357 msgid "Average nap duration" msgstr "Média de duração das sestas" -#: dashboard/templatetags/cards.py:335 +#: dashboard/templatetags/cards.py:364 msgid "Average naps per day" msgstr "Média de sestas por dua" -#: dashboard/templatetags/cards.py:345 +#: dashboard/templatetags/cards.py:374 msgid "Average sleep duration" msgstr "Média de duração dos sonos" -#: dashboard/templatetags/cards.py:352 +#: dashboard/templatetags/cards.py:381 msgid "Average awake duration" msgstr "Média de tempo acordado" -#: dashboard/templatetags/cards.py:362 +#: dashboard/templatetags/cards.py:391 msgid "Weight change per week" msgstr "Alterações de peso por semana" -#: dashboard/templatetags/cards.py:372 +#: dashboard/templatetags/cards.py:401 #, fuzzy #| msgid "Weight change per week" msgid "Height change per week" msgstr "Alterações de peso por semana" -#: dashboard/templatetags/cards.py:382 +#: dashboard/templatetags/cards.py:411 #, fuzzy #| msgid "Weight change per week" msgid "Head circumference change per week" msgstr "Alterações de peso por semana" -#: dashboard/templatetags/cards.py:392 +#: dashboard/templatetags/cards.py:421 #, fuzzy #| msgid "Weight change per week" msgid "BMI change per week" msgstr "Alterações de peso por semana" -#: dashboard/templatetags/cards.py:410 +#: dashboard/templatetags/cards.py:439 #, fuzzy #| msgid "Feeding frequency (past 3 days)" msgid "Diaper change frequency (past 3 days)" msgstr "Frequência de alimentação (últimos 3 dias)" -#: dashboard/templatetags/cards.py:414 +#: dashboard/templatetags/cards.py:443 #, fuzzy #| msgid "Feeding frequency (past 2 weeks)" msgid "Diaper change frequency (past 2 weeks)" msgstr "Frequência de alimentação (últimas 2 semanas)" -#: dashboard/templatetags/cards.py:420 +#: dashboard/templatetags/cards.py:449 msgid "Diaper change frequency" msgstr "Frequência da mudança de fralda" -#: dashboard/templatetags/cards.py:456 +#: dashboard/templatetags/cards.py:485 msgid "Feeding frequency (past 3 days)" msgstr "Frequência de alimentação (últimos 3 dias)" -#: dashboard/templatetags/cards.py:460 +#: dashboard/templatetags/cards.py:489 msgid "Feeding frequency (past 2 weeks)" msgstr "Frequência de alimentação (últimas 2 semanas)" -#: dashboard/templatetags/cards.py:466 +#: dashboard/templatetags/cards.py:495 msgid "Feeding frequency" msgstr "Frequência de alimentação" @@ -2032,13 +2046,13 @@ msgstr "" msgid "Height" msgstr "Peso" -#: reports/graphs/pumping_amounts.py:57 +#: reports/graphs/pumping_amounts.py:59 #, fuzzy #| msgid "Total Feeding Amounts" msgid "Total Pumping Amount" msgstr "Total de Alimentações" -#: reports/graphs/pumping_amounts.py:60 +#: reports/graphs/pumping_amounts.py:62 #, fuzzy #| msgid "Feeding Amounts" msgid "Pumping Amount" @@ -2155,3 +2169,10 @@ msgstr "" #: reports/templates/reports/tummytime_duration.html:8 msgid "Total Tummy Time Durations" msgstr "" + +#~ msgid "Today's Sleep" +#~ msgstr "Sono de Hoje" + +#, python-format +#~ msgid "%(count)s sleep entries" +#~ msgstr "%(count)s entradas de sono" diff --git a/locale/sv/LC_MESSAGES/django.mo b/locale/sv/LC_MESSAGES/django.mo index f4ff03b4..d7835c20 100644 Binary files a/locale/sv/LC_MESSAGES/django.mo and b/locale/sv/LC_MESSAGES/django.mo differ diff --git a/locale/sv/LC_MESSAGES/django.po b/locale/sv/LC_MESSAGES/django.po index 7cf7b9cf..49ac3479 100644 --- a/locale/sv/LC_MESSAGES/django.po +++ b/locale/sv/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Baby Buddy\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-06-05 13:25+0000\n" +"POT-Creation-Date: 2022-06-17 22:25+0000\n" "Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -11,12 +11,12 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: babybuddy/admin.py:12 babybuddy/admin.py:13 -#: babybuddy/templates/babybuddy/nav-dropdown.html:347 +#: babybuddy/templates/babybuddy/nav-dropdown.html:327 #: babybuddy/templates/babybuddy/user_settings_form.html:8 msgid "Settings" msgstr "Inställningar" -#: babybuddy/admin.py:17 babybuddy/templates/babybuddy/nav-dropdown.html:111 +#: babybuddy/admin.py:17 babybuddy/templates/babybuddy/nav-dropdown.html:92 #: babybuddy/templates/babybuddy/user_settings_form.html:61 #: dashboard/templates/dashboard/child.html:4 #: dashboard/templates/dashboard/child.html:9 @@ -183,7 +183,7 @@ msgstr "" #: babybuddy/templates/admin/base_site.html:4 #: babybuddy/templates/admin/base_site.html:7 -#: babybuddy/templates/babybuddy/nav-dropdown.html:359 +#: babybuddy/templates/babybuddy/nav-dropdown.html:339 msgid "Database Admin" msgstr "" @@ -232,19 +232,19 @@ msgid "Diaper Change" msgstr "Blöjbyte" #: babybuddy/templates/babybuddy/nav-dropdown.html:57 -#: babybuddy/templates/babybuddy/nav-dropdown.html:281 core/models.py:312 +#: babybuddy/templates/babybuddy/nav-dropdown.html:262 core/models.py:312 #: core/models.py:316 core/templates/core/timer_detail.html:43 msgid "Feeding" msgstr "Matning" #: babybuddy/templates/babybuddy/nav-dropdown.html:63 -#: babybuddy/templates/babybuddy/nav-dropdown.html:157 core/models.py:396 +#: babybuddy/templates/babybuddy/nav-dropdown.html:138 core/models.py:396 #: core/models.py:407 core/models.py:411 core/templates/core/note_list.html:29 msgid "Note" msgstr "Anteckning" #: babybuddy/templates/babybuddy/nav-dropdown.html:69 -#: babybuddy/templates/babybuddy/nav-dropdown.html:288 +#: babybuddy/templates/babybuddy/nav-dropdown.html:283 #: babybuddy/templates/babybuddy/welcome.html:42 core/models.py:467 #: core/models.py:468 core/models.py:471 #: core/templates/core/sleep_confirm_delete.html:7 @@ -255,19 +255,7 @@ msgid "Sleep" msgstr "Sömn" #: babybuddy/templates/babybuddy/nav-dropdown.html:75 -#: babybuddy/templates/babybuddy/nav-dropdown.html:179 core/models.py:506 -#: core/models.py:519 core/models.py:520 core/models.py:523 -#: core/templates/core/temperature_confirm_delete.html:7 -#: core/templates/core/temperature_form.html:13 -#: core/templates/core/temperature_list.html:4 -#: core/templates/core/temperature_list.html:7 -#: core/templates/core/temperature_list.html:12 -#: core/templates/core/temperature_list.html:29 -msgid "Temperature" -msgstr "" - -#: babybuddy/templates/babybuddy/nav-dropdown.html:81 -#: babybuddy/templates/babybuddy/nav-dropdown.html:301 +#: babybuddy/templates/babybuddy/nav-dropdown.html:296 #: babybuddy/templates/babybuddy/welcome.html:50 core/models.py:647 #: core/models.py:648 core/models.py:651 #: core/templates/core/timer_detail.html:59 @@ -279,44 +267,15 @@ msgstr "" msgid "Tummy Time" msgstr "Magläge" -#: babybuddy/templates/babybuddy/nav-dropdown.html:87 -#: babybuddy/templates/babybuddy/nav-dropdown.html:193 core/models.py:673 -#: core/models.py:685 core/models.py:686 core/models.py:689 -#: core/templates/core/weight_confirm_delete.html:7 -#: core/templates/core/weight_form.html:13 -#: core/templates/core/weight_list.html:4 -#: core/templates/core/weight_list.html:7 -#: core/templates/core/weight_list.html:12 -#: core/templates/core/weight_list.html:29 reports/graphs/weight_change.py:19 -#: reports/graphs/weight_change.py:30 -#: reports/templates/reports/report_list.html:22 -#: reports/templates/reports/weight_change.html:4 -#: reports/templates/reports/weight_change.html:8 -msgid "Weight" -msgstr "Vikt" - -#: babybuddy/templates/babybuddy/nav-dropdown.html:93 -#: babybuddy/templates/babybuddy/nav-dropdown.html:316 core/models.py:437 -#: core/models.py:438 core/models.py:441 -#: core/templates/core/pumping_confirm_delete.html:7 -#: core/templates/core/pumping_form.html:13 -#: core/templates/core/pumping_list.html:4 -#: core/templates/core/pumping_list.html:7 -#: core/templates/core/pumping_list.html:12 -#: reports/templates/reports/pumping_amounts.html:4 -#: reports/templates/reports/pumping_amounts.html:8 -msgid "Pumping" -msgstr "" - -#: babybuddy/templates/babybuddy/nav-dropdown.html:118 +#: babybuddy/templates/babybuddy/nav-dropdown.html:99 #: core/templates/timeline/timeline.html:4 #: core/templates/timeline/timeline.html:7 #: dashboard/templates/dashboard/child_button_group.html:9 msgid "Timeline" msgstr "" -#: babybuddy/templates/babybuddy/nav-dropdown.html:129 -#: babybuddy/templates/babybuddy/nav-dropdown.html:137 core/models.py:188 +#: babybuddy/templates/babybuddy/nav-dropdown.html:110 +#: babybuddy/templates/babybuddy/nav-dropdown.html:118 core/models.py:188 #: core/templates/core/child_confirm_delete.html:7 #: core/templates/core/child_detail.html:7 #: core/templates/core/child_form.html:13 core/templates/core/child_list.html:4 @@ -326,7 +285,7 @@ msgstr "" msgid "Children" msgstr "Barn" -#: babybuddy/templates/babybuddy/nav-dropdown.html:143 core/models.py:137 +#: babybuddy/templates/babybuddy/nav-dropdown.html:124 core/models.py:137 #: core/models.py:187 core/models.py:221 core/models.py:274 core/models.py:335 #: core/models.py:367 core/models.py:394 core/models.py:426 core/models.py:450 #: core/models.py:503 core/models.py:537 core/models.py:630 core/models.py:671 @@ -345,7 +304,7 @@ msgstr "Barn" msgid "Child" msgstr "Barnet" -#: babybuddy/templates/babybuddy/nav-dropdown.html:151 core/models.py:143 +#: babybuddy/templates/babybuddy/nav-dropdown.html:132 core/models.py:143 #: core/models.py:240 core/models.py:304 core/models.py:343 core/models.py:373 #: core/models.py:408 core/models.py:430 core/models.py:458 core/models.py:511 #: core/models.py:677 core/templates/core/note_confirm_delete.html:7 @@ -354,19 +313,48 @@ msgstr "Barnet" msgid "Notes" msgstr "Anteckningar" -#: babybuddy/templates/babybuddy/nav-dropdown.html:171 +#: babybuddy/templates/babybuddy/nav-dropdown.html:152 msgid "Measurements" msgstr "" -#: babybuddy/templates/babybuddy/nav-dropdown.html:185 -msgid "Temperature reading" +#: babybuddy/templates/babybuddy/nav-dropdown.html:160 core/models.py:139 +#: core/models.py:151 core/models.py:152 core/models.py:155 +#: core/templates/core/bmi_confirm_delete.html:7 +#: core/templates/core/bmi_form.html:13 core/templates/core/bmi_list.html:4 +#: core/templates/core/bmi_list.html:7 core/templates/core/bmi_list.html:12 +#: core/templates/core/bmi_list.html:29 reports/graphs/bmi_change.py:19 +#: reports/graphs/bmi_change.py:30 reports/templates/reports/bmi_change.html:4 +#: reports/templates/reports/bmi_change.html:8 +msgid "BMI" msgstr "" -#: babybuddy/templates/babybuddy/nav-dropdown.html:199 -msgid "Weight entry" -msgstr "Viktinlägg" +#: babybuddy/templates/babybuddy/nav-dropdown.html:166 +#, fuzzy +#| msgid "Sleep entry" +msgid "BMI entry" +msgstr "Sömninlägg" -#: babybuddy/templates/babybuddy/nav-dropdown.html:207 core/models.py:369 +#: babybuddy/templates/babybuddy/nav-dropdown.html:174 core/models.py:338 +#: core/models.py:351 core/models.py:352 core/models.py:355 +#: core/templates/core/head_circumference_confirm_delete.html:7 +#: core/templates/core/head_circumference_form.html:13 +#: core/templates/core/head_circumference_list.html:4 +#: core/templates/core/head_circumference_list.html:7 +#: core/templates/core/head_circumference_list.html:12 +#: core/templates/core/head_circumference_list.html:29 +#: reports/graphs/head_circumference_change.py:19 +#: reports/graphs/head_circumference_change.py:30 +#: reports/templates/reports/head_circumference_change.html:4 +#: reports/templates/reports/head_circumference_change.html:8 +#: reports/templates/reports/report_list.html:16 +msgid "Head Circumference" +msgstr "" + +#: babybuddy/templates/babybuddy/nav-dropdown.html:180 +msgid "Head Circumference entry" +msgstr "" + +#: babybuddy/templates/babybuddy/nav-dropdown.html:188 core/models.py:369 #: core/models.py:381 core/models.py:382 core/models.py:385 #: core/templates/core/height_confirm_delete.html:7 #: core/templates/core/height_form.html:13 @@ -383,63 +371,60 @@ msgstr "Viktinlägg" msgid "Height" msgstr "Vikt" -#: babybuddy/templates/babybuddy/nav-dropdown.html:213 +#: babybuddy/templates/babybuddy/nav-dropdown.html:194 #, fuzzy #| msgid "Weight entry" msgid "Height entry" msgstr "Viktinlägg" -#: babybuddy/templates/babybuddy/nav-dropdown.html:221 core/models.py:338 -#: core/models.py:351 core/models.py:352 core/models.py:355 -#: core/templates/core/head_circumference_confirm_delete.html:7 -#: core/templates/core/head_circumference_form.html:13 -#: core/templates/core/head_circumference_list.html:4 -#: core/templates/core/head_circumference_list.html:7 -#: core/templates/core/head_circumference_list.html:12 -#: core/templates/core/head_circumference_list.html:29 -#: reports/graphs/head_circumference_change.py:19 -#: reports/graphs/head_circumference_change.py:30 -#: reports/templates/reports/head_circumference_change.html:4 -#: reports/templates/reports/head_circumference_change.html:8 -#: reports/templates/reports/report_list.html:16 -msgid "Head Circumference" +#: babybuddy/templates/babybuddy/nav-dropdown.html:202 core/models.py:506 +#: core/models.py:519 core/models.py:520 core/models.py:523 +#: core/templates/core/temperature_confirm_delete.html:7 +#: core/templates/core/temperature_form.html:13 +#: core/templates/core/temperature_list.html:4 +#: core/templates/core/temperature_list.html:7 +#: core/templates/core/temperature_list.html:12 +#: core/templates/core/temperature_list.html:29 +msgid "Temperature" msgstr "" -#: babybuddy/templates/babybuddy/nav-dropdown.html:227 -msgid "Head Circumference entry" +#: babybuddy/templates/babybuddy/nav-dropdown.html:208 +msgid "Temperature reading" msgstr "" -#: babybuddy/templates/babybuddy/nav-dropdown.html:235 core/models.py:139 -#: core/models.py:151 core/models.py:152 core/models.py:155 -#: core/templates/core/bmi_confirm_delete.html:7 -#: core/templates/core/bmi_form.html:13 core/templates/core/bmi_list.html:4 -#: core/templates/core/bmi_list.html:7 core/templates/core/bmi_list.html:12 -#: core/templates/core/bmi_list.html:29 reports/graphs/bmi_change.py:19 -#: reports/graphs/bmi_change.py:30 reports/templates/reports/bmi_change.html:4 -#: reports/templates/reports/bmi_change.html:8 -msgid "BMI" -msgstr "" +#: babybuddy/templates/babybuddy/nav-dropdown.html:216 core/models.py:673 +#: core/models.py:685 core/models.py:686 core/models.py:689 +#: core/templates/core/weight_confirm_delete.html:7 +#: core/templates/core/weight_form.html:13 +#: core/templates/core/weight_list.html:4 +#: core/templates/core/weight_list.html:7 +#: core/templates/core/weight_list.html:12 +#: core/templates/core/weight_list.html:29 reports/graphs/weight_change.py:19 +#: reports/graphs/weight_change.py:30 +#: reports/templates/reports/report_list.html:22 +#: reports/templates/reports/weight_change.html:4 +#: reports/templates/reports/weight_change.html:8 +msgid "Weight" +msgstr "Vikt" -#: babybuddy/templates/babybuddy/nav-dropdown.html:241 -#, fuzzy -#| msgid "Sleep entry" -msgid "BMI entry" -msgstr "Sömninlägg" +#: babybuddy/templates/babybuddy/nav-dropdown.html:222 +msgid "Weight entry" +msgstr "Viktinlägg" -#: babybuddy/templates/babybuddy/nav-dropdown.html:255 +#: babybuddy/templates/babybuddy/nav-dropdown.html:236 msgid "Activities" msgstr "Aktiviteter" -#: babybuddy/templates/babybuddy/nav-dropdown.html:262 +#: babybuddy/templates/babybuddy/nav-dropdown.html:243 #: reports/graphs/diaperchange_lifetimes.py:27 msgid "Changes" msgstr "Ändringar" -#: babybuddy/templates/babybuddy/nav-dropdown.html:268 +#: babybuddy/templates/babybuddy/nav-dropdown.html:249 msgid "Change" msgstr "Ändring" -#: babybuddy/templates/babybuddy/nav-dropdown.html:275 +#: babybuddy/templates/babybuddy/nav-dropdown.html:256 #: babybuddy/templates/babybuddy/welcome.html:34 core/models.py:313 #: core/templates/core/feeding_confirm_delete.html:7 #: core/templates/core/feeding_form.html:13 @@ -449,21 +434,33 @@ msgstr "Ändring" msgid "Feedings" msgstr "Matningar" -#: babybuddy/templates/babybuddy/nav-dropdown.html:294 -msgid "Sleep entry" -msgstr "Sömninlägg" +#: babybuddy/templates/babybuddy/nav-dropdown.html:270 core/models.py:437 +#: core/models.py:438 core/models.py:441 +#: core/templates/core/pumping_confirm_delete.html:7 +#: core/templates/core/pumping_form.html:13 +#: core/templates/core/pumping_list.html:4 +#: core/templates/core/pumping_list.html:7 +#: core/templates/core/pumping_list.html:12 +#: reports/templates/reports/pumping_amounts.html:4 +#: reports/templates/reports/pumping_amounts.html:8 +msgid "Pumping" +msgstr "" -#: babybuddy/templates/babybuddy/nav-dropdown.html:307 -msgid "Tummy Time entry" -msgstr "Magläge-inlägg" - -#: babybuddy/templates/babybuddy/nav-dropdown.html:322 +#: babybuddy/templates/babybuddy/nav-dropdown.html:276 #, fuzzy #| msgid "Weight entry" msgid "Pumping entry" msgstr "Viktinlägg" -#: babybuddy/templates/babybuddy/nav-dropdown.html:346 +#: babybuddy/templates/babybuddy/nav-dropdown.html:289 +msgid "Sleep entry" +msgstr "Sömninlägg" + +#: babybuddy/templates/babybuddy/nav-dropdown.html:302 +msgid "Tummy Time entry" +msgstr "Magläge-inlägg" + +#: babybuddy/templates/babybuddy/nav-dropdown.html:326 #: babybuddy/templates/babybuddy/user_list.html:17 #: babybuddy/templates/babybuddy/user_password_form.html:7 #: babybuddy/templates/babybuddy/user_settings_form.html:7 core/models.py:556 @@ -471,23 +468,23 @@ msgstr "Viktinlägg" msgid "User" msgstr "Användare" -#: babybuddy/templates/babybuddy/nav-dropdown.html:348 +#: babybuddy/templates/babybuddy/nav-dropdown.html:328 msgid "Password" msgstr "Lösenord" -#: babybuddy/templates/babybuddy/nav-dropdown.html:352 +#: babybuddy/templates/babybuddy/nav-dropdown.html:332 msgid "Logout" msgstr "Logga ut" -#: babybuddy/templates/babybuddy/nav-dropdown.html:355 +#: babybuddy/templates/babybuddy/nav-dropdown.html:335 msgid "Site" msgstr "Sidan" -#: babybuddy/templates/babybuddy/nav-dropdown.html:356 +#: babybuddy/templates/babybuddy/nav-dropdown.html:336 msgid "API Browser" msgstr "API-bläddrare" -#: babybuddy/templates/babybuddy/nav-dropdown.html:358 +#: babybuddy/templates/babybuddy/nav-dropdown.html:338 #: babybuddy/templates/babybuddy/user_confirm_delete.html:7 #: babybuddy/templates/babybuddy/user_form.html:13 #: babybuddy/templates/babybuddy/user_list.html:4 @@ -495,15 +492,15 @@ msgstr "API-bläddrare" msgid "Users" msgstr "Användare" -#: babybuddy/templates/babybuddy/nav-dropdown.html:361 +#: babybuddy/templates/babybuddy/nav-dropdown.html:341 msgid "Support" msgstr "Support" -#: babybuddy/templates/babybuddy/nav-dropdown.html:363 +#: babybuddy/templates/babybuddy/nav-dropdown.html:343 msgid "Source Code" msgstr "Källkod" -#: babybuddy/templates/babybuddy/nav-dropdown.html:365 +#: babybuddy/templates/babybuddy/nav-dropdown.html:345 msgid "Chat / Support" msgstr "Chatt / Support" @@ -514,6 +511,7 @@ msgstr "Chatt / Support" #: core/templates/timeline/_timeline.html:73 #: dashboard/templates/cards/feeding_day.html:43 #: dashboard/templates/cards/feeding_last_method.html:34 +#: dashboard/templates/cards/sleep_recent.html:43 #: dashboard/templates/cards/statistics.html:34 msgid "Previous" msgstr "Föregående" @@ -525,6 +523,7 @@ msgstr "Föregående" #: core/templates/timeline/_timeline.html:80 #: dashboard/templates/cards/feeding_day.html:47 #: dashboard/templates/cards/feeding_last_method.html:38 +#: dashboard/templates/cards/sleep_recent.html:47 #: dashboard/templates/cards/statistics.html:38 msgid "Next" msgstr "Nästa" @@ -993,7 +992,7 @@ msgstr "" #: reports/graphs/diaperchange_types.py:49 reports/graphs/feeding_amounts.py:70 #: reports/graphs/feeding_duration.py:56 #: reports/graphs/head_circumference_change.py:28 -#: reports/graphs/height_change.py:28 reports/graphs/pumping_amounts.py:58 +#: reports/graphs/height_change.py:28 reports/graphs/pumping_amounts.py:60 #: reports/graphs/sleep_pattern.py:151 reports/graphs/sleep_totals.py:59 #: reports/graphs/tummytime_duration.py:51 reports/graphs/weight_change.py:28 msgid "Date" @@ -1173,7 +1172,7 @@ msgstr "" #: core/templates/core/bmi_list.html:70 #, fuzzy #| msgid "No timer entries found." -msgid "No bmi entries found." +msgid "No BMI entries found." msgstr "Inga timer-inlägg funna." #: core/templates/core/child_confirm_delete.html:4 @@ -1493,9 +1492,10 @@ msgstr "Aktiva timers" #: dashboard/templates/cards/feeding_day.html:52 #: dashboard/templates/cards/feeding_last.html:17 #: dashboard/templates/cards/feeding_last_method.html:43 -#: dashboard/templates/cards/sleep_day.html:14 #: dashboard/templates/cards/sleep_last.html:17 #: dashboard/templates/cards/sleep_naps_day.html:18 +#: dashboard/templates/cards/sleep_recent.html:20 +#: dashboard/templates/cards/sleep_recent.html:52 #: dashboard/templates/cards/tummytime_day.html:14 msgid "None" msgstr "Inga" @@ -1616,6 +1616,22 @@ msgstr "" msgid "0 days" msgstr "" +#: core/templatetags/duration.py:111 +#: dashboard/templates/cards/diaperchange_types.html:49 +msgid "today" +msgstr "idag" + +#: core/templatetags/duration.py:113 +#: dashboard/templates/cards/diaperchange_types.html:51 +msgid "yesterday" +msgstr "igår" + +#: core/templatetags/duration.py:116 +#, fuzzy +#| msgid "%(key)s days ago" +msgid " days ago" +msgstr "%(key)s dagar sedan" + #: core/timeline.py:53 #, python-format msgid "%(child)s started tummy time!" @@ -1755,14 +1771,6 @@ msgstr "våt" msgid "solid" msgstr "fast" -#: dashboard/templates/cards/diaperchange_types.html:49 -msgid "today" -msgstr "idag" - -#: dashboard/templates/cards/diaperchange_types.html:51 -msgid "yesterday" -msgstr "igår" - #: dashboard/templates/cards/diaperchange_types.html:53 #, python-format msgid "%(key)s days ago" @@ -1781,6 +1789,7 @@ msgstr[0] "%(count)s sömn-inlägg" msgstr[1] "%(count)s sömn-inlägg" #: dashboard/templates/cards/feeding_day.html:32 +#: dashboard/templates/cards/sleep_recent.html:32 #, python-format msgid "
%(since)s
" msgstr "" @@ -1805,15 +1814,6 @@ msgid_plural "%(n)s feedings ago" msgstr[0] "%(key)s dagar sedan" msgstr[1] "%(key)s dagar sedan" -#: dashboard/templates/cards/sleep_day.html:6 -msgid "Today's Sleep" -msgstr "Sömn idag" - -#: dashboard/templates/cards/sleep_day.html:20 -#, python-format -msgid "%(count)s sleep entries" -msgstr "%(count)s sömn-inlägg" - #: dashboard/templates/cards/sleep_last.html:6 msgid "Last Sleep" msgstr "" @@ -1830,6 +1830,18 @@ msgid_plural "%(count)s naps" msgstr[0] "%(count)s tupplur%(plural)s" msgstr[1] "%(count)s tupplur%(plural)s" +#: dashboard/templates/cards/sleep_recent.html:6 +msgid "Recent Sleep" +msgstr "" + +#: dashboard/templates/cards/sleep_recent.html:25 +#, fuzzy, python-format +#| msgid "%(count)s sleep entries" +msgid "%(counter)s sleep" +msgid_plural "%(counter)s sleep" +msgstr[0] "%(count)s sömn-inlägg" +msgstr[1] "%(count)s sömn-inlägg" + #: dashboard/templates/cards/statistics.html:7 msgid "Statistics" msgstr "Statistik" @@ -1882,69 +1894,69 @@ msgstr "Barnåtgärder" msgid "Reports" msgstr "Rapporter" -#: dashboard/templatetags/cards.py:328 +#: dashboard/templatetags/cards.py:357 msgid "Average nap duration" msgstr "Genomsnittlig tupplurslängd" -#: dashboard/templatetags/cards.py:335 +#: dashboard/templatetags/cards.py:364 msgid "Average naps per day" msgstr "Genomsnittlig mängd tupplurer per dag" -#: dashboard/templatetags/cards.py:345 +#: dashboard/templatetags/cards.py:374 msgid "Average sleep duration" msgstr "Genomsnittlig sömnlängd" -#: dashboard/templatetags/cards.py:352 +#: dashboard/templatetags/cards.py:381 msgid "Average awake duration" msgstr "Genomsnittlig vakentid" -#: dashboard/templatetags/cards.py:362 +#: dashboard/templatetags/cards.py:391 msgid "Weight change per week" msgstr "Viktförändring per vecka" -#: dashboard/templatetags/cards.py:372 +#: dashboard/templatetags/cards.py:401 #, fuzzy #| msgid "Weight change per week" msgid "Height change per week" msgstr "Viktförändring per vecka" -#: dashboard/templatetags/cards.py:382 +#: dashboard/templatetags/cards.py:411 #, fuzzy #| msgid "Weight change per week" msgid "Head circumference change per week" msgstr "Viktförändring per vecka" -#: dashboard/templatetags/cards.py:392 +#: dashboard/templatetags/cards.py:421 #, fuzzy #| msgid "Weight change per week" msgid "BMI change per week" msgstr "Viktförändring per vecka" -#: dashboard/templatetags/cards.py:410 +#: dashboard/templatetags/cards.py:439 #, fuzzy #| msgid "Diaper change frequency" msgid "Diaper change frequency (past 3 days)" msgstr "Blöjbytesfrekvens" -#: dashboard/templatetags/cards.py:414 +#: dashboard/templatetags/cards.py:443 #, fuzzy #| msgid "Diaper change frequency" msgid "Diaper change frequency (past 2 weeks)" msgstr "Blöjbytesfrekvens" -#: dashboard/templatetags/cards.py:420 +#: dashboard/templatetags/cards.py:449 msgid "Diaper change frequency" msgstr "Blöjbytesfrekvens" -#: dashboard/templatetags/cards.py:456 +#: dashboard/templatetags/cards.py:485 msgid "Feeding frequency (past 3 days)" msgstr "" -#: dashboard/templatetags/cards.py:460 +#: dashboard/templatetags/cards.py:489 msgid "Feeding frequency (past 2 weeks)" msgstr "" -#: dashboard/templatetags/cards.py:466 +#: dashboard/templatetags/cards.py:495 msgid "Feeding frequency" msgstr "Matningsfrekvens" @@ -2026,13 +2038,13 @@ msgstr "" msgid "Height" msgstr "Vikt" -#: reports/graphs/pumping_amounts.py:57 +#: reports/graphs/pumping_amounts.py:59 #, fuzzy #| msgid "Total Feeding Amounts" msgid "Total Pumping Amount" msgstr "Genomsnittlig matningsvaraktighet" -#: reports/graphs/pumping_amounts.py:60 +#: reports/graphs/pumping_amounts.py:62 #, fuzzy #| msgid "Feeding Amounts" msgid "Pumping Amount" @@ -2149,3 +2161,10 @@ msgstr "" #: reports/templates/reports/tummytime_duration.html:8 msgid "Total Tummy Time Durations" msgstr "" + +#~ msgid "Today's Sleep" +#~ msgstr "Sömn idag" + +#, python-format +#~ msgid "%(count)s sleep entries" +#~ msgstr "%(count)s sömn-inlägg" diff --git a/locale/tr/LC_MESSAGES/django.mo b/locale/tr/LC_MESSAGES/django.mo index 4b7f4403..9ef16fe3 100644 Binary files a/locale/tr/LC_MESSAGES/django.mo and b/locale/tr/LC_MESSAGES/django.mo differ diff --git a/locale/tr/LC_MESSAGES/django.po b/locale/tr/LC_MESSAGES/django.po index 4984f06c..6b3f2def 100644 --- a/locale/tr/LC_MESSAGES/django.po +++ b/locale/tr/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Baby Buddy\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-06-05 13:25+0000\n" +"POT-Creation-Date: 2022-06-17 22:25+0000\n" "Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -11,12 +11,12 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n>1);\n" #: babybuddy/admin.py:12 babybuddy/admin.py:13 -#: babybuddy/templates/babybuddy/nav-dropdown.html:347 +#: babybuddy/templates/babybuddy/nav-dropdown.html:327 #: babybuddy/templates/babybuddy/user_settings_form.html:8 msgid "Settings" msgstr "Ayarlar" -#: babybuddy/admin.py:17 babybuddy/templates/babybuddy/nav-dropdown.html:111 +#: babybuddy/admin.py:17 babybuddy/templates/babybuddy/nav-dropdown.html:92 #: babybuddy/templates/babybuddy/user_settings_form.html:61 #: dashboard/templates/dashboard/child.html:4 #: dashboard/templates/dashboard/child.html:9 @@ -186,7 +186,7 @@ msgstr "Türkçe" #: babybuddy/templates/admin/base_site.html:4 #: babybuddy/templates/admin/base_site.html:7 -#: babybuddy/templates/babybuddy/nav-dropdown.html:359 +#: babybuddy/templates/babybuddy/nav-dropdown.html:339 msgid "Database Admin" msgstr "Veritabanı Admin" @@ -235,19 +235,19 @@ msgid "Diaper Change" msgstr "Bez Değişimi" #: babybuddy/templates/babybuddy/nav-dropdown.html:57 -#: babybuddy/templates/babybuddy/nav-dropdown.html:281 core/models.py:312 +#: babybuddy/templates/babybuddy/nav-dropdown.html:262 core/models.py:312 #: core/models.py:316 core/templates/core/timer_detail.html:43 msgid "Feeding" msgstr "Beslenme" #: babybuddy/templates/babybuddy/nav-dropdown.html:63 -#: babybuddy/templates/babybuddy/nav-dropdown.html:157 core/models.py:396 +#: babybuddy/templates/babybuddy/nav-dropdown.html:138 core/models.py:396 #: core/models.py:407 core/models.py:411 core/templates/core/note_list.html:29 msgid "Note" msgstr "Not" #: babybuddy/templates/babybuddy/nav-dropdown.html:69 -#: babybuddy/templates/babybuddy/nav-dropdown.html:288 +#: babybuddy/templates/babybuddy/nav-dropdown.html:283 #: babybuddy/templates/babybuddy/welcome.html:42 core/models.py:467 #: core/models.py:468 core/models.py:471 #: core/templates/core/sleep_confirm_delete.html:7 @@ -258,19 +258,7 @@ msgid "Sleep" msgstr "Uyku" #: babybuddy/templates/babybuddy/nav-dropdown.html:75 -#: babybuddy/templates/babybuddy/nav-dropdown.html:179 core/models.py:506 -#: core/models.py:519 core/models.py:520 core/models.py:523 -#: core/templates/core/temperature_confirm_delete.html:7 -#: core/templates/core/temperature_form.html:13 -#: core/templates/core/temperature_list.html:4 -#: core/templates/core/temperature_list.html:7 -#: core/templates/core/temperature_list.html:12 -#: core/templates/core/temperature_list.html:29 -msgid "Temperature" -msgstr "Sıcaklık" - -#: babybuddy/templates/babybuddy/nav-dropdown.html:81 -#: babybuddy/templates/babybuddy/nav-dropdown.html:301 +#: babybuddy/templates/babybuddy/nav-dropdown.html:296 #: babybuddy/templates/babybuddy/welcome.html:50 core/models.py:647 #: core/models.py:648 core/models.py:651 #: core/templates/core/timer_detail.html:59 @@ -282,44 +270,15 @@ msgstr "Sıcaklık" msgid "Tummy Time" msgstr "Karın üstü zamanı" -#: babybuddy/templates/babybuddy/nav-dropdown.html:87 -#: babybuddy/templates/babybuddy/nav-dropdown.html:193 core/models.py:673 -#: core/models.py:685 core/models.py:686 core/models.py:689 -#: core/templates/core/weight_confirm_delete.html:7 -#: core/templates/core/weight_form.html:13 -#: core/templates/core/weight_list.html:4 -#: core/templates/core/weight_list.html:7 -#: core/templates/core/weight_list.html:12 -#: core/templates/core/weight_list.html:29 reports/graphs/weight_change.py:19 -#: reports/graphs/weight_change.py:30 -#: reports/templates/reports/report_list.html:22 -#: reports/templates/reports/weight_change.html:4 -#: reports/templates/reports/weight_change.html:8 -msgid "Weight" -msgstr "Ağırlık" - -#: babybuddy/templates/babybuddy/nav-dropdown.html:93 -#: babybuddy/templates/babybuddy/nav-dropdown.html:316 core/models.py:437 -#: core/models.py:438 core/models.py:441 -#: core/templates/core/pumping_confirm_delete.html:7 -#: core/templates/core/pumping_form.html:13 -#: core/templates/core/pumping_list.html:4 -#: core/templates/core/pumping_list.html:7 -#: core/templates/core/pumping_list.html:12 -#: reports/templates/reports/pumping_amounts.html:4 -#: reports/templates/reports/pumping_amounts.html:8 -msgid "Pumping" -msgstr "" - -#: babybuddy/templates/babybuddy/nav-dropdown.html:118 +#: babybuddy/templates/babybuddy/nav-dropdown.html:99 #: core/templates/timeline/timeline.html:4 #: core/templates/timeline/timeline.html:7 #: dashboard/templates/dashboard/child_button_group.html:9 msgid "Timeline" msgstr "Zaman çizelgesi" -#: babybuddy/templates/babybuddy/nav-dropdown.html:129 -#: babybuddy/templates/babybuddy/nav-dropdown.html:137 core/models.py:188 +#: babybuddy/templates/babybuddy/nav-dropdown.html:110 +#: babybuddy/templates/babybuddy/nav-dropdown.html:118 core/models.py:188 #: core/templates/core/child_confirm_delete.html:7 #: core/templates/core/child_detail.html:7 #: core/templates/core/child_form.html:13 core/templates/core/child_list.html:4 @@ -329,7 +288,7 @@ msgstr "Zaman çizelgesi" msgid "Children" msgstr "Çocuklar" -#: babybuddy/templates/babybuddy/nav-dropdown.html:143 core/models.py:137 +#: babybuddy/templates/babybuddy/nav-dropdown.html:124 core/models.py:137 #: core/models.py:187 core/models.py:221 core/models.py:274 core/models.py:335 #: core/models.py:367 core/models.py:394 core/models.py:426 core/models.py:450 #: core/models.py:503 core/models.py:537 core/models.py:630 core/models.py:671 @@ -348,7 +307,7 @@ msgstr "Çocuklar" msgid "Child" msgstr "Çocuk" -#: babybuddy/templates/babybuddy/nav-dropdown.html:151 core/models.py:143 +#: babybuddy/templates/babybuddy/nav-dropdown.html:132 core/models.py:143 #: core/models.py:240 core/models.py:304 core/models.py:343 core/models.py:373 #: core/models.py:408 core/models.py:430 core/models.py:458 core/models.py:511 #: core/models.py:677 core/templates/core/note_confirm_delete.html:7 @@ -357,19 +316,48 @@ msgstr "Çocuk" msgid "Notes" msgstr "Notlar" -#: babybuddy/templates/babybuddy/nav-dropdown.html:171 +#: babybuddy/templates/babybuddy/nav-dropdown.html:152 msgid "Measurements" msgstr "" -#: babybuddy/templates/babybuddy/nav-dropdown.html:185 -msgid "Temperature reading" -msgstr "Sıcaklık okuma" +#: babybuddy/templates/babybuddy/nav-dropdown.html:160 core/models.py:139 +#: core/models.py:151 core/models.py:152 core/models.py:155 +#: core/templates/core/bmi_confirm_delete.html:7 +#: core/templates/core/bmi_form.html:13 core/templates/core/bmi_list.html:4 +#: core/templates/core/bmi_list.html:7 core/templates/core/bmi_list.html:12 +#: core/templates/core/bmi_list.html:29 reports/graphs/bmi_change.py:19 +#: reports/graphs/bmi_change.py:30 reports/templates/reports/bmi_change.html:4 +#: reports/templates/reports/bmi_change.html:8 +msgid "BMI" +msgstr "" -#: babybuddy/templates/babybuddy/nav-dropdown.html:199 -msgid "Weight entry" -msgstr "Ağırlık girdisi" +#: babybuddy/templates/babybuddy/nav-dropdown.html:166 +#, fuzzy +#| msgid "Sleep entry" +msgid "BMI entry" +msgstr "Uyku Girişi" -#: babybuddy/templates/babybuddy/nav-dropdown.html:207 core/models.py:369 +#: babybuddy/templates/babybuddy/nav-dropdown.html:174 core/models.py:338 +#: core/models.py:351 core/models.py:352 core/models.py:355 +#: core/templates/core/head_circumference_confirm_delete.html:7 +#: core/templates/core/head_circumference_form.html:13 +#: core/templates/core/head_circumference_list.html:4 +#: core/templates/core/head_circumference_list.html:7 +#: core/templates/core/head_circumference_list.html:12 +#: core/templates/core/head_circumference_list.html:29 +#: reports/graphs/head_circumference_change.py:19 +#: reports/graphs/head_circumference_change.py:30 +#: reports/templates/reports/head_circumference_change.html:4 +#: reports/templates/reports/head_circumference_change.html:8 +#: reports/templates/reports/report_list.html:16 +msgid "Head Circumference" +msgstr "" + +#: babybuddy/templates/babybuddy/nav-dropdown.html:180 +msgid "Head Circumference entry" +msgstr "" + +#: babybuddy/templates/babybuddy/nav-dropdown.html:188 core/models.py:369 #: core/models.py:381 core/models.py:382 core/models.py:385 #: core/templates/core/height_confirm_delete.html:7 #: core/templates/core/height_form.html:13 @@ -386,63 +374,60 @@ msgstr "Ağırlık girdisi" msgid "Height" msgstr "Ağırlık" -#: babybuddy/templates/babybuddy/nav-dropdown.html:213 +#: babybuddy/templates/babybuddy/nav-dropdown.html:194 #, fuzzy #| msgid "Weight entry" msgid "Height entry" msgstr "Ağırlık girdisi" -#: babybuddy/templates/babybuddy/nav-dropdown.html:221 core/models.py:338 -#: core/models.py:351 core/models.py:352 core/models.py:355 -#: core/templates/core/head_circumference_confirm_delete.html:7 -#: core/templates/core/head_circumference_form.html:13 -#: core/templates/core/head_circumference_list.html:4 -#: core/templates/core/head_circumference_list.html:7 -#: core/templates/core/head_circumference_list.html:12 -#: core/templates/core/head_circumference_list.html:29 -#: reports/graphs/head_circumference_change.py:19 -#: reports/graphs/head_circumference_change.py:30 -#: reports/templates/reports/head_circumference_change.html:4 -#: reports/templates/reports/head_circumference_change.html:8 -#: reports/templates/reports/report_list.html:16 -msgid "Head Circumference" -msgstr "" +#: babybuddy/templates/babybuddy/nav-dropdown.html:202 core/models.py:506 +#: core/models.py:519 core/models.py:520 core/models.py:523 +#: core/templates/core/temperature_confirm_delete.html:7 +#: core/templates/core/temperature_form.html:13 +#: core/templates/core/temperature_list.html:4 +#: core/templates/core/temperature_list.html:7 +#: core/templates/core/temperature_list.html:12 +#: core/templates/core/temperature_list.html:29 +msgid "Temperature" +msgstr "Sıcaklık" -#: babybuddy/templates/babybuddy/nav-dropdown.html:227 -msgid "Head Circumference entry" -msgstr "" +#: babybuddy/templates/babybuddy/nav-dropdown.html:208 +msgid "Temperature reading" +msgstr "Sıcaklık okuma" -#: babybuddy/templates/babybuddy/nav-dropdown.html:235 core/models.py:139 -#: core/models.py:151 core/models.py:152 core/models.py:155 -#: core/templates/core/bmi_confirm_delete.html:7 -#: core/templates/core/bmi_form.html:13 core/templates/core/bmi_list.html:4 -#: core/templates/core/bmi_list.html:7 core/templates/core/bmi_list.html:12 -#: core/templates/core/bmi_list.html:29 reports/graphs/bmi_change.py:19 -#: reports/graphs/bmi_change.py:30 reports/templates/reports/bmi_change.html:4 -#: reports/templates/reports/bmi_change.html:8 -msgid "BMI" -msgstr "" +#: babybuddy/templates/babybuddy/nav-dropdown.html:216 core/models.py:673 +#: core/models.py:685 core/models.py:686 core/models.py:689 +#: core/templates/core/weight_confirm_delete.html:7 +#: core/templates/core/weight_form.html:13 +#: core/templates/core/weight_list.html:4 +#: core/templates/core/weight_list.html:7 +#: core/templates/core/weight_list.html:12 +#: core/templates/core/weight_list.html:29 reports/graphs/weight_change.py:19 +#: reports/graphs/weight_change.py:30 +#: reports/templates/reports/report_list.html:22 +#: reports/templates/reports/weight_change.html:4 +#: reports/templates/reports/weight_change.html:8 +msgid "Weight" +msgstr "Ağırlık" -#: babybuddy/templates/babybuddy/nav-dropdown.html:241 -#, fuzzy -#| msgid "Sleep entry" -msgid "BMI entry" -msgstr "Uyku Girişi" +#: babybuddy/templates/babybuddy/nav-dropdown.html:222 +msgid "Weight entry" +msgstr "Ağırlık girdisi" -#: babybuddy/templates/babybuddy/nav-dropdown.html:255 +#: babybuddy/templates/babybuddy/nav-dropdown.html:236 msgid "Activities" msgstr "Faaliyetler" -#: babybuddy/templates/babybuddy/nav-dropdown.html:262 +#: babybuddy/templates/babybuddy/nav-dropdown.html:243 #: reports/graphs/diaperchange_lifetimes.py:27 msgid "Changes" msgstr "Değişimler" -#: babybuddy/templates/babybuddy/nav-dropdown.html:268 +#: babybuddy/templates/babybuddy/nav-dropdown.html:249 msgid "Change" msgstr "Değişim" -#: babybuddy/templates/babybuddy/nav-dropdown.html:275 +#: babybuddy/templates/babybuddy/nav-dropdown.html:256 #: babybuddy/templates/babybuddy/welcome.html:34 core/models.py:313 #: core/templates/core/feeding_confirm_delete.html:7 #: core/templates/core/feeding_form.html:13 @@ -452,21 +437,33 @@ msgstr "Değişim" msgid "Feedings" msgstr "Beslenmeler" -#: babybuddy/templates/babybuddy/nav-dropdown.html:294 -msgid "Sleep entry" -msgstr "Uyku Girişi" +#: babybuddy/templates/babybuddy/nav-dropdown.html:270 core/models.py:437 +#: core/models.py:438 core/models.py:441 +#: core/templates/core/pumping_confirm_delete.html:7 +#: core/templates/core/pumping_form.html:13 +#: core/templates/core/pumping_list.html:4 +#: core/templates/core/pumping_list.html:7 +#: core/templates/core/pumping_list.html:12 +#: reports/templates/reports/pumping_amounts.html:4 +#: reports/templates/reports/pumping_amounts.html:8 +msgid "Pumping" +msgstr "" -#: babybuddy/templates/babybuddy/nav-dropdown.html:307 -msgid "Tummy Time entry" -msgstr "Karın Üstü Zaman Girişi" - -#: babybuddy/templates/babybuddy/nav-dropdown.html:322 +#: babybuddy/templates/babybuddy/nav-dropdown.html:276 #, fuzzy #| msgid "Weight entry" msgid "Pumping entry" msgstr "Ağırlık girdisi" -#: babybuddy/templates/babybuddy/nav-dropdown.html:346 +#: babybuddy/templates/babybuddy/nav-dropdown.html:289 +msgid "Sleep entry" +msgstr "Uyku Girişi" + +#: babybuddy/templates/babybuddy/nav-dropdown.html:302 +msgid "Tummy Time entry" +msgstr "Karın Üstü Zaman Girişi" + +#: babybuddy/templates/babybuddy/nav-dropdown.html:326 #: babybuddy/templates/babybuddy/user_list.html:17 #: babybuddy/templates/babybuddy/user_password_form.html:7 #: babybuddy/templates/babybuddy/user_settings_form.html:7 core/models.py:556 @@ -474,23 +471,23 @@ msgstr "Ağırlık girdisi" msgid "User" msgstr "Kullanıcı" -#: babybuddy/templates/babybuddy/nav-dropdown.html:348 +#: babybuddy/templates/babybuddy/nav-dropdown.html:328 msgid "Password" msgstr "Şifre" -#: babybuddy/templates/babybuddy/nav-dropdown.html:352 +#: babybuddy/templates/babybuddy/nav-dropdown.html:332 msgid "Logout" msgstr "Çıkış" -#: babybuddy/templates/babybuddy/nav-dropdown.html:355 +#: babybuddy/templates/babybuddy/nav-dropdown.html:335 msgid "Site" msgstr "Site" -#: babybuddy/templates/babybuddy/nav-dropdown.html:356 +#: babybuddy/templates/babybuddy/nav-dropdown.html:336 msgid "API Browser" msgstr "API Görüntüleyici" -#: babybuddy/templates/babybuddy/nav-dropdown.html:358 +#: babybuddy/templates/babybuddy/nav-dropdown.html:338 #: babybuddy/templates/babybuddy/user_confirm_delete.html:7 #: babybuddy/templates/babybuddy/user_form.html:13 #: babybuddy/templates/babybuddy/user_list.html:4 @@ -498,15 +495,15 @@ msgstr "API Görüntüleyici" msgid "Users" msgstr "Kullanıcılar" -#: babybuddy/templates/babybuddy/nav-dropdown.html:361 +#: babybuddy/templates/babybuddy/nav-dropdown.html:341 msgid "Support" msgstr "Destek" -#: babybuddy/templates/babybuddy/nav-dropdown.html:363 +#: babybuddy/templates/babybuddy/nav-dropdown.html:343 msgid "Source Code" msgstr "Kaynak Kod" -#: babybuddy/templates/babybuddy/nav-dropdown.html:365 +#: babybuddy/templates/babybuddy/nav-dropdown.html:345 msgid "Chat / Support" msgstr "Sohbet / Destek" @@ -517,6 +514,7 @@ msgstr "Sohbet / Destek" #: core/templates/timeline/_timeline.html:73 #: dashboard/templates/cards/feeding_day.html:43 #: dashboard/templates/cards/feeding_last_method.html:34 +#: dashboard/templates/cards/sleep_recent.html:43 #: dashboard/templates/cards/statistics.html:34 msgid "Previous" msgstr "Önceki" @@ -528,6 +526,7 @@ msgstr "Önceki" #: core/templates/timeline/_timeline.html:80 #: dashboard/templates/cards/feeding_day.html:47 #: dashboard/templates/cards/feeding_last_method.html:38 +#: dashboard/templates/cards/sleep_recent.html:47 #: dashboard/templates/cards/statistics.html:38 msgid "Next" msgstr "Sonraki" @@ -996,7 +995,7 @@ msgstr "" #: reports/graphs/diaperchange_types.py:49 reports/graphs/feeding_amounts.py:70 #: reports/graphs/feeding_duration.py:56 #: reports/graphs/head_circumference_change.py:28 -#: reports/graphs/height_change.py:28 reports/graphs/pumping_amounts.py:58 +#: reports/graphs/height_change.py:28 reports/graphs/pumping_amounts.py:60 #: reports/graphs/sleep_pattern.py:151 reports/graphs/sleep_totals.py:59 #: reports/graphs/tummytime_duration.py:51 reports/graphs/weight_change.py:28 msgid "Date" @@ -1176,7 +1175,7 @@ msgstr "" #: core/templates/core/bmi_list.html:70 #, fuzzy #| msgid "No timer entries found." -msgid "No bmi entries found." +msgid "No BMI entries found." msgstr "Zamanlayıcı girdisi bulunamadı" #: core/templates/core/child_confirm_delete.html:4 @@ -1496,9 +1495,10 @@ msgstr "Etkin Zamanlayıcılar" #: dashboard/templates/cards/feeding_day.html:52 #: dashboard/templates/cards/feeding_last.html:17 #: dashboard/templates/cards/feeding_last_method.html:43 -#: dashboard/templates/cards/sleep_day.html:14 #: dashboard/templates/cards/sleep_last.html:17 #: dashboard/templates/cards/sleep_naps_day.html:18 +#: dashboard/templates/cards/sleep_recent.html:20 +#: dashboard/templates/cards/sleep_recent.html:52 #: dashboard/templates/cards/tummytime_day.html:14 msgid "None" msgstr "Hiç" @@ -1619,6 +1619,22 @@ msgstr "{}, {}" msgid "0 days" msgstr "0 gün" +#: core/templatetags/duration.py:111 +#: dashboard/templates/cards/diaperchange_types.html:49 +msgid "today" +msgstr "bugün" + +#: core/templatetags/duration.py:113 +#: dashboard/templates/cards/diaperchange_types.html:51 +msgid "yesterday" +msgstr "dün" + +#: core/templatetags/duration.py:116 +#, fuzzy +#| msgid "%(key)s days ago" +msgid " days ago" +msgstr "%(key)s gün önce" + #: core/timeline.py:53 #, python-format msgid "%(child)s started tummy time!" @@ -1759,14 +1775,6 @@ msgstr "ıslak" msgid "solid" msgstr "kuru" -#: dashboard/templates/cards/diaperchange_types.html:49 -msgid "today" -msgstr "bugün" - -#: dashboard/templates/cards/diaperchange_types.html:51 -msgid "yesterday" -msgstr "dün" - #: dashboard/templates/cards/diaperchange_types.html:53 #, python-format msgid "%(key)s days ago" @@ -1785,6 +1793,7 @@ msgstr[0] "%(count)s uygu girdileri" msgstr[1] "%(count)s uygu girdileri" #: dashboard/templates/cards/feeding_day.html:32 +#: dashboard/templates/cards/sleep_recent.html:32 #, python-format msgid "
%(since)s
" msgstr "" @@ -1809,15 +1818,6 @@ msgid_plural "%(n)s feedings ago" msgstr[0] "%(n) beslenmeler önce" msgstr[1] "%(n) beslenmeler önce" -#: dashboard/templates/cards/sleep_day.html:6 -msgid "Today's Sleep" -msgstr "Bugünkü Uyku" - -#: dashboard/templates/cards/sleep_day.html:20 -#, python-format -msgid "%(count)s sleep entries" -msgstr "%(count)s uygu girdileri" - #: dashboard/templates/cards/sleep_last.html:6 msgid "Last Sleep" msgstr "En Son Uyku" @@ -1834,6 +1834,20 @@ msgid_plural "%(count)s naps" msgstr[0] "%(count)s kısa uyku%(plural)s" msgstr[1] "%(count)s kısa uyku%(plural)s" +#: dashboard/templates/cards/sleep_recent.html:6 +#, fuzzy +#| msgid "Last Sleep" +msgid "Recent Sleep" +msgstr "En Son Uyku" + +#: dashboard/templates/cards/sleep_recent.html:25 +#, fuzzy, python-format +#| msgid "%(count)s sleep entries" +msgid "%(counter)s sleep" +msgid_plural "%(counter)s sleep" +msgstr[0] "%(count)s uygu girdileri" +msgstr[1] "%(count)s uygu girdileri" + #: dashboard/templates/cards/statistics.html:7 msgid "Statistics" msgstr "İstatistikler" @@ -1886,69 +1900,69 @@ msgstr "Çocuk eylemleri" msgid "Reports" msgstr "Raporlar" -#: dashboard/templatetags/cards.py:328 +#: dashboard/templatetags/cards.py:357 msgid "Average nap duration" msgstr "Ortalama kısa uyku süresi" -#: dashboard/templatetags/cards.py:335 +#: dashboard/templatetags/cards.py:364 msgid "Average naps per day" msgstr "Ortalama günlük kısa uyku" -#: dashboard/templatetags/cards.py:345 +#: dashboard/templatetags/cards.py:374 msgid "Average sleep duration" msgstr "Ortalama uyku süresi" -#: dashboard/templatetags/cards.py:352 +#: dashboard/templatetags/cards.py:381 msgid "Average awake duration" msgstr "Ortalama uyanıklık süresi" -#: dashboard/templatetags/cards.py:362 +#: dashboard/templatetags/cards.py:391 msgid "Weight change per week" msgstr "Haftalık ağırlık değişimi" -#: dashboard/templatetags/cards.py:372 +#: dashboard/templatetags/cards.py:401 #, fuzzy #| msgid "Weight change per week" msgid "Height change per week" msgstr "Haftalık ağırlık değişimi" -#: dashboard/templatetags/cards.py:382 +#: dashboard/templatetags/cards.py:411 #, fuzzy #| msgid "Weight change per week" msgid "Head circumference change per week" msgstr "Haftalık ağırlık değişimi" -#: dashboard/templatetags/cards.py:392 +#: dashboard/templatetags/cards.py:421 #, fuzzy #| msgid "Weight change per week" msgid "BMI change per week" msgstr "Haftalık ağırlık değişimi" -#: dashboard/templatetags/cards.py:410 +#: dashboard/templatetags/cards.py:439 #, fuzzy #| msgid "Feeding frequency (past 3 days)" msgid "Diaper change frequency (past 3 days)" msgstr "Beslenme sıklığı (son 3 gün)" -#: dashboard/templatetags/cards.py:414 +#: dashboard/templatetags/cards.py:443 #, fuzzy #| msgid "Feeding frequency (past 2 weeks)" msgid "Diaper change frequency (past 2 weeks)" msgstr "Beslenme sıklığı (son 2 hafta)" -#: dashboard/templatetags/cards.py:420 +#: dashboard/templatetags/cards.py:449 msgid "Diaper change frequency" msgstr "Bez değişim sıklığı" -#: dashboard/templatetags/cards.py:456 +#: dashboard/templatetags/cards.py:485 msgid "Feeding frequency (past 3 days)" msgstr "Beslenme sıklığı (son 3 gün)" -#: dashboard/templatetags/cards.py:460 +#: dashboard/templatetags/cards.py:489 msgid "Feeding frequency (past 2 weeks)" msgstr "Beslenme sıklığı (son 2 hafta)" -#: dashboard/templatetags/cards.py:466 +#: dashboard/templatetags/cards.py:495 msgid "Feeding frequency" msgstr "Beslenme sıklığı" @@ -2030,13 +2044,13 @@ msgstr "" msgid "Height" msgstr "Ağırlık" -#: reports/graphs/pumping_amounts.py:57 +#: reports/graphs/pumping_amounts.py:59 #, fuzzy #| msgid "Total Feeding Amounts" msgid "Total Pumping Amount" msgstr "Ortalama Beslenme Süreleri" -#: reports/graphs/pumping_amounts.py:60 +#: reports/graphs/pumping_amounts.py:62 #, fuzzy #| msgid "Feeding Amounts" msgid "Pumping Amount" @@ -2153,3 +2167,10 @@ msgstr "Karın üstü süresi (Sum)" #: reports/templates/reports/tummytime_duration.html:8 msgid "Total Tummy Time Durations" msgstr "Toplam Karın Üstü Süresi" + +#~ msgid "Today's Sleep" +#~ msgstr "Bugünkü Uyku" + +#, python-format +#~ msgid "%(count)s sleep entries" +#~ msgstr "%(count)s uygu girdileri" diff --git a/locale/zh/LC_MESSAGES/django.mo b/locale/zh/LC_MESSAGES/django.mo index 501875b5..6417aba6 100644 Binary files a/locale/zh/LC_MESSAGES/django.mo and b/locale/zh/LC_MESSAGES/django.mo differ diff --git a/locale/zh/LC_MESSAGES/django.po b/locale/zh/LC_MESSAGES/django.po index 88c40874..88c1b9a7 100644 --- a/locale/zh/LC_MESSAGES/django.po +++ b/locale/zh/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Baby Buddy\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-06-07 06:48+0000\n" +"POT-Creation-Date: 2022-06-17 22:25+0000\n" "Language: zh-Hans\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -11,12 +11,12 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" #: babybuddy/admin.py:12 babybuddy/admin.py:13 -#: babybuddy/templates/babybuddy/nav-dropdown.html:347 +#: babybuddy/templates/babybuddy/nav-dropdown.html:327 #: babybuddy/templates/babybuddy/user_settings_form.html:8 msgid "Settings" msgstr "设置" -#: babybuddy/admin.py:17 babybuddy/templates/babybuddy/nav-dropdown.html:111 +#: babybuddy/admin.py:17 babybuddy/templates/babybuddy/nav-dropdown.html:92 #: babybuddy/templates/babybuddy/user_settings_form.html:61 #: dashboard/templates/dashboard/child.html:4 #: dashboard/templates/dashboard/child.html:9 @@ -179,7 +179,7 @@ msgstr "土耳其语" #: babybuddy/templates/admin/base_site.html:4 #: babybuddy/templates/admin/base_site.html:7 -#: babybuddy/templates/babybuddy/nav-dropdown.html:359 +#: babybuddy/templates/babybuddy/nav-dropdown.html:339 msgid "Database Admin" msgstr "数据库管理员" @@ -226,19 +226,19 @@ msgid "Diaper Change" msgstr "更换尿布" #: babybuddy/templates/babybuddy/nav-dropdown.html:57 -#: babybuddy/templates/babybuddy/nav-dropdown.html:281 core/models.py:312 +#: babybuddy/templates/babybuddy/nav-dropdown.html:262 core/models.py:312 #: core/models.py:316 core/templates/core/timer_detail.html:43 msgid "Feeding" msgstr "喂食" #: babybuddy/templates/babybuddy/nav-dropdown.html:63 -#: babybuddy/templates/babybuddy/nav-dropdown.html:157 core/models.py:396 +#: babybuddy/templates/babybuddy/nav-dropdown.html:138 core/models.py:396 #: core/models.py:407 core/models.py:411 core/templates/core/note_list.html:29 msgid "Note" msgstr "记录" #: babybuddy/templates/babybuddy/nav-dropdown.html:69 -#: babybuddy/templates/babybuddy/nav-dropdown.html:288 +#: babybuddy/templates/babybuddy/nav-dropdown.html:283 #: babybuddy/templates/babybuddy/welcome.html:42 core/models.py:467 #: core/models.py:468 core/models.py:471 #: core/templates/core/sleep_confirm_delete.html:7 @@ -249,19 +249,7 @@ msgid "Sleep" msgstr "睡眠" #: babybuddy/templates/babybuddy/nav-dropdown.html:75 -#: babybuddy/templates/babybuddy/nav-dropdown.html:179 core/models.py:506 -#: core/models.py:519 core/models.py:520 core/models.py:523 -#: core/templates/core/temperature_confirm_delete.html:7 -#: core/templates/core/temperature_form.html:13 -#: core/templates/core/temperature_list.html:4 -#: core/templates/core/temperature_list.html:7 -#: core/templates/core/temperature_list.html:12 -#: core/templates/core/temperature_list.html:29 -msgid "Temperature" -msgstr "体温" - -#: babybuddy/templates/babybuddy/nav-dropdown.html:81 -#: babybuddy/templates/babybuddy/nav-dropdown.html:301 +#: babybuddy/templates/babybuddy/nav-dropdown.html:296 #: babybuddy/templates/babybuddy/welcome.html:50 core/models.py:647 #: core/models.py:648 core/models.py:651 #: core/templates/core/timer_detail.html:59 @@ -273,44 +261,15 @@ msgstr "体温" msgid "Tummy Time" msgstr "趴玩时间" -#: babybuddy/templates/babybuddy/nav-dropdown.html:87 -#: babybuddy/templates/babybuddy/nav-dropdown.html:193 core/models.py:673 -#: core/models.py:685 core/models.py:686 core/models.py:689 -#: core/templates/core/weight_confirm_delete.html:7 -#: core/templates/core/weight_form.html:13 -#: core/templates/core/weight_list.html:4 -#: core/templates/core/weight_list.html:7 -#: core/templates/core/weight_list.html:12 -#: core/templates/core/weight_list.html:29 reports/graphs/weight_change.py:19 -#: reports/graphs/weight_change.py:30 -#: reports/templates/reports/report_list.html:22 -#: reports/templates/reports/weight_change.html:4 -#: reports/templates/reports/weight_change.html:8 -msgid "Weight" -msgstr "体重" - -#: babybuddy/templates/babybuddy/nav-dropdown.html:93 -#: babybuddy/templates/babybuddy/nav-dropdown.html:316 core/models.py:437 -#: core/models.py:438 core/models.py:441 -#: core/templates/core/pumping_confirm_delete.html:7 -#: core/templates/core/pumping_form.html:13 -#: core/templates/core/pumping_list.html:4 -#: core/templates/core/pumping_list.html:7 -#: core/templates/core/pumping_list.html:12 -#: reports/templates/reports/pumping_amounts.html:4 -#: reports/templates/reports/pumping_amounts.html:8 -msgid "Pumping" -msgstr "吸奶" - -#: babybuddy/templates/babybuddy/nav-dropdown.html:118 +#: babybuddy/templates/babybuddy/nav-dropdown.html:99 #: core/templates/timeline/timeline.html:4 #: core/templates/timeline/timeline.html:7 #: dashboard/templates/dashboard/child_button_group.html:9 msgid "Timeline" msgstr "时间线" -#: babybuddy/templates/babybuddy/nav-dropdown.html:129 -#: babybuddy/templates/babybuddy/nav-dropdown.html:137 core/models.py:188 +#: babybuddy/templates/babybuddy/nav-dropdown.html:110 +#: babybuddy/templates/babybuddy/nav-dropdown.html:118 core/models.py:188 #: core/templates/core/child_confirm_delete.html:7 #: core/templates/core/child_detail.html:7 #: core/templates/core/child_form.html:13 core/templates/core/child_list.html:4 @@ -320,7 +279,7 @@ msgstr "时间线" msgid "Children" msgstr "我的宝宝" -#: babybuddy/templates/babybuddy/nav-dropdown.html:143 core/models.py:137 +#: babybuddy/templates/babybuddy/nav-dropdown.html:124 core/models.py:137 #: core/models.py:187 core/models.py:221 core/models.py:274 core/models.py:335 #: core/models.py:367 core/models.py:394 core/models.py:426 core/models.py:450 #: core/models.py:503 core/models.py:537 core/models.py:630 core/models.py:671 @@ -339,7 +298,7 @@ msgstr "我的宝宝" msgid "Child" msgstr "宝宝" -#: babybuddy/templates/babybuddy/nav-dropdown.html:151 core/models.py:143 +#: babybuddy/templates/babybuddy/nav-dropdown.html:132 core/models.py:143 #: core/models.py:240 core/models.py:304 core/models.py:343 core/models.py:373 #: core/models.py:408 core/models.py:430 core/models.py:458 core/models.py:511 #: core/models.py:677 core/templates/core/note_confirm_delete.html:7 @@ -348,38 +307,26 @@ msgstr "宝宝" msgid "Notes" msgstr "成长记录" -#: babybuddy/templates/babybuddy/nav-dropdown.html:171 +#: babybuddy/templates/babybuddy/nav-dropdown.html:152 msgid "Measurements" msgstr "测量" -#: babybuddy/templates/babybuddy/nav-dropdown.html:185 -msgid "Temperature reading" -msgstr "体温读数" +#: babybuddy/templates/babybuddy/nav-dropdown.html:160 core/models.py:139 +#: core/models.py:151 core/models.py:152 core/models.py:155 +#: core/templates/core/bmi_confirm_delete.html:7 +#: core/templates/core/bmi_form.html:13 core/templates/core/bmi_list.html:4 +#: core/templates/core/bmi_list.html:7 core/templates/core/bmi_list.html:12 +#: core/templates/core/bmi_list.html:29 reports/graphs/bmi_change.py:19 +#: reports/graphs/bmi_change.py:30 reports/templates/reports/bmi_change.html:4 +#: reports/templates/reports/bmi_change.html:8 +msgid "BMI" +msgstr "身体质量指数(BMI)" -#: babybuddy/templates/babybuddy/nav-dropdown.html:199 -msgid "Weight entry" -msgstr "体重记录" +#: babybuddy/templates/babybuddy/nav-dropdown.html:166 +msgid "BMI entry" +msgstr "BMI记录" -#: babybuddy/templates/babybuddy/nav-dropdown.html:207 core/models.py:369 -#: core/models.py:381 core/models.py:382 core/models.py:385 -#: core/templates/core/height_confirm_delete.html:7 -#: core/templates/core/height_form.html:13 -#: core/templates/core/height_list.html:4 -#: core/templates/core/height_list.html:7 -#: core/templates/core/height_list.html:12 -#: core/templates/core/height_list.html:29 reports/graphs/height_change.py:19 -#: reports/graphs/height_change.py:30 -#: reports/templates/reports/height_change.html:4 -#: reports/templates/reports/height_change.html:8 -#: reports/templates/reports/report_list.html:17 -msgid "Height" -msgstr "身高" - -#: babybuddy/templates/babybuddy/nav-dropdown.html:213 -msgid "Height entry" -msgstr "身高记录" - -#: babybuddy/templates/babybuddy/nav-dropdown.html:221 core/models.py:338 +#: babybuddy/templates/babybuddy/nav-dropdown.html:174 core/models.py:338 #: core/models.py:351 core/models.py:352 core/models.py:355 #: core/templates/core/head_circumference_confirm_delete.html:7 #: core/templates/core/head_circumference_form.html:13 @@ -395,39 +342,77 @@ msgstr "身高记录" msgid "Head Circumference" msgstr "头围" -#: babybuddy/templates/babybuddy/nav-dropdown.html:227 +#: babybuddy/templates/babybuddy/nav-dropdown.html:180 msgid "Head Circumference entry" msgstr "头围记录" -#: babybuddy/templates/babybuddy/nav-dropdown.html:235 core/models.py:139 -#: core/models.py:151 core/models.py:152 core/models.py:155 -#: core/templates/core/bmi_confirm_delete.html:7 -#: core/templates/core/bmi_form.html:13 core/templates/core/bmi_list.html:4 -#: core/templates/core/bmi_list.html:7 core/templates/core/bmi_list.html:12 -#: core/templates/core/bmi_list.html:29 reports/graphs/bmi_change.py:19 -#: reports/graphs/bmi_change.py:30 reports/templates/reports/bmi_change.html:4 -#: reports/templates/reports/bmi_change.html:8 -msgid "BMI" -msgstr "身体质量指数(BMI)" +#: babybuddy/templates/babybuddy/nav-dropdown.html:188 core/models.py:369 +#: core/models.py:381 core/models.py:382 core/models.py:385 +#: core/templates/core/height_confirm_delete.html:7 +#: core/templates/core/height_form.html:13 +#: core/templates/core/height_list.html:4 +#: core/templates/core/height_list.html:7 +#: core/templates/core/height_list.html:12 +#: core/templates/core/height_list.html:29 reports/graphs/height_change.py:19 +#: reports/graphs/height_change.py:30 +#: reports/templates/reports/height_change.html:4 +#: reports/templates/reports/height_change.html:8 +#: reports/templates/reports/report_list.html:17 +msgid "Height" +msgstr "身高" -#: babybuddy/templates/babybuddy/nav-dropdown.html:241 -msgid "BMI entry" -msgstr "BMI记录" +#: babybuddy/templates/babybuddy/nav-dropdown.html:194 +msgid "Height entry" +msgstr "身高记录" -#: babybuddy/templates/babybuddy/nav-dropdown.html:255 +#: babybuddy/templates/babybuddy/nav-dropdown.html:202 core/models.py:506 +#: core/models.py:519 core/models.py:520 core/models.py:523 +#: core/templates/core/temperature_confirm_delete.html:7 +#: core/templates/core/temperature_form.html:13 +#: core/templates/core/temperature_list.html:4 +#: core/templates/core/temperature_list.html:7 +#: core/templates/core/temperature_list.html:12 +#: core/templates/core/temperature_list.html:29 +msgid "Temperature" +msgstr "体温" + +#: babybuddy/templates/babybuddy/nav-dropdown.html:208 +msgid "Temperature reading" +msgstr "体温读数" + +#: babybuddy/templates/babybuddy/nav-dropdown.html:216 core/models.py:673 +#: core/models.py:685 core/models.py:686 core/models.py:689 +#: core/templates/core/weight_confirm_delete.html:7 +#: core/templates/core/weight_form.html:13 +#: core/templates/core/weight_list.html:4 +#: core/templates/core/weight_list.html:7 +#: core/templates/core/weight_list.html:12 +#: core/templates/core/weight_list.html:29 reports/graphs/weight_change.py:19 +#: reports/graphs/weight_change.py:30 +#: reports/templates/reports/report_list.html:22 +#: reports/templates/reports/weight_change.html:4 +#: reports/templates/reports/weight_change.html:8 +msgid "Weight" +msgstr "体重" + +#: babybuddy/templates/babybuddy/nav-dropdown.html:222 +msgid "Weight entry" +msgstr "体重记录" + +#: babybuddy/templates/babybuddy/nav-dropdown.html:236 msgid "Activities" msgstr "活动" -#: babybuddy/templates/babybuddy/nav-dropdown.html:262 +#: babybuddy/templates/babybuddy/nav-dropdown.html:243 #: reports/graphs/diaperchange_lifetimes.py:27 msgid "Changes" msgstr "换尿布" -#: babybuddy/templates/babybuddy/nav-dropdown.html:268 +#: babybuddy/templates/babybuddy/nav-dropdown.html:249 msgid "Change" msgstr "换尿布" -#: babybuddy/templates/babybuddy/nav-dropdown.html:275 +#: babybuddy/templates/babybuddy/nav-dropdown.html:256 #: babybuddy/templates/babybuddy/welcome.html:34 core/models.py:313 #: core/templates/core/feeding_confirm_delete.html:7 #: core/templates/core/feeding_form.html:13 @@ -437,19 +422,31 @@ msgstr "换尿布" msgid "Feedings" msgstr "喂食" -#: babybuddy/templates/babybuddy/nav-dropdown.html:294 -msgid "Sleep entry" -msgstr "睡眠记录" +#: babybuddy/templates/babybuddy/nav-dropdown.html:270 core/models.py:437 +#: core/models.py:438 core/models.py:441 +#: core/templates/core/pumping_confirm_delete.html:7 +#: core/templates/core/pumping_form.html:13 +#: core/templates/core/pumping_list.html:4 +#: core/templates/core/pumping_list.html:7 +#: core/templates/core/pumping_list.html:12 +#: reports/templates/reports/pumping_amounts.html:4 +#: reports/templates/reports/pumping_amounts.html:8 +msgid "Pumping" +msgstr "吸奶" -#: babybuddy/templates/babybuddy/nav-dropdown.html:307 -msgid "Tummy Time entry" -msgstr "趴玩时间记录" - -#: babybuddy/templates/babybuddy/nav-dropdown.html:322 +#: babybuddy/templates/babybuddy/nav-dropdown.html:276 msgid "Pumping entry" msgstr "吸奶记录" -#: babybuddy/templates/babybuddy/nav-dropdown.html:346 +#: babybuddy/templates/babybuddy/nav-dropdown.html:289 +msgid "Sleep entry" +msgstr "睡眠记录" + +#: babybuddy/templates/babybuddy/nav-dropdown.html:302 +msgid "Tummy Time entry" +msgstr "趴玩时间记录" + +#: babybuddy/templates/babybuddy/nav-dropdown.html:326 #: babybuddy/templates/babybuddy/user_list.html:17 #: babybuddy/templates/babybuddy/user_password_form.html:7 #: babybuddy/templates/babybuddy/user_settings_form.html:7 core/models.py:556 @@ -457,23 +454,23 @@ msgstr "吸奶记录" msgid "User" msgstr "用户" -#: babybuddy/templates/babybuddy/nav-dropdown.html:348 +#: babybuddy/templates/babybuddy/nav-dropdown.html:328 msgid "Password" msgstr "密码" -#: babybuddy/templates/babybuddy/nav-dropdown.html:352 +#: babybuddy/templates/babybuddy/nav-dropdown.html:332 msgid "Logout" msgstr "登出" -#: babybuddy/templates/babybuddy/nav-dropdown.html:355 +#: babybuddy/templates/babybuddy/nav-dropdown.html:335 msgid "Site" msgstr "站点" -#: babybuddy/templates/babybuddy/nav-dropdown.html:356 +#: babybuddy/templates/babybuddy/nav-dropdown.html:336 msgid "API Browser" msgstr "API浏览" -#: babybuddy/templates/babybuddy/nav-dropdown.html:358 +#: babybuddy/templates/babybuddy/nav-dropdown.html:338 #: babybuddy/templates/babybuddy/user_confirm_delete.html:7 #: babybuddy/templates/babybuddy/user_form.html:13 #: babybuddy/templates/babybuddy/user_list.html:4 @@ -481,15 +478,15 @@ msgstr "API浏览" msgid "Users" msgstr "用户" -#: babybuddy/templates/babybuddy/nav-dropdown.html:361 +#: babybuddy/templates/babybuddy/nav-dropdown.html:341 msgid "Support" msgstr "支持" -#: babybuddy/templates/babybuddy/nav-dropdown.html:363 +#: babybuddy/templates/babybuddy/nav-dropdown.html:343 msgid "Source Code" msgstr "源代码" -#: babybuddy/templates/babybuddy/nav-dropdown.html:365 +#: babybuddy/templates/babybuddy/nav-dropdown.html:345 msgid "Chat / Support" msgstr "聊天 / 支持" @@ -500,6 +497,7 @@ msgstr "聊天 / 支持" #: core/templates/timeline/_timeline.html:73 #: dashboard/templates/cards/feeding_day.html:43 #: dashboard/templates/cards/feeding_last_method.html:34 +#: dashboard/templates/cards/sleep_recent.html:43 #: dashboard/templates/cards/statistics.html:34 msgid "Previous" msgstr "上一页" @@ -511,6 +509,7 @@ msgstr "上一页" #: core/templates/timeline/_timeline.html:80 #: dashboard/templates/cards/feeding_day.html:47 #: dashboard/templates/cards/feeding_last_method.html:38 +#: dashboard/templates/cards/sleep_recent.html:47 #: dashboard/templates/cards/statistics.html:38 msgid "Next" msgstr "下一页" @@ -969,7 +968,7 @@ msgstr "标签" #: reports/graphs/diaperchange_types.py:49 reports/graphs/feeding_amounts.py:70 #: reports/graphs/feeding_duration.py:56 #: reports/graphs/head_circumference_change.py:28 -#: reports/graphs/height_change.py:28 reports/graphs/pumping_amounts.py:58 +#: reports/graphs/height_change.py:28 reports/graphs/pumping_amounts.py:60 #: reports/graphs/sleep_pattern.py:151 reports/graphs/sleep_totals.py:59 #: reports/graphs/tummytime_duration.py:51 reports/graphs/weight_change.py:28 msgid "Date" @@ -1143,7 +1142,9 @@ msgid "Add BMI" msgstr "新增BMI记录" #: core/templates/core/bmi_list.html:70 -msgid "No bmi entries found." +#, fuzzy +#| msgid "No bmi entries found." +msgid "No BMI entries found." msgstr "未找到BMI记录。" #: core/templates/core/child_confirm_delete.html:4 @@ -1439,9 +1440,10 @@ msgstr "激活的计时器" #: dashboard/templates/cards/feeding_day.html:52 #: dashboard/templates/cards/feeding_last.html:17 #: dashboard/templates/cards/feeding_last_method.html:43 -#: dashboard/templates/cards/sleep_day.html:14 #: dashboard/templates/cards/sleep_last.html:17 #: dashboard/templates/cards/sleep_naps_day.html:18 +#: dashboard/templates/cards/sleep_recent.html:20 +#: dashboard/templates/cards/sleep_recent.html:52 #: dashboard/templates/cards/tummytime_day.html:14 msgid "None" msgstr "无" @@ -1724,6 +1726,7 @@ msgid_plural "%(counter)s feedings" msgstr[0] "%(counter)s 次喂食" #: dashboard/templates/cards/feeding_day.html:32 +#: dashboard/templates/cards/sleep_recent.html:32 #, python-format msgid "
%(since)s
" msgstr "" @@ -1746,15 +1749,6 @@ msgid "%(n)s feeding ago" msgid_plural "%(n)s feedings ago" msgstr[0] "前 %(n)s 次喂食" -#: dashboard/templates/cards/sleep_day.html:6 -msgid "Today's Sleep" -msgstr "今天的睡觉" - -#: dashboard/templates/cards/sleep_day.html:20 -#, python-format -msgid "%(count)s sleep entries" -msgstr "%(count)s 条睡眠记录" - #: dashboard/templates/cards/sleep_last.html:6 msgid "Last Sleep" msgstr "上一次睡眠" @@ -1769,6 +1763,20 @@ msgid "%(count)s nap" msgid_plural "%(count)s naps" msgstr[0] "%(count)s 小睡" +#: dashboard/templates/cards/sleep_recent.html:6 +#, fuzzy +#| msgid "Last Sleep" +msgid "Recent Sleep" +msgstr "上一次睡眠" + +#: dashboard/templates/cards/sleep_recent.html:25 +#, fuzzy, python-format +#| msgid "%(counter)s feeding" +#| msgid_plural "%(counter)s feedings" +msgid "%(counter)s sleep" +msgid_plural "%(counter)s sleep" +msgstr[0] "%(counter)s 次喂食" + #: dashboard/templates/cards/statistics.html:7 msgid "Statistics" msgstr "统计数据" @@ -1819,59 +1827,59 @@ msgstr "宝宝行动" msgid "Reports" msgstr "报告" -#: dashboard/templatetags/cards.py:328 +#: dashboard/templatetags/cards.py:357 msgid "Average nap duration" msgstr "平均小睡时间" -#: dashboard/templatetags/cards.py:335 +#: dashboard/templatetags/cards.py:364 msgid "Average naps per day" msgstr "每天的平均小睡次数" -#: dashboard/templatetags/cards.py:345 +#: dashboard/templatetags/cards.py:374 msgid "Average sleep duration" msgstr "平均睡眠时间" -#: dashboard/templatetags/cards.py:352 +#: dashboard/templatetags/cards.py:381 msgid "Average awake duration" msgstr "平均清醒时间" -#: dashboard/templatetags/cards.py:362 +#: dashboard/templatetags/cards.py:391 msgid "Weight change per week" msgstr "每周体重变化" -#: dashboard/templatetags/cards.py:372 +#: dashboard/templatetags/cards.py:401 msgid "Height change per week" msgstr "每周身高变化" -#: dashboard/templatetags/cards.py:382 +#: dashboard/templatetags/cards.py:411 msgid "Head circumference change per week" msgstr "每周头围变化" -#: dashboard/templatetags/cards.py:392 +#: dashboard/templatetags/cards.py:421 msgid "BMI change per week" msgstr "每周BMI变化" -#: dashboard/templatetags/cards.py:410 +#: dashboard/templatetags/cards.py:439 msgid "Diaper change frequency (past 3 days)" msgstr "换尿布频率（过去三天）" -#: dashboard/templatetags/cards.py:414 +#: dashboard/templatetags/cards.py:443 msgid "Diaper change frequency (past 2 weeks)" msgstr "换尿布频率（过去两周）" -#: dashboard/templatetags/cards.py:420 +#: dashboard/templatetags/cards.py:449 msgid "Diaper change frequency" msgstr "换尿布频率" -#: dashboard/templatetags/cards.py:456 +#: dashboard/templatetags/cards.py:485 msgid "Feeding frequency (past 3 days)" msgstr "喂食频率（过去三天）" -#: dashboard/templatetags/cards.py:460 +#: dashboard/templatetags/cards.py:489 msgid "Feeding frequency (past 2 weeks)" msgstr "喂食频率（过去两周）" -#: dashboard/templatetags/cards.py:466 +#: dashboard/templatetags/cards.py:495 msgid "Feeding frequency" msgstr "喂食频率" @@ -1947,11 +1955,11 @@ msgstr "头围" msgid "Height" msgstr "身高" -#: reports/graphs/pumping_amounts.py:57 +#: reports/graphs/pumping_amounts.py:59 msgid "Total Pumping Amount" msgstr "合计吸奶量" -#: reports/graphs/pumping_amounts.py:60 +#: reports/graphs/pumping_amounts.py:62 msgid "Pumping Amount" msgstr "吸奶量" @@ -2064,3 +2072,10 @@ msgstr "趴玩时光持续时间（合计）" #: reports/templates/reports/tummytime_duration.html:8 msgid "Total Tummy Time Durations" msgstr "趴玩时光持续时间合计" + +#~ msgid "Today's Sleep" +#~ msgstr "今天的睡觉" + +#, python-format +#~ msgid "%(count)s sleep entries" +#~ msgstr "%(count)s 条睡眠记录"