diff --git a/babybuddy/templates/403.html b/babybuddy/templates/403.html
index 530950a0..a6004db6 100644
--- a/babybuddy/templates/403.html
+++ b/babybuddy/templates/403.html
@@ -9,7 +9,9 @@
 
 {% block content %}
     <div class="alert alert-danger" role="alert">
-        {% blocktrans %}You do not have permission to access this resource.
-        Contact a site administrator for assistance.{% endblocktrans %}
+        {% blocktrans trimmed %}
+            You do not have permission to access this resource. Contact a site
+            administrator for assistance.
+        {% endblocktrans %}
     </div>
 {% endblock %}
\ No newline at end of file
diff --git a/babybuddy/templates/babybuddy/messages.html b/babybuddy/templates/babybuddy/messages.html
index c751a753..36a518da 100644
--- a/babybuddy/templates/babybuddy/messages.html
+++ b/babybuddy/templates/babybuddy/messages.html
@@ -20,7 +20,10 @@
             {% endfor %}
         {% elif form.errors %}
             <div class="alert alert-danger" role="alert">
-                {% blocktrans %}<strong>Error:</strong> Some fields have errors. See below for details. {% endblocktrans %}
+                {% blocktrans trimmed%}
+                    <strong>Error:</strong> Some fields have errors. See below
+                    for details.
+                {% endblocktrans %}
             </div>
         {% endif %}
     {% endif %}
diff --git a/babybuddy/templates/babybuddy/user_confirm_delete.html b/babybuddy/templates/babybuddy/user_confirm_delete.html
index be1a2b71..94902af5 100644
--- a/babybuddy/templates/babybuddy/user_confirm_delete.html
+++ b/babybuddy/templates/babybuddy/user_confirm_delete.html
@@ -12,7 +12,9 @@
 {% block content %}
     <form role="form" method="post">
         {% csrf_token %}
-        {% blocktrans %}<h1>Are you sure you want to delete <span class="text-info">{{ object }}</span>?</h1>{% endblocktrans %}
+        {% blocktrans trimmed %}
+            <h1>Are you sure you want to delete <span class="text-info">{{ object }}</span>?</h1>
+        {% endblocktrans %}
         <input type="submit" value="Delete" class="btn btn-danger" />
         <a href="{% url 'babybuddy:user-list' %}" class="btn btn-default">{% trans "Cancel" %}</a>
     </form>
diff --git a/babybuddy/templates/babybuddy/user_form.html b/babybuddy/templates/babybuddy/user_form.html
index fd38ad86..63af95e2 100644
--- a/babybuddy/templates/babybuddy/user_form.html
+++ b/babybuddy/templates/babybuddy/user_form.html
@@ -21,7 +21,9 @@
 
 {% block content %}
     {% if object %}
-        {% blocktrans %}<h1>Update <span class="text-info">{{ object }}</span></h1>{% endblocktrans %}
+        {% blocktrans trimmed %}
+            <h1>Update <span class="text-info">{{ object }}</span></h1>
+        {% endblocktrans %}
     {% else %}
         <h1>{% trans "Create User" %}</h1>
     {% endif %}
diff --git a/babybuddy/templates/babybuddy/user_settings_form.html b/babybuddy/templates/babybuddy/user_settings_form.html
index e3b3d7b6..f9c617d3 100644
--- a/babybuddy/templates/babybuddy/user_settings_form.html
+++ b/babybuddy/templates/babybuddy/user_settings_form.html
@@ -16,12 +16,17 @@
             {% if form.non_field_errors %}
                 {% for error in form.non_field_errors %}
                     <div class="alert alert-danger" role="alert">
-                        {% blocktrans %}<strong>Error:</strong> {{ error }}{% endblocktrans %}
+                        {% blocktrans trimmed %}
+                            <strong>Error:</strong> {{ error }}
+                        {% endblocktrans %}
                     </div>
                 {% endfor %}
             {% elif form.errors %}
                 <div class="alert alert-danger" role="alert">
-                    {% blocktrans %}<strong>Error:</strong> Some fields have errors. See below for details.{% endblocktrans %}
+                    {% blocktrans trimmed %}
+                        <strong>Error:</strong> Some fields have errors. See
+                        below for details.
+                    {% endblocktrans %}
                 </div>
             {% endif %}
             <fieldset>
diff --git a/babybuddy/templates/babybuddy/welcome.html b/babybuddy/templates/babybuddy/welcome.html
index c46c3b60..d9d7d029 100644
--- a/babybuddy/templates/babybuddy/welcome.html
+++ b/babybuddy/templates/babybuddy/welcome.html
@@ -11,8 +11,10 @@
     <div class="jumbotron">
         <h1 class="display-3">{% trans "Welcome to Baby Buddy!" %}</h1>
         <p class="lead">
-            {% blocktrans %}Learn about and predict baby's needs without
-            (<em>as much</em>) guess work by using Baby Buddy to track &mdash;{% endblocktrans %}
+            {% blocktrans trimmed%}
+                Learn about and predict baby's needs without (<em>as much</em>)
+                guess work by using Baby Buddy to track &mdash;
+            {% endblocktrans %}
         </p>
         <hr class="my-4">
         <div class="card-deck">
@@ -51,12 +53,14 @@
         </div>
         <hr class="my-4">
         <p class="lead">
-            {% blocktrans %}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!{% endblocktrans %}
+            {% blocktrans trimmed %}
+                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!
+            {% endblocktrans %}
         </p>
         <p class="text-center">
             {% if perms.core.add_child %}
diff --git a/babybuddy/templates/registration/password_reset_confirm.html b/babybuddy/templates/registration/password_reset_confirm.html
index d6e752b7..b72e813b 100644
--- a/babybuddy/templates/registration/password_reset_confirm.html
+++ b/babybuddy/templates/registration/password_reset_confirm.html
@@ -9,8 +9,12 @@
 
         {% if form.errors %}
             <div class="alert alert-danger">
-                {% blocktrans %}<p class="mb-0"><strong>Oh snap!</strong> The
-                two passwords did not match. Please try again.</p>{% endblocktrans %}
+                <p class="mb-0">
+                {% blocktrans trimmed %}
+                    <strong>Oh snap!</strong> The two passwords did not
+                    match. Please try again.
+                {% endblocktrans %}
+                </p>
             </div>
         {% endif %}
 
diff --git a/babybuddy/templates/registration/password_reset_done.html b/babybuddy/templates/registration/password_reset_done.html
index c1f6c3be..c1efb5e2 100644
--- a/babybuddy/templates/registration/password_reset_done.html
+++ b/babybuddy/templates/registration/password_reset_done.html
@@ -5,12 +5,18 @@
 {% block content %}
 
     <div class="text-center mb-0">
-        {% blocktrans %}<p>We've emailed you instructions for setting your
+        <p>
+        {% blocktrans trimmed %}We've emailed you instructions for setting your
             password, if an account exists with the email you entered. You
-            should receive them shortly.</p>
-        <p class="mb-0">If you don't receive an email, please make sure you've
-            entered the address you registered with, and check your spam
-            folder.</p>{% endblocktrans %}
+            should receive them shortly.
+        {% endblocktrans %}
+        </p>
+        <p class="mb-0">
+        {% blocktrans trimmed %}
+            If you don't receive an email, please make sure you've entered the
+            address you registered with, and check your spam folder.
+        {% endblocktrans %}
+        </p>
     </div>
 
 {% endblock %}
\ No newline at end of file
diff --git a/babybuddy/templates/registration/password_reset_form.html b/babybuddy/templates/registration/password_reset_form.html
index 9f08f82f..87a63626 100644
--- a/babybuddy/templates/registration/password_reset_form.html
+++ b/babybuddy/templates/registration/password_reset_form.html
@@ -5,9 +5,13 @@
 {% block content %}
 
     <div class="text-center mb-4">
-        {% blocktrans %}<p class="mb-0">Enter your account email address in the
-        form below. If the address is valid, you will receive instructions for
-        resetting your password.</p>{% endblocktrans %}
+        <p class="mb-0">
+        {% blocktrans trimmed %}
+            Enter your account email address in the form below. If the address
+            is valid, you will receive instructions for resetting your
+            password.
+        {% endblocktrans %}
+        </p>
     </div>
 
     <form method="post">
diff --git a/core/templates/core/child_confirm_delete.html b/core/templates/core/child_confirm_delete.html
index a8357fb7..8e7b04dd 100644
--- a/core/templates/core/child_confirm_delete.html
+++ b/core/templates/core/child_confirm_delete.html
@@ -12,7 +12,9 @@
 {% block content %}
     <form role="form" method="post">
         {% csrf_token %}
-        {% blocktrans %}<h1>Are you sure you want to delete <span class="text-info">{{ object }}</span>?</h1>{% endblocktrans %}
+        {% blocktrans trimmed %}
+            <h1>Are you sure you want to delete <span class="text-info">{{ object }}</span>?</h1>
+        {% endblocktrans %}
         <div class="form-group">
             <label for="{{ form.confirm_name.id_for_label }}">
                 {% trans "To confirm this action. Type the full name of the child below." %}
diff --git a/core/templates/core/child_detail.html b/core/templates/core/child_detail.html
index f5f99c6c..f9b805f8 100644
--- a/core/templates/core/child_detail.html
+++ b/core/templates/core/child_detail.html
@@ -55,7 +55,9 @@
                                 {{ object.event }}
                             </div>
                             <div class="card-footer text-muted">
-                                {% blocktrans with since=object.time|timesince time=object.time|time %}{{ since }} ago ({{ time }}){% endblocktrans %}
+                                {% blocktrans trimmed with since=object.time|timesince time=object.time|time %}
+                                    {{ since }} ago ({{ time }})
+                                {% endblocktrans %}
                             </div>
                         </div>
                     </li>
diff --git a/core/templates/core/child_form.html b/core/templates/core/child_form.html
index afe41da2..00e628db 100644
--- a/core/templates/core/child_form.html
+++ b/core/templates/core/child_form.html
@@ -21,7 +21,9 @@
 
 {% block content %}
     {% if object %}
-        {% blocktrans %}<h1>Update <span class="text-info">{{ object }}</span></h1>{% endblocktrans %}
+        {% blocktrans trimmed %}
+            <h1>Update <span class="text-info">{{ object }}</span></h1>
+        {% endblocktrans %}
     {% else %}
         <h1>{% trans "Add a Child" %}</h1>
     {% endif %}
diff --git a/core/templates/core/diaperchange_confirm_delete.html b/core/templates/core/diaperchange_confirm_delete.html
index 8336fe55..058450a4 100644
--- a/core/templates/core/diaperchange_confirm_delete.html
+++ b/core/templates/core/diaperchange_confirm_delete.html
@@ -11,7 +11,9 @@
 {% block content %}
     <form role="form" method="post">
         {% csrf_token %}
-        {% blocktrans %}<h1>Are you sure you want to delete <span class="text-info">{{ object }}</span>?</h1>{% endblocktrans %}
+        {% blocktrans trimmed %}
+            <h1>Are you sure you want to delete <span class="text-info">{{ object }}</span>?</h1>
+        {% endblocktrans %}
         <input type="submit" value="{% trans "Delete" %}" class="btn btn-danger" />
         <a href="{% url 'core:diaperchange-list' %}" class="btn btn-default">{% trans "Cancel" %}</a>
     </form>
diff --git a/core/templates/core/diaperchange_form.html b/core/templates/core/diaperchange_form.html
index e32f27e4..c7de974e 100644
--- a/core/templates/core/diaperchange_form.html
+++ b/core/templates/core/diaperchange_form.html
@@ -20,7 +20,9 @@
 
 {% block content %}
     {% if object %}
-        {% blocktrans %}<h1>Update <span class="text-info">{{ object }}</span></h1>{% endblocktrans %}
+        {% blocktrans trimmed %}
+            <h1>Update <span class="text-info">{{ object }}</span></h1>
+        {% endblocktrans %}
     {% else %}
         <h1>{% trans "Add a Diaper Change" %}</h1>
     {% endif %}
diff --git a/core/templates/core/feeding_confirm_delete.html b/core/templates/core/feeding_confirm_delete.html
index 8d5a0b8f..5ccfac54 100644
--- a/core/templates/core/feeding_confirm_delete.html
+++ b/core/templates/core/feeding_confirm_delete.html
@@ -11,7 +11,9 @@
 {% block content %}
     <form role="form" method="post">
         {% csrf_token %}
-        {% blocktrans %}<h1>Are you sure you want to delete <span class="text-info">{{ object }}</span>?</h1>{% endblocktrans %}
+        {% blocktrans trimmed %}
+            <h1>Are you sure you want to delete <span class="text-info">{{ object }}</span>?</h1>
+        {% endblocktrans %}
         <input type="submit" value="{% trans "Delete" %}" class="btn btn-danger" />
         <a href="{% url 'core:feeding-list' %}" class="btn btn-default">{% trans "Cancel" %}</a>
     </form>
diff --git a/core/templates/core/feeding_form.html b/core/templates/core/feeding_form.html
index 97ca5aff..a0ab70f8 100644
--- a/core/templates/core/feeding_form.html
+++ b/core/templates/core/feeding_form.html
@@ -20,7 +20,9 @@
 
 {% block content %}
     {% if object %}
-        {% blocktrans %}<h1>Update <span class="text-info">{{ object }}</span></h1>{% endblocktrans %}
+        {% blocktrans trimmed %}
+            <h1>Update <span class="text-info">{{ object }}</span></h1>
+        {% endblocktrans %}
     {% else %}
         <h1>{% trans "Add a Feeding" %}</h1>
     {% endif %}
diff --git a/core/templates/core/note_confirm_delete.html b/core/templates/core/note_confirm_delete.html
index a70ffa02..ef3b1f06 100644
--- a/core/templates/core/note_confirm_delete.html
+++ b/core/templates/core/note_confirm_delete.html
@@ -11,7 +11,9 @@
 {% block content %}
     <form role="form" method="post">
         {% csrf_token %}
-        {% blocktrans %}<h1>Are you sure you want to delete <span class="text-info">{{ object }}</span>?</h1>{% endblocktrans %}
+        {% blocktrans trimmed %}
+            <h1>Are you sure you want to delete <span class="text-info">{{ object }}</span>?</h1>
+        {% endblocktrans %}
         <input type="submit" value="{% trans "Delete" %}" class="btn btn-danger" />
         <a href="{% url 'core:note-list' %}" class="btn btn-default">{% trans "Cancel" %}</a>
     </form>
diff --git a/core/templates/core/note_form.html b/core/templates/core/note_form.html
index 1718fa3f..0f0fe52a 100644
--- a/core/templates/core/note_form.html
+++ b/core/templates/core/note_form.html
@@ -20,7 +20,9 @@
 
 {% block content %}
     {% if object %}
-        {% blocktrans %}<h1>Update <span class="text-info">{{ object }}</span></h1>{% endblocktrans %}
+        {% blocktrans trimmed %}
+            <h1>Update <span class="text-info">{{ object }}</span></h1>
+        {% endblocktrans %}
     {% else %}
         <h1>{% trans "Add a Note" %}</h1>
     {% endif %}
diff --git a/core/templates/core/sleep_confirm_delete.html b/core/templates/core/sleep_confirm_delete.html
index 56c265e4..6a2c5a45 100644
--- a/core/templates/core/sleep_confirm_delete.html
+++ b/core/templates/core/sleep_confirm_delete.html
@@ -11,7 +11,9 @@
 {% block content %}
     <form role="form" method="post">
         {% csrf_token %}
-        {% blocktrans %}<h1>Are you sure you want to delete <span class="text-info">{{ object }}</span>?</h1>{% endblocktrans %}
+        {% blocktrans trimmed %}
+            <h1>Are you sure you want to delete <span class="text-info">{{ object }}</span>?</h1>
+        {% endblocktrans %}
         <input type="submit" value="{% trans "Delete" %}" class="btn btn-danger" />
         <a href="{% url 'core:sleep-list' %}" class="btn btn-default">{% trans "Cancel" %}</a>
     </form>
diff --git a/core/templates/core/sleep_form.html b/core/templates/core/sleep_form.html
index a4bcb761..19b18b29 100644
--- a/core/templates/core/sleep_form.html
+++ b/core/templates/core/sleep_form.html
@@ -20,7 +20,9 @@
 
 {% block content %}
     {% if object %}
-        {% blocktrans %}<h1>Update <span class="text-info">{{ object }}</span></h1>{% endblocktrans %}
+        {% blocktrans trimmed %}
+            <h1>Update <span class="text-info">{{ object }}</span></h1>
+        {% endblocktrans %}
     {% else %}
         <h1>{% trans "Add a Sleep Entry" %}</h1>
     {% endif %}
diff --git a/core/templates/core/temperature_confirm_delete.html b/core/templates/core/temperature_confirm_delete.html
index 2af6d647..d03b7115 100644
--- a/core/templates/core/temperature_confirm_delete.html
+++ b/core/templates/core/temperature_confirm_delete.html
@@ -11,7 +11,9 @@
 {% block content %}
     <form role="form" method="post">
         {% csrf_token %}
-        {% blocktrans %}<h1>Are you sure you want to delete <span class="text-info">{{ object }}</span>?</h1>{% endblocktrans %}
+        {% blocktrans trimmed %}
+            <h1>Are you sure you want to delete <span class="text-info">{{ object }}</span>?</h1>
+        {% endblocktrans %}
         <input type="submit" value="{% trans "Delete" %}" class="btn btn-danger" />
         <a href="{% url 'core:temperature-list' %}" class="btn btn-default">{% trans "Cancel" %}</a>
     </form>
diff --git a/core/templates/core/temperature_form.html b/core/templates/core/temperature_form.html
index 54b0786b..57667c7f 100644
--- a/core/templates/core/temperature_form.html
+++ b/core/templates/core/temperature_form.html
@@ -20,7 +20,9 @@
 
 {% block content %}
     {% if object %}
-        {% blocktrans %}<h1>Update <span class="text-info">{{ object }}</span></h1>{% endblocktrans %}
+        {% blocktrans trimmed %}
+            <h1>Update <span class="text-info">{{ object }}</span></h1>
+        {% endblocktrans %}
     {% else %}
         <h1>{% trans "Add a Temperature Entry" %}</h1>
     {% endif %}
diff --git a/core/templates/core/timer_confirm_delete.html b/core/templates/core/timer_confirm_delete.html
index 853effb8..3101cfbf 100644
--- a/core/templates/core/timer_confirm_delete.html
+++ b/core/templates/core/timer_confirm_delete.html
@@ -1,7 +1,9 @@
 {% extends 'babybuddy/page.html' %}
 {% load i18n widget_tweaks %}
 
-{% block title %}{% blocktrans %}Delete {{ object }}{% endblocktrans %}{% endblock %}
+{% block title %}
+    {% blocktrans %}Delete {{ object }}{% endblocktrans %}
+{% endblock %}
 
 {% block breadcrumbs %}
     <li class="breadcrumb-item"><a href="{% url 'core:timer-list' %}">{% trans "Timers" %}</a></li>
