diff --git a/locale/zh/LC_MESSAGES/django.mo b/locale/zh/LC_MESSAGES/django.mo
new file mode 100644
index 00000000..e89d80f3
Binary files /dev/null and b/locale/zh/LC_MESSAGES/django.mo differ
diff --git a/locale/zh_hans/LC_MESSAGES/django.po b/locale/zh/LC_MESSAGES/django.po
similarity index 86%
rename from locale/zh_hans/LC_MESSAGES/django.po
rename to locale/zh/LC_MESSAGES/django.po
index e5416c15..8b26a38b 100644
--- a/locale/zh_hans/LC_MESSAGES/django.po
+++ b/locale/zh/LC_MESSAGES/django.po
@@ -1,13 +1,11 @@
msgid ""
msgstr ""
-"Project-Id-Version: Baby Buddy\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-21 17:11+0000\n"
-"Language: zh-Hans\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: POEditor.com\n"
+"Project-Id-Version: Baby Buddy\n"
+"Language: zh-Hans\n"
"Plural-Forms: nplurals=1; plural=0;\n"
#: babybuddy/admin.py:12 babybuddy/admin.py:13
@@ -31,10 +29,8 @@ msgid "Refresh rate"
msgstr "刷新频率"
#: babybuddy/models.py:21
-msgid ""
-"If supported by browser, the dashboard will only refresh when visible, and "
-"also when receiving focus."
-msgstr "如果浏览器支持,数据看板只会在可见及接收焦点时也会刷新。"
+msgid "This setting will only be used when a browser does not support refresh on focus."
+msgstr "此设置仅在浏览器不支持焦点刷新时使用。"
#: babybuddy/models.py:28
msgid "disabled"
@@ -72,122 +68,31 @@ msgstr "15分钟"
msgid "30 min."
msgstr "30分钟"
-#: babybuddy/models.py:40
-msgid "Hide Empty Dashboard Cards"
-msgstr "隐藏空的数据看板卡片"
-
-#: babybuddy/models.py:43
-msgid "Hide data older than"
-msgstr "隐藏数据早于"
-
-#: babybuddy/models.py:45
-msgid "This setting controls which data will be shown in the dashboard."
-msgstr "此设置控制哪些数据显示在数据看板中。"
-
-#: babybuddy/models.py:51
-msgid "show all data"
-msgstr "展示所有数据"
-
-#: babybuddy/models.py:52
-msgid "1 day"
-msgstr "1天"
-
-#: babybuddy/models.py:53
-msgid "2 days"
-msgstr "2天"
-
-#: babybuddy/models.py:54
-msgid "3 days"
-msgstr "3天"
-
-#: babybuddy/models.py:55
-msgid "1 week"
-msgstr "1周"
-
-#: babybuddy/models.py:56
-msgid "4 weeks"
-msgstr "4 周"
-
#: babybuddy/models.py:63
msgid "Language"
msgstr "语言"
-#: babybuddy/models.py:69
-msgid "Timezone"
-msgstr "时区"
-
#: babybuddy/models.py:73
-#, python-brace-format
msgid "{user}'s Settings"
msgstr "{user}的设置"
-#: babybuddy/settings/base.py:166
-#, fuzzy
-#| msgid "English"
-msgid "English (US)"
+#: babybuddy/settings/base.py:171
+msgid "English"
msgstr "英语"
-#: babybuddy/settings/base.py:167
-#, fuzzy
-#| msgid "English"
-msgid "English (UK)"
-msgstr "英语"
-
-#: babybuddy/settings/base.py:168
-msgid "Dutch"
-msgstr "荷兰语"
-
#: babybuddy/settings/base.py:169
msgid "French"
msgstr "法语"
-#: babybuddy/settings/base.py:170
-msgid "Finnish"
-msgstr "芬兰语"
-
-#: babybuddy/settings/base.py:171
-msgid "German"
-msgstr "德语"
-
-#: babybuddy/settings/base.py:172
-msgid "Italian"
-msgstr "意大利语"
-
-#: babybuddy/settings/base.py:173
-msgid "Polish"
-msgstr "波兰语"
-
-#: babybuddy/settings/base.py:174
-msgid "Portuguese"
-msgstr "葡萄牙语"
-
-#: babybuddy/settings/base.py:175
-msgid "Spanish"
-msgstr "西班牙语"
-
-#: babybuddy/settings/base.py:176
-msgid "Swedish"
-msgstr "瑞典语"
-
-#: babybuddy/settings/base.py:177
-msgid "Turkish"
-msgstr "土耳其语"
-
#: babybuddy/templates/403.html:4 babybuddy/templates/403.html:7
msgid "Permission Denied"
msgstr "无权限"
#: babybuddy/templates/403.html:12
-msgid ""
-"You do not have permission to access this resource. Contact a site "
-"administrator for assistance."
-msgstr "您没有访问此资源的权限。请联系网站管理员以获得帮助。"
-
-#: babybuddy/templates/admin/base_site.html:4
-#: babybuddy/templates/admin/base_site.html:7
-#: babybuddy/templates/babybuddy/nav-dropdown.html:338
-msgid "Database Admin"
-msgstr "数据库管理员"
+msgid "You do not have permission to access this resource.\n"
+" Contact a site administrator for assistance."
+msgstr "您没有访问此资源的权限。\n"
+"请与站点管理员联系以获取帮助。"
#: babybuddy/templates/babybuddy/base.html:36
msgid "Home"
@@ -212,19 +117,12 @@ msgstr "提交"
#: babybuddy/templates/babybuddy/messages.html:18
#: babybuddy/templates/babybuddy/user_settings_form.html:19
-#, python-format
msgid "Error: %(error)s"
msgstr "错误: %(error)s"
#: babybuddy/templates/babybuddy/messages.html:23
-#: babybuddy/templates/babybuddy/user_settings_form.html:26
-msgid "Error: Some fields have errors. See below for details."
-msgstr "错误: 有些字段有错误。详情见下文。 "
-
-#: babybuddy/templates/babybuddy/nav-dropdown.html:32
-#: core/templates/core/timer_nav.html:18
-msgid "Quick Start Timer"
-msgstr "快速开始计时"
+msgid "Error: Some fields have errors. See below for details. "
+msgstr "错误: 字段填写错误。参见具体原因。 "
#: babybuddy/templates/babybuddy/nav-dropdown.html:51 core/models.py:158
#: core/models.py:162
@@ -254,18 +152,6 @@ msgstr "记录"
msgid "Sleep"
msgstr "睡眠"
-#: babybuddy/templates/babybuddy/nav-dropdown.html:75
-#: babybuddy/templates/babybuddy/nav-dropdown.html:172 core/models.py:331
-#: core/models.py:341 core/models.py:342 core/models.py:345
-#: 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:294
#: babybuddy/templates/babybuddy/welcome.html:50 core/models.py:468
@@ -295,13 +181,6 @@ msgstr "趴玩时间"
msgid "Weight"
msgstr "体重"
-#: babybuddy/templates/babybuddy/nav-dropdown.html:111
-#: 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:122
#: babybuddy/templates/babybuddy/nav-dropdown.html:130 core/models.py:101
#: core/templates/core/child_confirm_delete.html:7
@@ -339,80 +218,10 @@ msgstr "宝宝"
msgid "Notes"
msgstr "成长记录"
-#: babybuddy/templates/babybuddy/nav-dropdown.html:164
-msgid "Measurements"
-msgstr ""
-
-#: babybuddy/templates/babybuddy/nav-dropdown.html:178
-msgid "Temperature reading"
-msgstr "体温读数"
-
#: babybuddy/templates/babybuddy/nav-dropdown.html:192
msgid "Weight entry"
msgstr "体重记录"
-#: babybuddy/templates/babybuddy/nav-dropdown.html:200 core/models.py:521
-#: core/models.py:530 core/models.py:531 core/models.py:534
-#: 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
-#: dashboard/templates/dashboard/child_button_group.html:32
-#: reports/graphs/height_height.py:19 reports/graphs/height_height.py:30
-#: reports/templates/reports/height_change.html:4
-#: reports/templates/reports/height_change.html:8
-#, fuzzy
-#| msgid "Weight"
-msgid "Height"
-msgstr "体重"
-
-#: babybuddy/templates/babybuddy/nav-dropdown.html:206
-#, fuzzy
-#| msgid "Weight entry"
-msgid "Height entry"
-msgstr "体重记录"
-
-#: babybuddy/templates/babybuddy/nav-dropdown.html:214 core/models.py:549
-#: core/models.py:559 core/models.py:560 core/models.py:563
-#: 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
-#: dashboard/templates/dashboard/child_button_group.html:33
-#: reports/graphs/head_circumference_head_circumference.py:19
-#: reports/graphs/head_circumference_head_circumference.py:30
-#: reports/templates/reports/head_circumference_change.html:4
-#: reports/templates/reports/head_circumference_change.html:8
-msgid "Head Circumference"
-msgstr ""
-
-#: babybuddy/templates/babybuddy/nav-dropdown.html:220
-msgid "Head Circumference entry"
-msgstr ""
-
-#: babybuddy/templates/babybuddy/nav-dropdown.html:228 core/models.py:574
-#: core/models.py:583 core/models.py:584 core/models.py:587
-#: 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
-#: dashboard/templates/dashboard/child_button_group.html:34
-#: reports/graphs/bmi_bmi.py:19 reports/graphs/bmi_bmi.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:234
-#, fuzzy
-#| msgid "Sleep entry"
-msgid "BMI entry"
-msgstr "睡眠记录"
-
#: babybuddy/templates/babybuddy/nav-dropdown.html:248
msgid "Activities"
msgstr "活动"
@@ -476,6 +285,10 @@ msgstr "API浏览"
msgid "Users"
msgstr "用户"
+#: babybuddy/templates/babybuddy/nav-dropdown.html:250
+msgid "Backend Admin"
+msgstr "后台管理员"
+
#: babybuddy/templates/babybuddy/nav-dropdown.html:340
msgid "Support"
msgstr "支持"
@@ -556,10 +369,7 @@ msgstr "删除"
#: core/templates/core/timer_confirm_delete.html:17
#: core/templates/core/tummytime_confirm_delete.html:14
#: core/templates/core/weight_confirm_delete.html:14
-#, python-format
-msgid ""
-"
Are you sure you want to delete %(object)s"
-"span>?
"
+msgid "Are you sure you want to delete %(object)s?
"
msgstr "确定要删除吗?%(object)s?
"
#: babybuddy/templates/babybuddy/user_confirm_delete.html:19
@@ -611,7 +421,6 @@ msgstr "更新"
#: core/templates/core/timer_form.html:18
#: core/templates/core/tummytime_form.html:23
#: core/templates/core/weight_form.html:23
-#, python-format
msgid "Update %(object)s
"
msgstr "更新 %(object)s
"
@@ -677,10 +486,16 @@ msgstr "更改密码"
msgid "User Settings"
msgstr "用户设置"
+#: babybuddy/templates/babybuddy/messages.html:23
+#: babybuddy/templates/babybuddy/user_settings_form.html:26
+msgid "Error: Some fields have errors. See below for details."
+msgstr "错误: 有些字段有错误。详情见下文。 "
+
#: babybuddy/templates/babybuddy/user_settings_form.html:33
msgid "User Profile"
msgstr "用户档案"
+#. This general word doesn't need translation.
#: babybuddy/templates/babybuddy/user_settings_form.html:79
msgid "API"
msgstr "API"
@@ -703,12 +518,9 @@ msgid "Welcome to Baby Buddy!"
msgstr "欢迎使用Baby Buddy!"
#: babybuddy/templates/babybuddy/welcome.html:14
-msgid ""
-"Learn about and predict baby's needs without (as much) guess work "
-"by using Baby Buddy to track —"
-msgstr ""
-"通过使用 Baby Buddy 来跟踪了解和预测宝宝的需求,而无需 (尽可能多地) "
-"进行猜测工作 —"
+msgid "Learn about and predict baby's needs without\n"
+" (as much) guess work by using Baby Buddy to track —"
+msgstr "通过使用 Baby Buddy 来跟踪了解和预测宝宝的需求,而无需 (尽可能多地) 进行猜测工作 —"
#: babybuddy/templates/babybuddy/welcome.html:26 core/models.py:159
#: core/templates/core/diaperchange_confirm_delete.html:7
@@ -720,18 +532,15 @@ msgstr ""
msgid "Diaper Changes"
msgstr "更换尿布"
-#: babybuddy/templates/babybuddy/welcome.html:56
-msgid ""
-"As the amount of entries grows, Baby Buddy will help parents and caregivers "
-"to identify small patterns in baby's habits using the dashboard and graphs. "
-"Baby Buddy is mobile-friendly and uses a dark theme to help weary moms and "
-"dads with 2AM feedings and changings. To get started, just click the button "
-"below to add your first (or second, third, etc.) child!"
-msgstr ""
-"随着条目数量的增加,Baby Buddy将帮助家长和护理人员使用数据看板和图表识别宝宝"
-"的习惯。Baby Buddy是一款手机友好型产品,使用黑色主题帮助疲惫的爸爸妈妈在凌晨2"
-"点喂食和换尿布。想要开始使用,只需单击下面的按钮添加您的第一个(或第二个、第三"
-"个等)宝宝!"
+#: babybuddy/templates/babybuddy/welcome.html:54
+#, fuzzy
+msgid "As the amount of entries grows, Baby Buddy will help\n"
+" parents and caregivers to identify small patterns in baby's habits\n"
+" using the dashboard and graphs. Baby Buddy is mobile-friendly and\n"
+" uses a dark theme to help weary moms and dads with 2AM feedings and\n"
+" changings. To get started, just click the button below to add your\n"
+" first (or second, third, etc.) child!"
+msgstr "随着条目数量的增加,Baby Buddy将帮助家长和护理人员使用数据看板和图表识别宝宝的习惯。Baby Buddy是一款手机友好型产品,使用黑色主题帮助疲惫的爸爸妈妈在凌晨2点喂食和换尿布。想要开始使用,只需单击下面的按钮添加您的第一个(或第二个、第三个等)宝宝!"
#: babybuddy/templates/babybuddy/welcome.html:68
#: core/templates/core/child_form.html:8 core/templates/core/child_form.html:18
@@ -763,10 +572,10 @@ msgstr "登录"
msgid "Password Reset"
msgstr "密码重置"
-#: babybuddy/templates/registration/password_reset_confirm.html:13
-msgid ""
-"Oh snap! The two passwords did not match. Please try again."
-msgstr "提示! 两次密码输入的不一致,请重试。"
+#: babybuddy/templates/registration/password_reset_confirm.html:12
+msgid "Oh snap! The\n"
+" two passwords did not match. Please try again.
"
+msgstr "提示两次密码输入的不一致,请重试。
"
#: babybuddy/templates/registration/password_reset_confirm.html:22
msgid "Enter your new password in each field below."
@@ -781,45 +590,35 @@ msgstr "重置密码"
msgid "Reset Email Sent"
msgstr "重置邮件发送"
-#: babybuddy/templates/registration/password_reset_done.html:9
-msgid ""
-"We've emailed you instructions for setting your password, if an account "
-"exists with the email you entered. You should receive them shortly."
-msgstr ""
-"我们已通过电子邮件向您发送了设置密码的说明。如果您输入的电子邮件正确,您将很"
-"快收到邮件。"
-
-#: babybuddy/templates/registration/password_reset_done.html:15
-msgid ""
-"If you don't receive an email, please make sure you've entered the address "
-"you registered with, and check your spam folder."
-msgstr ""
-"如果您没有收到电子邮件,请确保您已输入正确的邮箱地址,并检查您的垃圾邮件文件"
-"夹。"
+#: babybuddy/templates/registration/password_reset_done.html:8
+msgid "We've emailed you instructions for setting your\n"
+" password, if an account exists with the email you entered. You\n"
+" should receive them shortly.
\n"
+" If you don't receive an email, please make sure you've\n"
+" entered the address you registered with, and check your spam\n"
+" folder.
"
+msgstr "我们已通过电子邮件向您发送了设置密码的说明。如果您输入的电子邮件正确,您将很快收到邮件。
\n"
+" 如果您没有收到电子邮件,请确保您已输入正确的邮箱地址,并检查您的垃圾邮件文件夹。
"
#: babybuddy/templates/registration/password_reset_form.html:4
msgid "Forgot Password"
msgstr "忘记密码"
-#: babybuddy/templates/registration/password_reset_form.html:9
-msgid ""
-"Enter your account email address in the form below. If the address is valid, "
-"you will receive instructions for resetting your password."
-msgstr ""
-"在下面的表格中输入您的电子邮箱地址。如果地址有效,您将收到重置密码的说明。"
+#: babybuddy/templates/registration/password_reset_form.html:8
+msgid "Enter your account email address in the\n"
+" form below. If the address is valid, you will receive instructions for\n"
+" resetting your password.
"
+msgstr "在下面的表格中输入您的帐户电子邮件地址。如果地址有效,您将收到重置密码的说明。
"
#: babybuddy/views.py:76
-#, python-format
msgid "User %(username)s added!"
msgstr "用户 %(username)s 已添加!"
#: babybuddy/views.py:87
-#, python-format
msgid "User %(username)s updated."
msgstr "用户 %(username)s 已更新。"
#: babybuddy/views.py:99
-#, python-brace-format
msgid "User {user} deleted."
msgstr "User {user} 删除成功。"
@@ -916,11 +715,6 @@ msgstr "黄色"
msgid "Color"
msgstr "颜色"
-#: core/models.py:150 core/models.py:219
-#: core/templates/core/diaperchange_list.html:31
-msgid "Amount"
-msgstr "数量"
-
#: core/models.py:180
msgid "Wet and/or solid is required."
msgstr "大便或小便是必填的。"
@@ -949,14 +743,6 @@ msgstr "母乳"
msgid "Formula"
msgstr "配方奶"
-#: core/models.py:201
-msgid "Fortified breast milk"
-msgstr "强化母乳"
-
-#: core/models.py:202
-msgid "Solid food"
-msgstr "固体食物"
-
#: core/models.py:205 core/templates/core/feeding_list.html:30
msgid "Type"
msgstr "类型"
@@ -973,25 +759,18 @@ msgstr "左乳房"
msgid "Right breast"
msgstr "右乳房"
-#: core/models.py:212
-msgid "Both breasts"
-msgstr "两侧乳房"
-
-#: core/models.py:213
-msgid "Parent fed"
-msgstr "父母喂养"
-
-#: core/models.py:214
-msgid "Self fed"
-msgstr "自己吃"
-
#: core/models.py:217 core/templates/core/feeding_list.html:29
msgid "Method"
msgstr "方式"
-#: core/models.py:278
-msgid "Napping"
-msgstr ""
+#: core/models.py:150 core/models.py:219
+#: core/templates/core/diaperchange_list.html:31
+msgid "Amount"
+msgstr "数量"
+
+#: core/models.py:243
+msgid "Only \"Bottle\" method is allowed with \"Formula\" type."
+msgstr "只有“奶瓶”方式才允许使用“配方奶”类型。"
#: core/models.py:362 core/templates/core/timer_list.html:25
msgid "Name"
@@ -1011,7 +790,6 @@ msgid "Timers"
msgstr "计时器"
#: core/models.py:390
-#, python-brace-format
msgid "Timer #{id}"
msgstr "计时器 #{id}"
@@ -1035,29 +813,6 @@ msgstr "里程碑"
msgid "Date"
msgstr "日期"
-#: core/templates/core/bmi_confirm_delete.html:4
-#, fuzzy
-#| msgid "Delete a Sleep Entry"
-msgid "Delete a BMI Entry"
-msgstr "删除一条睡眠记录"
-
-#: core/templates/core/bmi_form.html:8 core/templates/core/bmi_form.html:17
-#: core/templates/core/bmi_form.html:27
-#, fuzzy
-#| msgid "Add a Sleep Entry"
-msgid "Add a BMI Entry"
-msgstr "新增一条睡眠记录"
-
-#: core/templates/core/bmi_list.html:15
-msgid "Add BMI"
-msgstr ""
-
-#: core/templates/core/bmi_list.html:66
-#, fuzzy
-#| msgid "No timer entries found."
-msgid "No bmi entries found."
-msgstr "未找到计时器。"
-
#: core/templates/core/child_confirm_delete.html:4
msgid "Delete a Child"
msgstr "删除宝宝信息"
@@ -1076,9 +831,9 @@ msgstr "生日"
msgid "Age"
msgstr "年龄"
-#: core/templates/core/child_list.html:15
-msgid "Add Child"
-msgstr "新增宝宝"
+#: core/templates/timeline/_timeline.html:33
+msgid "%(since)s ago (%(time)s)"
+msgstr "%(since)s 之前 (%(time)s)"
#: core/templates/core/child_list.html:27
msgid "Birth Date"
@@ -1108,18 +863,14 @@ msgstr "添加一条换尿布记录"
msgid "Add"
msgstr "添加"
-#: core/templates/core/diaperchange_list.html:15
-msgid "Add Diaper Change"
-msgstr "新增换尿布记录"
-
-#: core/templates/core/diaperchange_list.html:29
-msgid "Contents"
-msgstr "内容"
-
#: core/templates/core/diaperchange_list.html:73
msgid "No diaper changes found."
msgstr "未找到换尿布记录。"
+#: core/templates/core/diaperchange_list.html:63
+msgid "Add a Change"
+msgstr "添加一条尿布记录"
+
#: core/templates/core/feeding_confirm_delete.html:4
msgid "Delete a Feeding"
msgstr "删除一条喂食记录"
@@ -1133,10 +884,6 @@ msgstr "更新一条喂食记录"
msgid "Add a Feeding"
msgstr "新增一条喂食记录"
-#: core/templates/core/feeding_list.html:15
-msgid "Add Feeding"
-msgstr "新增喂食记录"
-
#: core/templates/core/feeding_list.html:33
msgid "Amt."
msgstr "数量"
@@ -1145,56 +892,6 @@ msgstr "数量"
msgid "No feedings found."
msgstr "未找到喂食记录。"
-#: core/templates/core/head_circumference_confirm_delete.html:4
-#, fuzzy
-#| msgid "Delete a Tummy Time Entry"
-msgid "Delete a Head Circumference Entry"
-msgstr "删除一条趴玩记录"
-
-#: core/templates/core/head_circumference_form.html:8
-#: core/templates/core/head_circumference_form.html:17
-#: core/templates/core/head_circumference_form.html:27
-#, fuzzy
-#| msgid "Add a Temperature Entry"
-msgid "Add a Head Circumference Entry"
-msgstr "新增一个体温条目"
-
-#: core/templates/core/head_circumference_list.html:15
-msgid "Add Head Circumference"
-msgstr ""
-
-#: core/templates/core/head_circumference_list.html:66
-#, fuzzy
-#| msgid "No timer entries found."
-msgid "No head circumference entries found."
-msgstr "未找到计时器。"
-
-#: core/templates/core/height_confirm_delete.html:4
-#, fuzzy
-#| msgid "Delete a Weight Entry"
-msgid "Delete a Height Entry"
-msgstr "删除一条体重记录"
-
-#: core/templates/core/height_form.html:8
-#: core/templates/core/height_form.html:17
-#: core/templates/core/height_form.html:27
-#, fuzzy
-#| msgid "Add a Weight Entry"
-msgid "Add a Height Entry"
-msgstr "新增一条体重记录"
-
-#: core/templates/core/height_list.html:15
-#, fuzzy
-#| msgid "Add Weight"
-msgid "Add Height"
-msgstr "新增体重记录"
-
-#: core/templates/core/height_list.html:66
-#, fuzzy
-#| msgid "No weight entries found."
-msgid "No height entries found."
-msgstr "未找到体重记录。"
-
#: core/templates/core/note_confirm_delete.html:4
msgid "Delete a Note"
msgstr "删除一条记录"
@@ -1207,10 +904,6 @@ msgstr "更新一条记录"
msgid "Add a Note"
msgstr "新增一条记录"
-#: core/templates/core/note_list.html:15
-msgid "Add Note"
-msgstr "新增笔记"
-
#: core/templates/core/note_list.html:60
msgid "No notes found."
msgstr "未找到记录。"
@@ -1227,10 +920,6 @@ msgstr "更新一条睡眠记录"
msgid "Add a Sleep Entry"
msgstr "新增一条睡眠记录"
-#: core/templates/core/sleep_list.html:15
-msgid "Add Sleep"
-msgstr "新增睡眠记录"
-
#: core/templates/core/sleep_list.html:25
#: core/templates/core/timer_form.html:12
#: core/templates/core/timer_list.html:24
@@ -1246,52 +935,16 @@ msgstr "结束"
#: core/templates/core/sleep_list.html:31
msgid "Nap"
-msgstr "打盹"
+msgstr "小睡"
#: core/templates/core/sleep_list.html:70
msgid "No sleep entries found."
msgstr "未找到睡眠记录。"
-#: core/templates/core/temperature_confirm_delete.html:4
-msgid "Delete a Temperature Reading"
-msgstr "删除一个体温读数"
-
-#: core/templates/core/temperature_form.html:8
-#: core/templates/core/temperature_form.html:17
-msgid "Add a Temperature Reading"
-msgstr "新增一个体温读数"
-
-#: core/templates/core/temperature_form.html:27
-msgid "Add a Temperature Entry"
-msgstr "新增一个体温条目"
-
-#: core/templates/core/temperature_list.html:15
-msgid "Add Temperature Reading"
-msgstr "新增体温记录"
-
-#: core/templates/core/temperature_list.html:66
-msgid "No temperature entries found."
-msgstr "未找到体温条目。"
-
#: core/templates/core/timer_confirm_delete.html:5
-#, python-format
msgid "Delete %(object)s"
msgstr "删除 %(object)s"
-#: core/templates/core/timer_confirm_delete_inactive.html:5
-msgid "Delete All Inactive Timers"
-msgstr "删除所有处于非活动状态的计时器"
-
-#: core/templates/core/timer_confirm_delete_inactive.html:10
-msgid "Delete Inactive"
-msgstr "删除非活动"
-
-#: core/templates/core/timer_confirm_delete_inactive.html:17
-#, fuzzy, python-format
-#| msgid "Are you sure you want to delete %(number)s inactive timer%(plural)s?"
-msgid "Are you sure you want to delete %(number)s inactive timer%(plural)s?"
-msgstr "确定要删除 %(number)s 个非活动的计时器?"
-
#: core/templates/core/timer_detail.html:28
msgid "Started"
msgstr "已经开始"
@@ -1300,23 +953,14 @@ msgstr "已经开始"
msgid "Stopped"
msgstr "已经结束"
-#: core/templates/core/timer_detail.html:34
-#, python-format
-msgid "%(timer)s created by %(user)s"
-msgstr "%(timer)s 由 %(user)s 创建"
+#: core/templates/core/timer_detail.html:26
+msgid "%(timer)s created by %(object.user)s"
+msgstr "%(timer)s 由 %(object.user)s 创建"
#: core/templates/core/timer_detail.html:63
msgid "Timer actions"
msgstr "计时器操作"
-#: core/templates/core/timer_detail.html:77
-msgid "Restart timer"
-msgstr "重启计时器"
-
-#: core/templates/core/timer_detail.html:84
-msgid "Delete timer"
-msgstr "删除计时器"
-
#: core/templates/core/timer_form.html:22
#: core/templates/core/timer_list.html:15 core/templates/core/timer_nav.html:23
msgid "Start Timer"
@@ -1326,9 +970,10 @@ msgstr "开始计时"
msgid "No timer entries found."
msgstr "未找到计时器。"
-#: core/templates/core/timer_list.html:68
-msgid "Delete Inactive Timers"
-msgstr "删除处于非活动状态下的计时器"
+#: babybuddy/templates/babybuddy/nav-dropdown.html:32
+#: core/templates/core/timer_nav.html:18
+msgid "Quick Start Timer"
+msgstr "快速开始计时"
#: core/templates/core/timer_nav.html:28
msgid "View Timers"
@@ -1365,10 +1010,6 @@ msgstr "更新一条趴玩记录"
msgid "Add a Tummy Time Entry"
msgstr "新增一条趴玩记录"
-#: core/templates/core/tummytime_list.html:15
-msgid "Add Tummy Time"
-msgstr "新增趴玩时间"
-
#: core/templates/core/tummytime_list.html:63
msgid "No tummy time entries found."
msgstr "未找到趴玩记录。"
@@ -1383,174 +1024,76 @@ msgstr "删除一条体重记录"
msgid "Add a Weight Entry"
msgstr "新增一条体重记录"
-#: core/templates/core/weight_list.html:15
-msgid "Add Weight"
-msgstr "新增体重记录"
-
#: core/templates/core/weight_list.html:66
msgid "No weight entries found."
msgstr "未找到体重记录。"
-#: core/templates/timeline/_timeline.html:33
-#, python-format
-msgid "%(since)s ago (%(time)s)"
-msgstr "%(since)s 之前 (%(time)s)"
-
-#: core/templates/timeline/_timeline.html:39
-#, fuzzy, python-format
-#| msgid "Duration too long."
-msgid "Duration: %(duration)s"
-msgstr "持续时间太长。"
-
-#: core/templates/timeline/_timeline.html:48
-#, python-format
-msgid "%(since)s since previous"
-msgstr ""
-
-#: core/templates/timeline/_timeline.html:56
-#: dashboard/templates/dashboard/child_button_group.html:41
-msgid "Edit"
-msgstr "编辑"
-
-#: core/templates/timeline/_timeline.html:80
-msgid "No events"
-msgstr ""
-
-#: core/templatetags/datetime.py:60
-msgid "Today"
-msgstr "今天"
-
-#: core/templatetags/datetime.py:75
-msgid "{}, {}"
-msgstr "{}, {}"
-
-#: core/templatetags/duration.py:23
-msgid "0 days"
-msgstr "0天"
-
-#: core/timeline.py:53
-#, python-format
-msgid "%(child)s started tummy time!"
-msgstr "%(child)s 开始了趴玩时光!"
-
-#: core/timeline.py:64
-#, python-format
-msgid "%(child)s finished tummy time."
-msgstr "%(child)s 结束了趴玩。"
-
-#: core/timeline.py:89
-#, python-format
-msgid "%(child)s fell asleep."
-msgstr "%(child)s 睡着了。"
-
-#: core/timeline.py:100
-#, python-format
-msgid "%(child)s woke up."
-msgstr "%(child)s 醒了。"
-
-#: core/timeline.py:133
-#, python-format
-msgid "Amount: %(amount).0f"
-msgstr "数量: %(amount).0f"
+#: core/timeline.py:164
+msgid "%(child)s had a diaper change."
+msgstr "%(child)s 换了一条尿布。"
#: core/timeline.py:141
-#, python-format
msgid "%(child)s started feeding."
msgstr "%(child)s 开始喂食。"
#: core/timeline.py:153
-#, python-format
msgid "%(child)s finished feeding."
msgstr "%(child)s 喂食完成。"
-#: core/timeline.py:179
-#, fuzzy, python-format
-#| msgid "%(child)s had a diaper change."
-msgid "%(child)s had a %(type)s diaper change."
-msgstr "%(child)s 换了一条尿布。"
+#: core/timeline.py:89
+msgid "%(child)s fell asleep."
+msgstr "%(child)s 睡着了。"
-#: core/utils.py:15
-#, python-format
-msgid "%(hours)s hour"
-msgid_plural "%(hours)s hours"
-msgstr[0] "%(hours)s 小时"
+#: core/timeline.py:100
+msgid "%(child)s woke up."
+msgstr "%(child)s 醒了。"
-#: core/utils.py:19
-#, python-format
-msgid "%(minutes)s minute"
-msgid_plural "%(minutes)s minutes"
-msgstr[0] "%(minutes)s 分钟"
+#: core/timeline.py:53
+msgid "%(child)s started tummy time!"
+msgstr "%(child)s 开始了趴玩时光!"
-#: core/utils.py:25
-#, python-format
-msgid "%(seconds)s second"
-msgid_plural "%(seconds)s seconds"
-msgstr[0] "%(seconds)s 秒"
+#: core/timeline.py:64
+msgid "%(child)s finished tummy time."
+msgstr "%(child)s 结束了趴玩。"
#: core/views.py:33
-#, python-format
msgid "%(model)s entry for %(child)s added!"
msgstr "为%(child)s 增加了一条 %(model)s 记录!"
#: core/views.py:35
-#, python-format
msgid "%(model)s entry added!"
msgstr "增加了一条 %(model)s 记录!"
#: core/views.py:61
-#, python-format
msgid "%(model)s entry for %(child)s updated."
msgstr "为%(child)s 更新了一条 %(model)s 记录!"
#: core/views.py:63
-#, python-format
msgid "%(model)s entry updated."
msgstr "更新了一条 %(model)s 记录!"
-#: core/views.py:69 core/views.py:118
-#, python-format
-msgid "%(model)s entry deleted."
-msgstr "%(model)s 条目已删除。"
-
#: core/views.py:87
-#, python-format
msgid "%(first_name)s %(last_name)s added!"
msgstr "%(first_name)s %(last_name)s 已新增!"
-#: core/views.py:249
-#, python-format
-msgid "%(model)s reading added!"
-msgstr "%(model)s 读数已增加!"
-
-#: core/views.py:257
-#, python-format
-msgid "%(model)s reading for %(child)s updated."
-msgstr "%(child)s 的 %(model)s 读数已更新。"
-
#: core/views.py:361
-#, python-format
msgid "%(timer)s stopped."
msgstr "%(timer)s 停止。"
-#: core/views.py:384
-msgid "All inactive timers deleted."
-msgstr "所有处于非活动状态下的计时器已删除。"
-
-#: core/views.py:394
-msgid "No inactive timers exist."
-msgstr "不存在非活动的计时器。"
-
#: dashboard/templates/cards/diaperchange_last.html:6
msgid "Last Diaper Change"
msgstr "上一次换尿布"
-#: dashboard/templates/cards/diaperchange_last.html:12
-#: dashboard/templates/cards/feeding_last.html:12
-#: dashboard/templates/cards/sleep_last.html:12
-#: dashboard/templates/cards/tummytime_last.html:13
-#, python-format
-msgid "%(since)s ago
%(time)s"
-msgstr "%(since)s 之前
%(time)s"
+#: dashboard/templates/cards/diaperchange_last.html:8
+#: dashboard/templates/cards/feeding_last.html:8
+#: dashboard/templates/cards/sleep_last.html:8
+#: dashboard/templates/cards/tummytime_last.html:8
+msgid "%(time)s ago"
+msgstr "%(time)s 之前"
+
+#: dashboard/templates/cards/tummytime_last.html:18
+msgid "Never"
+msgstr "从不"
#: dashboard/templates/cards/diaperchange_types.html:14
msgid "Past Week"
@@ -1573,19 +1116,9 @@ msgid "yesterday"
msgstr "昨天"
#: dashboard/templates/cards/diaperchange_types.html:42
-#, python-format
msgid "%(key)s days ago"
msgstr "%(key)s 天之前"
-#: dashboard/templates/cards/feeding_day.html:6
-msgid "Today's Feeding"
-msgstr "今天的喂食"
-
-#: dashboard/templates/cards/feeding_day.html:20
-#, python-format
-msgid "%(count)s feeding entries"
-msgstr "%(count)s 喂食条目"
-
#: dashboard/templates/cards/feeding_last.html:6
msgid "Last Feeding"
msgstr "上一次喂食"
@@ -1594,37 +1127,31 @@ msgstr "上一次喂食"
msgid "Last Feeding Method"
msgstr "上一次喂食的方式"
-#: dashboard/templates/cards/feeding_last_method.html:19
-msgid "most recent"
-msgstr "最近"
-
-#: dashboard/templates/cards/feeding_last_method.html:21
-#, fuzzy, python-format
-#| msgid "%(n)s feeding%(plural)s ago"
-msgid "%(n)s feeding%(plural)s ago"
-msgstr "前 %(n)s 喂食"
-
#: dashboard/templates/cards/sleep_day.html:6
msgid "Today's Sleep"
msgstr "今天的睡觉"
+#: dashboard/templates/cards/sleep_day.html:11
+#: dashboard/templates/cards/sleep_naps_day.html:13
+#: dashboard/templates/cards/tummytime_day.html:11
+msgid "None yet today"
+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 "上一次睡眠"
+#: dashboard/templates/cards/sleep_last.html:4
+msgid "Last Slept"
+msgstr "上一次入睡"
#: dashboard/templates/cards/sleep_naps_day.html:6
msgid "Today's Naps"
-msgstr "今天的打盹"
+msgstr "今天的小睡"
#: dashboard/templates/cards/sleep_naps_day.html:12
-#, python-format
msgid "%(count)s nap%(plural)s"
-msgstr "%(count)s 打盹%(plural)s"
+msgstr "%(count)s 小睡%(plural)s"
#: dashboard/templates/cards/statistics.html:7
msgid "Statistics"
@@ -1634,27 +1161,19 @@ msgstr "统计数据"
msgid "Not enough data"
msgstr "没有足够的数据"
-#: dashboard/templates/cards/statistics.html:42
-msgid "No data yet"
-msgstr "还没有数据"
-
#: dashboard/templates/cards/timer_list.html:12
-#, fuzzy, python-format
-#| msgid "%(count)s active timer%(plural)s"
msgid "%(count)s active timer%(plural)s"
msgstr "%(count)s 个激活的计时器"
-#: dashboard/templates/cards/timer_list.html:25
-#, python-format
-msgid "Started by %(user)s at %(start)s"
-msgstr "在 %(start)s 由 %(user)s 开始"
+#: dashboard/templates/cards/timer_list.html:19
+msgid "Started by %(instance.user)s at %(start)s"
+msgstr "在 %(start)s 由 %(instance.user)s 开始"
#: dashboard/templates/cards/tummytime_day.html:6
msgid "Today's Tummy Time"
msgstr "今天的趴玩时间"
#: dashboard/templates/cards/tummytime_day.html:22
-#, python-format
msgid "%(duration)s at %(end)s"
msgstr "%(duration)s 直到 %(end)s"
@@ -1662,23 +1181,10 @@ msgstr "%(duration)s 直到 %(end)s"
msgid "Last Tummy Time"
msgstr "上一次趴玩时间"
-#: dashboard/templates/cards/tummytime_last.html:18
-msgid "Never"
-msgstr "从不"
-
#: dashboard/templates/dashboard/child_button_group.html:3
msgid "Child actions"
msgstr "宝宝行动"
-#: dashboard/templates/dashboard/child_button_group.html:17
-#: reports/templates/reports/report_base.html:9
-msgid "Reports"
-msgstr "报告"
-
-#: dashboard/templates/dashboard/child_button_group.html:23
-msgid "Diaper Change Amounts"
-msgstr "换尿布数量"
-
#: dashboard/templates/dashboard/child_button_group.html:24
#: reports/templates/reports/diaperchange_types.html:4
#: reports/templates/reports/diaperchange_types.html:8
@@ -1691,12 +1197,6 @@ msgstr "换尿布类型"
msgid "Diaper Lifetimes"
msgstr "换尿布时间间隔"
-#: dashboard/templates/dashboard/child_button_group.html:26
-#: reports/templates/reports/feeding_amounts.html:4
-#: reports/templates/reports/feeding_amounts.html:8
-msgid "Feeding Amounts"
-msgstr "喂食量"
-
#: dashboard/templates/dashboard/child_button_group.html:27
msgid "Feeding Durations (Average)"
msgstr "喂食时间(平均)"
@@ -1713,21 +1213,21 @@ msgstr "睡眠类型"
msgid "Sleep Totals"
msgstr "睡眠统计"
-#: dashboard/templates/dashboard/child_button_group.html:30
-msgid "Tummy Time Durations (Sum)"
-msgstr "趴玩时光持续时间(合计)"
-
#: dashboard/templatetags/cards.py:288
msgid "Diaper change frequency"
msgstr "换尿布频率"
+#: dashboard/templatetags/cards.py:428
+msgid "Feeding frequency"
+msgstr "喂食频率"
+
#: dashboard/templatetags/cards.py:309
msgid "Average nap duration"
-msgstr "平均打盹时间"
+msgstr "平均小睡时间"
#: dashboard/templatetags/cards.py:316
msgid "Average naps per day"
-msgstr "每天的平均打盹次数"
+msgstr "每天的平均小睡次数"
#: dashboard/templatetags/cards.py:326
msgid "Average sleep duration"
@@ -1741,54 +1241,6 @@ msgstr "平均清醒时间"
msgid "Weight change per week"
msgstr "每周体重变化"
-#: dashboard/templatetags/cards.py:353
-#, fuzzy
-#| msgid "Weight change per week"
-msgid "Height change per week"
-msgstr "每周体重变化"
-
-#: dashboard/templatetags/cards.py:363
-#, fuzzy
-#| msgid "Weight change per week"
-msgid "Head circumference change per week"
-msgstr "每周体重变化"
-
-#: dashboard/templatetags/cards.py:373
-#, fuzzy
-#| msgid "Weight change per week"
-msgid "BMI change per week"
-msgstr "每周体重变化"
-
-#: dashboard/templatetags/cards.py:418
-msgid "Feeding frequency (past 3 days)"
-msgstr "喂食频率(过去三天)"
-
-#: dashboard/templatetags/cards.py:422
-msgid "Feeding frequency (past 2 weeks)"
-msgstr "喂食频率(过去两周)"
-
-#: dashboard/templatetags/cards.py:428
-msgid "Feeding frequency"
-msgstr "喂食频率"
-
-#: reports/graphs/bmi_bmi.py:27
-#, fuzzy
-#| msgid "Weight"
-msgid "BMI"
-msgstr "体重"
-
-#: reports/graphs/diaperchange_amounts.py:27
-msgid "Diaper change amount"
-msgstr "换尿布数量"
-
-#: reports/graphs/diaperchange_amounts.py:36
-msgid "Diaper Change Amounts"
-msgstr "换尿布数量"
-
-#: reports/graphs/diaperchange_amounts.py:39
-msgid "Change amount"
-msgstr "换尿布数量"
-
#: reports/graphs/diaperchange_lifetimes.py:35
msgid "Diaper Lifetimes"
msgstr "换尿布时间间隔"
@@ -1809,16 +1261,6 @@ msgstr "换尿布类型"
msgid "Number of changes"
msgstr "换尿布次数"
-#: reports/graphs/feeding_amounts.py:69
-#, fuzzy
-#| msgid "Total Feeding Amounts"
-msgid "Total Feeding Amount by Type"
-msgstr "合计喂食量"
-
-#: reports/graphs/feeding_amounts.py:72
-msgid "Feeding amount"
-msgstr "喂食量"
-
#: reports/graphs/feeding_duration.py:38
msgid "Average duration"
msgstr "平均持续时间"
@@ -1839,16 +1281,6 @@ msgstr "平均持续时间(分钟)"
msgid "Number of feedings"
msgstr "喂食次数"
-#: reports/graphs/head_circumference_head_circumference.py:27
-msgid "Head Circumference"
-msgstr ""
-
-#: reports/graphs/height_height.py:27
-#, fuzzy
-#| msgid "Weight"
-msgid "Height"
-msgstr "体重"
-
#: reports/graphs/sleep_pattern.py:148
msgid "Sleep Pattern"
msgstr "睡眠类型"
@@ -1869,6 +1301,414 @@ msgstr "睡眠总计"
msgid "Hours of sleep"
msgstr "睡眠时间"
+#: reports/graphs/weight_weight.py:27
+msgid "Weight"
+msgstr "体重"
+
+#: reports/templates/reports/feeding_duration.html:4
+#: reports/templates/reports/feeding_duration.html:8
+msgid "Average Feeding Durations"
+msgstr "平均喂食持续时间"
+
+#: dashboard/templates/dashboard/child_button_group.html:17
+#: reports/templates/reports/report_base.html:9
+msgid "Reports"
+msgstr "报告"
+
+#: reports/templates/reports/report_base.html:19
+msgid "There is no enough data to generate this report."
+msgstr "没有足够的数据来生成报告。"
+
+#: core/models.py:212
+msgid "Both breasts"
+msgstr "两侧乳房"
+
+#: babybuddy/settings/base.py:171
+msgid "German"
+msgstr "德语"
+
+#: babybuddy/settings/base.py:175
+msgid "Spanish"
+msgstr "西班牙语"
+
+#: babybuddy/settings/base.py:176
+msgid "Swedish"
+msgstr "瑞典语"
+
+#: babybuddy/settings/base.py:177
+msgid "Turkish"
+msgstr "土耳其语"
+
+#: babybuddy/templates/403.html:12
+msgid "You do not have permission to access this resource. Contact a site administrator for assistance."
+msgstr "您没有访问此资源的权限。请联系网站管理员以获得帮助。"
+
+#: babybuddy/templates/babybuddy/nav-dropdown.html:75
+#: babybuddy/templates/babybuddy/nav-dropdown.html:172 core/models.py:331
+#: core/models.py:341 core/models.py:342 core/models.py:345
+#: 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:178
+msgid "Temperature reading"
+msgstr "体温读数"
+
+#: babybuddy/templates/babybuddy/welcome.html:14
+msgid "Learn about and predict baby's needs without (as much) guess work by using Baby Buddy to track —"
+msgstr "通过使用 Baby Buddy 来跟踪了解和预测宝宝的需求,而无需 (尽可能多地) 进行猜测工作 —"
+
+#: babybuddy/templates/babybuddy/welcome.html:56
+msgid "As the amount of entries grows, Baby Buddy will help parents and caregivers to identify small patterns in baby's habits using the dashboard and graphs. Baby Buddy is mobile-friendly and uses a dark theme to help weary moms and dads with 2AM feedings and changings. To get started, just click the button below to add your first (or second, third, etc.) child!"
+msgstr "随着条目数量的增加,Baby Buddy将帮助家长和护理人员使用数据看板和图表识别宝宝的习惯。Baby Buddy是一款手机友好型产品,使用黑色主题帮助疲惫的爸爸妈妈在凌晨2点喂食和换尿布。想要开始使用,只需单击下面的按钮添加您的第一个(或第二个、第三个等)宝宝!"
+
+#: babybuddy/templates/registration/password_reset_confirm.html:13
+msgid "Oh snap! The two passwords did not match. Please try again."
+msgstr "提示! 两次密码输入的不一致,请重试。"
+
+#: babybuddy/templates/registration/password_reset_done.html:9
+msgid "We've emailed you instructions for setting your password, if an account exists with the email you entered. You should receive them shortly."
+msgstr "我们已通过电子邮件向您发送了设置密码的说明。如果您输入的电子邮件正确,您将很快收到邮件。"
+
+#: babybuddy/templates/registration/password_reset_done.html:15
+msgid "If you don't receive an email, please make sure you've entered the address you registered with, and check your spam folder."
+msgstr "如果您没有收到电子邮件,请确保您已输入正确的邮箱地址,并检查您的垃圾邮件文件夹。"
+
+#: babybuddy/templates/registration/password_reset_form.html:9
+msgid "Enter your account email address in the form below. If the address is valid, you will receive instructions for resetting your password."
+msgstr "在下面的表格中输入您的电子邮箱地址。如果地址有效,您将收到重置密码的说明。"
+
+#: core/models.py:201
+msgid "Fortified breast milk"
+msgstr "强化母乳"
+
+#: core/templates/core/temperature_confirm_delete.html:4
+msgid "Delete a Temperature Reading"
+msgstr "删除一个体温读数"
+
+#: core/templates/core/temperature_form.html:8
+#: core/templates/core/temperature_form.html:17
+msgid "Add a Temperature Reading"
+msgstr "新增一个体温读数"
+
+#: core/templates/core/temperature_form.html:27
+msgid "Add a Temperature Entry"
+msgstr "新增一个体温条目"
+
+#: core/templates/core/temperature_list.html:66
+msgid "No temperature entries found."
+msgstr "未找到体温条目。"
+
+#: core/templates/core/timer_detail.html:34
+msgid "%(timer)s created by %(user)s"
+msgstr "%(timer)s 由 %(user)s 创建"
+
+#: core/utils.py:15
+msgid "%(hours)s hour"
+msgid_plural "%(hours)s hours"
+msgstr[0] "%(hours)s 小时"
+
+#: core/utils.py:19
+msgid "%(minutes)s minute"
+msgid_plural "%(minutes)s minutes"
+msgstr[0] "%(minutes)s 分钟"
+
+#: core/utils.py:25
+msgid "%(seconds)s second"
+msgid_plural "%(seconds)s seconds"
+msgstr[0] "%(seconds)s 秒"
+
+#: core/views.py:69 core/views.py:118
+msgid "%(model)s entry deleted."
+msgstr "%(model)s 条目已删除。"
+
+#: core/views.py:249
+msgid "%(model)s reading added!"
+msgstr "%(model)s 读数已增加!"
+
+#: core/views.py:257
+msgid "%(model)s reading for %(child)s updated."
+msgstr "%(child)s 的 %(model)s 读数已更新。"
+
+#: dashboard/templates/cards/timer_list.html:25
+msgid "Started by %(user)s at %(start)s"
+msgstr "在 %(start)s 由 %(user)s 开始"
+
+#: dashboard/templates/dashboard/child_button_group.html:26
+#: reports/templates/reports/feeding_amounts.html:4
+#: reports/templates/reports/feeding_amounts.html:8
+msgid "Feeding Amounts"
+msgstr "喂食量"
+
+#: reports/graphs/feeding_amounts.py:27
+msgid "Total feeding amount"
+msgstr "合计喂食量"
+
+#: reports/graphs/feeding_amounts.py:36
+msgid "Total Feeding Amounts"
+msgstr "合计喂食量"
+
+#: reports/graphs/feeding_amounts.py:72
+msgid "Feeding amount"
+msgstr "喂食量"
+
+#: reports/templates/reports/report_base.html:19
+msgid "There is not enough data to generate this report."
+msgstr "没有足够的数据来生成这个报告。"
+
+#: babybuddy/models.py:69
+msgid "Timezone"
+msgstr "时区"
+
+#: babybuddy/templates/admin/base_site.html:4
+#: babybuddy/templates/admin/base_site.html:7
+#: babybuddy/templates/babybuddy/nav-dropdown.html:338
+msgid "Database Admin"
+msgstr "数据库管理员"
+
+#: core/templates/core/child_list.html:15
+msgid "Add Child"
+msgstr "新增宝宝"
+
+#: core/templates/core/diaperchange_list.html:15
+msgid "Add Diaper Change"
+msgstr "新增换尿布记录"
+
+#: core/templates/core/feeding_list.html:15
+msgid "Add Feeding"
+msgstr "新增喂食记录"
+
+#: core/templates/core/note_list.html:15
+msgid "Add Note"
+msgstr "新增笔记"
+
+#: core/templates/core/sleep_list.html:15
+msgid "Add Sleep"
+msgstr "新增睡眠记录"
+
+#: core/templates/core/temperature_list.html:15
+msgid "Add Temperature Reading"
+msgstr "新增体温记录"
+
+#: core/templates/core/timer_confirm_delete_inactive.html:5
+msgid "Delete All Inactive Timers"
+msgstr "删除所有处于非活动状态的计时器"
+
+#: core/templates/core/timer_confirm_delete_inactive.html:10
+msgid "Delete Inactive"
+msgstr "删除非活动"
+
+#: core/templates/core/timer_confirm_delete_inactive.html:17
+#, fuzzy
+msgid "Are you sure you want to delete %(number)s inactive timer%(plural)s?"
+msgstr "确定要删除 %(number)s 个非活动的计时器?"
+
+#: core/templates/core/timer_list.html:68
+msgid "Delete Inactive Timers"
+msgstr "删除处于非活动状态下的计时器"
+
+#: core/templates/core/tummytime_list.html:15
+msgid "Add Tummy Time"
+msgstr "新增趴玩时间"
+
+#: core/templates/core/weight_list.html:15
+msgid "Add Weight"
+msgstr "新增体重记录"
+
+#: core/views.py:384
+msgid "All inactive timers deleted."
+msgstr "所有处于非活动状态下的计时器已删除。"
+
+#: core/views.py:394
+msgid "No inactive timers exist."
+msgstr "不存在非活动的计时器。"
+
+#: dashboard/templates/cards/feeding_last_method.html:19
+msgid "most recent"
+msgstr "最近"
+
+#: dashboard/templates/cards/feeding_last_method.html:21
+msgid "%(n)s feeding%(plural)s ago"
+msgstr "前 %(n)s 喂食"
+
+#: dashboard/templates/cards/sleep_last.html:6
+msgid "Last Sleep"
+msgstr "上一次睡眠"
+
+#: dashboard/templates/dashboard/child_button_group.html:23
+msgid "Diaper Change Amounts"
+msgstr "换尿布数量"
+
+#: reports/graphs/diaperchange_amounts.py:27
+msgid "Diaper change amount"
+msgstr "换尿布数量"
+
+#: reports/graphs/diaperchange_amounts.py:36
+msgid "Diaper Change Amounts"
+msgstr "换尿布数量"
+
+#: reports/graphs/diaperchange_amounts.py:39
+msgid "Change amount"
+msgstr "换尿布数量"
+
+#: reports/templates/reports/diaperchange_amounts.html:4
+#: reports/templates/reports/diaperchange_amounts.html:8
+msgid "Diaper Amounts"
+msgstr "换尿布数量"
+
+#: babybuddy/models.py:21
+msgid "If supported by browser, the dashboard will only refresh when visible, and also when receiving focus."
+msgstr "如果浏览器支持,数据看板只会在可见及接收焦点时也会刷新。"
+
+#: babybuddy/models.py:40
+msgid "Hide Empty Dashboard Cards"
+msgstr "隐藏空的数据看板卡片"
+
+#. 应该为:隐藏早于......的数据
+#: babybuddy/models.py:43
+msgid "Hide data older than"
+msgstr "隐藏数据早于"
+
+#: babybuddy/models.py:45
+msgid "This setting controls which data will be shown in the dashboard."
+msgstr "此设置控制哪些数据显示在数据看板中。"
+
+#: babybuddy/models.py:51
+msgid "show all data"
+msgstr "展示所有数据"
+
+#: babybuddy/models.py:52
+msgid "1 day"
+msgstr "1天"
+
+#: babybuddy/models.py:53
+msgid "2 days"
+msgstr "2天"
+
+#: babybuddy/models.py:54
+msgid "3 days"
+msgstr "3天"
+
+#: babybuddy/models.py:55
+msgid "1 week"
+msgstr "1周"
+
+#: babybuddy/models.py:56
+msgid "4 weeks"
+msgstr "4 周"
+
+#: babybuddy/settings/base.py:168
+msgid "Dutch"
+msgstr "荷兰语"
+
+#: babybuddy/settings/base.py:170
+msgid "Finnish"
+msgstr "芬兰语"
+
+#: babybuddy/settings/base.py:172
+msgid "Italian"
+msgstr "意大利语"
+
+#: babybuddy/settings/base.py:173
+msgid "Polish"
+msgstr "波兰语"
+
+#: babybuddy/settings/base.py:174
+msgid "Portuguese"
+msgstr "葡萄牙语"
+
+#: babybuddy/templates/babybuddy/nav-dropdown.html:111
+#: core/templates/timeline/timeline.html:4
+#: core/templates/timeline/timeline.html:7
+#: dashboard/templates/dashboard/child_button_group.html:9
+msgid "Timeline"
+msgstr "时间线"
+
+#: core/models.py:202
+msgid "Solid food"
+msgstr "固体食物"
+
+#: core/models.py:213
+msgid "Parent fed"
+msgstr "父母喂养"
+
+#: core/models.py:214
+msgid "Self fed"
+msgstr "自己吃"
+
+#: core/templates/core/diaperchange_list.html:29
+msgid "Contents"
+msgstr "内容"
+
+#: core/templates/core/timer_detail.html:77
+msgid "Restart timer"
+msgstr "重启计时器"
+
+#: core/templates/core/timer_detail.html:84
+msgid "Delete timer"
+msgstr "删除计时器"
+
+#: core/templatetags/datetime.py:60
+msgid "Today"
+msgstr "今天"
+
+#: core/templatetags/datetime.py:75
+msgid "{}, {}"
+msgstr "{}, {}"
+
+#: core/templatetags/duration.py:23
+msgid "0 days"
+msgstr "0天"
+
+#: core/timeline.py:133
+msgid "Amount: %(amount).0f"
+msgstr "数量: %(amount).0f"
+
+#: core/timeline.py:157
+msgid "Contents: %(contents)s"
+msgstr "内容: %(contents)s"
+
+#: dashboard/templates/cards/diaperchange_last.html:12
+#: dashboard/templates/cards/feeding_last.html:12
+#: dashboard/templates/cards/sleep_last.html:12
+#: dashboard/templates/cards/tummytime_last.html:13
+msgid "%(since)s ago
%(time)s"
+msgstr "%(since)s 之前
%(time)s"
+
+#: dashboard/templates/cards/feeding_day.html:6
+msgid "Today's Feeding"
+msgstr "今天的喂食"
+
+#: dashboard/templates/cards/feeding_day.html:20
+msgid "%(count)s feeding entries"
+msgstr "%(count)s 喂食条目"
+
+#: dashboard/templates/cards/statistics.html:42
+msgid "No data yet"
+msgstr "还没有数据"
+
+#: dashboard/templates/dashboard/child_button_group.html:30
+msgid "Tummy Time Durations (Sum)"
+msgstr "趴玩时光持续时间(合计)"
+
+#: core/templates/timeline/_timeline.html:56
+#: dashboard/templates/dashboard/child_button_group.html:41
+msgid "Edit"
+msgstr "编辑"
+
+#: dashboard/templatetags/cards.py:418
+msgid "Feeding frequency (past 3 days)"
+msgstr "喂食频率(过去三天)"
+
+#: dashboard/templatetags/cards.py:422
+msgid "Feeding frequency (past 2 weeks)"
+msgstr "喂食频率(过去两周)"
+
#: reports/graphs/tummytime_duration.py:34
msgid "Total duration"
msgstr "总持续时间"
@@ -1886,25 +1726,178 @@ msgstr "趴玩时光持续时间合计"
msgid "Total duration (minutes)"
msgstr "总持续时间(分钟)"
-#: reports/graphs/weight_weight.py:27
-msgid "Weight"
-msgstr "体重"
-
-#: reports/templates/reports/diaperchange_amounts.html:4
-#: reports/templates/reports/diaperchange_amounts.html:8
-msgid "Diaper Amounts"
-msgstr "换尿布数量"
-
-#: reports/templates/reports/feeding_duration.html:4
-#: reports/templates/reports/feeding_duration.html:8
-msgid "Average Feeding Durations"
-msgstr "平均喂食持续时间"
-
-#: reports/templates/reports/report_base.html:19
-msgid "There is not enough data to generate this report."
-msgstr "没有足够的数据来生成这个报告。"
-
#: reports/templates/reports/tummytime_duration.html:4
#: reports/templates/reports/tummytime_duration.html:8
msgid "Total Tummy Time Durations"
msgstr "趴玩时光持续时间合计"
+
+#: babybuddy/settings/base.py:166
+msgid "English (US)"
+msgstr "英语(美国)"
+
+#: babybuddy/settings/base.py:167
+msgid "English (UK)"
+msgstr "英语(英国)"
+
+#: babybuddy/templates/babybuddy/nav-dropdown.html:164
+msgid "Measurements"
+msgstr "测量"
+
+#: babybuddy/templates/babybuddy/nav-dropdown.html:200 core/models.py:521
+#: core/models.py:530 core/models.py:531 core/models.py:534
+#: 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
+#: dashboard/templates/dashboard/child_button_group.html:32
+#: reports/graphs/height_height.py:19 reports/graphs/height_height.py:30
+#: reports/templates/reports/height_change.html:4
+#: reports/templates/reports/height_change.html:8
+msgid "Height"
+msgstr "身高"
+
+#: babybuddy/templates/babybuddy/nav-dropdown.html:206
+msgid "Height entry"
+msgstr "身高记录"
+
+#: babybuddy/templates/babybuddy/nav-dropdown.html:214 core/models.py:549
+#: core/models.py:559 core/models.py:560 core/models.py:563
+#: 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
+#: dashboard/templates/dashboard/child_button_group.html:33
+#: reports/graphs/head_circumference_head_circumference.py:19
+#: reports/graphs/head_circumference_head_circumference.py:30
+#: reports/templates/reports/head_circumference_change.html:4
+#: reports/templates/reports/head_circumference_change.html:8
+msgid "Head Circumference"
+msgstr "头围"
+
+#: babybuddy/templates/babybuddy/nav-dropdown.html:220
+msgid "Head Circumference entry"
+msgstr "头围记录"
+
+#. BMI is an international standard
+#: babybuddy/templates/babybuddy/nav-dropdown.html:228 core/models.py:574
+#: core/models.py:583 core/models.py:584 core/models.py:587
+#: 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
+#: dashboard/templates/dashboard/child_button_group.html:34
+#: reports/graphs/bmi_bmi.py:19 reports/graphs/bmi_bmi.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:234
+msgid "BMI entry"
+msgstr "BMI记录"
+
+#: core/models.py:278
+msgid "Napping"
+msgstr "小睡"
+
+#: core/templates/core/bmi_confirm_delete.html:4
+msgid "Delete a BMI Entry"
+msgstr "删除一条BMI记录"
+
+#: core/templates/core/bmi_form.html:8 core/templates/core/bmi_form.html:17
+#: core/templates/core/bmi_form.html:27
+msgid "Add a BMI Entry"
+msgstr "新增一条BMI记录"
+
+#: core/templates/core/bmi_list.html:15
+msgid "Add BMI"
+msgstr "新增BMI记录"
+
+#: core/templates/core/bmi_list.html:66
+msgid "No bmi entries found."
+msgstr "未找到BMI记录。"
+
+#: core/templates/core/head_circumference_confirm_delete.html:4
+msgid "Delete a Head Circumference Entry"
+msgstr "删除一条头围记录"
+
+#: core/templates/core/head_circumference_form.html:8
+#: core/templates/core/head_circumference_form.html:17
+#: core/templates/core/head_circumference_form.html:27
+msgid "Add a Head Circumference Entry"
+msgstr "新增一条头围记录"
+
+#: core/templates/core/head_circumference_list.html:15
+msgid "Add Head Circumference"
+msgstr "新增头围记录"
+
+#: core/templates/core/head_circumference_list.html:66
+msgid "No head circumference entries found."
+msgstr "未找到头围记录。"
+
+#: core/templates/core/height_confirm_delete.html:4
+msgid "Delete a Height Entry"
+msgstr "删除一条身高记录"
+
+#: core/templates/core/height_form.html:8
+#: core/templates/core/height_form.html:17
+#: core/templates/core/height_form.html:27
+msgid "Add a Height Entry"
+msgstr "新增一条身高记录"
+
+#: core/templates/core/height_list.html:15
+msgid "Add Height"
+msgstr "新增身高记录"
+
+#: core/templates/core/height_list.html:66
+msgid "No height entries found."
+msgstr "未找到身高记录。"
+
+#: core/templates/timeline/_timeline.html:39
+msgid "Duration: %(duration)s"
+msgstr "持续时间:%(duration)s"
+
+#: core/templates/timeline/_timeline.html:48
+msgid "%(since)s since previous"
+msgstr "距离上一次 %(since)s"
+
+#: core/templates/timeline/_timeline.html:80
+msgid "No events"
+msgstr "没有事件"
+
+#: core/timeline.py:179
+msgid "%(child)s had a %(type)s diaper change."
+msgstr "%(child)s 有一条 %(type)s 换尿裤记录."
+
+#: dashboard/templatetags/cards.py:353
+msgid "Height change per week"
+msgstr "每周身高变化"
+
+#: dashboard/templatetags/cards.py:363
+msgid "Head circumference change per week"
+msgstr "每周头围变化"
+
+#: dashboard/templatetags/cards.py:373
+msgid "BMI change per week"
+msgstr "每周BMI变化"
+
+#: reports/graphs/bmi_bmi.py:27
+msgid "BMI"
+msgstr "身体质量指数(BMI)"
+
+#: reports/graphs/feeding_amounts.py:69
+msgid "Total Feeding Amount by Type"
+msgstr "按类型划分的总喂食量统计"
+
+#: reports/graphs/head_circumference_head_circumference.py:27
+msgid "Head Circumference"
+msgstr "头围"
+
+#: reports/graphs/height_height.py:27
+msgid "Height"
+msgstr "身高"
+
diff --git a/locale/zh_hans/LC_MESSAGES/django.mo b/locale/zh_hans/LC_MESSAGES/django.mo
deleted file mode 100644
index 0cf83934..00000000
Binary files a/locale/zh_hans/LC_MESSAGES/django.mo and /dev/null differ