@@ -12,7 +14,9 @@
 {% block content %}
     <form role="form" method="post">
         {% csrf_token %}
-        {% blocktrans %}<h1>Are you sure you want to delete <span class="text-info">{{ object }}</span>?</h1>{% endblocktrans %}
+        {% blocktrans trimmed %}
+            <h1>Are you sure you want to delete <span class="text-info">{{ object }}</span>?</h1>
+        {% endblocktrans %}
         <input type="submit" value="{% trans "Delete" %}" class="btn btn-danger" />
         <a href="/" class="btn btn-default">{% trans "Cancel" %}</a>
     </form>
diff --git a/core/templates/core/timer_detail.html b/core/templates/core/timer_detail.html
index 3fa7ba59..76c0afc7 100644
--- a/core/templates/core/timer_detail.html
+++ b/core/templates/core/timer_detail.html
@@ -23,7 +23,9 @@
             {% endif %}
         </p>
         <p class="text-muted">
-            {% blocktrans with user=object.user %}{{ timer }} created by {{ user }}{% endblocktrans %}
+            {% blocktrans trimmed with user=object.user %}
+                {{ timer }} created by {{ user }}
+            {% endblocktrans %}
         </p>
 
         {% if perms.core.add_feeding %}
diff --git a/core/templates/core/timer_form.html b/core/templates/core/timer_form.html
index 3e2282d7..f2446f4e 100644
--- a/core/templates/core/timer_form.html
+++ b/core/templates/core/timer_form.html
@@ -15,7 +15,9 @@
 
 {% block content %}
     {% if object %}
-        {% blocktrans %}<h1>Update <span class="text-info">{{ object }}</span></h1>{% endblocktrans %}
+        {% blocktrans trimmed %}
+            <h1>Update <span class="text-info">{{ object }}</span></h1>
+        {% endblocktrans %}
     {% else %}
         <h1>{% trans "Start Timer" %}</h1>
     {% endif %}
diff --git a/core/templates/core/tummytime_confirm_delete.html b/core/templates/core/tummytime_confirm_delete.html
index cc613da0..757b718f 100644
--- a/core/templates/core/tummytime_confirm_delete.html
+++ b/core/templates/core/tummytime_confirm_delete.html
@@ -11,7 +11,9 @@
 {% block content %}
     <form role="form" method="post">
         {% csrf_token %}
-        {% blocktrans %}<h1>Are you sure you want to delete <span class="text-info">{{ object }}</span>?</h1>{% endblocktrans %}
+        {% blocktrans trimmed %}
+            <h1>Are you sure you want to delete <span class="text-info">{{ object }}</span>?</h1>
+        {% endblocktrans %}
         <input type="submit" value="{% trans "Delete" %}" class="btn btn-danger" />
         <a href="{% url 'core:tummytime-list' %}" class="btn btn-default">{% trans "Cancel" %}</a>
     </form>
diff --git a/core/templates/core/tummytime_form.html b/core/templates/core/tummytime_form.html
index ed0d2dae..ad8528f0 100644
--- a/core/templates/core/tummytime_form.html
+++ b/core/templates/core/tummytime_form.html
@@ -20,7 +20,9 @@
 
 {% block content %}
     {% if object %}
-        {% blocktrans %}<h1>Update <span class="text-info">{{ object }}</span></h1>{% endblocktrans %}
+        {% blocktrans trimmed %}
+            <h1>Update <span class="text-info">{{ object }}</span></h1>
+        {% endblocktrans %}
     {% else %}
         <h1>{% trans "Add a Tummy Time Entry" %}</h1>
     {% endif %}
diff --git a/core/templates/core/weight_confirm_delete.html b/core/templates/core/weight_confirm_delete.html
index 40cb1759..41ae0d7d 100644
--- a/core/templates/core/weight_confirm_delete.html
+++ b/core/templates/core/weight_confirm_delete.html
@@ -11,7 +11,9 @@
 {% block content %}
     <form role="form" method="post">
         {% csrf_token %}
-        {% blocktrans %}<h1>Are you sure you want to delete <span class="text-info">{{ object }}</span>?</h1>{% endblocktrans %}
+        {% blocktrans trimmed %}
+            <h1>Are you sure you want to delete <span class="text-info">{{ object }}</span>?</h1>
+        {% endblocktrans %}
         <input type="submit" value="{% trans "Delete" %}" class="btn btn-danger" />
         <a href="{% url 'core:weight-list' %}" class="btn btn-default">{% trans "Cancel" %}</a>
     </form>
diff --git a/core/templates/core/weight_form.html b/core/templates/core/weight_form.html
index eb0443dc..7386c95d 100644
--- a/core/templates/core/weight_form.html
+++ b/core/templates/core/weight_form.html
@@ -20,7 +20,9 @@
 
 {% block content %}
     {% if object %}
-        {% blocktrans %}<h1>Update <span class="text-info">{{ object }}</span></h1>{% endblocktrans %}
+        {% blocktrans trimmed %}
+            <h1>Update <span class="text-info">{{ object }}</span></h1>
+        {% endblocktrans %}
     {% else %}
         <h1>{% trans "Add a Weight Entry" %}</h1>
     {% endif %}
diff --git a/dashboard/templates/cards/diaperchange_last.html b/dashboard/templates/cards/diaperchange_last.html
index e5f833e3..e61688f3 100644
--- a/dashboard/templates/cards/diaperchange_last.html
+++ b/dashboard/templates/cards/diaperchange_last.html
@@ -5,7 +5,9 @@
 
 {% block title %}
     {% if change %}
-        {% blocktrans with time=change.time|timesince %}{{ time }} ago{% endblocktrans %}
+        {% blocktrans trimmed with time=change.time|timesince %}
+            {{ time }} ago
+        {% endblocktrans %}
     {% else %}
         {% trans "Never" %}
     {% endif %}
diff --git a/dashboard/templates/cards/feeding_last.html b/dashboard/templates/cards/feeding_last.html
index 3aaccfdf..32b009b2 100644
--- a/dashboard/templates/cards/feeding_last.html
+++ b/dashboard/templates/cards/feeding_last.html
@@ -5,7 +5,9 @@
 
 {% block title %}
     {% if feeding %}
-        {% blocktrans with time=feeding.start|timesince %}{{ time }} ago{% endblocktrans %}
+        {% blocktrans trimmed with time=feeding.start|timesince %}
+            {{ time }} ago
+        {% endblocktrans %}
     {% else %}
         {% trans "Never" %}
     {% endif %}
diff --git a/dashboard/templates/cards/sleep_last.html b/dashboard/templates/cards/sleep_last.html
index cdd6be76..520bb183 100644
--- a/dashboard/templates/cards/sleep_last.html
+++ b/dashboard/templates/cards/sleep_last.html
@@ -5,7 +5,9 @@
 
 {% block title %}
     {% if sleep %}
-        {% blocktrans with time=sleep.end|timesince %}{{ time }} ago{% endblocktrans %}
+        {% blocktrans trimmed with time=sleep.end|timesince %}
+            {{ time }} ago
+        {% endblocktrans %}
     {% else %}
         {% trans "Never" %}
     {% endif %}
diff --git a/dashboard/templates/cards/sleep_naps_day.html b/dashboard/templates/cards/sleep_naps_day.html
index e8f08e62..a579d654 100644
--- a/dashboard/templates/cards/sleep_naps_day.html
+++ b/dashboard/templates/cards/sleep_naps_day.html
@@ -5,7 +5,9 @@
 
 {% block title %}
     {% if count %}
-        {% blocktrans with plural=count|pluralize %}{{ count }} nap{{ plural }}{% endblocktrans %}
+        {% blocktrans trimmed with plural=count|pluralize %}
+            {{ count }} nap{{ plural }}
+        {% endblocktrans %}
     {% else %}
         <i class="icon icon-sad" aria-hidden="true"></i>
         {% trans "None yet today" %}
diff --git a/dashboard/templates/cards/timer_list.html b/dashboard/templates/cards/timer_list.html
index d24417dc..2e79a20d 100644
--- a/dashboard/templates/cards/timer_list.html
+++ b/dashboard/templates/cards/timer_list.html
@@ -5,7 +5,9 @@
 
 {% block title %}
     {% with instances|length as count %}
-        {% blocktrans with plural=count|pluralize %}{{ count }} active timer{{ plural }}{% endblocktrans %}
+        {% blocktrans trimmed with plural=count|pluralize %}
+            {{ count }} active timer{{ plural }}
+        {% endblocktrans %}
     {% endwith %}
 {% endblock %}
 
@@ -16,7 +18,9 @@
            class="list-group-item list-group-item-action">
             <strong>{{ instance }}</strong>
             <p class="text-muted small m-0">
-                {% blocktrans with start=instance.start|time user=instance.user %}Started by {{ user }} at {{ start }}{% endblocktrans %}
+                {% blocktrans trimmed with start=instance.start|time user=instance.user %}
+                    Started by {{ user }} at {{ start }}
+                {% endblocktrans %}
             </p>
         </a>
     {% endfor %}
diff --git a/dashboard/templates/cards/tummytime_day.html b/dashboard/templates/cards/tummytime_day.html
index fc677814..a1ac7d4b 100644
--- a/dashboard/templates/cards/tummytime_day.html
+++ b/dashboard/templates/cards/tummytime_day.html
@@ -17,7 +17,9 @@
     <ul class="list-group list-group-flush text-muted small">
     {% for instance in instances %}
         <li class="list-group-item">
-            {% blocktrans with duration=instance.duration|duration_string end=instance.end|time %}{{ duration }} at {{ end }}{% endblocktrans %}
+            {% blocktrans trimmed with duration=instance.duration|duration_string end=instance.end|time %}
+                {{ duration }} at {{ end }}
+            {% endblocktrans %}
         </li>
     {% endfor %}
     </ul>
diff --git a/dashboard/templates/cards/tummytime_last.html b/dashboard/templates/cards/tummytime_last.html
index a23de058..e423bfbf 100644
--- a/dashboard/templates/cards/tummytime_last.html
+++ b/dashboard/templates/cards/tummytime_last.html
@@ -5,7 +5,9 @@
 
 {% block title %}
     {% if tummytime %}
-        {% blocktrans with time=tummytime.time|timesince %}{{ time }} ago{% endblocktrans %}
+        {% blocktrans trimmed with time=tummytime.time|timesince %}
+            {{ time }} ago
+        {% endblocktrans %}
     {% else %}
         {% trans "Never" %}
     {% endif %}
diff --git a/locale/de/LC_MESSAGES/django.mo b/locale/de/LC_MESSAGES/django.mo
index 4d4a01d5..2320db01 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 e9458bf9..de56f3ee 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: 2020-01-23 19:19-0800\n"
+"POT-Creation-Date: 2020-01-23 19:59-0800\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -16,7 +16,7 @@ msgid "Settings"
 msgstr "Einstellungen"
 
 #: babybuddy/admin.py:16 babybuddy/templates/babybuddy/nav-dropdown.html:82
-#: babybuddy/templates/babybuddy/user_settings_form.html:51
+#: babybuddy/templates/babybuddy/user_settings_form.html:56
 #: dashboard/templates/dashboard/child.html:4
 #: dashboard/templates/dashboard/child.html:9
 #: dashboard/templates/dashboard/dashboard.html:4
@@ -111,8 +111,8 @@ msgstr "Zugriff verweigert"
 
 #: babybuddy/templates/403.html:12
 msgid ""
-"You do not have permission to access this resource.\n"
-"        Contact a site administrator for assistance."
+"You do not have permission to access this resource. Contact a site "
+"administrator for assistance."
 msgstr ""
 "Du hast keine Berechtigung auf diese Ressource zuzugreifen. Für "
 "Unterstützung kontaktiere bitte den Administrator."
@@ -134,7 +134,7 @@ msgid "Filters"
 msgstr "Filter"
 
 #: babybuddy/templates/babybuddy/form.html:11
-#: babybuddy/templates/babybuddy/user_settings_form.html:69
+#: babybuddy/templates/babybuddy/user_settings_form.html:74
 msgid "Submit"
 msgstr "Senden"
 
@@ -145,11 +145,11 @@ msgid "<strong>Error:</strong> %(error)s"
 msgstr "<strong>Fehler:</strong> %(error)s"
 
 #: babybuddy/templates/babybuddy/messages.html:23
-msgid ""
-"<strong>Error:</strong> Some fields have errors. See below for details. "
+#: babybuddy/templates/babybuddy/user_settings_form.html:26
+msgid "<strong>Error:</strong> Some fields have errors. See below for details."
 msgstr ""
 "<strong>Fehler:</strong> Gewisse Felder sind fehlerhaft. Details sind unten "
-"ersichtlich."
+"ersichtlich"
 
 #: babybuddy/templates/babybuddy/nav-dropdown.html:27 core/models.py:148
 #: core/models.py:152
@@ -158,7 +158,7 @@ msgstr "Windeln wechseln"
 
 #: babybuddy/templates/babybuddy/nav-dropdown.html:33
 #: babybuddy/templates/babybuddy/nav-dropdown.html:189 core/models.py:222
-#: core/models.py:226 core/templates/core/timer_detail.html:33
+#: core/models.py:226 core/templates/core/timer_detail.html:35
 msgid "Feeding"
 msgstr "Mahlzeit"
 
@@ -170,12 +170,12 @@ msgstr "Notiz"
 
 #: babybuddy/templates/babybuddy/nav-dropdown.html:45
 #: babybuddy/templates/babybuddy/nav-dropdown.html:196
-#: babybuddy/templates/babybuddy/welcome.html:40 core/models.py:306
+#: babybuddy/templates/babybuddy/welcome.html:42 core/models.py:306
 #: core/models.py:307 core/models.py:310
 #: core/templates/core/sleep_confirm_delete.html:7
 #: core/templates/core/sleep_form.html:13 core/templates/core/sleep_list.html:4
 #: core/templates/core/sleep_list.html:7 core/templates/core/sleep_list.html:11
-#: core/templates/core/timer_detail.html:41
+#: core/templates/core/timer_detail.html:43
 msgid "Sleep"
 msgstr "Schlafen"
 
@@ -193,9 +193,9 @@ msgstr ""
 
 #: babybuddy/templates/babybuddy/nav-dropdown.html:57
 #: babybuddy/templates/babybuddy/nav-dropdown.html:209
-#: babybuddy/templates/babybuddy/welcome.html:48 core/models.py:486
+#: babybuddy/templates/babybuddy/welcome.html:50 core/models.py:486
 #: core/models.py:487 core/models.py:490
-#: core/templates/core/timer_detail.html:49
+#: core/templates/core/timer_detail.html:51
 #: core/templates/core/tummytime_confirm_delete.html:7
 #: core/templates/core/tummytime_form.html:13
 #: core/templates/core/tummytime_list.html:4
@@ -272,7 +272,7 @@ msgid "Change"
 msgstr "Wechsel"
 
 #: babybuddy/templates/babybuddy/nav-dropdown.html:183
-#: babybuddy/templates/babybuddy/welcome.html:32 core/models.py:223
+#: babybuddy/templates/babybuddy/welcome.html:34 core/models.py:223
 #: core/templates/core/feeding_confirm_delete.html:7
 #: core/templates/core/feeding_form.html:13
 #: core/templates/core/feeding_list.html:4
@@ -357,23 +357,23 @@ msgstr "Benutzer löschen"
 
 #: babybuddy/templates/babybuddy/user_confirm_delete.html:9
 #: core/templates/core/child_confirm_delete.html:9
-#: core/templates/core/child_confirm_delete.html:29
+#: core/templates/core/child_confirm_delete.html:31
 #: core/templates/core/diaperchange_confirm_delete.html:8
-#: core/templates/core/diaperchange_confirm_delete.html:15
+#: core/templates/core/diaperchange_confirm_delete.html:17
 #: core/templates/core/feeding_confirm_delete.html:8
-#: core/templates/core/feeding_confirm_delete.html:15
+#: core/templates/core/feeding_confirm_delete.html:17
 #: core/templates/core/note_confirm_delete.html:8
-#: core/templates/core/note_confirm_delete.html:15
+#: core/templates/core/note_confirm_delete.html:17
 #: core/templates/core/sleep_confirm_delete.html:8
-#: core/templates/core/sleep_confirm_delete.html:15
+#: core/templates/core/sleep_confirm_delete.html:17
 #: core/templates/core/temperature_confirm_delete.html:8
-#: core/templates/core/temperature_confirm_delete.html:15
-#: core/templates/core/timer_confirm_delete.html:9
-#: core/templates/core/timer_confirm_delete.html:16
+#: core/templates/core/temperature_confirm_delete.html:17
+#: core/templates/core/timer_confirm_delete.html:11
+#: core/templates/core/timer_confirm_delete.html:20
 #: core/templates/core/tummytime_confirm_delete.html:8
-#: core/templates/core/tummytime_confirm_delete.html:15
+#: core/templates/core/tummytime_confirm_delete.html:17
 #: core/templates/core/weight_confirm_delete.html:8
-#: core/templates/core/weight_confirm_delete.html:15
+#: core/templates/core/weight_confirm_delete.html:17
 msgid "Delete"
 msgstr "löschen"
 
@@ -384,7 +384,7 @@ msgstr "löschen"
 #: core/templates/core/note_confirm_delete.html:14
 #: core/templates/core/sleep_confirm_delete.html:14
 #: core/templates/core/temperature_confirm_delete.html:14
-#: core/templates/core/timer_confirm_delete.html:15
+#: 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
@@ -395,22 +395,22 @@ msgstr ""
 "<h1>Bist du sicher, dass du <span class=\"text-info\">%(object)s</span> "
 "löschen möchtest?</h1>"
 
-#: babybuddy/templates/babybuddy/user_confirm_delete.html:17
-#: core/templates/core/child_confirm_delete.html:30
-#: core/templates/core/diaperchange_confirm_delete.html:16
-#: core/templates/core/feeding_confirm_delete.html:16
-#: core/templates/core/note_confirm_delete.html:16
-#: core/templates/core/sleep_confirm_delete.html:16
-#: core/templates/core/temperature_confirm_delete.html:16
-#: core/templates/core/timer_confirm_delete.html:17
-#: core/templates/core/tummytime_confirm_delete.html:16
-#: core/templates/core/weight_confirm_delete.html:16
+#: babybuddy/templates/babybuddy/user_confirm_delete.html:19
+#: core/templates/core/child_confirm_delete.html:32
+#: core/templates/core/diaperchange_confirm_delete.html:18
+#: core/templates/core/feeding_confirm_delete.html:18
+#: core/templates/core/note_confirm_delete.html:18
+#: core/templates/core/sleep_confirm_delete.html:18
+#: core/templates/core/temperature_confirm_delete.html:18
+#: core/templates/core/timer_confirm_delete.html:21
+#: core/templates/core/tummytime_confirm_delete.html:18
+#: core/templates/core/weight_confirm_delete.html:18
 msgid "Cancel"
 msgstr "Abbrechen"
 
 #: babybuddy/templates/babybuddy/user_form.html:8
 #: babybuddy/templates/babybuddy/user_form.html:18
-#: babybuddy/templates/babybuddy/user_form.html:26
+#: babybuddy/templates/babybuddy/user_form.html:28
 #: babybuddy/templates/babybuddy/user_list.html:65
 msgid "Create User"
 msgstr "Benutzer anlegen"
@@ -497,25 +497,19 @@ msgstr "Passwort ändern"
 msgid "User Settings"
 msgstr "Benutzereinstellungen"
 
-#: babybuddy/templates/babybuddy/user_settings_form.html:24
-msgid "<strong>Error:</strong> Some fields have errors. See below for details."
-msgstr ""
-"<strong>Fehler:</strong> Gewisse Felder sind fehlerhaft. Details sind unten "
-"ersichtlich"
-
-#: babybuddy/templates/babybuddy/user_settings_form.html:28
+#: babybuddy/templates/babybuddy/user_settings_form.html:33
 msgid "User Profile"
 msgstr "Benutzer-Profil"
 
-#: babybuddy/templates/babybuddy/user_settings_form.html:59
+#: babybuddy/templates/babybuddy/user_settings_form.html:64
 msgid "API"
 msgstr "API"
 
-#: babybuddy/templates/babybuddy/user_settings_form.html:61
+#: babybuddy/templates/babybuddy/user_settings_form.html:66
 msgid "Key"
 msgstr "Schlüssel"
 
-#: babybuddy/templates/babybuddy/user_settings_form.html:64
+#: babybuddy/templates/babybuddy/user_settings_form.html:69
 msgid "Regenerate"
 msgstr "Neu generieren"
 
@@ -530,15 +524,13 @@ msgstr "Willkommen bei Baby Buddy!"
 
 #: babybuddy/templates/babybuddy/welcome.html:14
 msgid ""
-"Learn about and predict baby's needs without\n"
-"            (<em>as much</em>) guess work by using Baby Buddy to track "
-"&mdash;"
+"Learn about and predict baby's needs without (<em>as much</em>) guess work "
+"by using Baby Buddy to track &mdash;"
 msgstr ""
-"Lerne und sehe die Bedürfnisse deines Babys voraus, ohne \n"
-"            (<em>allzu viel</em>) Spekulation indem du Baby Buddy verwendest "
-"&mdash;"
+"Lerne und sehe die Bedürfnisse deines Babys voraus, ohne (<em>allzu viel</"
+"em>)Spekulation indem du Baby Buddy verwendest &mdash;"
 
-#: babybuddy/templates/babybuddy/welcome.html:24 core/models.py:149
+#: babybuddy/templates/babybuddy/welcome.html:26 core/models.py:149
 #: core/templates/core/diaperchange_confirm_delete.html:7
 #: core/templates/core/diaperchange_form.html:13
 #: core/templates/core/diaperchange_list.html:4
@@ -548,18 +540,13 @@ msgstr ""
 msgid "Diaper Changes"
 msgstr "Windel-Wechsel"
 
-#: babybuddy/templates/babybuddy/welcome.html:54
+#: babybuddy/templates/babybuddy/welcome.html:56
 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!"
+"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 ""
 "Während die Anzahl Einträge wächst, hilft Baby Buddy Eltern und Pflegenden, "
 "mit Hilfe des Dashboards und Diagrammen, kleine Muster im Verhalten ihres "
@@ -569,9 +556,9 @@ msgstr ""
 "den untenstehenden Button, um das erste (oder zweite, dritte, etc.) Kind "
 "hinzuzufügen!"
 
-#: babybuddy/templates/babybuddy/welcome.html:64
+#: babybuddy/templates/babybuddy/welcome.html:68
 #: core/templates/core/child_form.html:8 core/templates/core/child_form.html:18
-#: core/templates/core/child_form.html:26
+#: core/templates/core/child_form.html:28
 #: core/templates/core/child_list.html:70
 msgid "Add a Child"
 msgstr "Kind hinzufügen"
@@ -601,20 +588,19 @@ msgstr "Login"
 msgid "Password Reset"
 msgstr "Passwort zurücksetzen"
 
-#: babybuddy/templates/registration/password_reset_confirm.html:12
+#: babybuddy/templates/registration/password_reset_confirm.html:13
 msgid ""
-"<p class=\"mb-0\"><strong>Oh snap!</strong> The\n"
-"                two passwords did not match. Please try again.</p>"
+"<strong>Oh snap!</strong> The two passwords did not match. Please try again."
 msgstr ""
-"<p class=\"mb-0\"><strong>Oh nein!</strong> Die beiden Passwörter stimmen "
-"nicht überein. Bitte versuche es erneut.</p>"
+"<strong>Oh nein!</strong> Die beiden Passwörter stimmen nicht überein. Bitte "
+"versuche es erneut."
 
-#: babybuddy/templates/registration/password_reset_confirm.html:18
+#: babybuddy/templates/registration/password_reset_confirm.html:22
 msgid "Enter your new password in each field below."
 msgstr "Gebe dein neues Passwort in jedes Feld unten ein."
 
-#: babybuddy/templates/registration/password_reset_confirm.html:42
-#: babybuddy/templates/registration/password_reset_form.html:27
+#: babybuddy/templates/registration/password_reset_confirm.html:46
+#: babybuddy/templates/registration/password_reset_form.html:31
 msgid "Reset Password"
 msgstr "Passwort zurücksetzen"
 
@@ -622,37 +608,33 @@ msgstr "Passwort zurücksetzen"
 msgid "Reset Email Sent"
 msgstr "Gesendete Email zurücksetzen"
 
-#: babybuddy/templates/registration/password_reset_done.html:8
+#: babybuddy/templates/registration/password_reset_done.html:9
 msgid ""
-"<p>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.</p>\n"
-"        <p class=\"mb-0\">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.</p>"
+"We've emailed you instructions for setting your password, if an account "
+"exists with the email you entered. You should receive them shortly."
 msgstr ""
-"<p>Wenn ein Account mit dieser E-Mail-Adresse existiert, haben wir dir  "
-"Anweisungen zum Zurücksetzen des Passworts an dieselbe Adresse gesendet.</"
-"p>\n"
-"        <p class=\"mb-0\">Falls du die E-Mail nicht erhältst, überprüfe, "
-"dass du die registrierte Adresse eingegeben hast und überprüfe deinen Spam-"
-"Ordner.</p>"
+"Wenn ein Account mit dieser E-Mail-Adresse existiert, haben wir dir "
+"Anweisungen zum Zurücksetzen des Passworts an dieselbe Adresse gesendet."
+
+#: 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 ""
+"Falls du die E-Mail nicht erhältst, überprüfe, dass du die registrierte "
+"Adresse eingegeben hast und überprüfe deinen Spam-Ordner."
 
 #: babybuddy/templates/registration/password_reset_form.html:4
 msgid "Forgot Password"
 msgstr "Passwort vergessen"
 
-#: babybuddy/templates/registration/password_reset_form.html:8
+#: babybuddy/templates/registration/password_reset_form.html:9
 msgid ""
-"<p class=\"mb-0\">Enter your account email address in the\n"
-"        form below. If the address is valid, you will receive instructions "
-"for\n"
-"        resetting your password.</p>"
+"Enter your account email address in the form below. If the address is valid, "
+"you will receive instructions for resetting your password."
 msgstr ""
-"p class=\"mb-0\">Bitte gib deine Account E-Mail-Adresse ins folgende "
-"Formular ein. Wenn die Adresse gültig ist, erhältst du Anweisungen um das "
-"Passwort zurückzusetzen.</p>"
+"Bitte gib deine Account E-Mail-Adresse ins folgende Formular ein. Wenn die "
+"Adresse gültig ist, erhältst du Anweisungen um das Passwort zurückzusetzen."
 
 #: babybuddy/views.py:56
 #, python-format
@@ -834,7 +816,7 @@ msgstr "Name"
 msgid "Timer"
 msgstr "Timer"
 
-#: core/models.py:409 core/templates/core/timer_confirm_delete.html:7
+#: core/models.py:409 core/templates/core/timer_confirm_delete.html:9
 #: core/templates/core/timer_detail.html:7
 #: core/templates/core/timer_form.html:7 core/templates/core/timer_list.html:4
 #: core/templates/core/timer_list.html:7 core/templates/core/timer_list.html:11
@@ -863,7 +845,7 @@ msgstr "Datum"
 msgid "Delete a Child"
 msgstr "Lösche ein Kind"
 
-#: core/templates/core/child_confirm_delete.html:18
+#: core/templates/core/child_confirm_delete.html:20
 msgid "To confirm this action. Type the full name of the child below."
 msgstr ""
 "Um diese Aktion zu bestätigen, gib unten den vollen Namen des Kindes ein. "
@@ -900,7 +882,7 @@ msgid "Update a Diaper Change"
 msgstr "Windelwechsel ändern."
 
 #: core/templates/core/diaperchange_form.html:8
-#: core/templates/core/diaperchange_form.html:25
+#: core/templates/core/diaperchange_form.html:27
 msgid "Add a Diaper Change"
 msgstr "Windel-Wechsel hinzufügen"
 
@@ -928,7 +910,7 @@ msgid "Update a Feeding"
 msgstr "Mahlzeit ändern"
 
 #: core/templates/core/feeding_form.html:8
-#: core/templates/core/feeding_form.html:25
+#: core/templates/core/feeding_form.html:27
 #: core/templates/core/feeding_list.html:71
 msgid "Add a Feeding"
 msgstr "Mahlzeit hinzufügen"
@@ -949,7 +931,7 @@ msgstr "Eine Notiz löschen"
 msgid "Update a Note"
 msgstr "Eine Notiz ändern"
 
-#: core/templates/core/note_form.html:8 core/templates/core/note_form.html:25
+#: core/templates/core/note_form.html:8 core/templates/core/note_form.html:27
 #: core/templates/core/note_list.html:59
 msgid "Add a Note"
 msgstr "Notiz hinzufügen"
@@ -966,7 +948,7 @@ msgstr "Einen Schlaf-Eintrag löschen"
 msgid "Update a Sleep Entry"
 msgstr "Einen Schlaf-Eintrag ändern"
 
-#: core/templates/core/sleep_form.html:8 core/templates/core/sleep_form.html:25
+#: core/templates/core/sleep_form.html:8 core/templates/core/sleep_form.html:27
 #: core/templates/core/sleep_list.html:63
 msgid "Add a Sleep Entry"
 msgstr "Schlaf-Eintrag hinzufügen"
@@ -1002,7 +984,7 @@ msgstr "Mahlzeit löschen"
 msgid "Add a Temperature Reading"
 msgstr "Mahlzeit hinzufügen"
 
-#: core/templates/core/temperature_form.html:25
+#: core/templates/core/temperature_form.html:27
 msgid "Add a Temperature Entry"
 msgstr "Schlaf-Eintrag hinzufügen"
 
@@ -1010,7 +992,7 @@ msgstr "Schlaf-Eintrag hinzufügen"
 msgid "No temperature entries found."
 msgstr "Keine Timer-Einträge gefunden."
 
-#: core/templates/core/timer_confirm_delete.html:4
+#: core/templates/core/timer_confirm_delete.html:5
 #, python-format
 msgid "Delete %(object)s"
 msgstr "Lösche %(object)s"
@@ -1028,11 +1010,11 @@ msgstr "Gestoppt"
 msgid "%(timer)s created by %(user)s"
 msgstr "%(timer)s von %(user)s erstellt"
 
-#: core/templates/core/timer_detail.html:53
+#: core/templates/core/timer_detail.html:55
 msgid "Timer actions"
 msgstr "Timer Aktionen"
 
-#: core/templates/core/timer_form.html:20 core/templates/core/timer_nav.html:18
+#: core/templates/core/timer_form.html:22 core/templates/core/timer_nav.html:18
 msgid "Start Timer"
 msgstr "Starte Timer"
 
@@ -1067,7 +1049,7 @@ msgid "Update a Tummy Time Entry"
 msgstr "Bauchzeit-Eintrag ändern"
 
 #: core/templates/core/tummytime_form.html:8
-#: core/templates/core/tummytime_form.html:25
+#: core/templates/core/tummytime_form.html:27
 #: core/templates/core/tummytime_list.html:63
 msgid "Add a Tummy Time Entry"
 msgstr "Bauchzeit-Eintrag hinzufügen"
@@ -1082,7 +1064,7 @@ msgstr "Gewichts-Eintrag löschen"
 
 #: core/templates/core/weight_form.html:8
 #: core/templates/core/weight_form.html:17
-#: core/templates/core/weight_form.html:25
+#: core/templates/core/weight_form.html:27
 #: core/templates/core/weight_list.html:59
 msgid "Add a Weight Entry"
 msgstr "Gewichts-Eintrag hinzufügen"
@@ -1204,10 +1186,10 @@ msgstr "Letzer Windel-Wechsel"
 msgid "%(time)s ago"
 msgstr "vor %(time)s"
 
-#: dashboard/templates/cards/diaperchange_last.html:10
-#: dashboard/templates/cards/feeding_last.html:10
-#: dashboard/templates/cards/sleep_last.html:10
-#: dashboard/templates/cards/tummytime_last.html:10
+#: 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:12
 msgid "Never"
 msgstr "Nie"
 
@@ -1249,7 +1231,7 @@ msgid "Today's Sleep"
 msgstr "Schlaf heute"
 
 #: dashboard/templates/cards/sleep_day.html:11
-#: dashboard/templates/cards/sleep_naps_day.html:11
+#: dashboard/templates/cards/sleep_naps_day.html:13
 #: dashboard/templates/cards/tummytime_day.html:11
 msgid "None yet today"
 msgstr "Noch keine heute"
@@ -1285,7 +1267,7 @@ msgstr "Nicht genügend Daten"
 msgid "%(count)s active timer%(plural)s"
 msgstr "%(count)s aktive timer%(plural)s"
 
-#: dashboard/templates/cards/timer_list.html:19
+#: dashboard/templates/cards/timer_list.html:21
 #, python-format
 msgid "Started by %(user)s at %(start)s"
 msgstr "Gestartet von %(user)s um %(start)s"
diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo
index dd526a01..432cf2e3 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 42d4e77d..d1b6a5d8 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: 2020-01-23 19:19-0800\n"
+"POT-Creation-Date: 2020-01-23 19:59-0800\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -16,7 +16,7 @@ msgid "Settings"
 msgstr "Configuración"
 
 #: babybuddy/admin.py:16 babybuddy/templates/babybuddy/nav-dropdown.html:82
-#: babybuddy/templates/babybuddy/user_settings_form.html:51
+#: babybuddy/templates/babybuddy/user_settings_form.html:56
 #: dashboard/templates/dashboard/child.html:4
 #: dashboard/templates/dashboard/child.html:9
 #: dashboard/templates/dashboard/dashboard.html:4
@@ -111,11 +111,11 @@ msgstr "Acceso denegado"
 
 #: babybuddy/templates/403.html:12
 msgid ""
-"You do not have permission to access this resource.\n"
-"        Contact a site administrator for assistance."
+"You do not have permission to access this resource. Contact a site "
+"administrator for assistance."
 msgstr ""
-"No tienes permiso para acceder a este recurso.\n"
-"Contacta con un administrador si necesitas asistencia."
+"No tienes permiso para acceder a este recurso. Contacta con un administrador "
+"si necesitas asistencia."
 
 #: babybuddy/templates/babybuddy/base.html:36
 msgid "Home"
@@ -134,23 +134,22 @@ msgid "Filters"
 msgstr "Filtros"
 
 #: babybuddy/templates/babybuddy/form.html:11
-#: babybuddy/templates/babybuddy/user_settings_form.html:69
+#: babybuddy/templates/babybuddy/user_settings_form.html:74
 msgid "Submit"
 msgstr "Enviar"
 
 #: babybuddy/templates/babybuddy/messages.html:18
 #: babybuddy/templates/babybuddy/user_settings_form.html:19
-#, fuzzy, python-format
-#| msgid "<strong>Error:</strong> %(error)s"
+#, python-format
 msgid "<strong>Error:</strong> %(error)s"
-msgstr "<strong>Error:</strong> %(error)"
+msgstr "<strong>Error:</strong> %(error)s"
 
 #: babybuddy/templates/babybuddy/messages.html:23
-msgid ""
-"<strong>Error:</strong> Some fields have errors. See below for details. "
+#: babybuddy/templates/babybuddy/user_settings_form.html:26
+msgid "<strong>Error:</strong> Some fields have errors. See below for details."
 msgstr ""
 "<strong>Error:</strong> Algunos campos contienen errores. Mira más abajo "
-"para más detalle."
+"para más detalles."
 
 #: babybuddy/templates/babybuddy/nav-dropdown.html:27 core/models.py:148
 #: core/models.py:152
@@ -159,7 +158,7 @@ msgstr "Cambio de Pañal"
 
 #: babybuddy/templates/babybuddy/nav-dropdown.html:33
 #: babybuddy/templates/babybuddy/nav-dropdown.html:189 core/models.py:222
-#: core/models.py:226 core/templates/core/timer_detail.html:33
+#: core/models.py:226 core/templates/core/timer_detail.html:35
 msgid "Feeding"
 msgstr "Tomando"
 
@@ -171,12 +170,12 @@ msgstr "Nota"
 
 #: babybuddy/templates/babybuddy/nav-dropdown.html:45
 #: babybuddy/templates/babybuddy/nav-dropdown.html:196
-#: babybuddy/templates/babybuddy/welcome.html:40 core/models.py:306
+#: babybuddy/templates/babybuddy/welcome.html:42 core/models.py:306
 #: core/models.py:307 core/models.py:310
 #: core/templates/core/sleep_confirm_delete.html:7
 #: core/templates/core/sleep_form.html:13 core/templates/core/sleep_list.html:4
 #: core/templates/core/sleep_list.html:7 core/templates/core/sleep_list.html:11
-#: core/templates/core/timer_detail.html:41
+#: core/templates/core/timer_detail.html:43
 msgid "Sleep"
 msgstr "Sueño"
 
@@ -194,9 +193,9 @@ msgstr ""
 
 #: babybuddy/templates/babybuddy/nav-dropdown.html:57
 #: babybuddy/templates/babybuddy/nav-dropdown.html:209
-#: babybuddy/templates/babybuddy/welcome.html:48 core/models.py:486
+#: babybuddy/templates/babybuddy/welcome.html:50 core/models.py:486
 #: core/models.py:487 core/models.py:490
-#: core/templates/core/timer_detail.html:49
+#: core/templates/core/timer_detail.html:51
 #: core/templates/core/tummytime_confirm_delete.html:7
 #: core/templates/core/tummytime_form.html:13
 #: core/templates/core/tummytime_list.html:4
@@ -273,7 +272,7 @@ msgid "Change"
 msgstr "Cambio"
 
 #: babybuddy/templates/babybuddy/nav-dropdown.html:183
-#: babybuddy/templates/babybuddy/welcome.html:32 core/models.py:223
+#: babybuddy/templates/babybuddy/welcome.html:34 core/models.py:223
 #: core/templates/core/feeding_confirm_delete.html:7
 #: core/templates/core/feeding_form.html:13
 #: core/templates/core/feeding_list.html:4
@@ -358,23 +357,23 @@ msgstr "Eliminar Usuario"
 
 #: babybuddy/templates/babybuddy/user_confirm_delete.html:9
 #: core/templates/core/child_confirm_delete.html:9
-#: core/templates/core/child_confirm_delete.html:29
+#: core/templates/core/child_confirm_delete.html:31
 #: core/templates/core/diaperchange_confirm_delete.html:8
-#: core/templates/core/diaperchange_confirm_delete.html:15
+#: core/templates/core/diaperchange_confirm_delete.html:17
 #: core/templates/core/feeding_confirm_delete.html:8
-#: core/templates/core/feeding_confirm_delete.html:15
+#: core/templates/core/feeding_confirm_delete.html:17
 #: core/templates/core/note_confirm_delete.html:8
-#: core/templates/core/note_confirm_delete.html:15
+#: core/templates/core/note_confirm_delete.html:17
 #: core/templates/core/sleep_confirm_delete.html:8
-#: core/templates/core/sleep_confirm_delete.html:15
+#: core/templates/core/sleep_confirm_delete.html:17
 #: core/templates/core/temperature_confirm_delete.html:8
-#: core/templates/core/temperature_confirm_delete.html:15
-#: core/templates/core/timer_confirm_delete.html:9
-#: core/templates/core/timer_confirm_delete.html:16
+#: core/templates/core/temperature_confirm_delete.html:17
+#: core/templates/core/timer_confirm_delete.html:11
+#: core/templates/core/timer_confirm_delete.html:20
 #: core/templates/core/tummytime_confirm_delete.html:8
-#: core/templates/core/tummytime_confirm_delete.html:15
+#: core/templates/core/tummytime_confirm_delete.html:17
 #: core/templates/core/weight_confirm_delete.html:8
-#: core/templates/core/weight_confirm_delete.html:15
+#: core/templates/core/weight_confirm_delete.html:17
 msgid "Delete"
 msgstr "Eliminar"
 
@@ -385,7 +384,7 @@ msgstr "Eliminar"
 #: core/templates/core/note_confirm_delete.html:14
 #: core/templates/core/sleep_confirm_delete.html:14
 #: core/templates/core/temperature_confirm_delete.html:14
-#: core/templates/core/timer_confirm_delete.html:15
+#: 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
@@ -396,22 +395,22 @@ msgstr ""
 "<h1>¿Estás seguro de querer eliminar <span class=\"text-info\">%(object)s</"
 "span>?</h1>"
 
-#: babybuddy/templates/babybuddy/user_confirm_delete.html:17
-#: core/templates/core/child_confirm_delete.html:30
-#: core/templates/core/diaperchange_confirm_delete.html:16
-#: core/templates/core/feeding_confirm_delete.html:16
-#: core/templates/core/note_confirm_delete.html:16
-#: core/templates/core/sleep_confirm_delete.html:16
-#: core/templates/core/temperature_confirm_delete.html:16
-#: core/templates/core/timer_confirm_delete.html:17
-#: core/templates/core/tummytime_confirm_delete.html:16
-#: core/templates/core/weight_confirm_delete.html:16
+#: babybuddy/templates/babybuddy/user_confirm_delete.html:19
+#: core/templates/core/child_confirm_delete.html:32
+#: core/templates/core/diaperchange_confirm_delete.html:18
+#: core/templates/core/feeding_confirm_delete.html:18
+#: core/templates/core/note_confirm_delete.html:18
+#: core/templates/core/sleep_confirm_delete.html:18
+#: core/templates/core/temperature_confirm_delete.html:18
+#: core/templates/core/timer_confirm_delete.html:21
+#: core/templates/core/tummytime_confirm_delete.html:18
+#: core/templates/core/weight_confirm_delete.html:18
 msgid "Cancel"
 msgstr "Cancelar"
 
 #: babybuddy/templates/babybuddy/user_form.html:8
 #: babybuddy/templates/babybuddy/user_form.html:18
-#: babybuddy/templates/babybuddy/user_form.html:26
+#: babybuddy/templates/babybuddy/user_form.html:28
 #: babybuddy/templates/babybuddy/user_list.html:65
 msgid "Create User"
 msgstr "Crear Usuario"
@@ -498,25 +497,19 @@ msgstr "Cambiar Contraseña"
 msgid "User Settings"
 msgstr "Configuración del Usuario"
 
-#: babybuddy/templates/babybuddy/user_settings_form.html:24
-msgid "<strong>Error:</strong> Some fields have errors. See below for details."
-msgstr ""
-"<strong>Error:</strong> Algunos campos contienen errores. Mira más abajo "
-"para más detalles."
-
-#: babybuddy/templates/babybuddy/user_settings_form.html:28
+#: babybuddy/templates/babybuddy/user_settings_form.html:33
 msgid "User Profile"
 msgstr "Perfil del Usuario"
 
-#: babybuddy/templates/babybuddy/user_settings_form.html:59
+#: babybuddy/templates/babybuddy/user_settings_form.html:64
 msgid "API"
 msgstr "API"
 
-#: babybuddy/templates/babybuddy/user_settings_form.html:61
+#: babybuddy/templates/babybuddy/user_settings_form.html:66
 msgid "Key"
 msgstr "Clave"
 
-#: babybuddy/templates/babybuddy/user_settings_form.html:64
+#: babybuddy/templates/babybuddy/user_settings_form.html:69
 msgid "Regenerate"
 msgstr "Regenerar"
 
@@ -531,14 +524,13 @@ msgstr "¡Bienvenido a Baby Buddy!"
 
 #: babybuddy/templates/babybuddy/welcome.html:14
 msgid ""
-"Learn about and predict baby's needs without\n"
-"            (<em>as much</em>) guess work by using Baby Buddy to track "
-"&mdash;"
+"Learn about and predict baby's needs without (<em>as much</em>) guess work "
+"by using Baby Buddy to track &mdash;"
 msgstr ""
-"Aprende y predice las necesidades de tu bebé sin\n"
-"            (<em>tener que adivinar</em>) usando Baby Buddy &mdash;"
+"Aprende y predice las necesidades de tu bebé sin (<em>tener que adivinar</"
+"em>) usando Baby Buddy &mdash;"
 
-#: babybuddy/templates/babybuddy/welcome.html:24 core/models.py:149
+#: babybuddy/templates/babybuddy/welcome.html:26 core/models.py:149
 #: core/templates/core/diaperchange_confirm_delete.html:7
 #: core/templates/core/diaperchange_form.html:13
 #: core/templates/core/diaperchange_list.html:4
@@ -548,34 +540,24 @@ msgstr ""
 msgid "Diaper Changes"
 msgstr "Cambios de Pañal"
 
-#: babybuddy/templates/babybuddy/welcome.html:54
+#: babybuddy/templates/babybuddy/welcome.html:56
 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!"
+"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 ""
-"A medida que las entradas van creciendo, Baby buddy ayudará\n"
-"            a padres y cuidadres a identificar pequeños patrones en los "
-"hábitos\n"
-"            del bebé usando las gráficas y el dashboard. Baby Buddy funciona "
-"en\n"
-"            el móvil y usa un tema oscuro para yudar a las mamás y papás "
-"cansados\n"
-"            con las tomas y cambios de las 2 de la mañana. Para empezar, haz "
-"click\n"
-"            en el enlace más abajo para añadir tu primer (o segundo, "
-"tercero, etc,) hijo!"
+"A medida que las entradas van creciendo, Baby buddy ayudará a padres y "
+"cuidadres a identificar pequeños patrones en los hábitos del bebé usando las "
+"gráficas y el dashboard. Baby Buddy funciona en el móvil y usa un tema "
+"oscuro para yudar a las mamás y papás cansados con las tomas y cambios de "
+"las 2 de la mañana. Para empezar, haz click en el enlace más abajo para "
+"añadir tu primer (o segundo, tercero, etc,) hijo!"
 
-#: babybuddy/templates/babybuddy/welcome.html:64
+#: babybuddy/templates/babybuddy/welcome.html:68
 #: core/templates/core/child_form.html:8 core/templates/core/child_form.html:18
-#: core/templates/core/child_form.html:26
+#: core/templates/core/child_form.html:28
 #: core/templates/core/child_list.html:70
 msgid "Add a Child"
 msgstr "Añadir Niño"
@@ -604,20 +586,19 @@ msgstr "Iniciar Sesión"
 msgid "Password Reset"
 msgstr "Resetear Contraseña"
 
-#: babybuddy/templates/registration/password_reset_confirm.html:12
+#: babybuddy/templates/registration/password_reset_confirm.html:13
 msgid ""
-"<p class=\"mb-0\"><strong>Oh snap!</strong> The\n"
-"                two passwords did not match. Please try again.</p>"
+"<strong>Oh snap!</strong> The two passwords did not match. Please try again."
 msgstr ""
-"<p class=\"mb-0\"><strong>¡Vaya!</strong> Las contraseñas no coinciden. Por "
-"favor, inténtalo de nuevo.</p>"
+"<strong>¡Vaya!</strong> Las contraseñas no coinciden. Por favor, inténtalo "
+"de nuevo."
 
-#: babybuddy/templates/registration/password_reset_confirm.html:18
+#: babybuddy/templates/registration/password_reset_confirm.html:22
 msgid "Enter your new password in each field below."
 msgstr "Introduce tu nueva contraseña en cada uno de los campos."
 
-#: babybuddy/templates/registration/password_reset_confirm.html:42
-#: babybuddy/templates/registration/password_reset_form.html:27
+#: babybuddy/templates/registration/password_reset_confirm.html:46
+#: babybuddy/templates/registration/password_reset_form.html:31
 msgid "Reset Password"
 msgstr "Resetear Contraseña"
 
@@ -625,51 +606,43 @@ msgstr "Resetear Contraseña"
 msgid "Reset Email Sent"
 msgstr "Correo de reseteo enviado"
 
-#: babybuddy/templates/registration/password_reset_done.html:8
+#: babybuddy/templates/registration/password_reset_done.html:9
 msgid ""
-"<p>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.</p>\n"
-"        <p class=\"mb-0\">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.</p>"
+"We've emailed you instructions for setting your password, if an account "
+"exists with the email you entered. You should receive them shortly."
 msgstr ""
-"<p>Te hemos enviado instrucciones para configurar tu\n"
-"            contraseña, si la cuenta existe y coincide con el email "
-"introducido, \n"
-"            deberías recibirlas en breve.</p>\n"
-"        <p class=\"mb-0\">Si no recibes el email, por favor comprueba que\n"
-"            has introducido el email con el que te has registrado y tu "
-"carpeta\n"
-"            de spam.</p>"
+"Te hemos enviado instrucciones para configurar tu contraseña, si la cuenta "
+"existe y coincide con el email introducido, deberías recibirlas en breve."
+
+#: 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 ""
+"Si no recibes el email, por favor comprueba que has introducido el email con "
+"el que te has registrado y tu carpeta de spam."
 
 #: babybuddy/templates/registration/password_reset_form.html:4
 msgid "Forgot Password"
 msgstr "Contraseña Olvidada"
 
-#: babybuddy/templates/registration/password_reset_form.html:8
+#: babybuddy/templates/registration/password_reset_form.html:9
 msgid ""
-"<p class=\"mb-0\">Enter your account email address in the\n"
-"        form below. If the address is valid, you will receive instructions "
-"for\n"
-"        resetting your password.</p>"
+"Enter your account email address in the form below. If the address is valid, "
+"you will receive instructions for resetting your password."
 msgstr ""
-"<p class=\"mb-0\">Introduce tu dirección de email en el siguiente \n"
-"        formulario. Si la direción es valida, recibirás las instrucciones\n"
-"        para resetear tu contraseña.</p>"
+"Introduce tu dirección de email en el siguiente formulario. Si la direción "
+"es valida, recibirás las instrucciones para resetear tu contraseña."
 
 #: babybuddy/views.py:56
-#, fuzzy, python-format
-#| msgid "User %(username)s added!"
+#, python-format
 msgid "User %(username)s added!"
-msgstr "¡Se ha añadido el usuario %(username)!"
+msgstr "¡Se ha añadido el usuario %(username)s!"
 
 #: babybuddy/views.py:66
-#, fuzzy, python-format
-#| msgid "User %(username)s updated."
+#, python-format
 msgid "User %(username)s updated."
-msgstr "¡Se ha actualizado el usuario %(username)!"
+msgstr "¡Se ha actualizado el usuario %(username)s!"
 
 #: babybuddy/views.py:78
 #, python-brace-format
@@ -798,10 +771,8 @@ msgid "Formula"
 msgstr "Fórmula"
 
 #: core/models.py:200
-#, fuzzy
-#| msgid "Breast milk"
 msgid "Fortified breast milk"
-msgstr "Leche de pecho"
+msgstr "Leche de pecho fortificada"
 
 #: core/models.py:203 core/templates/core/feeding_list.html:19
 msgid "Type"
@@ -843,7 +814,7 @@ msgstr "Nombre"
 msgid "Timer"
 msgstr "Temporizador"
 
-#: core/models.py:409 core/templates/core/timer_confirm_delete.html:7
+#: core/models.py:409 core/templates/core/timer_confirm_delete.html:9
 #: core/templates/core/timer_detail.html:7
 #: core/templates/core/timer_form.html:7 core/templates/core/timer_list.html:4
 #: core/templates/core/timer_list.html:7 core/templates/core/timer_list.html:11
@@ -872,7 +843,7 @@ msgstr "Fecha"
 msgid "Delete a Child"
 msgstr "Borrar Niño"
 
-#: core/templates/core/child_confirm_delete.html:18
+#: core/templates/core/child_confirm_delete.html:20
 msgid "To confirm this action. Type the full name of the child below."
 msgstr "Para confirmar esta acción, escribe el nombre completo del niño."
 
@@ -908,7 +879,7 @@ msgid "Update a Diaper Change"
 msgstr "Actualizar un Cambio de Pañal"
 
 #: core/templates/core/diaperchange_form.html:8
-#: core/templates/core/diaperchange_form.html:25
+#: core/templates/core/diaperchange_form.html:27
 msgid "Add a Diaper Change"
 msgstr "Añadir un Cambio de Pañal"
 
@@ -936,7 +907,7 @@ msgid "Update a Feeding"
 msgstr "Actualizar una Toma"
 
 #: core/templates/core/feeding_form.html:8
-#: core/templates/core/feeding_form.html:25
+#: core/templates/core/feeding_form.html:27
 #: core/templates/core/feeding_list.html:71
 msgid "Add a Feeding"
 msgstr "Añadir una Toma"
@@ -957,7 +928,7 @@ msgstr "Eliminar una Nota"
 msgid "Update a Note"
 msgstr "Actualizar una Nota"
 
-#: core/templates/core/note_form.html:8 core/templates/core/note_form.html:25
+#: core/templates/core/note_form.html:8 core/templates/core/note_form.html:27
 #: core/templates/core/note_list.html:59
 msgid "Add a Note"
 msgstr "Añadir una Nota"
@@ -974,7 +945,7 @@ msgstr "Eliminar Entrada de Sueño"
 msgid "Update a Sleep Entry"
 msgstr "Actualizar Entrada de Sueño"
 
-#: core/templates/core/sleep_form.html:8 core/templates/core/sleep_form.html:25
+#: core/templates/core/sleep_form.html:8 core/templates/core/sleep_form.html:27
 #: core/templates/core/sleep_list.html:63
 msgid "Add a Sleep Entry"
 msgstr "Añadir Entrada de Sueño"
@@ -1001,32 +972,24 @@ msgid "No sleep entries found."
 msgstr "No se han encontrado entradas de sueño."
 
 #: core/templates/core/temperature_confirm_delete.html:4
-#, fuzzy
-#| msgid "Delete a Feeding"
 msgid "Delete a Temperature Reading"
 msgstr "Eliminar una Toma"
 
 #: core/templates/core/temperature_form.html:8
 #: core/templates/core/temperature_form.html:17
 #: core/templates/core/temperature_list.html:59
-#, fuzzy
-#| msgid "Add a Feeding"
 msgid "Add a Temperature Reading"
 msgstr "Añadir una Toma"
 
-#: core/templates/core/temperature_form.html:25
-#, fuzzy
-#| msgid "Add a Sleep Entry"
+#: core/templates/core/temperature_form.html:27
 msgid "Add a Temperature Entry"
 msgstr "Añadir Entrada de Sueño"
 
 #: core/templates/core/temperature_list.html:49
-#, fuzzy
-#| msgid "No timer entries found."
 msgid "No temperature entries found."
 msgstr "No se han encontrado temporizadores."
 
-#: core/templates/core/timer_confirm_delete.html:4
+#: core/templates/core/timer_confirm_delete.html:5
 #, python-format
 msgid "Delete %(object)s"
 msgstr "Eliminar %(object)s"
@@ -1044,11 +1007,11 @@ msgstr "Parado"
 msgid "%(timer)s created by %(user)s"
 msgstr "%(timer)s creado por %(user)s"
 
-#: core/templates/core/timer_detail.html:53
+#: core/templates/core/timer_detail.html:55
 msgid "Timer actions"
 msgstr "Acciones de temporizador"
 
-#: core/templates/core/timer_form.html:20 core/templates/core/timer_nav.html:18
+#: core/templates/core/timer_form.html:22 core/templates/core/timer_nav.html:18
 msgid "Start Timer"
 msgstr "Iniciar Temporizador"
 
@@ -1083,7 +1046,7 @@ msgid "Update a Tummy Time Entry"
 msgstr "Actualizar entrada de Tiempo Boca Abajo"
 
 #: core/templates/core/tummytime_form.html:8
-#: core/templates/core/tummytime_form.html:25
+#: core/templates/core/tummytime_form.html:27
 #: core/templates/core/tummytime_list.html:63
 msgid "Add a Tummy Time Entry"
 msgstr "Añadir entrada de Tiempo Boca Abajo"
@@ -1098,7 +1061,7 @@ msgstr "Eliminar Entrada de Peso"
 
 #: core/templates/core/weight_form.html:8
 #: core/templates/core/weight_form.html:17
-#: core/templates/core/weight_form.html:25
+#: core/templates/core/weight_form.html:27
 #: core/templates/core/weight_list.html:59
 msgid "Add a Weight Entry"
 msgstr "Añadir Entrada de Peso"
@@ -1184,8 +1147,7 @@ msgid "%(model)s entry updated."
 msgstr "%(model)s entrada actualizada."
 
 #: core/views.py:43
-#, fuzzy, python-format
-#| msgid "%(model)s entry updated."
+#, python-format
 msgid "%(model)s entry deleted."
 msgstr "%(model)s entrada actualizada."
 
@@ -1195,14 +1157,12 @@ msgid "%(first_name)s %(last_name)s added!"
 msgstr "¡%(first_name)s %(last_name)s añadido!"
 
 #: core/views.py:235
-#, fuzzy, python-format
-#| msgid "%(model)s entry added!"
+#, python-format
 msgid "%(model)s reading added!"
 msgstr "¡%(model)s entrada añadida!"
 
 #: core/views.py:243
-#, fuzzy, python-format
-#| msgid "%(model)s entry for %(child)s updated."
+#, python-format
 msgid "%(model)s reading for %(child)s updated."
 msgstr "%(model)s entrada para %(child)s actualizada."
 
@@ -1223,10 +1183,10 @@ msgstr "Ultimo Cambio Pañal"
 msgid "%(time)s ago"
 msgstr "hace %(time)s"
 
-#: dashboard/templates/cards/diaperchange_last.html:10
-#: dashboard/templates/cards/feeding_last.html:10
-#: dashboard/templates/cards/sleep_last.html:10
-#: dashboard/templates/cards/tummytime_last.html:10
+#: 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:12
 msgid "Never"
 msgstr "Nunca"
 
@@ -1268,7 +1228,7 @@ msgid "Today's Sleep"
 msgstr "Sueño Hoy"
 
 #: dashboard/templates/cards/sleep_day.html:11
-#: dashboard/templates/cards/sleep_naps_day.html:11
+#: dashboard/templates/cards/sleep_naps_day.html:13
 #: dashboard/templates/cards/tummytime_day.html:11
 msgid "None yet today"
 msgstr "Ninguno hoy todavía"
@@ -1304,7 +1264,7 @@ msgstr "No hay suficientes datos"
 msgid "%(count)s active timer%(plural)s"
 msgstr "%(count)s temporizador%(plural)s activo%(plural)s"
 
-#: dashboard/templates/cards/timer_list.html:19
+#: dashboard/templates/cards/timer_list.html:21
 #, python-format
 msgid "Started by %(user)s at %(start)s"
 msgstr "Iniciado por %(user)s a las %(start)s"
@@ -1341,8 +1301,6 @@ msgstr "Duración Pañal"
 #: dashboard/templates/dashboard/child_button_group.html:21
 #: reports/templates/reports/feeding_amounts.html:4
 #: reports/templates/reports/feeding_amounts.html:8
-#, fuzzy
-#| msgid "Feedings"
 msgid "Feeding Amounts"
 msgstr "Tomas"
 
@@ -1411,20 +1369,14 @@ msgid "Number of changes"
 msgstr "Número de cambios"
 
 #: reports/graphs/feeding_amounts.py:27
-#, fuzzy
-#| msgid "Total feedings"
 msgid "Total feeding amount"
 msgstr "Total de tomas"
 
 #: reports/graphs/feeding_amounts.py:36
-#, fuzzy
-#| msgid "<b>Average Feeding Durations</b>"
 msgid "<b>Total Feeding Amounts</b>"
 msgstr "<b>Duración Media Tomas</b>"
 
 #: reports/graphs/feeding_amounts.py:39
-#, fuzzy
-#| msgid "Feeding"
 msgid "Feeding amount"
 msgstr "Tomando"
 
@@ -1482,7 +1434,5 @@ msgid "Reports"
 msgstr "Reportes"
 
 #: reports/templates/reports/report_base.html:19
-#, fuzzy
-#| msgid "There is no enough data to generate this report."
 msgid "There is not enough data to generate this report."
 msgstr "No hay suficientes datos para generar este reporte."
diff --git a/locale/fr/LC_MESSAGES/django.mo b/locale/fr/LC_MESSAGES/django.mo
index 4a7c1a37..edb4345c 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 c027bf76..ffb27369 100644
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -1,14 +1,8 @@
-# French translations file.
-# Copyright (C) 2019 Baby Buddy's Contributors
-# This file is distributed under the same license as the Baby Buddy package.
-# Christopher C. Wells <wells@chrxs.net>, 2019.
-#
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: babybuddy 1.2.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-01-23 19:19-0800\n"
+"POT-Creation-Date: 2020-01-23 19:59-0800\n"
 "PO-Revision-Date: 2019-05-02 17:20+0000\n"
 "Last-Translator: Christopher C. Wells <wells@chrxs.net>\n"
 "Language-Team: French <fr@li.org>\n"
@@ -25,7 +19,7 @@ msgid "Settings"
 msgstr "Paramètres"
 
 #: babybuddy/admin.py:16 babybuddy/templates/babybuddy/nav-dropdown.html:82
-#: babybuddy/templates/babybuddy/user_settings_form.html:51
+#: babybuddy/templates/babybuddy/user_settings_form.html:56
 #: dashboard/templates/dashboard/child.html:4
 #: dashboard/templates/dashboard/child.html:9
 #: dashboard/templates/dashboard/dashboard.html:4
@@ -120,11 +114,11 @@ msgstr "Permission Refusée"
 
 #: babybuddy/templates/403.html:12
 msgid ""
-"You do not have permission to access this resource.\n"
-"        Contact a site administrator for assistance."
+"You do not have permission to access this resource. Contact a site "
+"administrator for assistance."
 msgstr ""
-"Vous n'êtes pas autorisé à accéder à cette ressource.\n"
-"        Contactez un administrateur de site pour obtenir de l'aide."
+"Vous n'êtes pas autorisé à accéder à cette ressource. Contactez un "
+"administrateur de site pour obtenir de l'aide."
 
 #: babybuddy/templates/babybuddy/base.html:36
 msgid "Home"
@@ -143,7 +137,7 @@ msgid "Filters"
 msgstr "Les filtres"
 
 #: babybuddy/templates/babybuddy/form.html:11
-#: babybuddy/templates/babybuddy/user_settings_form.html:69
+#: babybuddy/templates/babybuddy/user_settings_form.html:74
 msgid "Submit"
 msgstr "Soumettre"
 
@@ -154,11 +148,11 @@ msgid "<strong>Error:</strong> %(error)s"
 msgstr "<strong>Erreur:</strong> %(error)s"
 
 #: babybuddy/templates/babybuddy/messages.html:23
-msgid ""
-"<strong>Error:</strong> Some fields have errors. See below for details. "
+#: babybuddy/templates/babybuddy/user_settings_form.html:26
+msgid "<strong>Error:</strong> Some fields have errors. See below for details."
 msgstr ""
 "<strong>Erreur:</strong> Certains champs comportent des erreurs. Voir ci-"
-"dessous pour plus de détails. "
+"dessous pour plus de détails."
 
 #: babybuddy/templates/babybuddy/nav-dropdown.html:27 core/models.py:148
 #: core/models.py:152
@@ -167,7 +161,7 @@ msgstr "Changement"
 
 #: babybuddy/templates/babybuddy/nav-dropdown.html:33
 #: babybuddy/templates/babybuddy/nav-dropdown.html:189 core/models.py:222
-#: core/models.py:226 core/templates/core/timer_detail.html:33
+#: core/models.py:226 core/templates/core/timer_detail.html:35
 msgid "Feeding"
 msgstr "Allaitement"
 
@@ -179,12 +173,12 @@ msgstr "Annotation"
 
 #: babybuddy/templates/babybuddy/nav-dropdown.html:45
 #: babybuddy/templates/babybuddy/nav-dropdown.html:196
-#: babybuddy/templates/babybuddy/welcome.html:40 core/models.py:306
+#: babybuddy/templates/babybuddy/welcome.html:42 core/models.py:306
 #: core/models.py:307 core/models.py:310
 #: core/templates/core/sleep_confirm_delete.html:7
 #: core/templates/core/sleep_form.html:13 core/templates/core/sleep_list.html:4
 #: core/templates/core/sleep_list.html:7 core/templates/core/sleep_list.html:11
-#: core/templates/core/timer_detail.html:41
+#: core/templates/core/timer_detail.html:43
 msgid "Sleep"
 msgstr "Sommeil"
 
@@ -202,9 +196,9 @@ msgstr ""
 
 #: babybuddy/templates/babybuddy/nav-dropdown.html:57
 #: babybuddy/templates/babybuddy/nav-dropdown.html:209
-#: babybuddy/templates/babybuddy/welcome.html:48 core/models.py:486
+#: babybuddy/templates/babybuddy/welcome.html:50 core/models.py:486
 #: core/models.py:487 core/models.py:490
-#: core/templates/core/timer_detail.html:49
+#: core/templates/core/timer_detail.html:51
 #: core/templates/core/tummytime_confirm_delete.html:7
 #: core/templates/core/tummytime_form.html:13
 #: core/templates/core/tummytime_list.html:4
@@ -281,7 +275,7 @@ msgid "Change"
 msgstr "Changement"
 
 #: babybuddy/templates/babybuddy/nav-dropdown.html:183
-#: babybuddy/templates/babybuddy/welcome.html:32 core/models.py:223
+#: babybuddy/templates/babybuddy/welcome.html:34 core/models.py:223
 #: core/templates/core/feeding_confirm_delete.html:7
 #: core/templates/core/feeding_form.html:13
 #: core/templates/core/feeding_list.html:4
@@ -366,23 +360,23 @@ msgstr "Supprimer l'utilisateur"
 
 #: babybuddy/templates/babybuddy/user_confirm_delete.html:9
 #: core/templates/core/child_confirm_delete.html:9
-#: core/templates/core/child_confirm_delete.html:29
+#: core/templates/core/child_confirm_delete.html:31
 #: core/templates/core/diaperchange_confirm_delete.html:8
-#: core/templates/core/diaperchange_confirm_delete.html:15
+#: core/templates/core/diaperchange_confirm_delete.html:17
 #: core/templates/core/feeding_confirm_delete.html:8
-#: core/templates/core/feeding_confirm_delete.html:15
+#: core/templates/core/feeding_confirm_delete.html:17
 #: core/templates/core/note_confirm_delete.html:8
-#: core/templates/core/note_confirm_delete.html:15
+#: core/templates/core/note_confirm_delete.html:17
 #: core/templates/core/sleep_confirm_delete.html:8
-#: core/templates/core/sleep_confirm_delete.html:15
+#: core/templates/core/sleep_confirm_delete.html:17
 #: core/templates/core/temperature_confirm_delete.html:8
-#: core/templates/core/temperature_confirm_delete.html:15
-#: core/templates/core/timer_confirm_delete.html:9
-#: core/templates/core/timer_confirm_delete.html:16
+#: core/templates/core/temperature_confirm_delete.html:17
+#: core/templates/core/timer_confirm_delete.html:11
+#: core/templates/core/timer_confirm_delete.html:20
 #: core/templates/core/tummytime_confirm_delete.html:8
-#: core/templates/core/tummytime_confirm_delete.html:15
+#: core/templates/core/tummytime_confirm_delete.html:17
 #: core/templates/core/weight_confirm_delete.html:8
-#: core/templates/core/weight_confirm_delete.html:15
+#: core/templates/core/weight_confirm_delete.html:17
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -393,7 +387,7 @@ msgstr "Supprimer"
 #: core/templates/core/note_confirm_delete.html:14
 #: core/templates/core/sleep_confirm_delete.html:14
 #: core/templates/core/temperature_confirm_delete.html:14
-#: core/templates/core/timer_confirm_delete.html:15
+#: 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
@@ -404,22 +398,22 @@ msgstr ""
 "<h1>Etes-vous sûr que vous voulez supprimer <span class=\"text-info\">"
 "%(object)s</span>?</h1>"
 
-#: babybuddy/templates/babybuddy/user_confirm_delete.html:17
-#: core/templates/core/child_confirm_delete.html:30
-#: core/templates/core/diaperchange_confirm_delete.html:16
-#: core/templates/core/feeding_confirm_delete.html:16
-#: core/templates/core/note_confirm_delete.html:16
-#: core/templates/core/sleep_confirm_delete.html:16
-#: core/templates/core/temperature_confirm_delete.html:16
-#: core/templates/core/timer_confirm_delete.html:17
-#: core/templates/core/tummytime_confirm_delete.html:16
-#: core/templates/core/weight_confirm_delete.html:16
+#: babybuddy/templates/babybuddy/user_confirm_delete.html:19
+#: core/templates/core/child_confirm_delete.html:32
+#: core/templates/core/diaperchange_confirm_delete.html:18
+#: core/templates/core/feeding_confirm_delete.html:18
+#: core/templates/core/note_confirm_delete.html:18
+#: core/templates/core/sleep_confirm_delete.html:18
+#: core/templates/core/temperature_confirm_delete.html:18
+#: core/templates/core/timer_confirm_delete.html:21
+#: core/templates/core/tummytime_confirm_delete.html:18
+#: core/templates/core/weight_confirm_delete.html:18
 msgid "Cancel"
 msgstr "Annuler"
 
 #: babybuddy/templates/babybuddy/user_form.html:8
 #: babybuddy/templates/babybuddy/user_form.html:18
-#: babybuddy/templates/babybuddy/user_form.html:26
+#: babybuddy/templates/babybuddy/user_form.html:28
 #: babybuddy/templates/babybuddy/user_list.html:65
 msgid "Create User"
 msgstr "Créer un utilisateur"
@@ -506,25 +500,19 @@ msgstr "Changer le mot de passe"
 msgid "User Settings"
 msgstr "Paramètres Utilisateur"
 
-#: babybuddy/templates/babybuddy/user_settings_form.html:24
-msgid "<strong>Error:</strong> Some fields have errors. See below for details."
-msgstr ""
-"<strong>Erreur:</strong> Certains champs comportent des erreurs. Voir ci-"
-"dessous pour plus de détails."
-
-#: babybuddy/templates/babybuddy/user_settings_form.html:28
+#: babybuddy/templates/babybuddy/user_settings_form.html:33
 msgid "User Profile"
 msgstr "Profil de l'utilisateur"
 
-#: babybuddy/templates/babybuddy/user_settings_form.html:59
+#: babybuddy/templates/babybuddy/user_settings_form.html:64
 msgid "API"
 msgstr "API"
 
-#: babybuddy/templates/babybuddy/user_settings_form.html:61
+#: babybuddy/templates/babybuddy/user_settings_form.html:66
 msgid "Key"
 msgstr "Clé"
 
-#: babybuddy/templates/babybuddy/user_settings_form.html:64
+#: babybuddy/templates/babybuddy/user_settings_form.html:69
 msgid "Regenerate"
 msgstr "Recréer"
 
@@ -539,14 +527,13 @@ msgstr "Bienvenue à Baby Buddy!"
 
 #: babybuddy/templates/babybuddy/welcome.html:14
 msgid ""
-"Learn about and predict baby's needs without\n"
-"            (<em>as much</em>) guess work by using Baby Buddy to track "
-"&mdash;"
+"Learn about and predict baby's needs without (<em>as much</em>) guess work "
+"by using Baby Buddy to track &mdash;"
 msgstr ""
 "En savoir plus sur et en prédire les besoins de bébé sans (<em>trop</em>) de "
 "devinettes en utilisant Baby Buddy pour suivre &mdash;"
 
-#: babybuddy/templates/babybuddy/welcome.html:24 core/models.py:149
+#: babybuddy/templates/babybuddy/welcome.html:26 core/models.py:149
 #: core/templates/core/diaperchange_confirm_delete.html:7
 #: core/templates/core/diaperchange_form.html:13
 #: core/templates/core/diaperchange_list.html:4
@@ -556,18 +543,13 @@ msgstr ""
 msgid "Diaper Changes"
 msgstr "Changement"
 
-#: babybuddy/templates/babybuddy/welcome.html:54
+#: babybuddy/templates/babybuddy/welcome.html:56
 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!"
+"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 ""
 "Au fur et à mesure que le nombre d'entrées augmente, Baby Buddy aidera les "
 "parents et les éducateurs à identifier de petites tendances dans les "
@@ -577,9 +559,9 @@ msgstr ""
 "nourriture. Pour commencer, cliquez simplement sur le bouton ci-dessous pour "
 "ajouter votre premier (ou deuxième, troisième, etc.) enfant!"
 
-#: babybuddy/templates/babybuddy/welcome.html:64
+#: babybuddy/templates/babybuddy/welcome.html:68
 #: core/templates/core/child_form.html:8 core/templates/core/child_form.html:18
-#: core/templates/core/child_form.html:26
+#: core/templates/core/child_form.html:28
 #: core/templates/core/child_list.html:70
 msgid "Add a Child"
 msgstr "Ajouter un Enfant"
@@ -609,20 +591,19 @@ msgstr "Se connecter"
 msgid "Password Reset"
 msgstr "Réinitialiser le mot de passe"
 
-#: babybuddy/templates/registration/password_reset_confirm.html:12
+#: babybuddy/templates/registration/password_reset_confirm.html:13
 msgid ""
-"<p class=\"mb-0\"><strong>Oh snap!</strong> The\n"
-"                two passwords did not match. Please try again.</p>"
+"<strong>Oh snap!</strong> The two passwords did not match. Please try again."
 msgstr ""
-"<p class=\"mb-0\"><strong>Oh non!</strong> Les deux mots de passe ne "
-"correspondent pas. Veuillez réessayer.</p>"
+"<strong>Oh non!</strong> Les deux mots de passe ne correspondent pas. "
+"Veuillez réessayer."
 
-#: babybuddy/templates/registration/password_reset_confirm.html:18
+#: babybuddy/templates/registration/password_reset_confirm.html:22
 msgid "Enter your new password in each field below."
 msgstr "Entrez votre nouveau mot de passe dans chaque champ ci-dessous."
 
-#: babybuddy/templates/registration/password_reset_confirm.html:42
-#: babybuddy/templates/registration/password_reset_form.html:27
+#: babybuddy/templates/registration/password_reset_confirm.html:46
+#: babybuddy/templates/registration/password_reset_form.html:31
 msgid "Reset Password"
 msgstr "Réinitialiser"
 
@@ -630,36 +611,35 @@ msgstr "Réinitialiser"
 msgid "Reset Email Sent"
 msgstr "Réinitialiser email envoyé"
 
-#: babybuddy/templates/registration/password_reset_done.html:8
+#: babybuddy/templates/registration/password_reset_done.html:9
 msgid ""
-"<p>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.</p>\n"
-"        <p class=\"mb-0\">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.</p>"
+"We've emailed you instructions for setting your password, if an account "
+"exists with the email you entered. You should receive them shortly."
 msgstr ""
-"<p>Les instructions pour définir votre mot de passe ont été envoyées, si "
-"uncompte existe avec le courrier électronique que vous avez entré.</p>\n"
-"        <p class=\"mb-0\">Si vous ne recevez pas d'e-mail, assurez-vous "
-"d'avoir entré l'adresse avec laquelle vous vous êtes inscrit et vérifiez "
-"votre dossier de courrier indésirable.</p>"
+"Les instructions pour définir votre mot de passe ont été envoyées, si "
+"uncompte existe avec le courrier électronique que vous avez entré."
+
+#: 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 ""
+"Si vous ne recevez pas d'e-mail, assurez-vous d'avoir entré l'adresse avec "
+"laquelle vous vous êtes inscrit et vérifiez votre dossier de courrier "
+"indésirable."
 
 #: babybuddy/templates/registration/password_reset_form.html:4
 msgid "Forgot Password"
 msgstr "Mot de passe oublié"
 
-#: babybuddy/templates/registration/password_reset_form.html:8
+#: babybuddy/templates/registration/password_reset_form.html:9
 msgid ""
-"<p class=\"mb-0\">Enter your account email address in the\n"
-"        form below. If the address is valid, you will receive instructions "
-"for\n"
-"        resetting your password.</p>"
+"Enter your account email address in the form below. If the address is valid, "
+"you will receive instructions for resetting your password."
 msgstr ""
-"<p class=\"mb-0\">Entrez l'adresse email de votre compte dans le formulaire "
-"ci-dessous. Si l'adresse est valide, vous recevrez des instructions pour "
-"réinitialiser votre mot de passe.</p>"
+"Entrez l'adresse email de votre compte dans le formulaire ci-dessous. Si "
+"l'adresse est valide, vous recevrez des instructions pour réinitialiser "
+"votre mot de passe."
 
 #: babybuddy/views.py:56
 #, python-format
@@ -841,7 +821,7 @@ msgstr "Prénom"
 msgid "Timer"
 msgstr "Chronomètre"
 
-#: core/models.py:409 core/templates/core/timer_confirm_delete.html:7
+#: core/models.py:409 core/templates/core/timer_confirm_delete.html:9
 #: core/templates/core/timer_detail.html:7
 #: core/templates/core/timer_form.html:7 core/templates/core/timer_list.html:4
 #: core/templates/core/timer_list.html:7 core/templates/core/timer_list.html:11
@@ -870,7 +850,7 @@ msgstr "Date"
 msgid "Delete a Child"
 msgstr "Supprimer un Enfant"
 
-#: core/templates/core/child_confirm_delete.html:18
+#: core/templates/core/child_confirm_delete.html:20
 msgid "To confirm this action. Type the full name of the child below."
 msgstr ""
 "Tapez le nom complet de l'enfant ci-dessous pour confirmer cette action."
@@ -907,7 +887,7 @@ msgid "Update a Diaper Change"
 msgstr "Mettre à Jour un Changement"
 
 #: core/templates/core/diaperchange_form.html:8
-#: core/templates/core/diaperchange_form.html:25
+#: core/templates/core/diaperchange_form.html:27
 msgid "Add a Diaper Change"
 msgstr "Ajuter un Changement"
 
@@ -935,7 +915,7 @@ msgid "Update a Feeding"
 msgstr "Mettre à Jour une Alimentation"
 
 #: core/templates/core/feeding_form.html:8
-#: core/templates/core/feeding_form.html:25
+#: core/templates/core/feeding_form.html:27
 #: core/templates/core/feeding_list.html:71
 msgid "Add a Feeding"
 msgstr "Ajouter une Alimentation"
@@ -956,7 +936,7 @@ msgstr "Supprimer une annotation"
 msgid "Update a Note"
 msgstr "Mettre à Jour une annotation"
 
-#: core/templates/core/note_form.html:8 core/templates/core/note_form.html:25
+#: core/templates/core/note_form.html:8 core/templates/core/note_form.html:27
 #: core/templates/core/note_list.html:59
 msgid "Add a Note"
 msgstr "Ajouter une annotation"
@@ -973,7 +953,7 @@ msgstr "Supprimer une entrée de sommeil"
 msgid "Update a Sleep Entry"
 msgstr "Mettre à Jour une entrée de sommeil"
 
-#: core/templates/core/sleep_form.html:8 core/templates/core/sleep_form.html:25
+#: core/templates/core/sleep_form.html:8 core/templates/core/sleep_form.html:27
 #: core/templates/core/sleep_list.html:63
 msgid "Add a Sleep Entry"
 msgstr "Ajouter une entrée de sommeil"
@@ -1009,7 +989,7 @@ msgstr "Supprimer une Alimentation"
 msgid "Add a Temperature Reading"
 msgstr "Ajouter une Alimentation"
 
-#: core/templates/core/temperature_form.html:25
+#: core/templates/core/temperature_form.html:27
 msgid "Add a Temperature Entry"
 msgstr "Ajouter une entrée de sommeil"
 
@@ -1017,7 +997,7 @@ msgstr "Ajouter une entrée de sommeil"
 msgid "No temperature entries found."
 msgstr "Aucun chronomètre trouvé."
 
-#: core/templates/core/timer_confirm_delete.html:4
+#: core/templates/core/timer_confirm_delete.html:5
 #, python-format
 msgid "Delete %(object)s"
 msgstr "Supprimer %(object)s"
@@ -1035,11 +1015,11 @@ msgstr "Arrêté"
 msgid "%(timer)s created by %(user)s"
 msgstr "%(timer)s a été créé par %(user)s"
 
-#: core/templates/core/timer_detail.html:53
+#: core/templates/core/timer_detail.html:55
 msgid "Timer actions"
 msgstr "Opérations sur le chronomètre"
 
-#: core/templates/core/timer_form.html:20 core/templates/core/timer_nav.html:18
+#: core/templates/core/timer_form.html:22 core/templates/core/timer_nav.html:18
 msgid "Start Timer"
 msgstr "Démarrer un chronomètre"
 
@@ -1074,7 +1054,7 @@ msgid "Update a Tummy Time Entry"
 msgstr "Mettre à Jour une entrée d'heure de ventre"
 
 #: core/templates/core/tummytime_form.html:8
-#: core/templates/core/tummytime_form.html:25
+#: core/templates/core/tummytime_form.html:27
 #: core/templates/core/tummytime_list.html:63
 msgid "Add a Tummy Time Entry"
 msgstr "Ajouter une entrée d'heure de ventre"
@@ -1089,7 +1069,7 @@ msgstr "Supprimer une entrée de poids"
 
 #: core/templates/core/weight_form.html:8
 #: core/templates/core/weight_form.html:17
-#: core/templates/core/weight_form.html:25
+#: core/templates/core/weight_form.html:27
 #: core/templates/core/weight_list.html:59
 msgid "Add a Weight Entry"
 msgstr "Ajouter une entrée de poids"
@@ -1211,10 +1191,10 @@ msgstr "Dernier Changement"
 msgid "%(time)s ago"
 msgstr "il y a %(time)s"
 
-#: dashboard/templates/cards/diaperchange_last.html:10
-#: dashboard/templates/cards/feeding_last.html:10
-#: dashboard/templates/cards/sleep_last.html:10
-#: dashboard/templates/cards/tummytime_last.html:10
+#: 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:12
 msgid "Never"
 msgstr "Jamais"
 
@@ -1256,7 +1236,7 @@ msgid "Today's Sleep"
 msgstr "Sommeil Aujourd'hui"
 
 #: dashboard/templates/cards/sleep_day.html:11
-#: dashboard/templates/cards/sleep_naps_day.html:11
+#: dashboard/templates/cards/sleep_naps_day.html:13
 #: dashboard/templates/cards/tummytime_day.html:11
 msgid "None yet today"
 msgstr "Pas encore aujourd'hui"
@@ -1292,7 +1272,7 @@ msgstr "Pas assez de données"
 msgid "%(count)s active timer%(plural)s"
 msgstr "%(count)s chronomètre%(plural)s actif"
 
-#: dashboard/templates/cards/timer_list.html:19
+#: dashboard/templates/cards/timer_list.html:21
 #, python-format
 msgid "Started by %(user)s at %(start)s"
 msgstr "Lancé par %(user)s à %(start)s"
diff --git a/locale/sv/LC_MESSAGES/django.mo b/locale/sv/LC_MESSAGES/django.mo
index 96a2b775..cecf7627 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 6f406f69..518dd379 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: 2020-01-23 19:19-0800\n"
+"POT-Creation-Date: 2020-01-23 19:59-0800\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -16,7 +16,7 @@ msgid "Settings"
 msgstr "Inställningar"
 
 #: babybuddy/admin.py:16 babybuddy/templates/babybuddy/nav-dropdown.html:82
-#: babybuddy/templates/babybuddy/user_settings_form.html:51
+#: babybuddy/templates/babybuddy/user_settings_form.html:56
 #: dashboard/templates/dashboard/child.html:4
 #: dashboard/templates/dashboard/child.html:9
 #: dashboard/templates/dashboard/dashboard.html:4
@@ -111,8 +111,8 @@ msgstr "Åtkomst nekad"
 
 #: babybuddy/templates/403.html:12
 msgid ""
-"You do not have permission to access this resource.\n"
-"        Contact a site administrator for assistance."
+"You do not have permission to access this resource. Contact a site "
+"administrator for assistance."
 msgstr ""
 "Du har inte behörighet att komma åt den här resursen. Kontakta "
 "webbplatsadministratören för hjälp."
@@ -134,7 +134,7 @@ msgid "Filters"
 msgstr "Filter"
 
 #: babybuddy/templates/babybuddy/form.html:11
-#: babybuddy/templates/babybuddy/user_settings_form.html:69
+#: babybuddy/templates/babybuddy/user_settings_form.html:74
 msgid "Submit"
 msgstr "Skicka"
 
@@ -145,10 +145,11 @@ msgid "<strong>Error:</strong> %(error)s"
 msgstr "<strong>Fel:</strong> %(error)s"
 
 #: babybuddy/templates/babybuddy/messages.html:23
-msgid ""
-"<strong>Error:</strong> Some fields have errors. See below for details. "
+#: babybuddy/templates/babybuddy/user_settings_form.html:26
+msgid "<strong>Error:</strong> Some fields have errors. See below for details."
 msgstr ""
-"<strong>Error:</strong> Vissa fält innehåller fel. Se nedan för detaljer._"
+"<strong>Fel:</strong> Vissa fält innehåller felaktigheter. Se nedan för "
+"detaljer."
 
 #: babybuddy/templates/babybuddy/nav-dropdown.html:27 core/models.py:148
 #: core/models.py:152
@@ -157,7 +158,7 @@ msgstr "Blöjbyte"
 
 #: babybuddy/templates/babybuddy/nav-dropdown.html:33
 #: babybuddy/templates/babybuddy/nav-dropdown.html:189 core/models.py:222
-#: core/models.py:226 core/templates/core/timer_detail.html:33
+#: core/models.py:226 core/templates/core/timer_detail.html:35
 msgid "Feeding"
 msgstr "Matning"
 
@@ -169,12 +170,12 @@ msgstr "Anteckning"
 
 #: babybuddy/templates/babybuddy/nav-dropdown.html:45
 #: babybuddy/templates/babybuddy/nav-dropdown.html:196
-#: babybuddy/templates/babybuddy/welcome.html:40 core/models.py:306
+#: babybuddy/templates/babybuddy/welcome.html:42 core/models.py:306
 #: core/models.py:307 core/models.py:310
 #: core/templates/core/sleep_confirm_delete.html:7
 #: core/templates/core/sleep_form.html:13 core/templates/core/sleep_list.html:4
 #: core/templates/core/sleep_list.html:7 core/templates/core/sleep_list.html:11
-#: core/templates/core/timer_detail.html:41
+#: core/templates/core/timer_detail.html:43
 msgid "Sleep"
 msgstr "Sömn"
 
@@ -192,9 +193,9 @@ msgstr ""
 
 #: babybuddy/templates/babybuddy/nav-dropdown.html:57
 #: babybuddy/templates/babybuddy/nav-dropdown.html:209
-#: babybuddy/templates/babybuddy/welcome.html:48 core/models.py:486
+#: babybuddy/templates/babybuddy/welcome.html:50 core/models.py:486
 #: core/models.py:487 core/models.py:490
-#: core/templates/core/timer_detail.html:49
+#: core/templates/core/timer_detail.html:51
 #: core/templates/core/tummytime_confirm_delete.html:7
 #: core/templates/core/tummytime_form.html:13
 #: core/templates/core/tummytime_list.html:4
@@ -271,7 +272,7 @@ msgid "Change"
 msgstr "Ändring"
 
 #: babybuddy/templates/babybuddy/nav-dropdown.html:183
-#: babybuddy/templates/babybuddy/welcome.html:32 core/models.py:223
+#: babybuddy/templates/babybuddy/welcome.html:34 core/models.py:223
 #: core/templates/core/feeding_confirm_delete.html:7
 #: core/templates/core/feeding_form.html:13
 #: core/templates/core/feeding_list.html:4
@@ -356,23 +357,23 @@ msgstr "Ta bort användare"
 
 #: babybuddy/templates/babybuddy/user_confirm_delete.html:9
 #: core/templates/core/child_confirm_delete.html:9
-#: core/templates/core/child_confirm_delete.html:29
+#: core/templates/core/child_confirm_delete.html:31
 #: core/templates/core/diaperchange_confirm_delete.html:8
-#: core/templates/core/diaperchange_confirm_delete.html:15
+#: core/templates/core/diaperchange_confirm_delete.html:17
 #: core/templates/core/feeding_confirm_delete.html:8
-#: core/templates/core/feeding_confirm_delete.html:15
+#: core/templates/core/feeding_confirm_delete.html:17
 #: core/templates/core/note_confirm_delete.html:8
-#: core/templates/core/note_confirm_delete.html:15
+#: core/templates/core/note_confirm_delete.html:17
 #: core/templates/core/sleep_confirm_delete.html:8
-#: core/templates/core/sleep_confirm_delete.html:15
+#: core/templates/core/sleep_confirm_delete.html:17
 #: core/templates/core/temperature_confirm_delete.html:8
-#: core/templates/core/temperature_confirm_delete.html:15
-#: core/templates/core/timer_confirm_delete.html:9
-#: core/templates/core/timer_confirm_delete.html:16
+#: core/templates/core/temperature_confirm_delete.html:17
+#: core/templates/core/timer_confirm_delete.html:11
+#: core/templates/core/timer_confirm_delete.html:20
 #: core/templates/core/tummytime_confirm_delete.html:8
-#: core/templates/core/tummytime_confirm_delete.html:15
+#: core/templates/core/tummytime_confirm_delete.html:17
 #: core/templates/core/weight_confirm_delete.html:8
-#: core/templates/core/weight_confirm_delete.html:15
+#: core/templates/core/weight_confirm_delete.html:17
 msgid "Delete"
 msgstr "Ta bort"
 
@@ -383,7 +384,7 @@ msgstr "Ta bort"
 #: core/templates/core/note_confirm_delete.html:14
 #: core/templates/core/sleep_confirm_delete.html:14
 #: core/templates/core/temperature_confirm_delete.html:14
-#: core/templates/core/timer_confirm_delete.html:15
+#: 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
@@ -394,22 +395,22 @@ msgstr ""
 "<h1>Är du säker på att du vill ta bort <span class=\"text-info\">%(object)s</"
 "span>?</h1>"
 
-#: babybuddy/templates/babybuddy/user_confirm_delete.html:17
-#: core/templates/core/child_confirm_delete.html:30
-#: core/templates/core/diaperchange_confirm_delete.html:16
-#: core/templates/core/feeding_confirm_delete.html:16
-#: core/templates/core/note_confirm_delete.html:16
-#: core/templates/core/sleep_confirm_delete.html:16
-#: core/templates/core/temperature_confirm_delete.html:16
-#: core/templates/core/timer_confirm_delete.html:17
-#: core/templates/core/tummytime_confirm_delete.html:16
-#: core/templates/core/weight_confirm_delete.html:16
+#: babybuddy/templates/babybuddy/user_confirm_delete.html:19
+#: core/templates/core/child_confirm_delete.html:32
+#: core/templates/core/diaperchange_confirm_delete.html:18
+#: core/templates/core/feeding_confirm_delete.html:18
+#: core/templates/core/note_confirm_delete.html:18
+#: core/templates/core/sleep_confirm_delete.html:18
+#: core/templates/core/temperature_confirm_delete.html:18
+#: core/templates/core/timer_confirm_delete.html:21
+#: core/templates/core/tummytime_confirm_delete.html:18
+#: core/templates/core/weight_confirm_delete.html:18
 msgid "Cancel"
 msgstr "Avbryt"
 
 #: babybuddy/templates/babybuddy/user_form.html:8
 #: babybuddy/templates/babybuddy/user_form.html:18
-#: babybuddy/templates/babybuddy/user_form.html:26
+#: babybuddy/templates/babybuddy/user_form.html:28
 #: babybuddy/templates/babybuddy/user_list.html:65
 msgid "Create User"
 msgstr "Skapa användare"
@@ -496,25 +497,19 @@ msgstr "Byt lösenord"
 msgid "User Settings"
 msgstr "Användarinställningar"
 
-#: babybuddy/templates/babybuddy/user_settings_form.html:24
-msgid "<strong>Error:</strong> Some fields have errors. See below for details."
-msgstr ""
-"<strong>Fel:</strong> Vissa fält innehåller felaktigheter. Se nedan för "
-"detaljer."
-
-#: babybuddy/templates/babybuddy/user_settings_form.html:28
+#: babybuddy/templates/babybuddy/user_settings_form.html:33
 msgid "User Profile"
 msgstr "Användarprofil"
 
-#: babybuddy/templates/babybuddy/user_settings_form.html:59
+#: babybuddy/templates/babybuddy/user_settings_form.html:64
 msgid "API"
 msgstr "API"
 
-#: babybuddy/templates/babybuddy/user_settings_form.html:61
+#: babybuddy/templates/babybuddy/user_settings_form.html:66
 msgid "Key"
 msgstr "Nyckel"
 
-#: babybuddy/templates/babybuddy/user_settings_form.html:64
+#: babybuddy/templates/babybuddy/user_settings_form.html:69
 msgid "Regenerate"
 msgstr "Återskapa"
 
@@ -529,14 +524,13 @@ msgstr "Välkommen till Baby Buddy!"
 
 #: babybuddy/templates/babybuddy/welcome.html:14
 msgid ""
-"Learn about and predict baby's needs without\n"
-"            (<em>as much</em>) guess work by using Baby Buddy to track "
-"&mdash;"
+"Learn about and predict baby's needs without (<em>as much</em>) guess work "
+"by using Baby Buddy to track &mdash;"
 msgstr ""
 "Lär dig om och förutsäga barnets behov utan (<em>så mycket</em>) "
 "gissningsarbete genom att använda Baby Buddy för att spåra &mdash;"
 
-#: babybuddy/templates/babybuddy/welcome.html:24 core/models.py:149
+#: babybuddy/templates/babybuddy/welcome.html:26 core/models.py:149
 #: core/templates/core/diaperchange_confirm_delete.html:7
 #: core/templates/core/diaperchange_form.html:13
 #: core/templates/core/diaperchange_list.html:4
@@ -546,18 +540,13 @@ msgstr ""
 msgid "Diaper Changes"
 msgstr "Blöjbyten"
 
-#: babybuddy/templates/babybuddy/welcome.html:54
+#: babybuddy/templates/babybuddy/welcome.html:56
 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!"
+"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 ""
 "När antalet inlägg ökar, hjälper Baby Buddy föräldrar och vårdgivare "
 "identifierar små mönster i barnens vanormed hjälp av instrumentpanelen och "
@@ -566,9 +555,9 @@ msgstr ""
 "komma igång, klicka bara på knappen nedan för att lägga till din första "
 "(eller andra, tredje, etc.) barn!"
 
-#: babybuddy/templates/babybuddy/welcome.html:64
+#: babybuddy/templates/babybuddy/welcome.html:68
 #: core/templates/core/child_form.html:8 core/templates/core/child_form.html:18
-#: core/templates/core/child_form.html:26
+#: core/templates/core/child_form.html:28
 #: core/templates/core/child_list.html:70
 msgid "Add a Child"
 msgstr "Lägg till barn"
@@ -597,20 +586,18 @@ msgstr "Logga in"
 msgid "Password Reset"
 msgstr "Återställ lösenord"
 
-#: babybuddy/templates/registration/password_reset_confirm.html:12
+#: babybuddy/templates/registration/password_reset_confirm.html:13
 msgid ""
-"<p class=\"mb-0\"><strong>Oh snap!</strong> The\n"
-"                two passwords did not match. Please try again.</p>"
+"<strong>Oh snap!</strong> The two passwords did not match. Please try again."
 msgstr ""
-"<p class=\"mb-0\"><strong>Ajdå!</strong> Lösenorden stämmer inte överens. "
-"Vänligen försök igen.</p>"
+"<strong>Ajdå!</strong> Lösenorden stämmer inte överens. Vänligen försök igen."
 
-#: babybuddy/templates/registration/password_reset_confirm.html:18
+#: babybuddy/templates/registration/password_reset_confirm.html:22
 msgid "Enter your new password in each field below."
 msgstr "Ange ditt nya lösenord i varje fält här nedan."
 
-#: babybuddy/templates/registration/password_reset_confirm.html:42
-#: babybuddy/templates/registration/password_reset_form.html:27
+#: babybuddy/templates/registration/password_reset_confirm.html:46
+#: babybuddy/templates/registration/password_reset_form.html:31
 msgid "Reset Password"
 msgstr "Återställ lösenord"
 
@@ -618,36 +605,33 @@ msgstr "Återställ lösenord"
 msgid "Reset Email Sent"
 msgstr "E-post med lösenordsåterställning skickad"
 
-#: babybuddy/templates/registration/password_reset_done.html:8
+#: babybuddy/templates/registration/password_reset_done.html:9
 msgid ""
-"<p>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.</p>\n"
-"        <p class=\"mb-0\">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.</p>"
+"We've emailed you instructions for setting your password, if an account "
+"exists with the email you entered. You should receive them shortly."
 msgstr ""
-"<p> Vi har mailat dig instruktioner för att ställa in ditt lösenord, om ett "
-"konto finns med det e-postmeddelande du angav. Du bör få detta inom kort. </ "
-"p><p class = \"mb-0\"> Om du inte får ett e-postmeddelande, se till att du "
-"har anget adressen du registrerade med och kontrollera din skräppost mapp. "
-"</ p>"
+"Vi har mailat dig instruktioner för att ställa in ditt lösenord, om ett "
+"konto finns med det e-postmeddelande du angav. Du bör få detta inom kort."
+
+#: 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 ""
+" Om du inte får ett e-postmeddelande, se till att du har anget adressen du "
+"registrerade med och kontrollera din skräppost mapp."
 
 #: babybuddy/templates/registration/password_reset_form.html:4
 msgid "Forgot Password"
 msgstr "Glömt lösenord"
 
-#: babybuddy/templates/registration/password_reset_form.html:8
+#: babybuddy/templates/registration/password_reset_form.html:9
 msgid ""
-"<p class=\"mb-0\">Enter your account email address in the\n"
-"        form below. If the address is valid, you will receive instructions "
-"for\n"
-"        resetting your password.</p>"
+"Enter your account email address in the form below. If the address is valid, "
+"you will receive instructions for resetting your password."
 msgstr ""
-"<p class=\"mb-0\">Ange ditt kontos e-postadress i formuläret nedan. Om e-"
-"postadressen är korrekt så skickar vi instruktioner för att återställa "
-"lösenordet.</p>"
+"Ange ditt kontos e-postadress i formuläret nedan. Om e-postadressen är "
+"korrekt så skickar vi instruktioner för att återställa lösenordet."
 
 #: babybuddy/views.py:56
 #, python-format
@@ -829,7 +813,7 @@ msgstr "Namn"
 msgid "Timer"
 msgstr "Timer"
 
-#: core/models.py:409 core/templates/core/timer_confirm_delete.html:7
+#: core/models.py:409 core/templates/core/timer_confirm_delete.html:9
 #: core/templates/core/timer_detail.html:7
 #: core/templates/core/timer_form.html:7 core/templates/core/timer_list.html:4
 #: core/templates/core/timer_list.html:7 core/templates/core/timer_list.html:11
@@ -858,7 +842,7 @@ msgstr "Datum"
 msgid "Delete a Child"
 msgstr "Radera ett barn"
 
-#: core/templates/core/child_confirm_delete.html:18
+#: core/templates/core/child_confirm_delete.html:20
 msgid "To confirm this action. Type the full name of the child below."
 msgstr ""
 "För att bekräfta denna åtgärd. Skriv hela barnets fullständiga namn nedan."
@@ -895,7 +879,7 @@ msgid "Update a Diaper Change"
 msgstr "Uppdatera ett blöjbyte"
 
 #: core/templates/core/diaperchange_form.html:8
-#: core/templates/core/diaperchange_form.html:25
+#: core/templates/core/diaperchange_form.html:27
 msgid "Add a Diaper Change"
 msgstr "Lägg till blöjbyte"
 
@@ -923,7 +907,7 @@ msgid "Update a Feeding"
 msgstr "Uppdatera matning"
 
 #: core/templates/core/feeding_form.html:8
-#: core/templates/core/feeding_form.html:25
+#: core/templates/core/feeding_form.html:27
 #: core/templates/core/feeding_list.html:71
 msgid "Add a Feeding"
 msgstr "Lägg till matning"
@@ -944,7 +928,7 @@ msgstr "Radera anteckning"
 msgid "Update a Note"
 msgstr "Uppdatera anteckning"
 
-#: core/templates/core/note_form.html:8 core/templates/core/note_form.html:25
+#: core/templates/core/note_form.html:8 core/templates/core/note_form.html:27
 #: core/templates/core/note_list.html:59
 msgid "Add a Note"
 msgstr "Lägg till anteckning"
@@ -961,7 +945,7 @@ msgstr "Radera sömn-inlägg"
 msgid "Update a Sleep Entry"
 msgstr "Uppdatera sömn-inlägg"
 
-#: core/templates/core/sleep_form.html:8 core/templates/core/sleep_form.html:25
+#: core/templates/core/sleep_form.html:8 core/templates/core/sleep_form.html:27
 #: core/templates/core/sleep_list.html:63
 msgid "Add a Sleep Entry"
 msgstr "Lägg till sömn-inlägg"
@@ -997,7 +981,7 @@ msgstr "Radera matning"
 msgid "Add a Temperature Reading"
 msgstr "Lägg till matning"
 
-#: core/templates/core/temperature_form.html:25
+#: core/templates/core/temperature_form.html:27
 msgid "Add a Temperature Entry"
 msgstr "Lägg till sömn-inlägg"
 
@@ -1005,7 +989,7 @@ msgstr "Lägg till sömn-inlägg"
 msgid "No temperature entries found."
 msgstr "Inga timer-inlägg funna."
 
-#: core/templates/core/timer_confirm_delete.html:4
+#: core/templates/core/timer_confirm_delete.html:5
 #, python-format
 msgid "Delete %(object)s"
 msgstr "Radera %(object)s"
@@ -1023,11 +1007,11 @@ msgstr "Stoppad"
 msgid "%(timer)s created by %(user)s"
 msgstr " %(timer)s skapad av %(user)s"
 
-#: core/templates/core/timer_detail.html:53
+#: core/templates/core/timer_detail.html:55
 msgid "Timer actions"
 msgstr "Timer-åtgärder"
 
-#: core/templates/core/timer_form.html:20 core/templates/core/timer_nav.html:18
+#: core/templates/core/timer_form.html:22 core/templates/core/timer_nav.html:18
 msgid "Start Timer"
 msgstr "Starta timer"
 
@@ -1062,7 +1046,7 @@ msgid "Update a Tummy Time Entry"
 msgstr "Update magtränings-inlägg"
 
 #: core/templates/core/tummytime_form.html:8
-#: core/templates/core/tummytime_form.html:25
+#: core/templates/core/tummytime_form.html:27
 #: core/templates/core/tummytime_list.html:63
 msgid "Add a Tummy Time Entry"
 msgstr "Lägg till magtränings-inlägg"
@@ -1077,7 +1061,7 @@ msgstr "Radera viktinlägg"
 
 #: core/templates/core/weight_form.html:8
 #: core/templates/core/weight_form.html:17
-#: core/templates/core/weight_form.html:25
+#: core/templates/core/weight_form.html:27
 #: core/templates/core/weight_list.html:59
 msgid "Add a Weight Entry"
 msgstr "Lägg till viktinlägg"
@@ -1199,10 +1183,10 @@ msgstr "Senaste blöjbyte"
 msgid "%(time)s ago"
 msgstr "%(time)s sedan"
 
-#: dashboard/templates/cards/diaperchange_last.html:10
-#: dashboard/templates/cards/feeding_last.html:10
-#: dashboard/templates/cards/sleep_last.html:10
-#: dashboard/templates/cards/tummytime_last.html:10
+#: 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:12
 msgid "Never"
 msgstr "Aldrig"
 
@@ -1244,7 +1228,7 @@ msgid "Today's Sleep"
 msgstr "Sömn idag"
 
 #: dashboard/templates/cards/sleep_day.html:11
-#: dashboard/templates/cards/sleep_naps_day.html:11
+#: dashboard/templates/cards/sleep_naps_day.html:13
 #: dashboard/templates/cards/tummytime_day.html:11
 msgid "None yet today"
 msgstr "Ingen ännu idag"
@@ -1280,7 +1264,7 @@ msgstr "Otillräcklig data"
 msgid "%(count)s active timer%(plural)s"
 msgstr "%(count)s aktiv timer%(plural)s"
 
-#: dashboard/templates/cards/timer_list.html:19
+#: dashboard/templates/cards/timer_list.html:21
 #, python-format
 msgid "Started by %(user)s at %(start)s"
 msgstr "Startad av %(user)s vid %(start)s"
diff --git a/locale/tr/LC_MESSAGES/django.mo b/locale/tr/LC_MESSAGES/django.mo
index 54ca6196..76dc15bf 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 6ae30142..3b2fbe82 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: 2020-01-23 19:19-0800\n"
+"POT-Creation-Date: 2020-01-23 19:59-0800\n"
 "Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -16,7 +16,7 @@ msgid "Settings"
 msgstr "Ayarlar"
 
 #: babybuddy/admin.py:16 babybuddy/templates/babybuddy/nav-dropdown.html:82
-#: babybuddy/templates/babybuddy/user_settings_form.html:51
+#: babybuddy/templates/babybuddy/user_settings_form.html:56
 #: dashboard/templates/dashboard/child.html:4
 #: dashboard/templates/dashboard/child.html:9
 #: dashboard/templates/dashboard/dashboard.html:4
@@ -110,11 +110,11 @@ msgstr "Erişim Engellendi"
 
 #: babybuddy/templates/403.html:12
 msgid ""
-"You do not have permission to access this resource.\n"
-"        Contact a site administrator for assistance."
+"You do not have permission to access this resource. Contact a site "
+"administrator for assistance."
 msgstr ""
-"Bu kaynağa erişmek için izniniz yoktur.\n"
-"Yardım için website yöneticisiyle iletişime geçin."
+"Bu kaynağa erişmek için izniniz yoktur. Yardım için website yöneticisiyle "
+"iletişime geçin."
 
 #: babybuddy/templates/babybuddy/base.html:36
 msgid "Home"
@@ -133,7 +133,7 @@ msgid "Filters"
 msgstr "Filtreler"
 
 #: babybuddy/templates/babybuddy/form.html:11
-#: babybuddy/templates/babybuddy/user_settings_form.html:69
+#: babybuddy/templates/babybuddy/user_settings_form.html:74
 msgid "Submit"
 msgstr "Gönder"
 
@@ -144,11 +144,11 @@ msgid "<strong>Error:</strong> %(error)s"
 msgstr "<strong>Hata:</strong> %(error)s"
 
 #: babybuddy/templates/babybuddy/messages.html:23
-msgid ""
-"<strong>Error:</strong> Some fields have errors. See below for details. "
+#: babybuddy/templates/babybuddy/user_settings_form.html:26
+msgid "<strong>Error:</strong> Some fields have errors. See below for details."
 msgstr ""
 "<strong>Hata:</strong> Bazı alanlarda hata var. Detaylar için aşağıya "
-"bakınız. "
+"bakınız."
 
 #: babybuddy/templates/babybuddy/nav-dropdown.html:27 core/models.py:148
 #: core/models.py:152
@@ -157,7 +157,7 @@ msgstr "Bez Değişimi"
 
 #: babybuddy/templates/babybuddy/nav-dropdown.html:33
 #: babybuddy/templates/babybuddy/nav-dropdown.html:189 core/models.py:222
-#: core/models.py:226 core/templates/core/timer_detail.html:33
+#: core/models.py:226 core/templates/core/timer_detail.html:35
 msgid "Feeding"
 msgstr "Beslenme"
 
@@ -169,12 +169,12 @@ msgstr "Not"
 
 #: babybuddy/templates/babybuddy/nav-dropdown.html:45
 #: babybuddy/templates/babybuddy/nav-dropdown.html:196
-#: babybuddy/templates/babybuddy/welcome.html:40 core/models.py:306
+#: babybuddy/templates/babybuddy/welcome.html:42 core/models.py:306
 #: core/models.py:307 core/models.py:310
 #: core/templates/core/sleep_confirm_delete.html:7
 #: core/templates/core/sleep_form.html:13 core/templates/core/sleep_list.html:4
 #: core/templates/core/sleep_list.html:7 core/templates/core/sleep_list.html:11
-#: core/templates/core/timer_detail.html:41
+#: core/templates/core/timer_detail.html:43
 msgid "Sleep"
 msgstr "Uyku"
 
@@ -192,9 +192,9 @@ msgstr ""
 
 #: babybuddy/templates/babybuddy/nav-dropdown.html:57
 #: babybuddy/templates/babybuddy/nav-dropdown.html:209
-#: babybuddy/templates/babybuddy/welcome.html:48 core/models.py:486
+#: babybuddy/templates/babybuddy/welcome.html:50 core/models.py:486
 #: core/models.py:487 core/models.py:490
-#: core/templates/core/timer_detail.html:49
+#: core/templates/core/timer_detail.html:51
 #: core/templates/core/tummytime_confirm_delete.html:7
 #: core/templates/core/tummytime_form.html:13
 #: core/templates/core/tummytime_list.html:4
@@ -271,7 +271,7 @@ msgid "Change"
 msgstr "Değişim"
 
 #: babybuddy/templates/babybuddy/nav-dropdown.html:183
-#: babybuddy/templates/babybuddy/welcome.html:32 core/models.py:223
+#: babybuddy/templates/babybuddy/welcome.html:34 core/models.py:223
 #: core/templates/core/feeding_confirm_delete.html:7
 #: core/templates/core/feeding_form.html:13
 #: core/templates/core/feeding_list.html:4
@@ -356,23 +356,23 @@ msgstr "Kullanıcı Sil"
 
 #: babybuddy/templates/babybuddy/user_confirm_delete.html:9
 #: core/templates/core/child_confirm_delete.html:9
-#: core/templates/core/child_confirm_delete.html:29
+#: core/templates/core/child_confirm_delete.html:31
 #: core/templates/core/diaperchange_confirm_delete.html:8
-#: core/templates/core/diaperchange_confirm_delete.html:15
+#: core/templates/core/diaperchange_confirm_delete.html:17
 #: core/templates/core/feeding_confirm_delete.html:8
-#: core/templates/core/feeding_confirm_delete.html:15
+#: core/templates/core/feeding_confirm_delete.html:17
 #: core/templates/core/note_confirm_delete.html:8
-#: core/templates/core/note_confirm_delete.html:15
+#: core/templates/core/note_confirm_delete.html:17
 #: core/templates/core/sleep_confirm_delete.html:8
-#: core/templates/core/sleep_confirm_delete.html:15
+#: core/templates/core/sleep_confirm_delete.html:17
 #: core/templates/core/temperature_confirm_delete.html:8
-#: core/templates/core/temperature_confirm_delete.html:15
-#: core/templates/core/timer_confirm_delete.html:9
-#: core/templates/core/timer_confirm_delete.html:16
+#: core/templates/core/temperature_confirm_delete.html:17
+#: core/templates/core/timer_confirm_delete.html:11
+#: core/templates/core/timer_confirm_delete.html:20
 #: core/templates/core/tummytime_confirm_delete.html:8
-#: core/templates/core/tummytime_confirm_delete.html:15
+#: core/templates/core/tummytime_confirm_delete.html:17
 #: core/templates/core/weight_confirm_delete.html:8
-#: core/templates/core/weight_confirm_delete.html:15
+#: core/templates/core/weight_confirm_delete.html:17
 msgid "Delete"
 msgstr "Sil"
 
@@ -383,7 +383,7 @@ msgstr "Sil"
 #: core/templates/core/note_confirm_delete.html:14
 #: core/templates/core/sleep_confirm_delete.html:14
 #: core/templates/core/temperature_confirm_delete.html:14
-#: core/templates/core/timer_confirm_delete.html:15
+#: 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
@@ -394,22 +394,22 @@ msgstr ""
 "<h1>Silmek istediğinizden emin misiniz <span class=\"text-info\">%(object)s</"
 "span>?</h1>"
 
-#: babybuddy/templates/babybuddy/user_confirm_delete.html:17
-#: core/templates/core/child_confirm_delete.html:30
-#: core/templates/core/diaperchange_confirm_delete.html:16
-#: core/templates/core/feeding_confirm_delete.html:16
-#: core/templates/core/note_confirm_delete.html:16
-#: core/templates/core/sleep_confirm_delete.html:16
-#: core/templates/core/temperature_confirm_delete.html:16
-#: core/templates/core/timer_confirm_delete.html:17
-#: core/templates/core/tummytime_confirm_delete.html:16
-#: core/templates/core/weight_confirm_delete.html:16
+#: babybuddy/templates/babybuddy/user_confirm_delete.html:19
+#: core/templates/core/child_confirm_delete.html:32
+#: core/templates/core/diaperchange_confirm_delete.html:18
+#: core/templates/core/feeding_confirm_delete.html:18
+#: core/templates/core/note_confirm_delete.html:18
+#: core/templates/core/sleep_confirm_delete.html:18
+#: core/templates/core/temperature_confirm_delete.html:18
+#: core/templates/core/timer_confirm_delete.html:21
+#: core/templates/core/tummytime_confirm_delete.html:18
+#: core/templates/core/weight_confirm_delete.html:18
 msgid "Cancel"
 msgstr "İptal"
 
 #: babybuddy/templates/babybuddy/user_form.html:8
 #: babybuddy/templates/babybuddy/user_form.html:18
-#: babybuddy/templates/babybuddy/user_form.html:26
+#: babybuddy/templates/babybuddy/user_form.html:28
 #: babybuddy/templates/babybuddy/user_list.html:65
 msgid "Create User"
 msgstr "Kullanıcı Ekle"
@@ -496,25 +496,19 @@ msgstr "Şifre Değiştir"
 msgid "User Settings"
 msgstr "Kullanıcı Ayarları"
 
-#: babybuddy/templates/babybuddy/user_settings_form.html:24
-msgid "<strong>Error:</strong> Some fields have errors. See below for details."
-msgstr ""
-"<strong>Hata:</strong> Bazı alanlarda hata var. Detaylar için aşağıya "
-"bakınız."
-
-#: babybuddy/templates/babybuddy/user_settings_form.html:28
+#: babybuddy/templates/babybuddy/user_settings_form.html:33
 msgid "User Profile"
 msgstr "Kullanıcı Profili"
 
-#: babybuddy/templates/babybuddy/user_settings_form.html:59
+#: babybuddy/templates/babybuddy/user_settings_form.html:64
 msgid "API"
 msgstr "API"
 
-#: babybuddy/templates/babybuddy/user_settings_form.html:61
+#: babybuddy/templates/babybuddy/user_settings_form.html:66
 msgid "Key"
 msgstr "Anahtar"
 
-#: babybuddy/templates/babybuddy/user_settings_form.html:64
+#: babybuddy/templates/babybuddy/user_settings_form.html:69
 msgid "Regenerate"
 msgstr "Yeniden Oluştur"
 
@@ -529,14 +523,13 @@ msgstr "Baby Buddy'e Hoşgeldiniz!"
 
 #: babybuddy/templates/babybuddy/welcome.html:14
 msgid ""
-"Learn about and predict baby's needs without\n"
-"            (<em>as much</em>) guess work by using Baby Buddy to track "
-"&mdash;"
+"Learn about and predict baby's needs without (<em>as much</em>) guess work "
+"by using Baby Buddy to track &mdash;"
 msgstr ""
-"Baby Buddy ile takip ederek tahmin etmeye\n"
-"            (<em>çok</em>) gerek kalmadan bebeğin ihtiyaçlarını öğren &mdash;"
+"Baby Buddy ile takip ederek tahmin etmeye (<em>çok</em>) gerek kalmadan "
+"bebeğin ihtiyaçlarını öğren &mdash;"
 
-#: babybuddy/templates/babybuddy/welcome.html:24 core/models.py:149
+#: babybuddy/templates/babybuddy/welcome.html:26 core/models.py:149
 #: core/templates/core/diaperchange_confirm_delete.html:7
 #: core/templates/core/diaperchange_form.html:13
 #: core/templates/core/diaperchange_list.html:4
@@ -546,18 +539,13 @@ msgstr ""
 msgid "Diaper Changes"
 msgstr "Bez Değişiklikleri"
 
-#: babybuddy/templates/babybuddy/welcome.html:54
+#: babybuddy/templates/babybuddy/welcome.html:56
 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!"
+"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 ""
 "Girdiler arttıkça Baby Buddy ailelere bebeklerin alışkanlıkları hakkında "
 "kontrol paneli ve grafikler ile fikir verir. Baby Buddy mobil dostudur ve "
@@ -565,9 +553,9 @@ msgstr ""
 "değişiklikleri için kotu temayı kullanır. Başlamak için yalnızca aşağıdaki "
 "butonu tıklayınız ve ilk (veya ikinci, üçüncü, vs.) çocuğunuzu ekleyiniz!"
 
-#: babybuddy/templates/babybuddy/welcome.html:64
+#: babybuddy/templates/babybuddy/welcome.html:68
 #: core/templates/core/child_form.html:8 core/templates/core/child_form.html:18
-#: core/templates/core/child_form.html:26
+#: core/templates/core/child_form.html:28
 #: core/templates/core/child_list.html:70
 msgid "Add a Child"
 msgstr "Çocuk Ekle"
@@ -596,20 +584,18 @@ msgstr "Giriş Yap"
 msgid "Password Reset"
 msgstr "Şifre Sıfırlama"
 
-#: babybuddy/templates/registration/password_reset_confirm.html:12
+#: babybuddy/templates/registration/password_reset_confirm.html:13
 msgid ""
-"<p class=\"mb-0\"><strong>Oh snap!</strong> The\n"
-"                two passwords did not match. Please try again.</p>"
+"<strong>Oh snap!</strong> The two passwords did not match. Please try again."
 msgstr ""
-"<p class=\"mb-0\"><strong>Hay Aksi!</strong> Şifreler uyuşmuyor. Lütfen "
-"tekrar deneyiniz.</p>"
+"<strong>Hay Aksi!</strong> Şifreler uyuşmuyor. Lütfen tekrar deneyiniz."
 
-#: babybuddy/templates/registration/password_reset_confirm.html:18
+#: babybuddy/templates/registration/password_reset_confirm.html:22
 msgid "Enter your new password in each field below."
 msgstr "Yeni şifrenizi her iki alana giriniz."
 
-#: babybuddy/templates/registration/password_reset_confirm.html:42
-#: babybuddy/templates/registration/password_reset_form.html:27
+#: babybuddy/templates/registration/password_reset_confirm.html:46
+#: babybuddy/templates/registration/password_reset_form.html:31
 msgid "Reset Password"
 msgstr "Şifre Sıfırla"
 
@@ -617,36 +603,34 @@ msgstr "Şifre Sıfırla"
 msgid "Reset Email Sent"
 msgstr "Sıfırlama Epostası Gönderildi"
 
-#: babybuddy/templates/registration/password_reset_done.html:8
+#: babybuddy/templates/registration/password_reset_done.html:9
 msgid ""
-"<p>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.</p>\n"
-"        <p class=\"mb-0\">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.</p>"
+"We've emailed you instructions for setting your password, if an account "
+"exists with the email you entered. You should receive them shortly."
 msgstr ""
-"<p>Eğer girdiğiniz eposta ile kayıtlı kullanıcı varsa şifrenizi yeniden "
+"Eğer girdiğiniz eposta ile kayıtlı kullanıcı varsa şifrenizi yeniden "
 "oluşturmak için talimatları epostanıza gönderdik. Kısa süre sonra size "
-"ulaşacak.</p>\n"
-"<p class=\"mb-0\">Eğer eposta size ulaşmazsa lütfen girdiğiniz eposta "
-"adresinizin doğru olduğuna emin olun ve epostanızdaki spam klasörünü kontrol "
-"ediniz.</p>"
+"ulaşacak."
+
+#: 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 ""
+"Eğer eposta size ulaşmazsa lütfen girdiğiniz eposta adresinizin doğru "
+"olduğuna emin olun ve epostanızdaki spam klasörünü kontrol ediniz."
 
 #: babybuddy/templates/registration/password_reset_form.html:4
 msgid "Forgot Password"
 msgstr "Şifremi Unuttum"
 
-#: babybuddy/templates/registration/password_reset_form.html:8
+#: babybuddy/templates/registration/password_reset_form.html:9
 msgid ""
-"<p class=\"mb-0\">Enter your account email address in the\n"
-"        form below. If the address is valid, you will receive instructions "
-"for\n"
-"        resetting your password.</p>"
+"Enter your account email address in the form below. If the address is valid, "
+"you will receive instructions for resetting your password."
 msgstr ""
-"<p class=\"mb-0\">Eposta adresinizi aşağıdaki forma giriniz. Eposta adresi "
-"doğruysa şifrenizi sıfırmalak için talimatlar gönderilecek.</p>"
+"Eposta adresinizi aşağıdaki forma giriniz. Eposta adresi doğruysa şifrenizi "
+"sıfırmalak için talimatlar gönderilecek."
 
 #: babybuddy/views.py:56
 #, python-format
@@ -785,8 +769,6 @@ msgid "Formula"
 msgstr "Formül"
 
 #: core/models.py:200
-#, fuzzy
-#| msgid "Breast milk"
 msgid "Fortified breast milk"
 msgstr "Anne sütü"
 
@@ -830,7 +812,7 @@ msgstr "İsim"
 msgid "Timer"
 msgstr "Zamanlayıcı"
 
-#: core/models.py:409 core/templates/core/timer_confirm_delete.html:7
+#: core/models.py:409 core/templates/core/timer_confirm_delete.html:9
 #: core/templates/core/timer_detail.html:7
 #: core/templates/core/timer_form.html:7 core/templates/core/timer_list.html:4
 #: core/templates/core/timer_list.html:7 core/templates/core/timer_list.html:11
@@ -859,7 +841,7 @@ msgstr "Tarih"
 msgid "Delete a Child"
 msgstr "Çocuk Sil"
 
-#: core/templates/core/child_confirm_delete.html:18
+#: core/templates/core/child_confirm_delete.html:20
 msgid "To confirm this action. Type the full name of the child below."
 msgstr "İşlemi gerçekleştirmek için aşağıdaki çocuğun tüm ismini yazınız."
 
@@ -895,7 +877,7 @@ msgid "Update a Diaper Change"
 msgstr "Bez Değişikliğini Güncelle"
 
 #: core/templates/core/diaperchange_form.html:8
-#: core/templates/core/diaperchange_form.html:25
+#: core/templates/core/diaperchange_form.html:27
 msgid "Add a Diaper Change"
 msgstr "Bez Değişikliğini Ekle"
 
@@ -923,7 +905,7 @@ msgid "Update a Feeding"
 msgstr "Beslenme güncelle"
 
 #: core/templates/core/feeding_form.html:8
-#: core/templates/core/feeding_form.html:25
+#: core/templates/core/feeding_form.html:27
 #: core/templates/core/feeding_list.html:71
 msgid "Add a Feeding"
 msgstr "Beslenme ekle"
@@ -944,7 +926,7 @@ msgstr "Not Sil"
 msgid "Update a Note"
 msgstr "Not Güncelle"
 
-#: core/templates/core/note_form.html:8 core/templates/core/note_form.html:25
+#: core/templates/core/note_form.html:8 core/templates/core/note_form.html:27
 #: core/templates/core/note_list.html:59
 msgid "Add a Note"
 msgstr "Not Ekle"
@@ -961,7 +943,7 @@ msgstr "Uyku Girdisi Sil"
 msgid "Update a Sleep Entry"
 msgstr "Uyku Girdisi Güncelle"
 
-#: core/templates/core/sleep_form.html:8 core/templates/core/sleep_form.html:25
+#: core/templates/core/sleep_form.html:8 core/templates/core/sleep_form.html:27
 #: core/templates/core/sleep_list.html:63
 msgid "Add a Sleep Entry"
 msgstr "Uyku Girdisi Ekle"
@@ -988,32 +970,24 @@ msgid "No sleep entries found."
 msgstr "Uyku girdisi bulunamadı"
 
 #: core/templates/core/temperature_confirm_delete.html:4
-#, fuzzy
-#| msgid "Delete a Feeding"
 msgid "Delete a Temperature Reading"
 msgstr "Beslenme ekle"
 
 #: core/templates/core/temperature_form.html:8
 #: core/templates/core/temperature_form.html:17
 #: core/templates/core/temperature_list.html:59
-#, fuzzy
-#| msgid "Add a Feeding"
 msgid "Add a Temperature Reading"
 msgstr "Beslenme ekle"
 
-#: core/templates/core/temperature_form.html:25
-#, fuzzy
-#| msgid "Add a Sleep Entry"
+#: core/templates/core/temperature_form.html:27
 msgid "Add a Temperature Entry"
 msgstr "Uyku Girdisi Ekle"
 
 #: core/templates/core/temperature_list.html:49
-#, fuzzy
-#| msgid "No timer entries found."
 msgid "No temperature entries found."
 msgstr "Zamanlayıcı girdisi bulunamadı"
 
-#: core/templates/core/timer_confirm_delete.html:4
+#: core/templates/core/timer_confirm_delete.html:5
 #, python-format
 msgid "Delete %(object)s"
 msgstr "Sil %(object)s"
@@ -1031,11 +1005,11 @@ msgstr "Durdu"
 msgid "%(timer)s created by %(user)s"
 msgstr "%(timer)s %(user)s tarafından oluşturuldu"
 
-#: core/templates/core/timer_detail.html:53
+#: core/templates/core/timer_detail.html:55
 msgid "Timer actions"
 msgstr "Zamanlayıcı eylemleri"
 
-#: core/templates/core/timer_form.html:20 core/templates/core/timer_nav.html:18
+#: core/templates/core/timer_form.html:22 core/templates/core/timer_nav.html:18
 msgid "Start Timer"
 msgstr "Zamanlayıcı Başlat"
 
@@ -1070,7 +1044,7 @@ msgid "Update a Tummy Time Entry"
 msgstr "Karın Üstü Uyku Girdisi Güncelle"
 
 #: core/templates/core/tummytime_form.html:8
-#: core/templates/core/tummytime_form.html:25
+#: core/templates/core/tummytime_form.html:27
 #: core/templates/core/tummytime_list.html:63
 msgid "Add a Tummy Time Entry"
 msgstr "Karın Üstü Zamanı Girdisi Ekle"
@@ -1085,7 +1059,7 @@ msgstr "Ağırlık Girdisi Sil"
 
 #: core/templates/core/weight_form.html:8
 #: core/templates/core/weight_form.html:17
-#: core/templates/core/weight_form.html:25
+#: core/templates/core/weight_form.html:27
 #: core/templates/core/weight_list.html:59
 msgid "Add a Weight Entry"
 msgstr "Ağırlık Girdisi Ekle"
@@ -1151,10 +1125,9 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: core/views.py:20
-#, fuzzy, python-format
-#| msgid "%(model)s entry for %(child)s added!"
+#, python-format
 msgid "%(model)s entry for %(child)s added!"
-msgstr "%(child) için %(model)s girdisi eklendi!"
+msgstr "%(child)s için %(model)s girdisi eklendi!"
 
 #: core/views.py:22
 #, python-format
@@ -1162,10 +1135,9 @@ msgid "%(model)s entry added!"
 msgstr "%(model)s girdisi eklendi!"
 
 #: core/views.py:31
-#, fuzzy, python-format
-#| msgid "%(model)s entry for %(child)s updated."
+#, python-format
 msgid "%(model)s entry for %(child)s updated."
-msgstr "%(child) için %(model)s girdisi güncellendi."
+msgstr "%(child)s için %(model)s girdisi güncellendi."
 
 #: core/views.py:33
 #, python-format
@@ -1173,8 +1145,7 @@ msgid "%(model)s entry updated."
 msgstr "%(model)s girdisi güncellendi."
 
 #: core/views.py:43
-#, fuzzy, python-format
-#| msgid "%(model)s entry updated."
+#, python-format
 msgid "%(model)s entry deleted."
 msgstr "%(model)s girdisi güncellendi."
 
@@ -1184,16 +1155,14 @@ msgid "%(first_name)s %(last_name)s added!"
 msgstr "%(first_name)s %(last_name)s eklendi!"
 
 #: core/views.py:235
-#, fuzzy, python-format
-#| msgid "%(model)s entry added!"
+#, python-format
 msgid "%(model)s reading added!"
 msgstr "%(model)s girdisi eklendi!"
 
 #: core/views.py:243
-#, fuzzy, python-format
-#| msgid "%(model)s entry for %(child)s updated."
+#, python-format
 msgid "%(model)s reading for %(child)s updated."
-msgstr "%(child) için %(model)s girdisi güncellendi."
+msgstr "%(child)s için %(model)s girdisi güncellendi."
 
 #: core/views.py:321
 #, python-format
@@ -1212,10 +1181,10 @@ msgstr "En Son Bez Değişikliği"
 msgid "%(time)s ago"
 msgstr "%(time)s önce"
 
-#: dashboard/templates/cards/diaperchange_last.html:10
-#: dashboard/templates/cards/feeding_last.html:10
-#: dashboard/templates/cards/sleep_last.html:10
-#: dashboard/templates/cards/tummytime_last.html:10
+#: 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:12
 msgid "Never"
 msgstr "Asla"
 
@@ -1257,7 +1226,7 @@ msgid "Today's Sleep"
 msgstr "Bugünkü Uyku"
 
 #: dashboard/templates/cards/sleep_day.html:11
-#: dashboard/templates/cards/sleep_naps_day.html:11
+#: dashboard/templates/cards/sleep_naps_day.html:13
 #: dashboard/templates/cards/tummytime_day.html:11
 msgid "None yet today"
 msgstr "Bugün Henüz Yok"
@@ -1276,10 +1245,9 @@ msgid "Today's Naps"
 msgstr "Bugünkü Kısa Uykular"
 
 #: dashboard/templates/cards/sleep_naps_day.html:8
-#, fuzzy, python-format
-#| msgid "%(count)s nap%(plural)s"
+#, python-format
 msgid "%(count)s nap%(plural)s"
-msgstr "%(count)s kısa uyku"
+msgstr "%(count)s kısa uyku%(plural)s"
 
 #: dashboard/templates/cards/statistics.html:6
 msgid "Statistics"
@@ -1290,12 +1258,11 @@ msgid "Not enough data"
 msgstr "Yeterli veri yok"
 
 #: dashboard/templates/cards/timer_list.html:8
-#, fuzzy, python-format
-#| msgid "%(count)s active timer%(plural)s"
+#, python-format
 msgid "%(count)s active timer%(plural)s"
-msgstr "%(count)s etkin zamanlayıcı"
+msgstr "%(count)s etkin zamanlayıcı%(plural)s"
 
-#: dashboard/templates/cards/timer_list.html:19
+#: dashboard/templates/cards/timer_list.html:21
 #, python-format
 msgid "Started by %(user)s at %(start)s"
 msgstr "%(user)s tarafından %(start)s da başlatıldı"
@@ -1332,8 +1299,6 @@ msgstr "Bez Ömrü"
 #: dashboard/templates/dashboard/child_button_group.html:21
 #: reports/templates/reports/feeding_amounts.html:4
 #: reports/templates/reports/feeding_amounts.html:8
-#, fuzzy
-#| msgid "Feedings"
 msgid "Feeding Amounts"
 msgstr "Beslenmeler"
 
@@ -1402,20 +1367,14 @@ msgid "Number of changes"
 msgstr "Değişik sayıları"
 
 #: reports/graphs/feeding_amounts.py:27
-#, fuzzy
-#| msgid "Total feedings"
 msgid "Total feeding amount"
 msgstr "Toplam beslenmeler"
 
 #: reports/graphs/feeding_amounts.py:36
-#, fuzzy
-#| msgid "<b>Average Feeding Durations</b>"
 msgid "<b>Total Feeding Amounts</b>"
 msgstr "<b>Ortalama Beslenme Süreleri</b>"
 
 #: reports/graphs/feeding_amounts.py:39
-#, fuzzy
-#| msgid "Feeding"
 msgid "Feeding amount"
 msgstr "Beslenme"
 
@@ -1473,7 +1432,5 @@ msgid "Reports"
 msgstr "Raporlar"
 
 #: reports/templates/reports/report_base.html:19
-#, fuzzy
-#| msgid "There is no enough data to generate this report."
 msgid "There is not enough data to generate this report."
 msgstr "Raporu oluşturmak için yeterli veri yok."